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

kernel32: Return TRUE for all pointer params in GlobalUnlock.

This commit is contained in:
James Hawkins 2007-09-16 18:30:20 -05:00 committed by Alexandre Julliard
parent 40dff81b5a
commit 72a3f18338
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/kernel32/heap.c
View File

@ -480,7 +480,7 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem)
PGLOBAL32_INTERN pintern;
BOOL locked;
if (ISPOINTER(hmem)) return FALSE;
if (ISPOINTER(hmem)) return TRUE;
RtlLockHeap(GetProcessHeap());
__TRY

8
dlls/kernel32/tests/heap.c
View File

@ -189,6 +189,14 @@ START_TEST(heap)
ok(GetLastError() == ERROR_INVALID_HANDLE,
"Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
gbl = GlobalAlloc(GMEM_DDESHARE, 100);
res = GlobalUnlock(gbl);
ok(res == 1, "Expected 1, got %d\n", res);
res = GlobalUnlock(gbl);
ok(res == 1, "Expected 1, got %d\n", res);
/* ####################################### */
/* Local*() functions */
gbl = LocalAlloc(LMEM_MOVEABLE, 0);

20
dlls/user32/tests/dde.c
View File

@ -492,10 +492,7 @@ static void test_PackDDElParam(void)
ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]);
ret = GlobalUnlock((HGLOBAL)lparam);
todo_wine
{
ok(ret == 1, "Expected 1, got %d\n", ret);
}
ok(ret == 1, "Expected 1, got %d\n", ret);
lo = hi = 0;
ret = UnpackDDElParam(WM_DDE_ADVISE, lparam, &lo, &hi);
@ -534,10 +531,7 @@ static void test_PackDDElParam(void)
ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]);
ret = GlobalUnlock((HGLOBAL)lparam);
todo_wine
{
ok(ret == 1, "Expected 1, got %d\n", ret);
}
ok(ret == 1, "Expected 1, got %d\n", ret);
lo = hi = 0;
ret = UnpackDDElParam(WM_DDE_ACK, lparam, &lo, &hi);
@ -560,10 +554,7 @@ static void test_PackDDElParam(void)
ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]);
ret = GlobalUnlock((HGLOBAL)lparam);
todo_wine
{
ok(ret == 1, "Expected 1, got %d\n", ret);
}
ok(ret == 1, "Expected 1, got %d\n", ret);
lo = hi = 0;
ret = UnpackDDElParam(WM_DDE_DATA, lparam, &lo, &hi);
@ -602,10 +593,7 @@ static void test_PackDDElParam(void)
ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]);
ret = GlobalUnlock((HGLOBAL)lparam);
todo_wine
{
ok(ret == 1, "Expected 1, got %d\n", ret);
}
ok(ret == 1, "Expected 1, got %d\n", ret);
lo = hi = 0;
ret = UnpackDDElParam(WM_DDE_POKE, lparam, &lo, &hi);