Module: wine Branch: master Commit: 4dd693a7ea43dde319e01bcbb36ac4539a543b7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dd693a7ea43dde319e01bcbb...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Jul 2 12:38:25 2021 +0200
gdi32: Introduce NtGdiSelectPen.
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/pen.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 14a51e698eb..6ef3d45c4cb 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -215,20 +215,16 @@ invalid: }
/*********************************************************************** - * PEN_SelectObject + * NtGdiSelectPen (win32u.@) */ -static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) +HGDIOBJ WINAPI NtGdiSelectPen( HDC hdc, HGDIOBJ handle ) { PENOBJ *pen; HGDIOBJ ret = 0; - DC *dc = get_dc_ptr( hdc ); WORD type; + DC *dc;
- if (!dc) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } + if (!(dc = get_dc_ptr( hdc ))) return 0;
if ((pen = get_any_obj_ptr( handle, &type ))) { @@ -268,6 +264,16 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) return ret; }
+/*********************************************************************** + * PEN_SelectObject + */ +static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) +{ + HGDIOBJ ret = NtGdiSelectPen( hdc, handle ); + if (!ret) SetLastError( ERROR_INVALID_HANDLE ); + return ret; +} +
/*********************************************************************** * PEN_DeleteObject