[akhaldi] 71542: [COMDLG32] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sun Jun  5 18:59:07 2016
New Revision: 71542

URL: http://svn.reactos.org/svn/reactos?rev=71542&view=rev
Log:
[COMDLG32] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/reactos/dll/win32/comdlg32/filedlg.c
    trunk/reactos/dll/win32/comdlg32/fontdlg.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/filedlg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/filedlg.c	[iso-8859-1] Sun Jun  5 18:59:07 2016
@@ -434,6 +434,13 @@
       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);
@@ -524,6 +531,13 @@
       break;
   default :
       ret = FALSE;
+  }
+
+  /* set the lpstrFileTitle */
+  if (ret && ofn->lpstrFile && ofn->lpstrFileTitle)
+  {
+      LPWSTR lpstrFileTitle = PathFindFileNameW(ofn->lpstrFile);
+      lstrcpynW(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle);
   }
 
   if (lpstrSavDir)
@@ -2706,23 +2720,6 @@
               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)
           {

Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/fontdlg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/fontdlg.c	[iso-8859-1] Sun Jun  5 18:59:07 2016
@@ -1156,9 +1156,7 @@
         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 );

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Jun  5 18:59:07 2016
@@ -55,7 +55,7 @@
 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