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

[GDI32]

Browse source 
- Call NtGdiInit before initializing ourselves (ok, in ROS NtGdiInit does nothing interesting, but still do it to be call-compatible with win2k3 so everything initializes as it should).
- Do some cleanup on process detach.

svn path=/trunk/; revision=65797
This commit is contained in:
Hermès Bélusca-Maïto 2014-12-22 19:44:59 +00:00
parent e1ad312568
commit 61886223b4
1 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
reactos/win32ss/gdi/gdi32/main/dllmain.c
View file

@ -18,7 +18,7 @@ extern CRITICAL_SECTION gcsClientObjLinks;
*/
BOOL
WINAPI
DllMain (
DllMain(
HANDLE hDll,
DWORD dwReason,
LPVOID lpReserved)
@ -38,7 +38,7 @@ DllMain (
VOID
WINAPI
GdiProcessSetup (VOID)
GdiProcessSetup(VOID)
{
hProcessHeap = GetProcessHeap();
@ -53,36 +53,62 @@ GdiProcessSetup (VOID)
InitializeCriticalSection(&gcsClientObjLinks);
}
VOID
WINAPI
GdiProcessShutdown(VOID)
{
DeleteCriticalSection(&gcsClientObjLinks);
RtlDeleteCriticalSection(&semLocal);
}
/*
* @implemented
*/
BOOL
WINAPI
GdiDllInitialize (
GdiDllInitialize(
HANDLE hDll,
DWORD dwReason,
LPVOID lpReserved)
{
switch (dwReason)
{
case DLL_PROCESS_ATTACH:
GdiProcessSetup ();
break;
case DLL_PROCESS_ATTACH:
{
/* Don't bother us for each thread */
// DisableThreadLibraryCalls(hDll);
case DLL_THREAD_ATTACH:
NtCurrentTeb()->GdiTebBatch.Offset = 0;
NtCurrentTeb()->GdiBatchCount = 0;
break;
/* Initialize the kernel part of GDI first */
if (!NtGdiInit()) return FALSE;
default:
return FALSE;
/* Now initialize ourselves */
GdiProcessSetup();
break;
}
case DLL_THREAD_ATTACH:
{
NtCurrentTeb()->GdiTebBatch.Offset = 0;
NtCurrentTeb()->GdiBatchCount = 0;
break;
}
case DLL_PROCESS_DETACH:
{
/* Cleanup */
GdiProcessShutdown();
return TRUE;
}
default:
return FALSE;
}
// Very simple, the list will fill itself as it is needed.
if(!SetStockObjects)
/* Very simple, the list will fill itself as it is needed */
if (!SetStockObjects)
{
RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty.
RtlZeroMemory(&stock_objects, NB_STOCK_OBJECTS); // Assume ROS is dirty
SetStockObjects = TRUE;
}