reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ole32: Round the extected size in the marshal and moniker tests using the results of sizing a global, not a heap pointer.

Browse Source 
The rounding isn't the same on Win9x, and the size being compared to
is that of a global handle.
This commit is contained in:
Rob Shearman 2009-02-17 09:48:25 +00:00 committed by Alexandre Julliard
parent 88cb399a28
commit 2803516d26
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/ole32/tests/marshal.c
View File

@ -2040,17 +2040,17 @@ static void test_WM_QUIT_handling(void)
}
}
static SIZE_T round_heap_size(SIZE_T size)
static SIZE_T round_global_size(SIZE_T size)
{
static SIZE_T heap_size_alignment = -1;
if (heap_size_alignment == -1)
static SIZE_T global_size_alignment = -1;
if (global_size_alignment == -1)
{
void *p = HeapAlloc(GetProcessHeap(), 0, 1);
heap_size_alignment = HeapSize(GetProcessHeap(), 0, p);
HeapFree(GetProcessHeap(), 0, p);
void *p = GlobalAlloc(GMEM_FIXED, 1);
global_size_alignment = GlobalSize(p);
GlobalFree(p);
}
return ((size + heap_size_alignment - 1) & ~(heap_size_alignment - 1));
return ((size + global_size_alignment - 1) & ~(global_size_alignment - 1));
}
static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void *ptr, DWORD mshlflags)
@ -2069,9 +2069,9 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void *
if (mshctx == MSHCTX_INPROC)
{
DWORD expected_size = round_heap_size(3*sizeof(DWORD) + sizeof(GUID));
DWORD expected_size = round_global_size(3*sizeof(DWORD) + sizeof(GUID));
ok(size == expected_size ||
broken(size == round_heap_size(2*sizeof(DWORD))) /* Win9x & NT4 */,
broken(size == round_global_size(2*sizeof(DWORD))) /* Win9x & NT4 */,
"size should have been %d instead of %d\n", expected_size, size);
ok(*(DWORD *)marshal_data == mshlflags, "expected 0x%x, but got 0x%x for mshctx\n", mshlflags, *(DWORD *)marshal_data);

26
dlls/ole32/tests/moniker.c
View File

@ -82,17 +82,17 @@ static void UnlockModule(void)
InterlockedDecrement(&cLocks);
}
static SIZE_T round_heap_size(SIZE_T size)
static SIZE_T round_global_size(SIZE_T size)
{
static SIZE_T heap_size_alignment = -1;
if (heap_size_alignment == -1)
static SIZE_T global_size_alignment = -1;
if (global_size_alignment == -1)
{
void *p = HeapAlloc(GetProcessHeap(), 0, 1);
heap_size_alignment = HeapSize(GetProcessHeap(), 0, p);
HeapFree(GetProcessHeap(), 0, p);
void *p = GlobalAlloc(GMEM_FIXED, 1);
global_size_alignment = GlobalSize(p);
GlobalFree(p);
}
return ((size + heap_size_alignment - 1) & ~(heap_size_alignment - 1));
return ((size + global_size_alignment - 1) & ~(global_size_alignment - 1));
}
static HRESULT WINAPI Test_IClassFactory_QueryInterface(
@ -1220,12 +1220,12 @@ static void test_moniker(
moniker_data = GlobalLock(hglobal);
/* first check we have the right amount of data */
ok(moniker_size == round_heap_size(sizeof_expected_moniker_saved_data),
ok(moniker_size == round_global_size(sizeof_expected_moniker_saved_data),
"%s: Size of saved data differs (expected %d, actual %d)\n",
testname, (DWORD)round_heap_size(sizeof_expected_moniker_saved_data), moniker_size);
testname, (DWORD)round_global_size(sizeof_expected_moniker_saved_data), moniker_size);
/* then do a byte-by-byte comparison */
for (i = 0; i < min(moniker_size, round_heap_size(sizeof_expected_moniker_saved_data)); i++)
for (i = 0; i < min(moniker_size, round_global_size(sizeof_expected_moniker_saved_data)); i++)
{
if (expected_moniker_saved_data[i] != moniker_data[i])
{
@ -1266,14 +1266,14 @@ static void test_moniker(
moniker_data = GlobalLock(hglobal);
/* first check we have the right amount of data */
ok(moniker_size == round_heap_size(sizeof_expected_moniker_marshal_data),
ok(moniker_size == round_global_size(sizeof_expected_moniker_marshal_data),
"%s: Size of marshaled data differs (expected %d, actual %d)\n",
testname, (DWORD)round_heap_size(sizeof_expected_moniker_marshal_data), moniker_size);
testname, (DWORD)round_global_size(sizeof_expected_moniker_marshal_data), moniker_size);
/* then do a byte-by-byte comparison */
if (expected_moniker_marshal_data)
{
for (i = 0; i < min(moniker_size, round_heap_size(sizeof_expected_moniker_marshal_data)); i++)
for (i = 0; i < min(moniker_size, round_global_size(sizeof_expected_moniker_marshal_data)); i++)
{
if (expected_moniker_marshal_data[i] != moniker_data[i])
{