Jacek Caban : gdi32: Avoid calling kernel32 from ntgdi functions.
Alexandre Julliard
julliard at winehq.org
Fri Sep 24 15:31:59 CDT 2021
Module: wine
Branch: master
Commit: 5b513cbb0e1b8f520a9e1b8e134be90c8a96446b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b513cbb0e1b8f520a9e1b8e134be90c8a96446b
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Sep 24 12:56:11 2021 +0200
gdi32: Avoid calling kernel32 from ntgdi functions.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdi32/dibdrv/dc.c | 4 ++--
dlls/gdi32/driver.c | 2 +-
dlls/gdi32/gdiobj.c | 2 +-
dlls/gdi32/printdrv.c | 8 ++++++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c
index 0ff4688b170..413ba8b8665 100644
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/dlls/gdi32/dibdrv/dc.c
@@ -745,13 +745,13 @@ static inline void lock_surface( struct windrv_physdev *dev )
{
GDI_CheckNotLock();
dev->surface->funcs->lock( dev->surface );
- if (is_rect_empty( dev->dibdrv->bounds )) dev->start_ticks = GetTickCount();
+ if (is_rect_empty( dev->dibdrv->bounds )) dev->start_ticks = NtGetTickCount();
}
static inline void unlock_surface( struct windrv_physdev *dev )
{
dev->surface->funcs->unlock( dev->surface );
- if (GetTickCount() - dev->start_ticks > FLUSH_PERIOD) dev->surface->funcs->flush( dev->surface );
+ if (NtGetTickCount() - dev->start_ticks > FLUSH_PERIOD) dev->surface->funcs->flush( dev->surface );
}
static void CDECL unlock_bits_surface( struct gdi_image_bits *bits )
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 712dce06af6..f9cf592b28e 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -235,7 +235,7 @@ void CDECL __wine_set_display_driver( HMODULE module )
if (!(driver = create_driver( module )))
{
ERR( "Could not create graphics driver\n" );
- ExitProcess(1);
+ NtTerminateProcess( GetCurrentThread(), 1 );
}
if (InterlockedCompareExchangePointer( (void **)&display_driver, driver, NULL ))
HeapFree( GetProcessHeap(), 0, driver );
diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c
index cf8fbb8ebb4..9c62e9e62d1 100644
--- a/dlls/gdi32/gdiobj.c
+++ b/dlls/gdi32/gdiobj.c
@@ -885,7 +885,7 @@ void GDI_CheckNotLock(void)
if (RtlIsCriticalSectionLockedByThread(&gdi_section))
{
ERR( "BUG: holding GDI lock\n" );
- DebugBreak();
+ assert( 0 );
}
}
diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c
index 9a4ad3b5c23..152b43d6ae4 100644
--- a/dlls/gdi32/printdrv.c
+++ b/dlls/gdi32/printdrv.c
@@ -39,10 +39,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(print);
*/
DWORD WINAPI NtGdiGetSpoolMessage( void *ptr1, DWORD data2, void *ptr3, DWORD data4 )
{
- TRACE("(%p 0x%x %p 0x%x) stub\n", ptr1, data2, ptr3, data4);
+ LARGE_INTEGER time;
+
+ TRACE( "(%p 0x%x %p 0x%x) stub\n", ptr1, data2, ptr3, data4 );
+
/* avoid 100% cpu usage with spoolsv.exe from w2k
(spoolsv.exe from xp does Sleep 1000/1500/2000 in a loop) */
- Sleep(500);
+ time.QuadPart = 500 * -10000;
+ NtDelayExecution( FALSE, &time );
return 0;
}
More information about the wine-cvs
mailing list