To summarise:

- My "various Windows refinements" patch from yesterday went into 3.4.x correctly
- My "NumberPad" patch went into 3.4.x, but should be backed out
- My "various Windows refinements" patch from last week was for 3.5.0, but is incomplete; you can safely ignore that.
- I'll make a new "various Windows refinements" patch for 3.5.0 tonight.

win/win32/mhsplash.c

@@ -31,13 +31,12 @@ extern HFONT extrainfo_splash_font;
 void mswin_display_splash_window (BOOL show_ver)
 {
 	MSG msg;
- int left, top;
+	RECT rt;
 	RECT splashrt;
 	RECT clientrt;
 	RECT controlrt;
 	HWND hWnd;
  int buttop;
- HDC hDC;
 
 	hWnd = CreateDialog(GetNHApp()->hApp, MAKEINTRESOURCE(IDD_SPLASH),
 	    GetNHApp()->hMainWnd, NHSplashWndProc);
@@ -58,12 +57,10 @@ void mswin_display_splash_window (BOOL show_ver)
 	splashrt.right += SPLASH_WIDTH + SPLASH_OFFSET_X * 2 - clientrt.right;
 	splashrt.bottom += SPLASH_HEIGHT + controlrt.bottom + SPLASH_OFFSET_Y * 3 - clientrt.bottom;
 	/* Place the window centered */
- /* On the screen, not on the parent window */
- hDC = CreateDC("DISPLAY", NULL, NULL, NULL);
- left = (GetDeviceCaps(hDC, HORZRES) - splashrt.right) / 2;
- top = (GetDeviceCaps(hDC, VERTRES) - splashrt.bottom) / 2;
- DeleteDC(hDC);                          
- MoveWindow(hWnd, left, top, splashrt.right, splashrt.bottom, TRUE);
+	GetWindowRect(GetNHApp()->hMainWnd, &rt);
+	rt.left += (rt.right - rt.left - splashrt.right) / 2;
+	rt.top += (rt.bottom - rt.top - splashrt.bottom) / 2;
+	MoveWindow(hWnd, rt.left, rt.top, splashrt.right, splashrt.bottom, TRUE);
  /* Place the OK control */
 	GetClientRect (hWnd, &clientrt);
 	MoveWindow (GetDlgItem(hWnd, IDOK),