Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACTXPRXY] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-09 12:40:09 +01:00
parent 7bfbe4f57a
commit feea1bc5be
4 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/actxprxy/CMakeLists.txt
View file

@ -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)

17
dll/win32/actxprxy/precomp.h Normal file
View file

@ -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_ */

30
dll/win32/actxprxy/usrmarshal.c
View file

@ -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);

2
media/doc/README.WINE
View file

@ -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