https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8361200df092a5731059a445f3c576fdc93dfc98
commit 8361200df092a5731059a445f3c576fdc93dfc98 Author: Amine Khaldi <[email protected]> AuthorDate: Tue Mar 20 12:35:24 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Tue Mar 20 12:35:24 2018 +0100 [OBJSEL] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/objsel/CMakeLists.txt | 4 ++-- dll/win32/objsel/factory.c | 5 +++++ dll/win32/objsel/objsel.c | 5 ++++- dll/win32/objsel/objsel.rc | 5 +++-- dll/win32/objsel/objsel_private.h | 31 ++++++++++++++++--------------- dll/win32/objsel/precomp.h | 13 +++++++++++++ media/doc/README.WINE | 2 +- 7 files changed, 44 insertions(+), 21 deletions(-) diff --git a/dll/win32/objsel/CMakeLists.txt b/dll/win32/objsel/CMakeLists.txt index e784cfd227..c32bda6d5f 100644 --- a/dll/win32/objsel/CMakeLists.txt +++ b/dll/win32/objsel/CMakeLists.txt @@ -9,7 +9,7 @@ spec2def(objsel.dll objsel.spec) list(APPEND SOURCE factory.c objsel.c - objsel_private.h) + precomp.h) add_library(objsel SHARED ${SOURCE} @@ -19,5 +19,5 @@ add_library(objsel SHARED set_module_type(objsel win32dll) target_link_libraries(objsel uuid wine) add_importlibs(objsel ole32 advapi32 msvcrt kernel32 ntdll) -add_pch(objsel objsel_private.h SOURCE) +add_pch(objsel precomp.h SOURCE) add_cd_file(TARGET objsel DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/objsel/factory.c b/dll/win32/objsel/factory.c index af4e8cc393..cb0fb491cb 100644 --- a/dll/win32/objsel/factory.c +++ b/dll/win32/objsel/factory.c @@ -21,6 +21,11 @@ #include "objsel_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(objsel); + + static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) { return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface); diff --git a/dll/win32/objsel/objsel.c b/dll/win32/objsel/objsel.c index d2136e3506..83a845dc8e 100644 --- a/dll/win32/objsel/objsel.c +++ b/dll/win32/objsel/objsel.c @@ -19,8 +19,11 @@ */ #include "objsel_private.h" +#include "rpcproxy.h" -#include <rpcproxy.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(objsel); LONG dll_refs = 0; static HINSTANCE hInstance; diff --git a/dll/win32/objsel/objsel.rc b/dll/win32/objsel/objsel.rc index cefc6aaff0..baa6df6d90 100644 --- a/dll/win32/objsel/objsel.rc +++ b/dll/win32/objsel/objsel.rc @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> +#include "windef.h" +#include "winbase.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -26,4 +27,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILENAME_STR "objsel.dll" -#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" diff --git a/dll/win32/objsel/objsel_private.h b/dll/win32/objsel/objsel_private.h index 48e99d7d1f..1d5bc72ad9 100644 --- a/dll/win32/objsel/objsel_private.h +++ b/dll/win32/objsel/objsel_private.h @@ -18,24 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _OBJSEL_PRIVATE_H -#define _OBJSEL_PRIVATE_H +#pragma once +#include <string.h> #include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include <stdio.h> +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wingdi.h" +#include "winuser.h" #define COBJMACROS -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <objsel.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(objsel); +#include "ole2.h" +#include "strmif.h" +#include "olectl.h" +#include "unknwn.h" +#include "objsel.h" +#include "wine/unicode.h" +#include "uuids.h" /********************************************************************** * Dll lifetime tracking declaration for objsel.dll @@ -61,5 +64,3 @@ typedef struct HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj) DECLSPEC_HIDDEN; extern ClassFactoryImpl OBJSEL_ClassFactory DECLSPEC_HIDDEN; - -#endif /* _OBJSEL_PRIVATE_H */ diff --git a/dll/win32/objsel/precomp.h b/dll/win32/objsel/precomp.h new file mode 100644 index 0000000000..d92117783e --- /dev/null +++ b/dll/win32/objsel/precomp.h @@ -0,0 +1,13 @@ + +#ifndef _OBJSEL_PRECOMP_H +#define _OBJSEL_PRECOMP_H + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include "objsel_private.h" + +#include <wine/debug.h> + +#endif /* !_OBJSEL_PRECOMP_H */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 0a4d227dba..a53cb231fc 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -136,7 +136,7 @@ reactos/dll/win32/nddeapi # Synced to WineStaging-3.3 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 reactos/dll/win32/npptools # Synced to WineStaging-3.3 reactos/dll/win32/ntdsapi # Synced to WineStaging-3.3 -reactos/dll/win32/objsel # Synced to WineStaging-2.9 +reactos/dll/win32/objsel # Synced to WineStaging-3.3 reactos/dll/win32/odbc32 # Synced to WineStaging-2.9. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-2.9 reactos/dll/win32/ole32 # Synced to Wine-3.0
