diff --git a/dlls/gdi/gdi.spec b/dlls/gdi/gdi.spec index f4bdcdad148..155bd5b01e7 100644 --- a/dlls/gdi/gdi.spec +++ b/dlls/gdi/gdi.spec @@ -297,7 +297,7 @@ rsrc version16.res 400 pascal16 FastWindowFrame(word ptr s_word s_word long) FastWindowFrame16 401 stub GDIMOVEBITMAP 402 stub GDIGETBITSGLOBAL # W2.0 (only ?) -403 stub GDIINIT2 +403 pascal16 GdiInit2(word word) GdiInit216 404 stub GetTTGlyphIndexMap 405 pascal16 FinalGdiInit(word) FinalGdiInit16 406 stub CREATEREALBITMAPINDIRECT # W2.0 (only ?) diff --git a/objects/gdiobj.c b/objects/gdiobj.c index 0947f55c0d9..1d1f8646df1 100644 --- a/objects/gdiobj.c +++ b/objects/gdiobj.c @@ -504,7 +504,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) WARN("Already deleted\n"); break; default: - WARN("Unknown magic number (%d)\n",GDIMAGIC(header->wMagic)); + WARN("Unknown magic number (%04x)\n",GDIMAGIC(header->wMagic)); } GDI_ReleaseObj( obj ); return FALSE; @@ -1124,10 +1124,26 @@ WORD WINAPI GdiSignalProc( UINT uCode, DWORD dwThreadOrProcessID, return 0; } +/*********************************************************************** + * GdiInit2 (GDI.405) + * + * See "Undocumented Windows" + */ +HANDLE16 WINAPI GdiInit216( + HANDLE16 h1, /* GDI object */ + HANDLE16 h2 /* global data */ +) +{ + FIXME("(%04x, %04x), stub.\n", h1, h2); + if (h2 == 0xffff) + return 0xffff; /* undefined return value */ + return h1; /* FIXME: should be the memory handle of h1 */ +} + /*********************************************************************** * FinalGdiInit (GDI.405) */ -void WINAPI FinalGdiInit16( HANDLE16 unknown ) +void WINAPI FinalGdiInit16( HBRUSH16 hPattern /* fill pattern of desktop */ ) { }