Added FinalUserInit16/FinalGdiInit16 stubs.

if1632/gdi.spec

@@ -266,7 +266,7 @@ file	gdi.exe
 401 stub GDIMOVEBITMAP
 403 stub GDIINIT2
 404 stub GetTTGlyphIndexMap
-405 stub FINALGDIINIT
+405 pascal16 FinalGdiInit(word) FinalGdiInit16
 407 pascal16 CreateUserBitmap(word word word word ptr) CreateUserBitmap16
 409 pascal16 CreateUserDiscardableBitmap(word word word) CreateUserDiscardableBitmap16
 410 pascal16 IsValidMetaFile (word) IsValidMetaFile16

if1632/thunk.c

@@ -916,6 +916,7 @@ void THUNK_InitCallout(void)
         GETADDR( TranslateMessage16, "TranslateMessage", word_l );
         GETADDR( DispatchMessage16, "DispatchMessage", long_l );
         GETADDR( RedrawWindow16, "RedrawWindow", word_wlww );
+        GETADDR( FinalUserInit16, "FinalUserInit", word_ );
         GETADDR( InitApp16, "InitApp", word_w );
         GETADDR( InitThreadInput16, "InitThreadInput", word_ww );
         GETADDR( UserYield16, "UserYield", word_ );

if1632/user.spec

@@ -367,7 +367,7 @@ file	user.exe
 397 pascal16 RegisterClassEx(ptr) RegisterClassEx16
 398 pascal16 GetClassInfoEx(word segstr ptr) GetClassInfoEx16
 399 pascal16 ChildWindowFromPointEx(word long word) ChildWindowFromPointEx16
-400 stub FinalUserInit
+400 pascal16 FinalUserInit() FinalUserInit16
 402 pascal16 GetPriorityClipboardFormat(ptr s_word) GetPriorityClipboardFormat16
 403 pascal16 UnregisterClass(segstr word) UnregisterClass16
 404 pascal16 GetClassInfo(word segstr ptr) GetClassInfo16

include/callback.h

@@ -123,6 +123,7 @@ typedef struct
 
     WORD WINAPI (*UserSignalProc)( UINT uCode, DWORD dwThreadOrProcessID,
                                    DWORD dwFlags, HMODULE16 hModule );
+    void WINAPI (*FinalUserInit16)( void );
 
     INT16 WINAPI (*InitApp16)( HINSTANCE16 hInst );
     HQUEUE16 WINAPI (*InitThreadInput16)( WORD unknown, WORD flags );

miscemu/main.c

@@ -41,6 +41,9 @@ void MAIN_EmulatorRun( void )
     /* Get pointers to USER routines called by KERNEL */
     THUNK_InitCallout();
 
+    /* Call FinalUserInit routine */
+    Callout.FinalUserInit16();
+
     /* Call InitApp for initial task */
     Callout.InitApp16( MapHModuleLS( 0 ) );
 

objects/gdiobj.c

@@ -980,6 +980,12 @@ WORD WINAPI GdiSignalProc( UINT uCode, DWORD dwThreadOrProcessID,
     return 0;
 }
 
+/***********************************************************************
+ *           FinalGdiInit16     (GDI.405)
+ */
+void WINAPI FinalGdiInit16( HANDLE16 unknown )
+{
+}
 
 /***********************************************************************
  *           GdiFreeResources   (GDI.609)

windows/user.c

@@ -191,6 +191,14 @@ void WINAPI USER_SignalProc( HANDLE16 hTaskOrModule, UINT16 uCode,
 }
 
 /***********************************************************************
+ *           FinalUserInit (USER.400)
+ */
+void WINAPI FinalUserInit16( void )
+{
+    /* FIXME: Should chain to FinalGdiInit now. */
+}
+
+/***********************************************************************
  *           UserSignalProc     (USER.610) (USER32.559)
  *
  * For comments about the meaning of uCode and dwFlags