Merge branch '86Box:master' into qt

src/video/vid_tgui9440.c

@@ -465,7 +465,6 @@ tgui_out(uint16_t addr, uint8_t val, void *p)
 								tgui->linear_size = (val & 0x10) ? 0x200000 : 0x100000;
 								svga->decode_mask = (val & 0x10) ? 0x1fffff : 0xfffff;
 							}
-							pclog("Linear base = %08x, size = %08x, mask = %08x\n", tgui->linear_base, tgui->linear_size, svga->decode_mask);
 							tgui_recalcmapping(tgui);
 						}
 						break;
@@ -1379,7 +1378,6 @@ tgui_accel_command(int count, uint32_t cpu_dat, tgui_t *tgui)
 	}
 
 	/*Other than mode stuff, this bit is undocumented*/
-	pclog("TGUI ger22 = %04x, cmd = %i, hdisp = %i, svga = %i, bpp = %i\n", tgui->accel.ger22, tgui->accel.command, svga->hdisp, svga->bpp, tgui->accel.bpp);
 	switch (tgui->accel.ger22 & 0xff) {
 		case 0:
 			switch (tgui->accel.ger22 >> 8) {

src/win/86Box.rc

@@ -332,7 +332,7 @@ BEGIN
             VALUE "FileVersion", EMU_VERSION "\0"
             VALUE "InternalName", EMU_NAME "\0"
             VALUE "LegalCopyright", "Copyright \xa9 2007-" COPYRIGHT_YEAR " " EMU_NAME " contributors\0"
-            VALUE "OriginalFilename", "86box.exe\0"
+            VALUE "OriginalFilename", EMU_NAME ".exe\0"
             VALUE "ProductName", EMU_NAME "\0"
             VALUE "ProductVersion", EMU_VERSION "\0"
         END

src/win/win_stbar.c

@@ -60,7 +60,7 @@
 
 
 HWND		hwndSBAR;
-int		update_icons = 1;
+int		update_icons = 1, reset_occurred = 1;
 
 
 static LONG_PTR	OriginalProcedure;
@@ -122,12 +122,17 @@ hdd_count(int bus)
 void
 ui_sb_timer_callback(int pane)
 {
-    sb_part_icons[pane] &= ~1;
+    if (!(reset_occurred & 1)) {
+	sb_part_icons[pane] &= ~1;
 
-    if (sb_part_icons && sb_part_icons[pane]) {
-	SendMessage(hwndSBAR, SB_SETICON, pane,
-		    (LPARAM)hIcon[sb_part_icons[pane]]);
-    }
+	if (sb_part_icons && sb_part_icons[pane]) {
+		SendMessage(hwndSBAR, SB_SETICON, pane,
+			    (LPARAM)hIcon[sb_part_icons[pane]]);
+	}
+    } else
+	reset_occurred &= ~1;
+
+    reset_occurred &= ~2;
 }
 
 
@@ -152,6 +157,7 @@ ui_sb_update_icon(int tag, int active)
 	PostMessage(hwndSBAR, SB_SETICON, found,
 		    (LPARAM)hIcon[sb_part_icons[found]]);
 
+	reset_occurred = 2;
 	SetTimer(hwndMain, 0x8000 | found, 75, NULL);
     }
 }
@@ -832,6 +838,8 @@ ui_sb_update_panes(void)
     }
 
     sb_ready = 1;
+    if (reset_occurred & 2)
+	reset_occurred |= 1;
 }
 
 

src/win/win_ui.c

@@ -1315,9 +1315,6 @@ ui_init(int nCmdShow)
     if (! RegisterClassEx(&wincl))
 			return(2);
 
-    /* Load the Window Menu(s) from the resources. */
-    menuMain = LoadMenu(hinstance, MENU_NAME);
-
     /* Now create our main window. */
     mbstowcs(title, emu_version, sizeof_w(title));
     hwnd = CreateWindowEx (
@@ -1330,7 +1327,7 @@ ui_init(int nCmdShow)
 		scrnsz_x+(GetSystemMetrics(SM_CXFIXEDFRAME)*2),	/* width */
 		scrnsz_y+(GetSystemMetrics(SM_CYFIXEDFRAME)*2)+GetSystemMetrics(SM_CYMENUSIZE)+GetSystemMetrics(SM_CYCAPTION)+1,	/* and height in pixels */
 		HWND_DESKTOP,		/* window is a child to desktop */
-		menuMain,		/* menu */
+		NULL,			/* no menu (yet) */
 		hinstance,		/* Program Instance handler */
 		NULL);			/* no Window Creation data */
     hwndMain = tdconfig.hwndParent = hwnd;
@@ -1380,14 +1377,10 @@ ui_init(int nCmdShow)
 		ResizeWindowByClientArea(hwndMain, scrnsz_x, scrnsz_y + sbar_height);
     }
 
-  /* Load the desired language, and reset all menus to their defaults */
+    /* Load the desired language */
     uint32_t helper_lang = lang_id;
     lang_id = 0;
-    set_language(helper_lang);	
-
-    /* Reset all menus to their defaults. */
-    ResetAllMenus();
-    media_menu_init();
+    set_language(helper_lang);
 	
     /* Make the window visible on the screen. */
     ShowWindow(hwnd, nCmdShow);