ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ulrich Weigand 1999-07-27 16:10:24 +00:00 committed by Alexandre Julliard
parent cb310a3ce0
commit b2682d4d73
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
memory/global.c
View File

@ -388,22 +388,25 @@ HGLOBAL16 WINAPI GlobalFree16(
*/ */
SEGPTR WINAPI WIN16_GlobalLock16( HGLOBAL16 handle ) SEGPTR WINAPI WIN16_GlobalLock16( HGLOBAL16 handle )
{ {
TRACE("(%04x) -> %08lx\n", WORD sel = GlobalHandleToSel16( handle );
handle, MAKELONG( 0, GlobalHandleToSel16(handle)) ); TRACE("(%04x) -> %08lx\n", handle, MAKELONG( 0, sel ) );
if (handle) if (handle)
{ {
if (handle == (HGLOBAL16)-1) handle = CURRENT_DS; if (handle == (HGLOBAL16)-1) handle = CURRENT_DS;
if (!VALID_HANDLE(handle)) { if (!VALID_HANDLE(handle)) {
WARN("Invalid handle 0x%04x passed to WIN16_GlobalLock16!\n",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; if (!GET_ARENA_PTR(handle)->base)
sel = 0;
else
GET_ARENA_PTR(handle)->lockCount++; GET_ARENA_PTR(handle)->lockCount++;
return PTR_SEG_OFF_TO_SEGPTR( GlobalHandleToSel16(handle), 0 );
/* FIXME: put segment value in CX as well */
} }
return (SEGPTR)0;
CURRENT_STACK16->ecx = sel; /* selector must be returned in CX as well */
return PTR_SEG_OFF_TO_SEGPTR( sel, 0 );
} }