https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b391603d04b78ee7ba05f...
commit 8b391603d04b78ee7ba05f74fb9028e61276c5c7 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Wed Mar 21 12:56:06 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Wed Mar 21 12:56:06 2018 +0100
[OLEDLG] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/oledlg/CMakeLists.txt | 4 ++-- dll/win32/oledlg/insobjdlg.c | 18 +++++++++++++++--- dll/win32/oledlg/oledlg_main.c | 15 +++++++++++++++ dll/win32/oledlg/oledlg_private.h | 21 --------------------- dll/win32/oledlg/pastespl.c | 17 +++++++++++++++++ dll/win32/oledlg/precomp.h | 27 +++++++++++++++++++++++++++ dll/win32/oledlg/resource.h | 2 ++ media/doc/README.WINE | 2 +- 8 files changed, 79 insertions(+), 27 deletions(-)
diff --git a/dll/win32/oledlg/CMakeLists.txt b/dll/win32/oledlg/CMakeLists.txt index ef8e247454..4d568d37e3 100644 --- a/dll/win32/oledlg/CMakeLists.txt +++ b/dll/win32/oledlg/CMakeLists.txt @@ -7,7 +7,7 @@ list(APPEND SOURCE insobjdlg.c oledlg_main.c pastespl.c - oledlg_private.h) + precomp.h)
add_library(oledlg SHARED ${SOURCE} @@ -17,5 +17,5 @@ add_library(oledlg SHARED set_module_type(oledlg win32dll) target_link_libraries(oledlg wine) add_importlibs(oledlg ole32 comdlg32 user32 advapi32 msvcrt kernel32 ntdll) -add_pch(oledlg oledlg_private.h SOURCE) +add_pch(oledlg precomp.h SOURCE) add_cd_file(TARGET oledlg DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/oledlg/insobjdlg.c b/dll/win32/oledlg/insobjdlg.c index 349d6bc1fc..8c1d20588e 100644 --- a/dll/win32/oledlg/insobjdlg.c +++ b/dll/win32/oledlg/insobjdlg.c @@ -18,9 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "oledlg_private.h" - -#include <winreg.h> +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wine/winternl.h" +#include "winerror.h" +#include "wingdi.h" +#include "winuser.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +#include "oledlg.h" +#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(oledlg);
diff --git a/dll/win32/oledlg/oledlg_main.c b/dll/win32/oledlg/oledlg_main.c index 44be5eeda6..8ba9f17a7a 100644 --- a/dll/win32/oledlg/oledlg_main.c +++ b/dll/win32/oledlg/oledlg_main.c @@ -18,7 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winuser.h" +#include "oledlg.h" +#include "ole2.h" #include "oledlg_private.h" +#include "resource.h" + +#include "wine/debug.h" +#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff --git a/dll/win32/oledlg/oledlg_private.h b/dll/win32/oledlg/oledlg_private.h index d9df7c2733..8be1d6b3cb 100644 --- a/dll/win32/oledlg/oledlg_private.h +++ b/dll/win32/oledlg/oledlg_private.h @@ -21,27 +21,6 @@ #ifndef __OLEDLG_PRIVATE_H__ #define __OLEDLG_PRIVATE_H__
-#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <oledlg.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - -#include "resource.h" - extern HINSTANCE OLEDLG_hInstance DECLSPEC_HIDDEN;
extern UINT cf_embed_source DECLSPEC_HIDDEN; diff --git a/dll/win32/oledlg/pastespl.c b/dll/win32/oledlg/pastespl.c index ff8ae41dc9..530c4eddda 100644 --- a/dll/win32/oledlg/pastespl.c +++ b/dll/win32/oledlg/pastespl.c @@ -18,7 +18,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#define COBJMACROS +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "oledlg.h" + #include "oledlg_private.h" +#include "resource.h" + +#include "wine/debug.h" +#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff --git a/dll/win32/oledlg/precomp.h b/dll/win32/oledlg/precomp.h new file mode 100644 index 0000000000..4b6d825d23 --- /dev/null +++ b/dll/win32/oledlg/precomp.h @@ -0,0 +1,27 @@ + +#ifndef _OLEDLG_PRECOMP_H_ +#define _OLEDLG_PRECOMP_H_ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <oledlg.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "oledlg_private.h" +#include "resource.h" + +#endif /* !_OLEDLG_PRECOMP_H_ */ diff --git a/dll/win32/oledlg/resource.h b/dll/win32/oledlg/resource.h index 73b5365106..0cc5771dd5 100644 --- a/dll/win32/oledlg/resource.h +++ b/dll/win32/oledlg/resource.h @@ -20,6 +20,8 @@
#pragma once
+#include <oledlg.h> + #define IDS_RESULTOBJDESC 101 #define IDS_RESULTFILEOBJDESC 102 #define IDS_BROWSE 103 diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 3364224b3b..a577454652 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -143,7 +143,7 @@ reactos/dll/win32/ole32 # Synced to WineStaging-3.3 reactos/dll/win32/oleacc # Synced to WineStaging-3.3 reactos/dll/win32/oleaut32 # Synced to WineStaging-3.3 reactos/dll/win32/olecli32 # Synced to WineStaging-3.3 -reactos/dll/win32/oledlg # Synced to WineStaging-2.9 +reactos/dll/win32/oledlg # Synced to WineStaging-3.3 reactos/dll/win32/olepro32 # Synced to WineStaging-2.9 reactos/dll/win32/olesvr32 # Synced to WineStaging-2.9 reactos/dll/win32/olethk32 # Synced to WineStaging-2.9
-
Amine Khaldi