Author: akhaldi
Date: Wed Jul 22 19:35:34 2015
New Revision: 68555
URL:
http://svn.reactos.org/svn/reactos?rev=68555&view=rev
Log:
[COMDLG32] Sync with Wine Staging 1.7.47. CORE-9924
Modified:
trunk/reactos/dll/win32/comdlg32/cdlg.h
trunk/reactos/dll/win32/comdlg32/cdlg32.c
trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff
trunk/reactos/dll/win32/comdlg32/filedlg.c
trunk/reactos/dll/win32/comdlg32/itemdlg.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg.h?…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/cdlg.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/cdlg.h [iso-8859-1] Wed Jul 22 19:35:34 2015
@@ -62,7 +62,7 @@
#include "resource.h"
/* Common dialogs implementation globals */
-#define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */
+#define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */
extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN;
Modified: trunk/reactos/dll/win32/comdlg32/cdlg32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg32.…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/cdlg32.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/cdlg32.c [iso-8859-1] Wed Jul 22 19:35:34 2015
@@ -268,7 +268,11 @@
*/
HRESULT WINAPI DllRegisterServer(void)
{
+#ifdef __REACTOS__
return E_FAIL; // FIXME: __wine_register_resources(COMDLG32_hInstance);
+#else
+ return __wine_register_resources(COMDLG32_hInstance);
+#endif
}
/***********************************************************************
@@ -276,7 +280,11 @@
*/
HRESULT WINAPI DllUnregisterServer(void)
{
+#ifdef __REACTOS__
return E_FAIL; // FIXME: __wine_unregister_resources(COMDLG32_hInstance);
+#else
+ return __wine_unregister_resources(COMDLG32_hInstance);
+#endif
}
#endif /* Win 7 */
Modified: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff [iso-8859-1] Wed Jul 22 19:35:34
2015
@@ -1,6 +1,6 @@
-diff -prudN e:\Wine\dlls\comdlg32/cdlg32.c e:\reactos\dll\win32\comdlg32/cdlg32.c
---- e:\Wine\dlls\comdlg32/cdlg32.c 2013-10-26 22:24:27.508648000 +0100
-+++ e:\reactos\dll\win32\comdlg32/cdlg32.c 2014-03-05 11:46:06.260510700 +0100
+diff -pudN e:\wine\dlls\comdlg32/cdlg32.c e:\reactos\dll\win32\comdlg32/cdlg32.c
+--- e:\wine\dlls\comdlg32/cdlg32.c 2015-02-21 17:13:08.621542200 +0100
++++ e:\reactos\dll\win32\comdlg32/cdlg32.c 2015-07-21 09:48:05.584922500 +0100
@@ -174,6 +157,8 @@ DWORD WINAPI CommDlgExtendedError(void)
return 0; /* we never set an error, so there isn't one */
}
@@ -10,27 +10,33 @@
/*************************************************************************
* Implement the CommDlg32 class factory
*
-@@ -283,7 +268,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSI
+@@ -283,7 +268,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSI
*/
HRESULT WINAPI DllRegisterServer(void)
{
-- return __wine_register_resources(COMDLG32_hInstance);
++#ifdef __REACTOS__
+ return E_FAIL; // FIXME: __wine_register_resources(COMDLG32_hInstance);
++#else
+ return __wine_register_resources(COMDLG32_hInstance);
++#endif
}
/***********************************************************************
-@@ -291,5 +276,7 @@ HRESULT WINAPI DllRegisterServer(void)
+@@ -291,5 +280,11 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
-- return __wine_unregister_resources(COMDLG32_hInstance);
++#ifdef __REACTOS__
+ return E_FAIL; // FIXME: __wine_unregister_resources(COMDLG32_hInstance);
++#else
+ return __wine_unregister_resources(COMDLG32_hInstance);
++#endif
}
+
+#endif /* Win 7 */
-diff -prudN e:\Wine\dlls\comdlg32/comdlg32.spec
e:\reactos\dll\win32\comdlg32/comdlg32.spec
---- e:\Wine\dlls\comdlg32/comdlg32.spec 2011-09-16 23:22:36.026770600 +0100
+diff -pudN e:\wine\dlls\comdlg32/comdlg32.spec
e:\reactos\dll\win32\comdlg32/comdlg32.spec
+--- e:\wine\dlls\comdlg32/comdlg32.spec 2015-02-21 17:13:08.621542200 +0100
+++ e:\reactos\dll\win32\comdlg32/comdlg32.spec 2012-02-15 22:32:22.456422900 +0100
@@ -3,9 +3,9 @@
@ stdcall ChooseFontA(ptr)
@@ -45,11 +51,10 @@
@ stdcall FindTextA(ptr)
@ stdcall FindTextW(ptr)
@ stdcall GetFileTitleA(str ptr long)
-
-diff -prudN e:\Wine\dlls\comdlg32/itemdlg.c e:\reactos\dll\win32\comdlg32/itemdlg.c
---- e:\Wine\dlls\comdlg32/itemdlg.c 2013-10-26 22:24:27.515652700 +0100
-+++ e:\reactos\dll\win32\comdlg32/itemdlg.c 2013-10-15 19:32:27.803008200 +0100
-@@ -18,6 +18,8 @@
+diff -pudN e:\wine\dlls\comdlg32/itemdlg.c e:\reactos\dll\win32\comdlg32/itemdlg.c
+--- e:\wine\dlls\comdlg32/itemdlg.c 2015-04-05 20:44:56.807083800 +0100
++++ e:\reactos\dll\win32\comdlg32/itemdlg.c 2015-07-21 09:56:34.329021000 +0100
+@@ -18,10 +18,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
@@ -58,7 +63,12 @@
#include <stdarg.h>
#define COBJMACROS
-@@ -3660,3 +3662,5 @@ HRESULT FileSaveDialog_Constructor(IUnkn
+ #define NONAMELESSUNION
++#define NONAMELESSSTRUCT
+
+ #include "windef.h"
+ #include "winbase.h"
+@@ -3847,3 +3850,5 @@ HRESULT FileSaveDialog_Constructor(IUnkn
{
return FileDialog_constructor(pUnkOuter, riid, ppv, ITEMDLG_TYPE_SAVE);
}
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] Wed Jul 22 19:35:34 2015
@@ -2567,10 +2567,11 @@
filterSearchIndex[0] = '\0';
}
+ /* find the file extension by searching for the first dot in filterExt
*/
/* strip the * or anything else from the extension, "*.abc"
becomes "abc" */
/* if the extension is invalid or contains a glob, ignore it */
- filterSearchIndex = PathFindExtensionW(filterExt);
- if (*filterSearchIndex++ && !strchrW(filterSearchIndex,
'*') && !strchrW(filterSearchIndex, '?'))
+ filterSearchIndex = strchrW(filterExt, '.');
+ if (filterSearchIndex++ && !strchrW(filterSearchIndex,
'*') && !strchrW(filterSearchIndex, '?'))
{
strcpyW(filterExt, filterSearchIndex);
}
Modified: trunk/reactos/dll/win32/comdlg32/itemdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/itemdlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] Wed Jul 22 19:35:34 2015
@@ -1228,7 +1228,7 @@
/**************************************************************************
* Window related functions.
*/
-static SIZE update_layout(FileDialogImpl *This)
+static void update_layout(FileDialogImpl *This)
{
HDWP hdwp;
HWND hwnd;
@@ -1236,21 +1236,19 @@
RECT cancel_rc, open_rc;
RECT filetype_rc, filename_rc, filenamelabel_rc;
RECT toolbar_rc, ebrowser_rc, customctrls_rc;
- int missing_width, missing_height;
static const UINT vspacing = 4, hspacing = 4;
- SIZE ret;
-
- GetClientRect(This->dlg_hwnd, &dialog_rc);
-
- missing_width = max(0, 320 - dialog_rc.right);
- missing_height = max(0, 200 - dialog_rc.bottom);
-
- if(missing_width || missing_height)
- {
- TRACE("Missing (%d, %d)\n", missing_width, missing_height);
- ret.cx = missing_width;
- ret.cy = missing_height;
- return ret;
+ static const UINT min_width = 320, min_height = 200;
+
+ if (!GetClientRect(This->dlg_hwnd, &dialog_rc))
+ {
+ TRACE("Invalid dialog window, not updating layout\n");
+ return;
+ }
+
+ if(dialog_rc.right < min_width || dialog_rc.bottom < min_height)
+ {
+ TRACE("Dialog size (%d, %d) too small, not updating layout\n",
dialog_rc.right, dialog_rc.bottom);
+ return;
}
/****
@@ -1402,8 +1400,7 @@
else
ERR("Failed to position dialog controls.\n");
- ret.cx = 0; ret.cy = 0;
- return ret;
+ return;
}
static HRESULT init_explorerbrowser(FileDialogImpl *This)
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] Wed Jul 22 19:35:34 2015
@@ -56,7 +56,7 @@
reactos/dll/win32/clusapi # Synced to WineStaging-1.7.37
reactos/dll/win32/comcat # Synced to WineStaging-1.7.37
reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.47
-reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.37
+reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.47
reactos/dll/win32/compstui # Synced to WineStaging-1.7.37
reactos/dll/win32/credui # Synced to WineStaging-1.7.37
reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.47