commit b2682d4d73bd735a908b37e25296e5385d13a226
author Ulrich Weigand <weigand@informatik.uni-erlangen.de> Tue Jul 27 16:10:24 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jul 27 16:10:24 1999 +0000
tree 39aced980f825118ed8996533f57dfb30cc734d8
parent cb310a3ce03278c01c7f1d4cc8371ceadee3e4e5

Bugfix: Return selector also in CX from GlobalLock16().

memory/global.c

diff --git a/memory/global.c b/memory/global.c
index 16fcb25..04a748e 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -388,22 +388,25 @@
  */
 SEGPTR WINAPI WIN16_GlobalLock16( HGLOBAL16 handle )
 {
-    TRACE("(%04x) -> %08lx\n",
-                    handle, MAKELONG( 0, GlobalHandleToSel16(handle)) );
+    WORD sel = GlobalHandleToSel16( handle );
+    TRACE("(%04x) -> %08lx\n", handle, MAKELONG( 0, sel ) );
+
     if (handle)
     {
 	if (handle == (HGLOBAL16)-1) handle = CURRENT_DS;
 
 	if (!VALID_HANDLE(handle)) {
 	    WARN("Invalid handle 0x%04x passed to WIN16_GlobalLock16!\n",handle);
-	    return (SEGPTR)0;
+	    sel = 0;
 	}
-	if (!GET_ARENA_PTR(handle)->base) return (SEGPTR)0;
-        GET_ARENA_PTR(handle)->lockCount++;
-	return PTR_SEG_OFF_TO_SEGPTR( GlobalHandleToSel16(handle), 0 );
-	/* FIXME: put segment value in CX as well */
+	if (!GET_ARENA_PTR(handle)->base) 
+            sel = 0;
+        else
+            GET_ARENA_PTR(handle)->lockCount++;
     }
-    return (SEGPTR)0;
+
+    CURRENT_STACK16->ecx = sel;  /* selector must be returned in CX as well */
+    return PTR_SEG_OFF_TO_SEGPTR( sel, 0 );
 }