ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Introduce NtGdiExtGetObjectW. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-07-05 13:39:05 +02:00 committed by Alexandre Julliard
parent 5d9586a60b
commit 14a39fcfe7
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/gdi32/gdiobj.c
View File

@ -1060,9 +1060,9 @@ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer )
} }
/*********************************************************************** /***********************************************************************
* GetObjectW (GDI32.@) * NtGdiExtGetObjectW (win32u.@)
*/ */
INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) INT WINAPI NtGdiExtGetObjectW( HGDIOBJ handle, INT count, void *buffer )
{ {
GDI_HANDLE_ENTRY *entry; GDI_HANDLE_ENTRY *entry;
const struct gdi_obj_funcs *funcs = NULL; const struct gdi_obj_funcs *funcs = NULL;
@ -1078,11 +1078,9 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer )
} }
LeaveCriticalSection( &gdi_section ); LeaveCriticalSection( &gdi_section );
if (funcs) if (funcs && funcs->pGetObjectW)
{ {
if (!funcs->pGetObjectW) if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */
SetLastError( ERROR_INVALID_HANDLE );
else if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */
SetLastError( ERROR_NOACCESS ); SetLastError( ERROR_NOACCESS );
else else
result = funcs->pGetObjectW( handle, count, buffer ); result = funcs->pGetObjectW( handle, count, buffer );

29
dlls/gdi32/objects.c
View File

@ -111,3 +111,32 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ obj )
if (!ret) SetLastError( ERROR_INVALID_HANDLE ); if (!ret) SetLastError( ERROR_INVALID_HANDLE );
return ret; return ret;
} }
/***********************************************************************
* GetObjectW (GDI32.@)
*/
INT WINAPI GetObjectW( HGDIOBJ handle, INT count, void *buffer )
{
int result;
TRACE( "%p %d %p\n", handle, count, buffer );
result = NtGdiExtGetObjectW( handle, count, buffer );
if (!result && count)
{
switch(get_object_type( handle ))
{
case 0:
case OBJ_BITMAP:
case OBJ_BRUSH:
case OBJ_FONT:
case OBJ_PAL:
case OBJ_PEN:
case OBJ_EXTPEN:
break;
default:
SetLastError( ERROR_INVALID_HANDLE );
}
}
return result;
}