Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 01:40:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GDI32][USER32] Order the set_module_type arguments the usual way ("UNICODE" before the entrypoint).

Browse source 
+ Harmonize the entrypoints as well.
This commit is contained in:
Hermès Bélusca-Maïto 2022-10-05 23:15:29 +02:00
parent 069b08da0b
commit 58740bfbc1
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
7 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
win32ss/gdi/gdi32/CMakeLists.txt
View file

@ -50,10 +50,7 @@ add_library(gdi32 MODULE
gdi32.rc gdi32.rc
${CMAKE_CURRENT_BINARY_DIR}/gdi32.def) ${CMAKE_CURRENT_BINARY_DIR}/gdi32.def)
set_module_type(gdi32 set_module_type(gdi32 win32dll UNICODE ENTRYPOINT DllMain 12)
win32dll
ENTRYPOINT DllMain 12
UNICODE)
target_link_libraries(gdi32 target_link_libraries(gdi32
winegdi winegdi

21
win32ss/gdi/gdi32/main/dllmain.c
View file

@ -14,16 +14,19 @@ RTL_CRITICAL_SECTION semLocal;
extern CRITICAL_SECTION gcsClientObjLinks; extern CRITICAL_SECTION gcsClientObjLinks;
/* /*
* GDI32.DLL does have an entry point for disable threadlibrarycall,. The initialization is done by a call * GDI32.DLL does have an entry point for DisableThreadLibraryCalls().
* to GdiDllInitialize(). This call is done from the entry point of USER32.DLL. * The initialization is done by a call to GdiDllInitialize(). This
* call is done from the entry point of USER32.DLL.
*/ */
BOOL BOOL
WINAPI WINAPI
DllMain( DllMain(
HANDLE hDll, _In_ HANDLE hDll,
DWORD dwReason, _In_ ULONG dwReason,
LPVOID lpReserved) _In_opt_ PVOID pReserved)
{ {
UNREFERENCED_PARAMETER(pReserved);
switch (dwReason) switch (dwReason)
{ {
case DLL_PROCESS_ATTACH : case DLL_PROCESS_ATTACH :
@ -74,10 +77,12 @@ GdiProcessShutdown(VOID)
BOOL BOOL
WINAPI WINAPI
GdiDllInitialize( GdiDllInitialize(
HANDLE hDll, _In_ HANDLE hDll,
DWORD dwReason, _In_ ULONG dwReason,
LPVOID lpReserved) _In_opt_ PVOID pReserved)
{ {
UNREFERENCED_PARAMETER(pReserved);
switch (dwReason) switch (dwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

5
win32ss/gdi/gdi32_vista/CMakeLists.txt
View file

@ -13,10 +13,7 @@ add_library(gdi32_vista MODULE
gdi32_vista.rc gdi32_vista.rc
${CMAKE_CURRENT_BINARY_DIR}/gdi32_vista.def) ${CMAKE_CURRENT_BINARY_DIR}/gdi32_vista.def)
set_module_type(gdi32_vista set_module_type(gdi32_vista win32dll UNICODE ENTRYPOINT 0)
win32dll
ENTRYPOINT 0
UNICODE)
target_link_libraries(gdi32_vista win32ksys) target_link_libraries(gdi32_vista win32ksys)

2
win32ss/user/user32/CMakeLists.txt
View file

@ -79,7 +79,7 @@ add_library(user32 MODULE
user32.rc user32.rc
${CMAKE_CURRENT_BINARY_DIR}/user32.def) ${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}) target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB})
add_dependencies(user32 asm) add_dependencies(user32 asm)

2
win32ss/user/user32/include/user32p.h
View file

@ -60,7 +60,7 @@ extern Imm32ApiTable gImmApiEntries;
/* FIXME: move to a correct header */ /* FIXME: move to a correct header */
/* undocumented gdi32 definitions */ /* undocumented gdi32 definitions */
BOOL WINAPI GdiDllInitialize(HANDLE, DWORD, LPVOID); BOOL WINAPI GdiDllInitialize(HANDLE, ULONG, PVOID);
LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *);
/* definitions for spy.c */ /* definitions for spy.c */

16
win32ss/user/user32/misc/dllmain.c
View file

@ -466,11 +466,13 @@ Cleanup(VOID)
DeleteFrameBrushes(); DeleteFrameBrushes();
} }
INT WINAPI // UserClientDllInitialize
BOOL
WINAPI
DllMain( DllMain(
IN PVOID hInstanceDll, _In_ HANDLE hDll,
IN ULONG dwReason, _In_ ULONG dwReason,
IN PVOID reserved) _In_opt_ PVOID pReserved)
{ {
switch (dwReason) switch (dwReason)
{ {
@ -495,7 +497,7 @@ DllMain(
TRACE("user32::DllMain\n"); TRACE("user32::DllMain\n");
/* Don't bother us for each thread */ /* Don't bother us for each thread */
DisableThreadLibraryCalls(hInstanceDll); DisableThreadLibraryCalls(hDll);
RtlZeroMemory(&ConnectInfo, sizeof(ConnectInfo)); RtlZeroMemory(&ConnectInfo, sizeof(ConnectInfo));
@ -536,7 +538,7 @@ DllMain(
#endif #endif
User32Instance = hInstanceDll; User32Instance = hDll;
/* Finish initialization */ /* Finish initialization */
TRACE("Checkpoint (call Init)\n"); TRACE("Checkpoint (call Init)\n");
@ -572,7 +574,7 @@ DllMain(
} }
/* Finally, initialize GDI */ /* Finally, initialize GDI */
return GdiDllInitialize(hInstanceDll, dwReason, reserved); return GdiDllInitialize(hDll, dwReason, pReserved);
} }
NTSTATUS NTSTATUS

2
win32ss/user/user32/user32.spec
View file

@ -717,7 +717,7 @@
708 stdcall UpdatePerUserSystemParameters(long long) 708 stdcall UpdatePerUserSystemParameters(long long)
709 stdcall UpdateWindow(long) 709 stdcall UpdateWindow(long)
710 stdcall User32InitializeImmEntryTable(ptr) 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 712 stdcall UserHandleGrantAccess(ptr ptr long) NtUserUserHandleGrantAccess
713 stdcall UserLpkPSMTextOut(long long long wstr long long) 713 stdcall UserLpkPSMTextOut(long long long wstr long long)
714 stdcall UserLpkTabbedTextOut(long long long long long long long long long long long long) 714 stdcall UserLpkTabbedTextOut(long long long long long long long long long long long long)