Module: wine Branch: master Commit: 0e257cb1fbcd54c86840bc5d2f7a873266495c11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e257cb1fbcd54c86840bc5d2...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Aug 30 13:56:46 2021 +0200
gdi32: Move more DC stubs to gdidc.c.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/gdi32/driver.c | 37 ------------------------------------- dlls/gdi32/gdidc.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a5ba3ad4ea7..340476bca10 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -29,7 +29,6 @@ #include "winbase.h" #include "wingdi.h" #include "winreg.h" -#include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h"
@@ -1147,42 +1146,6 @@ INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, int driver_id, INT escape, IN }
-/******************************************************************* - * DrawEscape [GDI32.@] - * - * - */ -INT WINAPI DrawEscape(HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData) -{ - FIXME("DrawEscape, stub\n"); - return 0; -} - -/******************************************************************* - * NamedEscape [GDI32.@] - */ -INT WINAPI NamedEscape( HDC hdc, LPCWSTR pDriver, INT nEscape, INT cbInput, LPCSTR lpszInData, - INT cbOutput, LPSTR lpszOutData ) -{ - FIXME("(%p, %s, %d, %d, %p, %d, %p)\n", - hdc, wine_dbgstr_w(pDriver), nEscape, cbInput, lpszInData, cbOutput, - lpszOutData); - return 0; -} - -/******************************************************************* - * DdQueryDisplaySettingsUniqueness [GDI32.@] - * GdiEntry13 [GDI32.@] - */ -ULONG WINAPI DdQueryDisplaySettingsUniqueness(VOID) -{ - static int warn_once; - - if (!warn_once++) - FIXME("stub\n"); - return 0; -} - /****************************************************************************** * NtGdiDdDDIOpenAdapterFromHdc (win32u.@) */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index e12dbfeff03..c3c7ad710f2 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -22,6 +22,7 @@
#include "gdi_private.h" #include "winternl.h" +#include "ddrawgdi.h"
#include "wine/debug.h"
@@ -1843,3 +1844,34 @@ BOOL WINAPI GdiIsPlayMetafileDC( HDC hdc ) FIXME( "%p\n", hdc ); return FALSE; } + +/******************************************************************* + * DrawEscape (GDI32.@) + */ +INT WINAPI DrawEscape( HDC hdc, INT escape, INT input_size, const char *input ) +{ + FIXME( "stub\n" ); + return 0; +} + +/******************************************************************* + * NamedEscape (GDI32.@) + */ +INT WINAPI NamedEscape( HDC hdc, const WCHAR *driver, INT escape, INT input_size, + const char *input, INT output_size, char *output ) +{ + FIXME( "(%p %s %d, %d %p %d %p)\n", hdc, wine_dbgstr_w(driver), escape, input_size, + input, output_size, output ); + return 0; +} + +/******************************************************************* + * DdQueryDisplaySettingsUniqueness (GDI32.@) + * GdiEntry13 + */ +ULONG WINAPI DdQueryDisplaySettingsUniqueness(void) +{ + static int warn_once; + if (!warn_once++) FIXME( "stub\n" ); + return 0; +}