diff --git a/reactos/dll/win32/comdlg32/filedlg.c b/reactos/dll/win32/comdlg32/filedlg.c
index ea518b4f217..023768991a0 100644
--- a/reactos/dll/win32/comdlg32/filedlg.c
+++ b/reactos/dll/win32/comdlg32/filedlg.c
@@ -434,6 +434,13 @@ static BOOL GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
       ret = FALSE;
   }
 
+  /* set the lpstrFileTitle */
+  if (ret && ofn->lpstrFile && ofn->lpstrFileTitle)
+  {
+      LPSTR lpstrFileTitle = PathFindFileNameA(ofn->lpstrFile);
+      lstrcpynA(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle);
+  }
+
   if (lpstrSavDir)
   {
       SetCurrentDirectoryA(lpstrSavDir);
@@ -526,6 +533,13 @@ static BOOL GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType)
       ret = FALSE;
   }
 
+  /* set the lpstrFileTitle */
+  if (ret && ofn->lpstrFile && ofn->lpstrFileTitle)
+  {
+      LPWSTR lpstrFileTitle = PathFindFileNameW(ofn->lpstrFile);
+      lstrcpynW(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle);
+  }
+
   if (lpstrSavDir)
   {
       SetCurrentDirectoryW(lpstrSavDir);
@@ -2706,23 +2720,6 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
               fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - tempFileA) + 1 : 0;
           }
 
-          /* set the lpstrFileTitle */
-          if(fodInfos->ofnInfos->lpstrFileTitle)
-	  {
-            LPWSTR lpstrFileTitle = PathFindFileNameW(lpstrPathAndFile);
-            if(fodInfos->unicode)
-            {
-              LPOPENFILENAMEW ofn = fodInfos->ofnInfos;
-	      lstrcpynW(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle);
-            }
-            else
-            {
-              LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos;
-              WideCharToMultiByte(CP_ACP, 0, lpstrFileTitle, -1,
-                    ofn->lpstrFileTitle, ofn->nMaxFileTitle, NULL, NULL);
-            }
-	  }
-
           /* copy currently selected filter to lpstrCustomFilter */
           if (fodInfos->ofnInfos->lpstrCustomFilter)
           {
diff --git a/reactos/dll/win32/comdlg32/fontdlg.c b/reactos/dll/win32/comdlg32/fontdlg.c
index 7551064123c..b1a9bc90787 100644
--- a/reactos/dll/win32/comdlg32/fontdlg.c
+++ b/reactos/dll/win32/comdlg32/fontdlg.c
@@ -1156,9 +1156,7 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE
         MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2);
         hdc = BeginPaint( hDlg, &ps );
 
-        TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n", ps.fErase,
-              ps.rcPaint.left, ps.rcPaint.top,
-              ps.rcPaint.right, ps.rcPaint.bottom);
+        TRACE("erase %d, rect=%s\n", ps.fErase, wine_dbgstr_rect(&ps.rcPaint));
 
         /* Paint frame */
         DrawEdge( hdc, &info.rcWindow, EDGE_SUNKEN, BF_RECT|BF_ADJUST );
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 1487157fb9b..3062c922346 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -55,7 +55,7 @@ reactos/dll/win32/cabinet             # Synced to WineStaging-1.9.4
 reactos/dll/win32/clusapi             # Synced to WineStaging-1.9.4
 reactos/dll/win32/comcat              # Synced to WineStaging-1.9.4
 reactos/dll/win32/comctl32            # Synced to WineStaging-1.9.11
-reactos/dll/win32/comdlg32            # Synced to WineStaging-1.9.4
+reactos/dll/win32/comdlg32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/compstui            # Synced to WineStaging-1.9.4
 reactos/dll/win32/credui              # Synced to WineStaging-1.9.4
 reactos/dll/win32/crypt32             # Synced to WineStaging-1.9.4