Previous 15994 Revisions Next

r7098 Thursday 21st January, 2010 at 12:26:45 UTC by Miodrag Milanović
Some progress on making UI work
[src/mess/osd/winui]devview.c messui.c propertiesms.c softwarepicker.c swconfig.c
[src/osd/winui]bitmask.c dijoystick.c directdraw.c directories.c dirwatch.c mui_audit.c mui_opts.c mui_util.c picker.c properties.c screenshot.c splitters.c tabview.c treeview.c treeview.h winui.c

src/osd/winui/treeview.h
r7097r7098
165165
166166typedef struct
167167{
168    char        m_szTitle[256];  // Folder Title
168    char        m_szTitle[64];  // Folder Title
169169    UINT        m_nFolderId;    // ID
170170    int         m_nParent;      // Parent Folder index in treeFolders[]
171171    DWORD       m_dwFlags;      // Flags - Customizable and Filters
src/osd/winui/tabview.c
r7097r7098
7575   switch(message)
7676   {
7777      case WM_DESTROY:
78         free(pTabViewInfo);
78         global_free(pTabViewInfo);
7979         SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR) pfnParentWndProc);
8080         SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR) NULL);
8181         break;
r7097r7098
292292            return;
293293         tci.pszText = t_text;
294294         TabCtrl_InsertItem(hwndTabView, i, &tci);
295//         free(t_text);
295//         global_free(t_text);
296296      }
297297   }
298298   TabView_UpdateSelection(hwndTabView);
src/osd/winui/directories.c
r7097r7098
162162         return;
163163      pOldText = pInfo[nType].m_Directory;
164164      if (pOldText)
165         free(pOldText);
165         global_free(pOldText);
166166      pInfo[nType].m_Directory = s;
167167   }
168168}
r7097r7098
290290      if( !t_s )
291291         return FALSE;
292292      (void)ComboBox_InsertString(GetDlgItem(hDlg, IDC_DIR_COMBO), 0, win_tstring_strdup(t_s));
293      free(t_s);
293      global_free(t_s);
294294      t_s = NULL;
295295   }
296296
r7097r7098
334334      {
335335         DirInfo_SetDir(g_pDirInfo, i, -1, t_s);
336336      }
337      free(t_s);
337      global_free(t_s);
338338      t_s = NULL;
339339   }
340340
r7097r7098
343343
344344error:
345345   if( t_s )
346      free(t_s);
346      global_free(t_s);
347347   Directories_OnDestroy(hDlg);
348348   EndDialog(hDlg, -1);
349349   return FALSE;
r7097r7098
363363      for (i = 0; i < nDirInfoCount; i++)
364364      {
365365         if (g_pDirInfo[i].m_Path)
366            free(g_pDirInfo[i].m_Path);
366            global_free(g_pDirInfo[i].m_Path);
367367         if (g_pDirInfo[i].m_Directory)
368            free(g_pDirInfo[i].m_Directory);         
368            global_free(g_pDirInfo[i].m_Directory);         
369369      }
370      free(g_pDirInfo);
370      global_free(g_pDirInfo);
371371      g_pDirInfo = NULL;
372372   }
373373}
r7097r7098
398398      }
399399      utf8_buf = utf8_from_tstring(buf);
400400      SetTheseDirs(utf8_buf);
401      free(utf8_buf);
401      global_free(utf8_buf);
402402
403403      nResult |= nFlagResult;
404404    }
r7097r7098
423423         s = FixSlash(DirInfo_Dir(g_pDirInfo, i));
424424         utf8_s = utf8_from_tstring(s);
425425         g_directoryInfo[i].pfnSetTheseDirs(utf8_s);
426         free(utf8_s);
426         global_free(utf8_s);
427427      }
428428   }
429429   EndDialog(hDlg, nResult);
src/osd/winui/dijoystick.c
r7097r7098
448448   hr = IDirectInputDevice2_SetProperty(joystick->did, DIPROP_RANGE, &diprg.diph);
449449   if (FAILED(hr)) /* if this fails, don't use this axis */
450450   {
451      free(joystick->axes[joystick->num_axes].name);
451      global_free(joystick->axes[joystick->num_axes].name);
452452      joystick->axes[joystick->num_axes].name = NULL;
453453      return DIENUM_CONTINUE;
454454   }
r7097r7098
649649   for (i = 0; i < joystick->num_axes; i++)
650650   {
651651      if (joystick->axes[i].name)
652         free(joystick->axes[i].name);
652         global_free(joystick->axes[i].name);
653653      joystick->axes[i].name = NULL;
654654   }
655655   
656656   if (joystick->name != NULL)
657657   {
658      free(joystick->name);
658      global_free(joystick->name);
659659      joystick->name = NULL;
660660   }
661661}
src/osd/winui/screenshot.c
r7097r7098
211211      header = zip_file_next_file(zip);
212212   }
213213
214   free(new_filename);
214   global_free(new_filename);
215215   return header;
216216}
217217
r7097r7098
345345
346346   // free the buffer if we have to
347347   if (buffer != NULL) {
348      free(buffer);
348      global_free(buffer);
349349   }
350350   return success;
351351}
r7097r7098
498498     
499499      *pPal = CreatePalette(pLP);
500500     
501      free (pLP);
501      global_free (pLP);
502502   }
503503   
504504   copy_size = dibSize;
r7097r7098
520520   if (p.color_type != 3 && p.color_type != 2)
521521   {
522522      logerror("Unsupported color type %i (has to be 3)\n", p.color_type);
523      free(p.image);
523      global_free(p.image);
524524      return 0;
525525   }
526526   if (p.interlace_method != 0)
527527   {
528528      logerror("Interlace unsupported\n");
529      free (p.image);
529      global_free (p.image);
530530      return 0;
531531   }
532532 
r7097r7098
536536   if (!AllocatePNG(&p, phDIB, pPAL))
537537   {
538538      logerror("Unable to allocate memory for artwork\n");
539      free(p.image);
539      global_free(p.image);
540540      return 0;
541541   }
542542
r7097r7098
562562      store_pixels(p.image + i * (p.width * bytespp), p.width * bytespp);
563563   }
564564
565   free(p.image);
565   global_free(p.image);
566566
567567   return 1;
568568}
src/osd/winui/picker.c
r7097r7098
256256{
257257   // Free up all resources associated with this picker structure
258258   if (pPickerInfo->pnColumnsShown)
259      free(pPickerInfo->pnColumnsShown);
259      global_free(pPickerInfo->pnColumnsShown);
260260   if (pPickerInfo->pnColumnsOrder)
261      free(pPickerInfo->pnColumnsOrder);
262   free(pPickerInfo);
261      global_free(pPickerInfo->pnColumnsOrder);
262   global_free(pPickerInfo);
263263}
264264
265265
r7097r7098
418418
419419done:
420420   if (widths)
421      free(widths);
421      global_free(widths);
422422   if (order)
423      free(order);
423      global_free(order);
424424   if (shown)
425      free(shown);
425      global_free(shown);
426426}
427427
428428
r7097r7098
11621162      }
11631163   }
11641164
1165   free(shown);
1165   global_free(shown);
11661166   return nColumnCount;
11671167}
11681168
r7097r7098
12711271
12721272done:
12731273   if (widths)
1274      free(widths);
1274      global_free(widths);
12751275   if (order)
1276      free(order);
1276      global_free(order);
12771277   if (tmpOrder)
1278      free(tmpOrder);
1278      global_free(tmpOrder);
12791279   return bSuccess;
12801280}
src/osd/winui/mui_audit.c
r7097r7098
182182   audit_records = audit_images(MameUIGlobal(), drivers[game], AUDIT_VALIDATE_FAST, &audit);
183183   res = ProcessAuditResults(game, audit, audit_records);
184184   if (audit_records > 0)
185      free(audit);
185      global_free(audit);
186186
187187   SetRomAuditResults(game, res);
188188   return res;
r7097r7098
199199   audit_records = audit_samples(MameUIGlobal(), drivers[game], &audit);
200200   res = ProcessAuditResults(game, audit, audit_records);
201201   if (audit_records > 0)
202      free(audit);
202      global_free(audit);
203203
204204   SetSampleAuditResults(game, res);
205205   return res;
r7097r7098
454454   Edit_SetSel(hEdit, textLength, textLength);
455455   SendMessage( hEdit, EM_REPLACESEL, FALSE, (WPARAM)(LPCTSTR)win_tstring_strdup(t_s) );
456456   
457   free(t_s);
457   global_free(t_s);
458458}
459459
460460static const char * StatusString(int iStatus)
src/osd/winui/splitters.c
r7097r7098
7474{
7575   if (splitter)
7676   {
77      free(splitter);
77      global_free(splitter);
7878      splitter = NULL;
7979   }
8080   if (nSplitterOffset)
8181   {
82      free(nSplitterOffset);
82      global_free(nSplitterOffset);
8383      nSplitterOffset = NULL;
8484   }
8585}
src/osd/winui/bitmask.c
r7097r7098
2222
2323// MAME/MAMEUI headers
2424#include "bitmask.h"
25
25#include "emu.h"
2626/* Bit routines */
2727static UCHAR maskTable[8] = {
2828   0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01
r7097r7098
4949      }
5050      else
5151      {
52         free(lpBits);
52         global_free(lpBits);
5353         lpBits = 0;
5454      }
5555   }
r7097r7098
6363      return;
6464
6565   if (lpBits->m_nSize && lpBits->m_lpBits)
66      free(lpBits->m_lpBits);
66      global_free(lpBits->m_lpBits);
6767
68   free(lpBits);
68   global_free(lpBits);
6969}
7070
7171/* Test the 'nBit'th bit */
src/osd/winui/mui_opts.c
r7097r7098
21792179      if( !t_ptr )
21802180         return;
21812181      _tcscpy(f->lfFaceName, t_ptr);
2182      free(t_ptr);
2182      global_free(t_ptr);
21832183   }
21842184}
21852185
r7097r7098
22062206         f->lfPitchAndFamily,
22072207         utf8_FaceName);
22082208
2209   free(utf8_FaceName);
2209   global_free(utf8_FaceName);
22102210}
22112211
22122212static void TabFlagsEncodeString(int data, char *str)
src/osd/winui/dirwatch.c
r7097r7098
9696{
9797   if (pEntry->hDir)
9898      CloseHandle(pEntry->hDir);
99   free(pEntry);
99   global_free(pEntry);
100100}
101101
102102
r7097r7098
191191         pWatcher->nMessage,
192192         (pEntry->nIndex << 16) | (pEntry->nSubIndex << 0),
193193         (LPARAM)(LPCTSTR) win_tstring_strdup(t_filename));
194      free(t_filename);
194      global_free(t_filename);
195195   }
196196
197197   DirWatcher_SetupWatch(pWatcher, pEntry);
r7097r7098
368368      CloseHandle(pWatcher->hRequestEvent);
369369   if (pWatcher->hResponseEvent)
370370      CloseHandle(pWatcher->hResponseEvent);
371   free(pWatcher);
371   global_free(pWatcher);
372372}
373373
374374
src/osd/winui/mui_util.c
r7097r7098
203203   hErr = ShellExecute(hWnd, NULL, tName, NULL, NULL, SW_SHOWNORMAL);
204204   if ((FPTR)hErr > 32)
205205   {
206      free(tName);
206      global_free(tName);
207207      return;
208208   }
209209
r7097r7098
239239 
240240   MessageBox(NULL, msg, tName, MB_OK);
241241   
242   free(tName);
242   global_free(tName);
243243}
244244
245245char* MyStrStrI(const char* pFirst, const char* pSrch)
r7097r7098
557557void FreeIfAllocated(char **s)
558558{
559559   if (*s)
560      free(*s);
560      global_free(*s);
561561   *s = NULL;
562562}
563563
r7097r7098
603603   
604604   icon = ExtractIcon(inst, t_exefilename, iconindex);
605605   
606   free(t_exefilename);
606   global_free(t_exefilename);
607607   
608608   return icon;
609609}
r7097r7098
668668   if( bufferlength > 0 ) {
669669      utf8_buffer = utf8_from_tstring(t_buffer);
670670      if( !utf8_buffer ) {
671         free(t_buffer);
671         global_free(t_buffer);
672672         return result;
673673      }
674674   }
r7097r7098
676676   strncpy(buffer, utf8_buffer, bufferlength);
677677   
678678   if( utf8_buffer )
679      free(utf8_buffer);
679      global_free(utf8_buffer);
680680   
681681   if( t_buffer )
682      free(t_buffer);
682      global_free(t_buffer);
683683   
684684   return result;
685685}
r7097r7098
697697   
698698   result = FindFirstFile(t_filename, findfiledata);
699699   
700   free(t_filename);
700   global_free(t_filename);
701701   
702702   return result;
703703}
src/osd/winui/directdraw.c
r7097r7098
247247   
248248   for (i = 0; i < g_nNumDisplays; i++)
249249   {
250      free(g_Displays[i].name);
250      global_free(g_Displays[i].name);
251251      g_Displays[i].name = NULL;
252252      if (g_Displays[i].lpguid != NULL)
253253      {
254         free(g_Displays[i].lpguid);
254         global_free(g_Displays[i].lpguid);
255255         g_Displays[i].lpguid = NULL;
256256      }
257257     
src/osd/winui/treeview.c
r7097r7098
194194         treeFolders[i] = NULL;
195195         numFolders--;
196196      }
197      free(treeFolders);
197      global_free(treeFolders);
198198      treeFolders = NULL;
199199   }
200200   numFolders = 0;
r7097r7098
284284
285285void AddGame(LPTREEFOLDER lpFolder, UINT nGame)
286286{
287   dprintf("AddGame");
288287   if (lpFolder)
289288      SetBit(lpFolder->m_lpGameBits, nGame);
290289}
r7097r7098
305304   UINT   i, jj, k;
306305   BOOL b;
307306   int nGames = driver_list_get_count(drivers);
308
307dprintf("ResetWhichGamesInFolders : %d [%d]\n",nGames,numFolders);
309308   for (i = 0; i < numFolders; i++)
310309   {
311310      LPTREEFOLDER lpFolder = treeFolders[i];
312     
313311      // setup the games in our built-in folders
314312      for (k = 0; g_lpFolderData[k].m_lpTitle; k++)
315313      {
r7097r7098
470468         LPTREEFOLDER lpTemp;
471469         lpTemp = NewFolder(s, next_folder_id, parent_index, IDI_SOURCE,
472470                           GetFolderFlags(numFolders));
473         ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
471         ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
474472         memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
475473
476474         ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
521519         LPTREEFOLDER lpTemp;
522520         lpTemp = NewFolder(s, next_folder_id, parent_index, IDI_FOLDER,
523521                           GetFolderFlags(numFolders));
524         ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
522         ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
525523         memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
526524
527525         ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
579577               // nope, it's a manufacturer we haven't seen before, make it.
580578               lpTemp = NewFolder(t, next_folder_id, parent_index, IDI_MANUFACTURER,
581579                              GetFolderFlags(numFolders));
582               ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
580               ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
583581               memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
584582
585583               ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
969967
970968            lpTemp = NewFolder(device_get_name(device), next_folder_id, parent_index, icon_id,
971969                            GetFolderFlags(numFolders));
972            ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
970            ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
973971            memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
974972
975973            ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
10171015   LPTREEFOLDER lpProt, lpWrongCol, lpImpCol, lpImpGraph, lpMissSnd, lpImpSnd, lpFlip;
10181016   lpProt = NewFolder("Unemulated Protection", next_folder_id, parent_index, IDI_FOLDER,
10191017                   GetFolderFlags(numFolders));
1020   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
1018   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
10211019   memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
10221020
10231021   ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
10291027   AddFolder(lpProt);
10301028   lpWrongCol = NewFolder("Wrong Colors", next_folder_id, parent_index, IDI_FOLDER,
10311029                   GetFolderFlags(numFolders));
1032   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
1030   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
10331031   memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
10341032
10351033   ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
10421040
10431041   lpImpCol = NewFolder("Imperfect Colors", next_folder_id, parent_index, IDI_FOLDER,
10441042                   GetFolderFlags(numFolders));
1045   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
1043   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
10461044   memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
10471045
10481046   ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
10551053
10561054   lpImpGraph = NewFolder("Imperfect Graphics", next_folder_id, parent_index, IDI_FOLDER,
10571055                   GetFolderFlags(numFolders));
1058   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
1056   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
10591057   memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
10601058
10611059   ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
10681066
10691067   lpMissSnd = NewFolder("Missing Sound", next_folder_id, parent_index, IDI_FOLDER,
10701068                   GetFolderFlags(numFolders));
1071   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
1069   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
10721070   memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
10731071
10741072   ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
10811079
10821080   lpImpSnd = NewFolder("Imperfect Sound", next_folder_id, parent_index, IDI_FOLDER,
10831081                   GetFolderFlags(numFolders));
1084   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
1082   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
10851083   memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
10861084
10871085   ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
10941092
10951093   lpFlip = NewFolder("No Cocktail", next_folder_id, parent_index, IDI_FOLDER,
10961094                   GetFolderFlags(numFolders));
1097   ExtraFolderData[next_folder_id] =(EXFOLDERDATA*) malloc(sizeof(EXFOLDERDATA) );
1095   ExtraFolderData[next_folder_id] =(EXFOLDERDATA*) global_alloc_clear(EXFOLDERDATA) ;
10981096   memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
10991097
11001098   ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
11571155   LPTREEFOLDER lpBad, lpNo;
11581156   lpBad = NewFolder("Bad Dump", next_folder_id, parent_index, IDI_FOLDER,
11591157                   GetFolderFlags(numFolders));
1160   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
1158   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
11611159   memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
11621160
11631161   ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
11691167   AddFolder(lpBad);
11701168   lpNo = NewFolder("No Dump", next_folder_id, parent_index, IDI_FOLDER,
11711169                   GetFolderFlags(numFolders));
1172   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
1170   ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
11731171   memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
11741172
11751173   ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
12621260         LPTREEFOLDER lpTemp;
12631261         lpTemp = NewFolder(s, next_folder_id, parent_index, IDI_YEAR,
12641262                         GetFolderFlags(numFolders));
1265         ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
1263         ExtraFolderData[next_folder_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
12661264         memset(ExtraFolderData[next_folder_id], 0, sizeof(EXFOLDERDATA));
12671265
12681266         ExtraFolderData[next_folder_id]->m_nFolderId = next_folder_id;
r7097r7098
12831281   int num_top_level_folders = numFolders;
12841282   int i, j;
12851283
1286   dprintf("num_top_level_folders : %d",num_top_level_folders);
12871284   for (i = 0; i < num_top_level_folders; i++)
12881285   {
12891286      LPTREEFOLDER lpFolder = treeFolders[i];
r7097r7098
13001297
13011298      if (lpFolderData != NULL)
13021299      {
1303         dprintf("Found built-in-folder id %i %i",i,lpFolder->m_nFolderId);
1300         //dprintf("Found built-in-folder id %i %i",i,lpFolder->m_nFolderId);
13041301         if (lpFolderData->m_pfnCreateFolders != NULL)
13051302            lpFolderData->m_pfnCreateFolders(i);
13061303      }
r7097r7098
13121309            continue;
13131310         }
13141311
1315         dprintf("Loading custom folder %i %i",i,lpFolder->m_nFolderId);
1312         //dprintf("Loading custom folder %i %i",i,lpFolder->m_nFolderId);
13161313
13171314         // load the extra folder files, which also adds children
13181315         if (TryAddExtraFolderAndChildren(i) == FALSE)
r7097r7098
13391336
13401337   TreeView_DeleteAllItems(hTreeView);
13411338
1342   dprintf("Adding folders to tree ui indices");
1339   //dprintf("Adding folders to tree ui indices %i to %i",start_index,end_index);
13431340
13441341   tvs.hInsertAfter = TVI_SORT;
13451342
r7097r7098
14961493/* Add a folder to the list.  Does not allocate */
14971494static BOOL AddFolder(LPTREEFOLDER lpFolder)
14981495{
1499   dprintf("AddFolder");
1496   TREEFOLDER **tmpTree = NULL;
1497   UINT oldFolderArrayLength = folderArrayLength;
15001498   if (numFolders + 1 >= folderArrayLength)
15011499   {
15021500      folderArrayLength += 500;
1503      if (treeFolders) free(treeFolders);
1504      treeFolders = (TREEFOLDER **)malloc(sizeof(TREEFOLDER **) * folderArrayLength);
1501      tmpTree = (TREEFOLDER **)malloc(sizeof(TREEFOLDER **) * folderArrayLength);
1502      memcpy(tmpTree,treeFolders,sizeof(TREEFOLDER **) * oldFolderArrayLength);
1503      if (treeFolders) global_free(treeFolders);
1504      treeFolders = tmpTree;
15051505   }
15061506
15071507   /* Is there an folder.ini that can be edited? */
r7097r7098
15111511
15121512   treeFolders[numFolders] = lpFolder;
15131513   numFolders++;
1514   dprintf("end of AddFolder");
15151514   return TRUE;
15161515}
15171516
r7097r7098
15191518static LPTREEFOLDER NewFolder(const char *lpTitle,
15201519                  UINT nFolderId, int nParent, UINT nIconId, DWORD dwFlags)
15211520{   
1522   LPTREEFOLDER lpFolder = NULL;
1523
1524   lpFolder = (LPTREEFOLDER)malloc(sizeof(TREEFOLDER));
1521   LPTREEFOLDER lpFolder = (LPTREEFOLDER)malloc(sizeof(TREEFOLDER));
15251522   memset(lpFolder, '\0', sizeof (TREEFOLDER));
15261523   lpFolder->m_lpTitle = (LPSTR)malloc(strlen(lpTitle) + 1);
15271524   strcpy((char *)lpFolder->m_lpTitle,lpTitle);
1528   dprintf("%s",lpFolder->m_lpTitle);
15291525   lpFolder->m_lptTitle = tstring_from_utf8(lpFolder->m_lpTitle);
15301526   lpFolder->m_lpGameBits = NewBits(driver_list_get_count(drivers));
15311527   lpFolder->m_nFolderId = nFolderId;
r7097r7098
15381534/* Deallocate the passed in LPTREEFOLDER */
15391535static void DeleteFolder(LPTREEFOLDER lpFolder)
15401536{
1541   dprintf("DeleteFolder");
15421537   if (lpFolder)
15431538   {
15441539      if (lpFolder->m_lpGameBits)
r7097r7098
15461541         DeleteBits(lpFolder->m_lpGameBits);
15471542         lpFolder->m_lpGameBits = 0;
15481543      }
1549      free(lpFolder->m_lptTitle);
1544      global_free(lpFolder->m_lptTitle);
15501545      lpFolder->m_lptTitle = 0;
1551      free(lpFolder->m_lpTitle);
1546      global_free(lpFolder->m_lpTitle);
15521547      lpFolder->m_lpTitle = 0;
1553      free(lpFolder);
1548      global_free(lpFolder);
15541549      lpFolder = 0;
15551550   }
15561551}
r7097r7098
15611556   int          i = 0;
15621557   DWORD         dwFolderFlags;
15631558   LPCFOLDERDATA   fData = 0;
1564   dprintf("InitFolders");
15651559   if (treeFolders != NULL)
15661560   {
15671561      for (i = numFolders - 1; i >= 0; i--)
r7097r7098
15871581      }
15881582   }
15891583   // built-in top level folders
1590   dprintf(" built-in top level folders");
15911584   for (i = 0; g_lpFolderData[i].m_lpTitle; i++)
15921585   {
15931586      fData = &g_lpFolderData[i];
r7097r7098
15981591                     fData->m_nIconId, dwFolderFlags));
15991592   }
16001593   
1601   dprintf("InitExtraFolders");
16021594   numExtraFolders = InitExtraFolders();
16031595
16041596   for (i = 0; i < numExtraFolders; i++)
r7097r7098
16371629   HINSTANCE hInst = GetModuleHandle(0);
16381630
16391631   int numIcons = ICON_MAX + numExtraIcons;
1640dprintf("CreateTreeIcons");
16411632   hTreeSmall = ImageList_Create (16, 16, ILC_COLORDDB | ILC_MASK, numIcons, numIcons);
16421633
16431634   //dprintf("Trying to load %i normal icons",ICON_MAX);
r7097r7098
20462037   {
20472038      if (ExtraFolderData[i])
20482039      {
2049         free(ExtraFolderData[i]);
2040         global_free(ExtraFolderData[i]);
20502041         ExtraFolderData[i] = NULL;
20512042      }
20522043   }
20532044
20542045   for (i = 0; i < numExtraIcons; i++)
20552046    {
2056      free(ExtraFolderIcons[i]);
2047      global_free(ExtraFolderIcons[i]);
20572048    }
20582049
20592050   numExtraIcons = 0;
r7097r7098
21462137               lpTemp = NewFolder(name,current_id,parent_index,
21472138                               ExtraFolderData[id]->m_nSubIconId,
21482139                               GetFolderFlags(numFolders) | F_CUSTOM);
2149               ExtraFolderData[current_id] = (EXFOLDERDATA*)malloc(sizeof(EXFOLDERDATA) );
2140               ExtraFolderData[current_id] = (EXFOLDERDATA*)global_alloc_clear(EXFOLDERDATA) ;
21502141               memset(ExtraFolderData[current_id], 0, sizeof(EXFOLDERDATA));
21512142
21522143               ExtraFolderData[current_id]->m_nFolderId = current_id - MAX_EXTRA_FOLDERS;
r7097r7098
22512242      if (TrySaveExtraFolder(lpFolder) == FALSE)
22522243      {
22532244         // failed, so free newly allocated title and restore old
2254         free(lpFolder->m_lpTitle);
2245         global_free(lpFolder->m_lpTitle);
22552246         lpFolder->m_lpTitle = old_title;
22562247         return FALSE;
22572248      }
22582249      TryRenameCustomFolderIni(lpFolder, old_title, new_name);
22592250      // successful, so free old title
2260      free(old_title);
2251      global_free(old_title);
22612252      return TRUE;
22622253   }
22632254   
r7097r7098
22712262   if (retval)
22722263   {
22732264      TryRenameCustomFolderIni(lpFolder, lpFolder->m_lpTitle, new_name);
2274      free(lpFolder->m_lpTitle);
2265      global_free(lpFolder->m_lpTitle);
22752266      lpFolder->m_lpTitle = (char *)malloc(strlen(new_name) + 1);
22762267      strcpy(lpFolder->m_lpTitle,new_name);
22772268   }
src/osd/winui/winui.c
r7097r7098
4747
4848
4949// MAME/MAMEUI headers
50#include "emu.h"
50//#include "emu.h"
5151#include "emuopts.h"
5252#include "osdepend.h"
5353#include "unzip.h"
5454#include "winutf8.h"
5555#include "strconv.h"
56#include "input.h"
5756#include "window.h"
5857#include "winmain.h"
5958
r7097r7098
12011200                     {
12021201                        hIcon = FormatICOInMemoryToHICON(bufferPtr, entry->uncompressed_length);
12031202                     }
1204                     free(bufferPtr);
1203                     global_free(bufferPtr);
12051204                  }
12061205               }
12071206               entry = zip_file_next_file(zip);
r7097r7098
16611660      ResetBackground(szFile);
16621661   }
16631662
1664   free(buf);
1663   global_free(buf);
16651664}
16661665
16671666static void SetMainTitle(void)
r7097r7098
19771976      const input_seq *is1;
19781977      input_seq *is2;
19791978      is1 = &(GUISequenceControl[i].is);
1980      is2 = GUISequenceControl[i].getiniptr();
1979      //is2 = GUISequenceControl[i].getiniptr(); // MICKO-FIX
19811980      // FIXME
19821981      //input_seq_copy(is1, is2);
19831982      //dprintf("seq =%s is: %4i %4i %4i %4i\n",GUISequenceControl[i].name, (*is1)[0], (*is1)[1], (*is1)[2], (*is1)[3]);
r7097r7098
29842983         if( !t_gameinfostatus )
29852984            return;
29862985         _tcscpy(String, t_gameinfostatus);
2987         free(t_gameinfostatus);
2986         global_free(t_gameinfostatus);
29882987      }
29892988   }
29902989   else
r7097r7098
32373236
32383237   UpdateScreenShot();
32393238
3240   free(t_description);
3239   global_free(t_description);
32413240}
32423241
32433242static void PaintBackgroundImage(HWND hWnd, HRGN hRgn, int x, int y)
r7097r7098
33843383
33853384      result = TryRenameCustomFolder(folder,szText);
33863385     
3387      free(szText);
3386      global_free(szText);
33883387     
33893388      return result;
33903389   }
r7097r7098
37533752            return;
37543753         CreateProcess(NULL, t_exec_command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
37553754         
3756         free(t_exec_command);
3755         global_free(t_exec_command);
37573756
37583757         // We will not wait for the process to finish cause it might be a background task
37593758         // The process won't get closed when MAME32 closes either.
r7097r7098
45474546            ResetBackground(t_szFile);
45484547            LoadBackgroundBitmap();
45494548            InvalidateRect(hMain, NULL, TRUE);
4550            free(t_bgdir);
4551            free(t_szFile);
4549            global_free(t_bgdir);
4550            global_free(t_szFile);
45524551            return TRUE;
45534552         }
4554         free(t_bgdir);
4553         global_free(t_bgdir);
45554554      }
45564555      break;
45574556
r7097r7098
48714870         return s;
48724871     
48734872      _sntprintf(pszBuffer, nBufferLength, TEXT("%s"), t_s);     
4874      free(t_s);
4873      global_free(t_s);
48754874     
48764875      s = pszBuffer;
48774876   }
r7097r7098
48984897      a = GlobalAddAtom(t_description);
48994898      SendMessage(HWND_BROADCAST, g_mame32_message, a, a);
49004899      GlobalDeleteAtom(a);
4901      free(t_description);
4900      global_free(t_description);
49024901   }
49034902
49044903   EnableSelection(nItem);
r7097r7098
49744973
49754974   // Allow selection to change the default saved game
49764975   bListReady = TRUE;
4977   free(t_bgdir);
4976   global_free(t_bgdir);
49784977}
49794978
49804979static void AddDriverIcon(int nItem,int default_icon_index)
r7097r7098
53945393   if (t_filename != NULL)
53955394   {
53965395      _sntprintf(t_filename_buffer, ARRAY_LENGTH(t_filename_buffer), TEXT("%s"), t_filename);
5397      free(t_filename);
5396      global_free(t_filename);
53985397   }
53995398
54005399   of.lStructSize       = sizeof(of);
r7097r7098
55185517   }
55195518   
55205519   if( t_artdir )
5521      free(t_artdir);
5520      global_free(t_artdir);
55225521   if( t_statedir )
5523      free(t_statedir);
5522      global_free(t_statedir);
55245523   if( t_snapdir )
5525      free(t_snapdir);
5524      global_free(t_snapdir);
55265525
55275526   utf8_filename = utf8_from_tstring(t_filename_buffer);
55285527   if (utf8_filename != NULL)
r7097r7098
56095608         if( !utf8_LangFile )
56105609            return FALSE;
56115610         SetLanguage(utf8_LangFile);
5612         free(utf8_LangFile);
5611         global_free(utf8_LangFile);
56135612
56145613      case IDCANCEL:
56155614         EndDialog(hDlg, 0);
r7097r7098
56425641   if( !t_message )
56435642      return;
56445643   SendMessage(hStatusBar, SB_SETTEXT, (WPARAM) part_index, (LPARAM)(LPCTSTR) win_tstring_strdup(t_message));
5645   free(t_message);
5644   global_free(t_message);
56465645}
56475646
56485647void SetStatusBarTextF(int part_index, const char *fmt, ...)
r7097r7098
62676266
62686267      EnableMenuItem(hMenu, ID_CONTEXT_SELECT_RANDOM, MF_ENABLED);
62696268     
6270      free(t_description);
6269      global_free(t_description);
62716270   }
62726271   else
62736272   {
r7097r7098
63856384      else
63866385         InsertMenuItem(hMenu,i,FALSE,&mii);
63876386         
6388      free(t_title);
6387      global_free(t_title);
63896388   }
63906389
63916390}
src/osd/winui/properties.c
r7097r7098
489489      win_message_box_utf8(0, temp, "Error", IDOK);
490490   }
491491
492   free(pspage);
492   global_free(pspage);
493493}
494494
495495/* Initilize the property pages for anything but the Default option set */
r7097r7098
607607      win_message_box_utf8(0, temp, "Error", IDOK);
608608   }
609609
610   free(t_description);
611   free(pspage);
610   global_free(t_description);
611   global_free(pspage);
612612}
613613
614614
r7097r7098
19971997            return FALSE;
19981998         if (_tcscmp(t_option, dd.DeviceName) == 0)
19991999            nSelection = i+1;
2000         free(t_option);
2000         global_free(t_option);
20012001      }
20022002   }
20032003   (void)ComboBox_SetCurSel(control, nSelection);
r7097r7098
20962096   if( !t_ctrldir )
20972097   {
20982098      if( buf )
2099         free(buf);
2099         global_free(buf);
21002100      return FALSE;
21012101   }
21022102
21032103   _stprintf (path, TEXT("%s\\*.*"), t_ctrldir);
21042104   
2105   free(t_ctrldir);
2105   global_free(t_ctrldir);
21062106
21072107   hFind = FindFirstFile(path, &FindFileData);
21082108
r7097r7098
21422142   (void)ComboBox_SetCurSel(control, selected);
21432143   
21442144   if( buf )
2145      free(buf);
2145      global_free(buf);
21462146
21472147   return FALSE;
21482148}
r7097r7098
22662266            }
22672267         }
22682268      }
2269      free(t_screen);
2269      global_free(t_screen);
22702270
22712271      (void)ComboBox_SetCurSel(sizes_control, sizes_selection);
22722272      (void)ComboBox_SetCurSel(refresh_control, refresh_selection);
r7097r7098
29672967                     return;
29682968                  (void)ComboBox_InsertString(hCtrl, i, win_tstring_strdup(t_s));
29692969                  (void)ComboBox_SetItemData( hCtrl, i++, biosname);
2970                  free(t_s);
2970                  global_free(t_s);
29712971               }
29722972            }
29732973         }
r7097r7098
29962996                  return;
29972997               (void)ComboBox_InsertString(hCtrl, i, win_tstring_strdup(t_s));
29982998               (void)ComboBox_SetItemData( hCtrl, i++, biosname);
2999               free(t_s);
2999               global_free(t_s);
30003000            }
30013001         }
30023002      }
src/mess/osd/winui/messui.c
r7097r7098
712712      t_filter[i] = (t_buffer[i] != '|') ? t_buffer[i] : '\0';
713713   t_filter[i++] = '\0';
714714   t_filter[i++] = '\0';
715   free(t_buffer);
715   global_free(t_buffer);
716716
717717    of.lStructSize = sizeof(of);
718718    of.hwndOwner = GetMainWindow();
r7097r7098
826826         return;
827827      // TODO - this should go against InternalSetSelectedSoftware()
828828      SoftwarePicker_AddFile(GetDlgItem(GetMainWindow(), IDC_SWLIST), utf8_filename);
829      free(utf8_filename);
829      global_free(utf8_filename);
830830   }
831831
832832   machine_config_free(config);
r7097r7098
990990      return;
991991   MessSpecifyImage(drvindex, dev, utf8_filename);
992992   MessRefreshPicker();
993   free(utf8_filename);
993   global_free(utf8_filename);
994994}
995995
996996
r7097r7098
10071007      return t_buffer;
10081008
10091009   _sntprintf(pszBuffer, nBufferLength, TEXT("%s"), t_s);
1010   free(t_s);
1010   global_free(t_s);
10111011   t_buffer = pszBuffer;
10121012
10131013   return t_buffer;
src/mess/osd/winui/devview.c
r7097r7098
7070         DestroyWindow(pDevViewInfo->pEntries[i].hwndEdit);
7171         DestroyWindow(pDevViewInfo->pEntries[i].hwndBrowseButton);
7272      }
73      free(pDevViewInfo->pEntries);
73      global_free(pDevViewInfo->pEntries);
7474      pDevViewInfo->pEntries = NULL;
7575   }
7676
r7097r7098
216216         s = tstring_from_utf8(info.name);
217217         ppszDevices[i] = (WCHAR*)alloca((_tcslen(s) + 1) * sizeof(TCHAR));
218218         _tcscpy(ppszDevices[i], s);
219         free(s);
219         global_free(s);
220220         i++;
221221      }
222222
r7097r7098
374374   DevView_Clear(hwndDevView);
375375   pDevViewInfo = GetDevViewInfo(hwndDevView);
376376   DeleteObject(pDevViewInfo->hFont);
377   free(pDevViewInfo);
377   global_free(pDevViewInfo);
378378}
379379
380380
src/mess/osd/winui/swconfig.c
r7097r7098
5151      hashfile_close(config->hashfile);
5252      config->hashfile = NULL;
5353   }
54   free(config);
54   global_free(config);
5555}
src/mess/osd/winui/softwarepicker.c
r7097r7098
673673         SoftwarePicker_FreeSearchInfo(pSearchInfo);
674674      }
675675   }
676   else if (pPickerInfo->config->hashfile && (pPickerInfo->hashes_realized
676/*   else if (pPickerInfo->config->hashfile && (pPickerInfo->hashes_realized
677677      < pPickerInfo->file_index_length))
678678   {
679679      // time to realize some hashes
r7097r7098
707707            pPickerInfo->hashes_realized++;
708708         }
709709      }
710   }
710   }*/
711711   else
712712   {
713713      // we are done!
r7097r7098
744744            return s;
745745         _sntprintf(pszBuffer, nBufferLength, TEXT("%s"), t_buf);
746746         s = pszBuffer;
747         free(t_buf);
747         global_free(t_buf);
748748         break;
749749
750750      case MESS_COLUMN_GOODNAME:
r7097r7098
775775                  return s;
776776               _sntprintf(pszBuffer, nBufferLength, TEXT("%s"), t_buf);
777777               s = pszBuffer;
778               free(t_buf);
778               global_free(t_buf);
779779            }
780780         }
781781         break;
r7097r7098
796796               return s;
797797            _sntprintf(pszBuffer, nBufferLength, TEXT("%s"), t_buf);
798798            s = pszBuffer;
799            free(t_buf);
799            global_free(t_buf);
800800         }
801801         break;
802802   }
r7097r7098
818818   {
819819      SoftwarePicker_InternalClear(pPickerInfo);
820820      SoftwarePicker_SetDriver(hwndPicker, NULL);
821      free(pPickerInfo);
821      global_free(pPickerInfo);
822822   }
823823
824824   return rc;
r7097r7098
849849
850850error:
851851   if (pPickerInfo)
852      free(pPickerInfo);
852      global_free(pPickerInfo);
853853   return FALSE;
854854}
src/mess/osd/winui/propertiesms.c
r7097r7098
314314   {
315315      driver_index = PropertiesCurrentGame(dialog);
316316      SetExtraSoftwarePaths(driver_index, dir_list);
317      free(dir_list);
317      global_free(dir_list);
318318   }
319319   return TRUE;
320320}
r7097r7098
375375   // finish up
376376   AppendList(control, TEXT(DIRLIST_NEWENTRYTEXT), current_item);
377377   ListView_SetItemState(control, 0, LVIS_SELECTED, LVIS_SELECTED);
378   free(t_dir_list);
378   global_free(t_dir_list);
379379   return TRUE;
380380}
381381
r7097r7098
455455            (void)ComboBox_InsertString(control, i, win_tstring_strdup(t_ramstring));
456456            (void)ComboBox_SetItemData(control, i, ram);
457457
458            free(t_ramstring);
458            global_free(t_ramstring);
459459
460460            // is this the current option?  record the index if so
461461            if (ram == current_ram)

Previous 15994 Revisions Next


© 1998-2018 The MESS Team