Commit 21009822 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

win32u: Use syscall interface for some mapping functions.

parent 6fbbbe1f
...@@ -1176,7 +1176,6 @@ static struct unix_funcs unix_funcs = ...@@ -1176,7 +1176,6 @@ static struct unix_funcs unix_funcs =
NtGdiSetMagicColors, NtGdiSetMagicColors,
NtGdiSetPixel, NtGdiSetPixel,
NtGdiSetSystemPaletteUse, NtGdiSetSystemPaletteUse,
NtGdiSetVirtualResolution,
NtGdiStartDoc, NtGdiStartDoc,
NtGdiStartPage, NtGdiStartPage,
NtGdiStretchBlt, NtGdiStretchBlt,
...@@ -1184,7 +1183,6 @@ static struct unix_funcs unix_funcs = ...@@ -1184,7 +1183,6 @@ static struct unix_funcs unix_funcs =
NtGdiStrokeAndFillPath, NtGdiStrokeAndFillPath,
NtGdiStrokePath, NtGdiStrokePath,
NtGdiTransparentBlt, NtGdiTransparentBlt,
NtGdiTransformPoints,
NtGdiUnrealizeObject, NtGdiUnrealizeObject,
NtGdiUpdateColors, NtGdiUpdateColors,
NtGdiWidenPath, NtGdiWidenPath,
......
...@@ -78,7 +78,9 @@ static void * const syscalls[] = ...@@ -78,7 +78,9 @@ static void * const syscalls[] =
NtGdiSetPixelFormat, NtGdiSetPixelFormat,
NtGdiSetRectRgn, NtGdiSetRectRgn,
NtGdiSetTextJustification, NtGdiSetTextJustification,
NtGdiSetVirtualResolution,
NtGdiSwapBuffers, NtGdiSwapBuffers,
NtGdiTransformPoints,
}; };
static BYTE arguments[ARRAY_SIZE(syscalls)]; static BYTE arguments[ARRAY_SIZE(syscalls)];
......
...@@ -617,7 +617,7 @@ ...@@ -617,7 +617,7 @@
@ stdcall NtGdiSetSystemPaletteUse(long long) @ stdcall NtGdiSetSystemPaletteUse(long long)
@ stdcall -syscall NtGdiSetTextJustification(long long long) @ stdcall -syscall NtGdiSetTextJustification(long long long)
@ stub NtGdiSetUMPDSandboxState @ stub NtGdiSetUMPDSandboxState
@ stdcall NtGdiSetVirtualResolution(long long long long long) @ stdcall -syscall NtGdiSetVirtualResolution(long long long long long)
@ stdcall NtGdiStartDoc(long ptr ptr long) @ stdcall NtGdiStartDoc(long ptr ptr long)
@ stdcall NtGdiStartPage(long) @ stdcall NtGdiStartPage(long)
@ stdcall NtGdiStretchBlt(long long long long long long long long long long long long) @ stdcall NtGdiStretchBlt(long long long long long long long long long long long long)
...@@ -625,7 +625,7 @@ ...@@ -625,7 +625,7 @@
@ stdcall NtGdiStrokeAndFillPath(long) @ stdcall NtGdiStrokeAndFillPath(long)
@ stdcall NtGdiStrokePath(long) @ stdcall NtGdiStrokePath(long)
@ stdcall -syscall NtGdiSwapBuffers(long) @ stdcall -syscall NtGdiSwapBuffers(long)
@ stdcall NtGdiTransformPoints(long ptr ptr long long) @ stdcall -syscall NtGdiTransformPoints(long ptr ptr long long)
@ stdcall NtGdiTransparentBlt(long long long long long long long long long long long) @ stdcall NtGdiTransparentBlt(long long long long long long long long long long long)
@ stub NtGdiUMPDEngFreeUserMem @ stub NtGdiUMPDEngFreeUserMem
@ stub NtGdiUnloadPrinterDriver @ stub NtGdiUnloadPrinterDriver
......
...@@ -193,8 +193,6 @@ struct unix_funcs ...@@ -193,8 +193,6 @@ struct unix_funcs
BOOL (WINAPI *pNtGdiSetMagicColors)( HDC hdc, DWORD magic, ULONG index ); BOOL (WINAPI *pNtGdiSetMagicColors)( HDC hdc, DWORD magic, ULONG index );
COLORREF (WINAPI *pNtGdiSetPixel)( HDC hdc, INT x, INT y, COLORREF color ); COLORREF (WINAPI *pNtGdiSetPixel)( HDC hdc, INT x, INT y, COLORREF color );
UINT (WINAPI *pNtGdiSetSystemPaletteUse)( HDC hdc, UINT use ); UINT (WINAPI *pNtGdiSetSystemPaletteUse)( HDC hdc, UINT use );
BOOL (WINAPI *pNtGdiSetVirtualResolution)( HDC hdc, DWORD horz_res, DWORD vert_res,
DWORD horz_size, DWORD vert_size );
INT (WINAPI *pNtGdiStartDoc)( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job ); INT (WINAPI *pNtGdiStartDoc)( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job );
INT (WINAPI *pNtGdiStartPage)( HDC hdc ); INT (WINAPI *pNtGdiStartPage)( HDC hdc );
BOOL (WINAPI *pNtGdiStretchBlt)( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height_dst, BOOL (WINAPI *pNtGdiStretchBlt)( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height_dst,
...@@ -210,8 +208,6 @@ struct unix_funcs ...@@ -210,8 +208,6 @@ struct unix_funcs
BOOL (WINAPI *pNtGdiTransparentBlt)( HDC hdc, int x_dst, int y_dst, int width_dst, int height_dst, BOOL (WINAPI *pNtGdiTransparentBlt)( HDC hdc, int x_dst, int y_dst, int width_dst, int height_dst,
HDC hdc_src, int x_src, int y_src, int width_src, int height_src, HDC hdc_src, int x_src, int y_src, int width_src, int height_src,
UINT color ); UINT color );
BOOL (WINAPI *pNtGdiTransformPoints)( HDC hdc, const POINT *points_in, POINT *points_out,
INT count, UINT mode );
BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj );
BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc );
BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc );
......
...@@ -571,12 +571,6 @@ UINT WINAPI NtGdiSetSystemPaletteUse( HDC hdc, UINT use ) ...@@ -571,12 +571,6 @@ UINT WINAPI NtGdiSetSystemPaletteUse( HDC hdc, UINT use )
return unix_funcs->pNtGdiSetSystemPaletteUse( hdc, use ); return unix_funcs->pNtGdiSetSystemPaletteUse( hdc, use );
} }
BOOL WINAPI NtGdiSetVirtualResolution( HDC hdc, DWORD horz_res, DWORD vert_res,
DWORD horz_size, DWORD vert_size )
{
return unix_funcs->pNtGdiSetVirtualResolution( hdc, horz_res, vert_res, horz_size, vert_size );
}
INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job ) INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job )
{ {
return unix_funcs->pNtGdiStartDoc( hdc, doc, banding, job ); return unix_funcs->pNtGdiStartDoc( hdc, doc, banding, job );
...@@ -624,12 +618,6 @@ BOOL WINAPI NtGdiTransparentBlt( HDC hdc, int x_dst, int y_dst, int width_dst, i ...@@ -624,12 +618,6 @@ BOOL WINAPI NtGdiTransparentBlt( HDC hdc, int x_dst, int y_dst, int width_dst, i
x_src, y_src, width_src, height_src, color ); x_src, y_src, width_src, height_src, color );
} }
BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points_out,
INT count, UINT mode )
{
return unix_funcs->pNtGdiTransformPoints( hdc, points_in, points_out, count, mode );
}
BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ) BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj )
{ {
return unix_funcs->pNtGdiUnrealizeObject( obj ); return unix_funcs->pNtGdiUnrealizeObject( obj );
......
...@@ -450,6 +450,28 @@ NTSTATUS WINAPI wow64_NtGdiSetColorAdjustment( UINT *args ) ...@@ -450,6 +450,28 @@ NTSTATUS WINAPI wow64_NtGdiSetColorAdjustment( UINT *args )
return NtGdiSetColorAdjustment( hdc, ca ); return NtGdiSetColorAdjustment( hdc, ca );
} }
NTSTATUS WINAPI wow64_NtGdiSetVirtualResolution( UINT *args )
{
HDC hdc = get_handle( &args );
DWORD horz_res = get_ulong( &args );
DWORD vert_res = get_ulong( &args );
DWORD horz_size = get_ulong( &args );
DWORD vert_size = get_ulong( &args );
return NtGdiSetVirtualResolution( hdc, horz_res, vert_res, horz_size, vert_size );
}
NTSTATUS WINAPI wow64_NtGdiTransformPoints( UINT *args )
{
HDC hdc = get_handle( &args );
const POINT *points_in = get_ptr( &args );
POINT *points_out = get_ptr( &args );
INT count = get_ulong( &args );
UINT mode = get_ulong( &args );
return NtGdiTransformPoints( hdc, points_in, points_out, count, mode );
}
NTSTATUS WINAPI wow64_NtGdiFlush( UINT *args ) NTSTATUS WINAPI wow64_NtGdiFlush( UINT *args )
{ {
return NtGdiFlush(); return NtGdiFlush();
......
...@@ -66,6 +66,8 @@ ...@@ -66,6 +66,8 @@
SYSCALL_ENTRY( NtGdiSetPixelFormat ) \ SYSCALL_ENTRY( NtGdiSetPixelFormat ) \
SYSCALL_ENTRY( NtGdiSetRectRgn ) \ SYSCALL_ENTRY( NtGdiSetRectRgn ) \
SYSCALL_ENTRY( NtGdiSetTextJustification ) \ SYSCALL_ENTRY( NtGdiSetTextJustification ) \
SYSCALL_ENTRY( NtGdiSwapBuffers ) SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \
SYSCALL_ENTRY( NtGdiSwapBuffers ) \
SYSCALL_ENTRY( NtGdiTransformPoints )
#endif /* __WOW64WIN_SYSCALL_H */ #endif /* __WOW64WIN_SYSCALL_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment