6 Oct
2022
6 Oct
'22
2:16 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58740bfbc18e31591c980…
commit 58740bfbc18e31591c9803f314a4f2de77bdfb82
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Wed Oct 5 23:15:29 2022 +0200
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Thu Oct 6 15:37:23 2022 +0200
[GDI32][USER32] Order the set_module_type arguments the usual way ("UNICODE"
before the entrypoint).
+ Harmonize the entrypoints as well.
---
win32ss/gdi/gdi32/CMakeLists.txt | 5 +----
win32ss/gdi/gdi32/main/dllmain.c | 21 +++++++++++++--------
win32ss/gdi/gdi32_vista/CMakeLists.txt | 5 +----
win32ss/user/user32/CMakeLists.txt | 2 +-
win32ss/user/user32/include/user32p.h | 2 +-
win32ss/user/user32/misc/dllmain.c | 16 +++++++++-------
win32ss/user/user32/user32.spec | 2 +-
7 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/win32ss/gdi/gdi32/CMakeLists.txt b/win32ss/gdi/gdi32/CMakeLists.txt
index 4b9cc341e6f..37f66f8a7ea 100644
--- a/win32ss/gdi/gdi32/CMakeLists.txt
+++ b/win32ss/gdi/gdi32/CMakeLists.txt
@@ -50,10 +50,7 @@ add_library(gdi32 MODULE
gdi32.rc
${CMAKE_CURRENT_BINARY_DIR}/gdi32.def)
-set_module_type(gdi32
- win32dll
- ENTRYPOINT DllMain 12
- UNICODE)
+set_module_type(gdi32 win32dll UNICODE ENTRYPOINT DllMain 12)
target_link_libraries(gdi32
winegdi
diff --git a/win32ss/gdi/gdi32/main/dllmain.c b/win32ss/gdi/gdi32/main/dllmain.c
index 322fc156435..522248226fe 100644
--- a/win32ss/gdi/gdi32/main/dllmain.c
+++ b/win32ss/gdi/gdi32/main/dllmain.c
@@ -14,16 +14,19 @@ RTL_CRITICAL_SECTION semLocal;
extern CRITICAL_SECTION gcsClientObjLinks;
/*
- * GDI32.DLL does have an entry point for disable threadlibrarycall,. The initialization
is done by a call
- * to GdiDllInitialize(). This call is done from the entry point of USER32.DLL.
+ * GDI32.DLL does have an entry point for DisableThreadLibraryCalls().
+ * The initialization is done by a call to GdiDllInitialize(). This
+ * call is done from the entry point of USER32.DLL.
*/
BOOL
WINAPI
DllMain(
- HANDLE hDll,
- DWORD dwReason,
- LPVOID lpReserved)
+ _In_ HANDLE hDll,
+ _In_ ULONG dwReason,
+ _In_opt_ PVOID pReserved)
{
+ UNREFERENCED_PARAMETER(pReserved);
+
switch (dwReason)
{
case DLL_PROCESS_ATTACH :
@@ -74,10 +77,12 @@ GdiProcessShutdown(VOID)
BOOL
WINAPI
GdiDllInitialize(
- HANDLE hDll,
- DWORD dwReason,
- LPVOID lpReserved)
+ _In_ HANDLE hDll,
+ _In_ ULONG dwReason,
+ _In_opt_ PVOID pReserved)
{
+ UNREFERENCED_PARAMETER(pReserved);
+
switch (dwReason)
{
case DLL_PROCESS_ATTACH:
diff --git a/win32ss/gdi/gdi32_vista/CMakeLists.txt
b/win32ss/gdi/gdi32_vista/CMakeLists.txt
index 411e5b403ac..3ae8d6d0b4a 100644
--- a/win32ss/gdi/gdi32_vista/CMakeLists.txt
+++ b/win32ss/gdi/gdi32_vista/CMakeLists.txt
@@ -13,10 +13,7 @@ add_library(gdi32_vista MODULE
gdi32_vista.rc
${CMAKE_CURRENT_BINARY_DIR}/gdi32_vista.def)
-set_module_type(gdi32_vista
- win32dll
- ENTRYPOINT 0
- UNICODE)
+set_module_type(gdi32_vista win32dll UNICODE ENTRYPOINT 0)
target_link_libraries(gdi32_vista win32ksys)
diff --git a/win32ss/user/user32/CMakeLists.txt b/win32ss/user/user32/CMakeLists.txt
index c181932f8ee..8c938015115 100644
--- a/win32ss/user/user32/CMakeLists.txt
+++ b/win32ss/user/user32/CMakeLists.txt
@@ -79,7 +79,7 @@ add_library(user32 MODULE
user32.rc
${CMAKE_CURRENT_BINARY_DIR}/user32.def)
-set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE)
+set_module_type(user32 win32dll UNICODE ENTRYPOINT DllMain 12)
target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB})
add_dependencies(user32 asm)
diff --git a/win32ss/user/user32/include/user32p.h
b/win32ss/user/user32/include/user32p.h
index e531ad847af..06e02f8c158 100644
--- a/win32ss/user/user32/include/user32p.h
+++ b/win32ss/user/user32/include/user32p.h
@@ -60,7 +60,7 @@ extern Imm32ApiTable gImmApiEntries;
/* FIXME: move to a correct header */
/* undocumented gdi32 definitions */
-BOOL WINAPI GdiDllInitialize(HANDLE, DWORD, LPVOID);
+BOOL WINAPI GdiDllInitialize(HANDLE, ULONG, PVOID);
LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *);
/* definitions for spy.c */
diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c
index 18dd9ec0710..3cc2b426a2e 100644
--- a/win32ss/user/user32/misc/dllmain.c
+++ b/win32ss/user/user32/misc/dllmain.c
@@ -466,11 +466,13 @@ Cleanup(VOID)
DeleteFrameBrushes();
}
-INT WINAPI
+// UserClientDllInitialize
+BOOL
+WINAPI
DllMain(
- IN PVOID hInstanceDll,
- IN ULONG dwReason,
- IN PVOID reserved)
+ _In_ HANDLE hDll,
+ _In_ ULONG dwReason,
+ _In_opt_ PVOID pReserved)
{
switch (dwReason)
{
@@ -495,7 +497,7 @@ DllMain(
TRACE("user32::DllMain\n");
/* Don't bother us for each thread */
- DisableThreadLibraryCalls(hInstanceDll);
+ DisableThreadLibraryCalls(hDll);
RtlZeroMemory(&ConnectInfo, sizeof(ConnectInfo));
@@ -536,7 +538,7 @@ DllMain(
#endif
- User32Instance = hInstanceDll;
+ User32Instance = hDll;
/* Finish initialization */
TRACE("Checkpoint (call Init)\n");
@@ -572,7 +574,7 @@ DllMain(
}
/* Finally, initialize GDI */
- return GdiDllInitialize(hInstanceDll, dwReason, reserved);
+ return GdiDllInitialize(hDll, dwReason, pReserved);
}
NTSTATUS
diff --git a/win32ss/user/user32/user32.spec b/win32ss/user/user32/user32.spec
index 6af9bbc06b0..a77cfeaf29e 100644
--- a/win32ss/user/user32/user32.spec
+++ b/win32ss/user/user32/user32.spec
@@ -717,7 +717,7 @@
708 stdcall UpdatePerUserSystemParameters(long long)
709 stdcall UpdateWindow(long)
710 stdcall User32InitializeImmEntryTable(ptr)
-711 stdcall UserClientDllInitialize(long long ptr) DllMain
+711 stdcall UserClientDllInitialize(ptr long ptr) DllMain
712 stdcall UserHandleGrantAccess(ptr ptr long) NtUserUserHandleGrantAccess
713 stdcall UserLpkPSMTextOut(long long long wstr long long)
714 stdcall UserLpkTabbedTextOut(long long long long long long long long long long long
long)