Sync with trunk revision 63128.

[reactos.git] / dll / win32 / comdlg32 / comdlg32_ros.diff

diff --git a/dll/win32/comdlg32/comdlg32_ros.diff b/dll/win32/comdlg32/comdlg32_ros.diff
index 7a310d0..dceaf5b 100644 (file)
--- a/dll/win32/comdlg32/comdlg32_ros.diff
+++ b/dll/win32/comdlg32/comdlg32_ros.diff
@@ -1,71 +1,66 @@
-Index: filedlg.c\r
-===================================================================\r
---- filedlg.c  (Revision 56893)\r
-+++ filedlg.c  (Arbeitskopie)\r
-@@ -260,6 +260,8 @@\r
-     HRSRC hRes;
-     HANDLE hDlgTmpl = 0;
-     HRESULT hr;
-+    DWORD dwSize;
-+    LPDLGTEMPLATE hDialogTemplate;
- 
-     /* test for missing functionality */
-     if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS)
-@@ -276,12 +278,17 @@\r
-         return FALSE;
-     }
-     if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes )) ||
-+        !(dwSize = SizeofResource(COMDLG32_hInstance, hRes )) ||
-+        !(hDialogTemplate = malloc(dwSize)) ||
-         !(template = LockResource( hDlgTmpl )))
-     {
-         COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-         return FALSE;
-     }
- 
-+    /* Copy the read only resource */
-+    memcpy(hDialogTemplate, template, dwSize);
-+
-     /* msdn: explorer style dialogs permit sizing by default.
-      * The OFN_ENABLESIZING flag is only needed when a hook or
-      * custom tmeplate is provided */
-@@ -291,12 +298,12 @@\r
- 
-     if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING)
-     {
--        ((LPDLGTEMPLATEW)template)->style |= WS_SIZEBOX;
-+        hDialogTemplate->style |= WS_SIZEBOX;
-         fodInfos->sizedlg.cx = fodInfos->sizedlg.cy = 0;
-         fodInfos->initial_size.x = fodInfos->initial_size.y = 0;
-     }
-     else
--        ((LPDLGTEMPLATEW)template)->style &= ~WS_SIZEBOX;
-+        hDialogTemplate->style &= ~WS_SIZEBOX;
- 
- 
-     /* old style hook messages */
-@@ -313,19 +320,21 @@\r
- 
-     if (fodInfos->unicode)
-       lRes = DialogBoxIndirectParamW(COMDLG32_hInstance,
--                                     template,
-+                                     hDialogTemplate,
-                                      fodInfos->ofnInfos->hwndOwner,
-                                      FileOpenDlgProc95,
-                                      (LPARAM) fodInfos);
-     else
-       lRes = DialogBoxIndirectParamA(COMDLG32_hInstance,
--                                     template,
-+                                     hDialogTemplate,
-                                      fodInfos->ofnInfos->hwndOwner,
-                                      FileOpenDlgProc95,
-                                      (LPARAM) fodInfos);
--    if (SUCCEEDED(hr)) 
-+    if (SUCCEEDED(hr))
-         OleUninitialize();
- 
-+    free(hDialogTemplate);
-+
-     /* Unable to create the dialog */
-     if( lRes == -1)
-         return FALSE;
+diff -prudN e:\Wine\dlls\comdlg32/cdlg32.c e:\reactos\dll\win32\comdlg32/cdlg32.c\r
+--- e:\Wine\dlls\comdlg32/cdlg32.c     2013-10-26 22:24:27.508648000 +0100\r
++++ e:\reactos\dll\win32\comdlg32/cdlg32.c     2014-03-05 11:46:06.260510700 +0100\r
+@@ -174,6 +157,8 @@ DWORD WINAPI CommDlgExtendedError(void)\r
+         return 0; /* we never set an error, so there isn't one */\r
+ }\r
+ \r
++#ifndef __REACTOS__ /* Win 7 */\r
++\r
+ /*************************************************************************\r
+  * Implement the CommDlg32 class factory\r
+  *\r
+@@ -283,7 +268,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSI\r
+  */\r
+ HRESULT WINAPI DllRegisterServer(void)\r
+ {\r
+-    return __wine_register_resources(COMDLG32_hInstance);\r
++    return E_FAIL; // FIXME: __wine_register_resources(COMDLG32_hInstance);\r
+ }\r
+ \r
+ /***********************************************************************\r
+@@ -291,5 +276,7 @@ HRESULT WINAPI DllRegisterServer(void)\r
+  */\r
+ HRESULT WINAPI DllUnregisterServer(void)\r
+ {\r
+-    return __wine_unregister_resources(COMDLG32_hInstance);\r
++    return E_FAIL; // FIXME: __wine_unregister_resources(COMDLG32_hInstance);\r
+ }\r
++\r
++#endif /* Win 7 */\r
+\r
+diff -prudN e:\Wine\dlls\comdlg32/comdlg32.spec e:\reactos\dll\win32\comdlg32/comdlg32.spec\r
+--- e:\Wine\dlls\comdlg32/comdlg32.spec        2011-09-16 23:22:36.026770600 +0100\r
++++ e:\reactos\dll\win32\comdlg32/comdlg32.spec        2012-02-15 22:32:22.456422900 +0100\r
+@@ -3,9 +3,9 @@\r
+ @ stdcall ChooseFontA(ptr)\r
+ @ stdcall ChooseFontW(ptr)\r
+ @ stdcall CommDlgExtendedError()\r
+-@ stdcall -private DllGetClassObject(ptr ptr ptr)\r
+-@ stdcall -private DllRegisterServer()\r
+-@ stdcall -private DllUnregisterServer()\r
++;@ stdcall -private DllGetClassObject(ptr ptr ptr) ; Win 7\r
++;@ stdcall -private DllRegisterServer() ; Win 7\r
++;@ stdcall -private DllUnregisterServer() ; Win 7\r
+ @ stdcall FindTextA(ptr)\r
+ @ stdcall FindTextW(ptr)\r
+ @ stdcall GetFileTitleA(str ptr long)\r
+\r
+diff -prudN e:\Wine\dlls\comdlg32/itemdlg.c e:\reactos\dll\win32\comdlg32/itemdlg.c\r
+--- e:\Wine\dlls\comdlg32/itemdlg.c    2013-10-26 22:24:27.515652700 +0100\r
++++ e:\reactos\dll\win32\comdlg32/itemdlg.c    2013-10-15 19:32:27.803008200 +0100\r
+@@ -18,6 +18,8 @@\r
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA\r
+  */\r
+ \r
++#ifndef __REACTOS__ /* Win 7 */\r
++\r
+ #include <stdarg.h>\r
+ \r
+ #define COBJMACROS\r
+@@ -3660,3 +3662,5 @@ HRESULT FileSaveDialog_Constructor(IUnkn\r
+ {\r
+     return FileDialog_constructor(pUnkOuter, riid, ppv, ITEMDLG_TYPE_SAVE);\r
+ }\r
++\r
++#endif /* Win 7 */\r