[ros-diffs] [reactos] 322/360: [WINESYNC] winecrt0: Add a default implementation DllRegisterServer()/DllUnregisterServer().

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7cface09ce93a6d3a7ef3…

commit 7cface09ce93a6d3a7ef3c38b4c84a0f38eee3b5
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Mar 13 22:12:17 2022 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:28:38 2022 +0100

    [WINESYNC] winecrt0: Add a default implementation
DllRegisterServer()/DllUnregisterServer().
    
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 5d82baf9747b7b133cad3be77c0cc9e24cc09582 by Alexandre Julliard
<julliard(a)winehq.org>
---
 dll/win32/msi/CMakeLists.txt            |  2 +-
 dll/win32/msi/msi_main.c                | 16 -----------
 sdk/lib/3rdparty/libwine/CMakeLists.txt |  4 +++
 sdk/lib/3rdparty/libwine/dll_register.c | 47 +++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt
index 2927a5dd1bc..84bfef42ec6 100644
--- a/dll/win32/msi/CMakeLists.txt
+++ b/dll/win32/msi/CMakeLists.txt
@@ -84,7 +84,7 @@ add_idl_headers(msi_idlheader msiserver.idl winemsi.idl)
 add_typelib(msiserver.idl winemsi.idl)
 set_source_files_properties(msi.rc PROPERTIES OBJECT_DEPENDS
"${CMAKE_CURRENT_BINARY_DIR}/msiserver.tlb;${CMAKE_CURRENT_BINARY_DIR}/winemsi.tlb")
 set_module_type(msi win32dll)
-target_link_libraries(msi uuid ${PSEH_LIB} wine oldnames)
+target_link_libraries(msi uuid ${PSEH_LIB} wine_dll_register oldnames)
 add_dependencies(msi msi_idlheader)
 add_delay_importlibs(msi odbccp32 crypt32 wintrust)
 add_importlibs(msi advapi32 advapi32_vista cabinet comctl32 gdi32 ole32 oleaut32 shell32
shlwapi rpcrt4 urlmon user32 version wininet sxs
diff --git a/dll/win32/msi/msi_main.c b/dll/win32/msi/msi_main.c
index 0e436b09e59..738d9272cd9 100644
--- a/dll/win32/msi/msi_main.c
+++ b/dll/win32/msi/msi_main.c
@@ -216,19 +216,3 @@ HRESULT WINAPI DllCanUnloadNow(void)
 {
     return dll_count == 0 ? S_OK : S_FALSE;
 }
-
-/***********************************************************************
- *  DllRegisterServer (MSI.@)
- */
-HRESULT WINAPI DllRegisterServer(void)
-{
-    return __wine_register_resources( msi_hInstance );
-}
-
-/***********************************************************************
- *  DllUnregisterServer (MSI.@)
- */
-HRESULT WINAPI DllUnregisterServer(void)
-{
-    return __wine_unregister_resources( msi_hInstance );
-}
diff --git a/sdk/lib/3rdparty/libwine/CMakeLists.txt
b/sdk/lib/3rdparty/libwine/CMakeLists.txt
index bed7ca764eb..4bd0ef625c2 100644
--- a/sdk/lib/3rdparty/libwine/CMakeLists.txt
+++ b/sdk/lib/3rdparty/libwine/CMakeLists.txt
@@ -21,3 +21,7 @@ target_compile_definitions(wine PRIVATE __WINESRC__ _WINE)
 add_library(wineldr loader.c)
 add_dependencies(wineldr xdk)
 target_compile_definitions(wineldr PRIVATE __WINESRC__)
+
+add_library(wine_dll_register dll_register.c ${SOURCE})
+add_dependencies(wine_dll_register psdk)
+target_compile_definitions(wine_dll_register PRIVATE __WINESRC__ _WINE)
diff --git a/sdk/lib/3rdparty/libwine/dll_register.c
b/sdk/lib/3rdparty/libwine/dll_register.c
new file mode 100644
index 00000000000..3be0ea5581a
--- /dev/null
+++ b/sdk/lib/3rdparty/libwine/dll_register.c
@@ -0,0 +1,47 @@
+/*
+ * DllRegisterServer default implementation
+ *
+ * Copyright 2021 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+#define COBJMACROS
+#include "windef.h"
+#include "winbase.h"
+#include "olectl.h"
+#include "rpcproxy.h"
+
+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() );
+}
+
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    return __wine_unregister_resources( image_base() );
+}