commit 4d05761958e74d31f21084ac971af1b7603f664f
author Bernd Herd <info@herdsoft.com> Thu May 11 00:10:36 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu May 11 00:10:36 2000 +0000
tree 7834a40a7d9e751021177c1b54182f7cbcf57449
parent 077239414ec5ae453cd9b0a0ad08a9f33351e1c9

Make sure hInstance is a proper global handle and not a selector
value.

loader/task.c

diff --git a/loader/task.c b/loader/task.c
index 3d13b47..b6f704f 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -716,7 +716,7 @@
 
     /* Initialize the local heap */
     if ( CX_reg(context) )
-        LocalInit16( pTask->hInstance, 0, CX_reg(context) );
+        LocalInit16( GlobalHandleToSel16(pTask->hInstance), 0, CX_reg(context) );
 
     /* Initialize implicitly loaded DLLs */
     NE_InitializeDLLs( pTask->hModule );
@@ -928,6 +928,9 @@
 {
     BYTE *thunk,*lfunc;
     SEGPTR thunkaddr;
+    WORD hInstanceSelector;
+
+    hInstanceSelector = GlobalHandleToSel16(hInstance);
 
     TRACE("(%08lx, %04x);", (DWORD)func, hInstance);
 
@@ -948,7 +951,7 @@
 	}
     }
 
-    if ( (CURRENT_DS != hInstance)
+    if ( (CURRENT_DS != hInstanceSelector)
       && (hInstance != 0)
       && (hInstance != 0xffff) )
     {
@@ -961,7 +964,8 @@
      * We used to set hInstance to GetTaskDS16(), but this should be wrong
      * as CURRENT_DS provides the DSEG value we need.
      * ("calling" DS, *not* "task" DS !) */
-    hInstance = CURRENT_DS;
+    hInstanceSelector = CURRENT_DS;
+    hInstance = GlobalHandle16(hInstanceSelector);
 
     /* no thunking for DLLs */
     if (NE_GetPtr(FarGetOwner16(hInstance))->flags & NE_FFLAGS_LIBMODULE)
@@ -979,10 +983,10 @@
     ) {
     	FIXME("This was the (in)famous \"thunk useless\" warning. We thought we have to overwrite with nop;nop;, but this isn't true.\n");
     }
-    
+
     *thunk++ = 0xb8;    /* movw instance, %ax */
-    *thunk++ = (BYTE)(hInstance & 0xff);
-    *thunk++ = (BYTE)(hInstance >> 8);
+    *thunk++ = (BYTE)(hInstanceSelector & 0xff);
+    *thunk++ = (BYTE)(hInstanceSelector >> 8);
     *thunk++ = 0xea;    /* ljmp func */
     *(DWORD *)thunk = (DWORD)func;
     return (FARPROC16)thunkaddr;
@@ -1433,7 +1437,7 @@
     TDB *pTask;
 
     if (!(pTask = (TDB *)GlobalLock16( GetCurrentTask() ))) return 0;
-    return pTask->hInstance;
+    return GlobalHandleToSel16(pTask->hInstance);
 }
 
 /***********************************************************************
@@ -1631,7 +1635,7 @@
     if (!lpte->hNext) return FALSE;
     pTask = (TDB *)GlobalLock16( lpte->hNext );
     if (!pTask || pTask->magic != TDB_MAGIC) return FALSE;
-    pInstData = (INSTANCEDATA *)PTR_SEG_OFF_TO_LIN( pTask->hInstance, 0 );
+    pInstData = (INSTANCEDATA *)PTR_SEG_OFF_TO_LIN( GlobalHandleToSel16(pTask->hInstance), 0 );
     lpte->hTask         = lpte->hNext;
     lpte->hTaskParent   = pTask->hParent;
     lpte->hInst         = pTask->hInstance;