GdiInit2()

[Andreas Mohr]

Hi all,

added stub for GdiInit2().

This one seems to be needed for several programs who LoadLibrary()
special display drivers that call GdiInit2().
(broad evidence on groups.google.com, too)

I needed this for a program that displayed the familiar "Profiling display"
box after having loaded the display driver.

-- 
Andreas Mohr                        Stauferstr. 6, D-71272 Renningen, Germany
-------------- next part --------------
Determining best CVS host...
Using CVSROOT :pserver:cvs at rhlx01.fht-esslingen.de:/home/wine
Index: dlls/gdi/gdi.spec
===================================================================
RCS file: /home/wine/wine/dlls/gdi/gdi.spec,v
retrieving revision 1.10
diff -u -r1.10 gdi.spec
--- dlls/gdi/gdi.spec	29 Jul 2001 20:25:14 -0000	1.10
+++ dlls/gdi/gdi.spec	20 Sep 2001 10:00:40 -0000
@@ -297,7 +297,7 @@
 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 ?)
Index: objects/gdiobj.c
===================================================================
RCS file: /home/wine/wine/objects/gdiobj.c,v
retrieving revision 1.59
diff -u -r1.59 gdiobj.c
--- objects/gdiobj.c	12 Sep 2001 20:21:07 -0000	1.59
+++ objects/gdiobj.c	20 Sep 2001 10:00:41 -0000
@@ -504,7 +504,7 @@
         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;
@@ -1125,9 +1125,25 @@
 }
 
 /***********************************************************************
+ *           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 */ )
 {
 }