system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-22 15:34:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

setupapi: Make default context structure layout compatible.

Browse source
This commit is contained in:
Nikolay Sivov 2014-05-12 01:59:33 +04:00 committed by Alexandre Julliard
parent 776849987d
commit dcab5fe61b
2 changed files with 56 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/setupapi/queue.c
View file

@ -39,9 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
/* context structure for the default queue callback */
struct default_callback_context
{
HWND owner;
HWND progress;
UINT message;
DWORD magic;
HWND owner;
DWORD unk1[4];
DWORD_PTR unk2[7];
HWND progress;
UINT message;
DWORD_PTR unk3[5];
};
struct file_op
@ -1482,8 +1486,9 @@ PVOID WINAPI SetupInitDefaultQueueCallbackEx( HWND owner, HWND progress, UINT ms
{
struct default_callback_context *context;
if ((context = HeapAlloc( GetProcessHeap(), 0, sizeof(*context) )))
if ((context = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*context) )))
{
context->magic = 0x43515053; /* "SPQC" */
context->owner = owner;
context->progress = progress;
context->message = msg;

47
dlls/setupapi/tests/misc.c
View file

@ -731,6 +731,51 @@ static void test_SetupUninstallOEMInf(void)
}
}
struct default_callback_context
{
DWORD magic;
HWND owner;
DWORD unk1[4];
DWORD_PTR unk2[7];
HWND progress;
UINT message;
DWORD_PTR unk3[5];
};
static void test_defaultcallback(void)
{
struct default_callback_context *ctxt;
static const DWORD magic = 0x43515053; /* "SPQC" */
HWND owner, progress;
owner = (HWND)0x123;
progress = (HWND)0x456;
ctxt = SetupInitDefaultQueueCallbackEx(owner, progress, WM_USER, 0, NULL);
ok(ctxt != NULL, "got %p\n", ctxt);
ok(ctxt->magic == magic || broken(ctxt->magic != magic) /* win2000 */, "got magic 0x%08x\n", ctxt->magic);
if (ctxt->magic == magic)
{
ok(ctxt->owner == owner, "got %p, expected %p\n", ctxt->owner, owner);
ok(ctxt->progress == progress, "got %p, expected %p\n", ctxt->progress, progress);
ok(ctxt->message == WM_USER, "got %d, expected %d\n", ctxt->message, WM_USER);
SetupTermDefaultQueueCallback(ctxt);
}
else
{
win_skip("Skipping tests on old systems.\n");
SetupTermDefaultQueueCallback(ctxt);
return;
}
ctxt = SetupInitDefaultQueueCallback(owner);
ok(ctxt->magic == magic, "got magic 0x%08x\n", ctxt->magic);
ok(ctxt->owner == owner, "got %p, expected %p\n", ctxt->owner, owner);
ok(ctxt->progress == NULL, "got %p, expected %p\n", ctxt->progress, progress);
ok(ctxt->message == 0, "got %d\n", ctxt->message);
SetupTermDefaultQueueCallback(ctxt);
}
START_TEST(misc)
{
HMODULE hsetupapi = GetModuleHandleA("setupapi.dll");
@ -760,4 +805,6 @@ START_TEST(misc)
test_SetupUninstallOEMInf();
else
win_skip("SetupUninstallOEMInfA is not available\n");
test_defaultcallback();
}