https://git.reactos.org/?p=reactos.git;a=commitdiff;h=feea1bc5be337f08bce5f12a90f6623916cdc40e
commit feea1bc5be337f08bce5f12a90f6623916cdc40e Author: Amine Khaldi <[email protected]> AuthorDate: Fri Mar 9 12:40:09 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Fri Mar 9 12:40:09 2018 +0100 [ACTXPRXY] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/actxprxy/CMakeLists.txt | 8 ++++++-- dll/win32/actxprxy/precomp.h | 17 +++++++++++++++++ dll/win32/actxprxy/usrmarshal.c | 30 ++++++++++++------------------ media/doc/README.WINE | 2 +- 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/dll/win32/actxprxy/CMakeLists.txt b/dll/win32/actxprxy/CMakeLists.txt index 995f05237d..44672c94bb 100644 --- a/dll/win32/actxprxy/CMakeLists.txt +++ b/dll/win32/actxprxy/CMakeLists.txt @@ -20,7 +20,6 @@ add_rpcproxy_files( list(APPEND SOURCE usrmarshal.c - actxprxy.rc ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_activscp_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_comcat_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_docobj_p.c @@ -34,10 +33,15 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_shobjidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_urlhist_p.c ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + precomp.h) + +add_library(actxprxy SHARED + ${SOURCE} + actxprxy.rc ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def) -add_library(actxprxy SHARED ${SOURCE}) set_module_type(actxprxy win32dll) target_link_libraries(actxprxy uuid wine ${PSEH_LIB}) add_importlibs(actxprxy rpcrt4 ole32 oleaut32 msvcrt kernel32 ntdll) +add_pch(actxprxy precomp.h SOURCE) add_cd_file(TARGET actxprxy DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/actxprxy/precomp.h b/dll/win32/actxprxy/precomp.h new file mode 100644 index 0000000000..81d80f00f3 --- /dev/null +++ b/dll/win32/actxprxy/precomp.h @@ -0,0 +1,17 @@ + +#ifndef _ACTXPRXY_PRECOMP_H_ +#define _ACTXPRXY_PRECOMP_H_ + +#define __midl_proxy +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN +#define DECLSPEC_HIDDEN + +#include <objbase.h> +#include <rpcproxy.h> +#include <rpc.h> +#include <rpcndr.h> +#include <windows.h> +#include <ole2.h> + +#endif /* !_ACTXPRXY_PRECOMP_H_ */ diff --git a/dll/win32/actxprxy/usrmarshal.c b/dll/win32/actxprxy/usrmarshal.c index d61a37ec9c..2a276f98e5 100644 --- a/dll/win32/actxprxy/usrmarshal.c +++ b/dll/win32/actxprxy/usrmarshal.c @@ -18,29 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #include <stdarg.h> -//#include <string.h> +#include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -//#include "winuser.h" -//#include "winerror.h" -#include <objbase.h> -//#include "servprov.h" -//#include "comcat.h" -//#include "docobj.h" -#include <shobjidl.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "objbase.h" +#include "servprov.h" +#include "comcat.h" +#include "docobj.h" +#include "shobjidl.h" -#include <wine/debug.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(actxprxy); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 50de61d5f4..ff96bab112 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -43,7 +43,7 @@ reactos/dll/directx/wine/quartz # Synced to WineStaging-3.3 reactos/dll/directx/wine/wined3d # Synced to WineStaging-3.3 reactos/dll/win32/activeds # Synced to WineStaging-3.3 -reactos/dll/win32/actxprxy # Synced to WineStaging-2.9 +reactos/dll/win32/actxprxy # Synced to WineStaging-3.3 reactos/dll/win32/advpack # Synced to WineStaging-2.9 reactos/dll/win32/atl # Synced to Wine-3.0 reactos/dll/win32/atl80 # Synced to Wine-3.0
