Previous 15994 Revisions Next

r7937 Thursday 29th April, 2010 at 20:25:14 UTC by Firewave
[NEWUI] Re-applied append_menu_utf8() reorganisation. Cause for the crash was an improper free() call
[src/mess/osd/windows]menu.c winutils.c winutils.h

src/mess/osd/windows/winutils.c
r7936r7937
219219      ScrollWindowEx(window, 0, si.nPos - scroll_pos, NULL, NULL, NULL, NULL, SW_SCROLLCHILDREN | SW_INVALIDATE | SW_ERASE);
220220   }
221221}
222
223
224
225//============================================================
226//  win_append_menu_utf8
227//============================================================
228
229BOOL win_append_menu_utf8(HMENU menu, UINT flags, UINT_PTR id, const char *item)
230{
231   BOOL result;
232   const TCHAR *t_item = (const TCHAR*)item;
233   TCHAR *t_str = NULL;
234
235   // only convert string when it's no a bitmap
236   if (!(flags & MF_BITMAP) && item) {
237      t_str = tstring_from_utf8(item);
238      t_item = t_str;
239   }
240
241   result = AppendMenu(menu, flags, id, t_item);
242
243   //FIXME: this memory is on purpose for now
244   //if (t_str)
245   //   osd_free(t_str);
246
247   return result;
248}
src/mess/osd/windows/winutils.h
r7936r7937
4848
4949void win_scroll_window(HWND window, WPARAM wparam, int scroll_bar, int scroll_delta_line);
5050
51BOOL win_append_menu_utf8(HMENU menu, UINT flags, UINT_PTR id, const char *item);
52
5153#endif // WINUTILS_H
src/mess/osd/windows/menu.c
r7936r7937
13161316
13171317
13181318
1319//============================================================
1320//  append_menu_utf8
1321//============================================================
13221319
1323static void append_menu_utf8(HMENU menu, UINT flags, UINT_PTR id, const char *str)
1324{
1325   TCHAR *t_str = str ? tstring_from_utf8(str) : NULL;
1326   AppendMenu(menu, flags, id, t_str);
1327   if (t_str)
1328      global_free(t_str);
1329}
1330
1331
1332
1333
13341320//============================================================
13351321//  remove_menu_items
13361322//============================================================
r7936r7937
13941380               for (setting = field->settinglist; setting != NULL; setting = setting->next)
13951381               {
13961382                  command = ID_INPUT_0 + serial_number_from_input_item(machine, port, field, setting);
1397                  append_menu_utf8(submenu, MF_STRING, command, setting->name);
1383                  win_append_menu_utf8(submenu, MF_STRING, command, setting->name);
13981384               }
13991385
14001386               // tack on the final items and the menu item
14011387               command = ID_INPUT_0 + serial_number_from_input_item(machine, port, field, NULL);
14021388               AppendMenu(submenu, MF_SEPARATOR, 0, NULL);
14031389               AppendMenu(submenu, MF_STRING, command, TEXT("&Configure..."));
1404               append_menu_utf8(joystick_menu, MF_STRING | MF_POPUP, (UINT_PTR) submenu, field->name);
1390               win_append_menu_utf8(joystick_menu, MF_STRING | MF_POPUP, (UINT_PTR) submenu, field->name);
14051391               child_count++;
14061392            }
14071393         }
r7936r7937
14181404         for (i = 0; i < joystick_count; i++)
14191405         {
14201406            snprintf(buf, ARRAY_LENGTH(buf), "Joystick %i", i + 1);
1421            append_menu_utf8(joystick_menu, MF_STRING, ID_JOYSTICK_0 + i, buf);
1407            win_append_menu_utf8(joystick_menu, MF_STRING, ID_JOYSTICK_0 + i, buf);
14221408            child_count++;
14231409         }
14241410      }
r7936r7937
14761462   HMENU device_menu;
14771463   HMENU sub_menu;
14781464   UINT_PTR new_item;
1479   UINT flags;
14801465   UINT flags_for_exists;
14811466   UINT flags_for_writing;
14821467   running_device *img;
r7936r7937
16151600   // then set up the actual devices
16161601   for ( img = window->machine->devicelist.first();  img != NULL;  img =  img->next)
16171602   {
1618      if (is_image_device( img))
1603      if (is_image_device(img))
16191604      {
16201605         image_device_info info = image_device_getinfo(window->machine->config, img);
16211606
r7936r7937
16301615            flags_for_writing |= MF_GRAYED;
16311616
16321617         sub_menu = CreateMenu();
1633         append_menu_utf8(sub_menu, MF_STRING,      new_item + DEVOPTION_OPEN,      "Mount...");
1618         win_append_menu_utf8(sub_menu, MF_STRING,      new_item + DEVOPTION_OPEN,      "Mount...");
16341619
16351620         if (info.creatable)
1636            append_menu_utf8(sub_menu, MF_STRING,   new_item + DEVOPTION_CREATE,   "Create...");
1621            win_append_menu_utf8(sub_menu, MF_STRING,   new_item + DEVOPTION_CREATE,   "Create...");
16371622
1638         append_menu_utf8(sub_menu, flags_for_exists,   new_item + DEVOPTION_CLOSE,   "Unmount");
1623         win_append_menu_utf8(sub_menu, flags_for_exists,   new_item + DEVOPTION_CLOSE,   "Unmount");
16391624
16401625         if ((img->type == CASSETTE) && !strcmp(info.file_extensions, "wav"))
16411626         {
16421627            cassette_state state;
16431628            state = (cassette_state)(image_exists(img) ? (cassette_get_state(img) & CASSETTE_MASK_UISTATE) : CASSETTE_STOPPED);
1644            append_menu_utf8(sub_menu, MF_SEPARATOR, 0, NULL);
1645            append_menu_utf8(sub_menu, flags_for_exists   | ((state == CASSETTE_STOPPED)   ? MF_CHECKED : 0),   new_item + DEVOPTION_CASSETTE_STOPPAUSE,   "Pause/Stop");
1646            append_menu_utf8(sub_menu, flags_for_exists   | ((state == CASSETTE_PLAY)      ? MF_CHECKED : 0),   new_item + DEVOPTION_CASSETTE_PLAY,         "Play");
1647            append_menu_utf8(sub_menu, flags_for_writing   | ((state == CASSETTE_RECORD)   ? MF_CHECKED : 0),   new_item + DEVOPTION_CASSETTE_RECORD,      "Record");
1648            append_menu_utf8(sub_menu, flags_for_exists,                                          new_item + DEVOPTION_CASSETTE_REWIND,      "Rewind");
1649            append_menu_utf8(sub_menu, flags_for_exists,                                          new_item + DEVOPTION_CASSETTE_FASTFORWARD,   "Fast Forward");
1629            win_append_menu_utf8(sub_menu, MF_SEPARATOR, 0, NULL);
1630            win_append_menu_utf8(sub_menu, flags_for_exists   | ((state == CASSETTE_STOPPED)   ? MF_CHECKED : 0),   new_item + DEVOPTION_CASSETTE_STOPPAUSE,   "Pause/Stop");
1631            win_append_menu_utf8(sub_menu, flags_for_exists   | ((state == CASSETTE_PLAY)      ? MF_CHECKED : 0),   new_item + DEVOPTION_CASSETTE_PLAY,         "Play");
1632            win_append_menu_utf8(sub_menu, flags_for_writing   | ((state == CASSETTE_RECORD)   ? MF_CHECKED : 0),   new_item + DEVOPTION_CASSETTE_RECORD,      "Record");
1633            win_append_menu_utf8(sub_menu, flags_for_exists,                                          new_item + DEVOPTION_CASSETTE_REWIND,      "Rewind");
1634            win_append_menu_utf8(sub_menu, flags_for_exists,                                          new_item + DEVOPTION_CASSETTE_FASTFORWARD,   "Fast Forward");
16501635         }
16511636         s = image_exists(img) ? image_filename(img) : "[empty slot]";
1652         flags = MF_POPUP;
16531637
16541638         snprintf(buf, ARRAY_LENGTH(buf), "%s: %s", image_typename_id(img), s);
1655         append_menu_utf8(device_menu, flags, (UINT_PTR) sub_menu, buf);
1639         win_append_menu_utf8(device_menu, MF_POPUP, (UINT_PTR)sub_menu, buf);
16561640      }
16571641   }
16581642}
r7936r7937
22082192   for(i = 0; i < frameskip_level_count(); i++)
22092193   {
22102194      snprintf(buf, ARRAY_LENGTH(buf), "%i", i);
2211      append_menu_utf8(frameskip_menu, MF_STRING, ID_FRAMESKIP_0 + i, buf);
2195      win_append_menu_utf8(frameskip_menu, MF_STRING, ID_FRAMESKIP_0 + i, buf);
22122196   }
22132197
22142198   // set the help menu to refer to this machine

Previous 15994 Revisions Next


© 1998-2018 The MESS Team