[MSXML3][RPCRT4]

Author: DarkFire01

dll/win32/msxml3/CMakeLists.txt

@@ -71,7 +71,7 @@ add_library(msxml3 MODULE
 
 add_idl_headers(xmlparser_idlheader xmlparser.idl)
 set_module_type(msxml3 win32dll)
-target_link_libraries(msxml3 libxml2 iconv-static uuid wine wine_dll_register zlib)
+target_link_libraries(msxml3 libxml2 iconv-static uuid wine zlib)
 
 if(MSVC)
     target_compile_options(msxml3 PRIVATE /FIwine/typeof.h /FImsvc.h)

dll/win32/msxml3/main.c

@@ -52,6 +52,24 @@ HINSTANCE MSXML_hInstance = NULL;
 
 WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 
+#ifdef __REACTOS__
+static inline void *image_base(void)
+{
+#if defined(__MINGW32__) || defined(_MSC_VER)
+    extern IMAGE_DOS_HEADER __ImageBase;
+    return (void *)&__ImageBase;
+#else
+    extern IMAGE_NT_HEADERS __wine_spec_nt_header;
+    return (void *)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff);
+#endif
+}
+
+HRESULT WINAPI DllRegisterServer(void)
+{
+    return __wine_register_resources( image_base() );
+}
+#endif
+
 void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap)
 {
     enum __wine_debug_class dbcl;

dll/win32/msxml3/msxml3.spec

@@ -9,4 +9,4 @@
 @ stdcall -private DllCanUnloadNow()
 @ stdcall DllGetClassObject(ptr ptr ptr)
 @ stdcall -private DllRegisterServer()
-@ stdcall -private DllUnregisterServer()
+@ stdcall -stub -private DllUnregisterServer()

dll/win32/rpcrt4/CMakeLists.txt

@@ -65,7 +65,7 @@ if(MSVC)
 endif()
 
 set_module_type(rpcrt4 win32dll)
-target_link_libraries(rpcrt4 wine wine_dll_register uuid ${PSEH_LIB} oldnames)
+target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB} oldnames)
 add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32 ole32 oleaut32)
 add_importlibs(rpcrt4 advapi32 advapi32_vista kernel32_vista ws2_32 msvcrt kernel32 ntdll)
 add_dependencies(rpcrt4 ndr_types_header)

dll/win32/rpcrt4/rpcrt4_main.c

@@ -101,6 +101,24 @@ struct interface_header
     RPC_SYNTAX_IDENTIFIER id;
 };
 
+#ifdef __REACTOS__
+static inline void *image_base(void)
+{
+#if defined(__MINGW32__) || defined(_MSC_VER)
+    extern IMAGE_DOS_HEADER __ImageBase;
+    return (void *)&__ImageBase;
+#else
+    extern IMAGE_NT_HEADERS __wine_spec_nt_header;
+    return (void *)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff);
+#endif
+}
+
+HRESULT WINAPI DllRegisterServer(void)
+{
+    return __wine_register_resources( image_base() );
+}
+#endif
+
 /***********************************************************************
  * DllMain
  *