November 2018 - Wine-commits

Michael Stefaniuc : advapi32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: dc235ab4a7235cf15daf6f5c32d05b2a0c520097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc235ab4a7235cf15daf6f5c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 12 20:29:04 2018 +0100 advapi32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 8 ++++---- dlls/advapi32/service.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9989097..b537f69 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -108,7 +108,7 @@ static BOOL is_wow6432node( const UNICODE_STRING *name ) static const WCHAR wow6432nodeW[] = {'W','o','w','6','4','3','2','N','o','d','e'}; return (name->Length == sizeof(wow6432nodeW) && - !memicmpW( name->Buffer, wow6432nodeW, sizeof(wow6432nodeW)/sizeof(WCHAR) )); + !memicmpW( name->Buffer, wow6432nodeW, ARRAY_SIZE( wow6432nodeW ))); } /* open the Wow6432Node subkey of the specified key */ @@ -148,9 +148,9 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES UNICODE_STRING str; /* don't try to create registry root */ - if (!attr->RootDirectory && len > sizeof(registry_root)/sizeof(WCHAR) && - !memicmpW( buffer, registry_root, sizeof(registry_root)/sizeof(WCHAR))) - i += sizeof(registry_root)/sizeof(WCHAR); + if (!attr->RootDirectory && len > ARRAY_SIZE( registry_root ) && + !memicmpW( buffer, registry_root, ARRAY_SIZE( registry_root ))) + i += ARRAY_SIZE( registry_root ); while (i < len && buffer[i] != '\\') i++; if (i == len && !force_wow32) return status; diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 718c964..231f026 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -299,7 +299,7 @@ static LPWSTR service_get_pipe_name(void) RegCloseKey(service_current_key); if (ret != ERROR_SUCCESS || type != REG_DWORD) return NULL; - len = sizeof(format)/sizeof(WCHAR) + 10 /* strlenW("4294967295") */; + len = ARRAY_SIZE(format) + 10 /* strlenW("4294967295") */; name = heap_alloc(len * sizeof(WCHAR)); if (!name) return NULL;

1 0

Michael Stefaniuc : atl100/tests: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 0c28ca8d50e02af1fedfec3a171a31b094cd9864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c28ca8d50e02af1fedfec3a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 12 20:29:05 2018 +0100 atl100/tests: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl100/tests/atl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index eecf079..bdd3c57 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -304,8 +304,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > sizeof(scrrun_dll_suffixW)/sizeof(WCHAR) - && lstrcmpiW(path+len-sizeof(scrrun_dll_suffixW)/sizeof(WCHAR), scrrun_dll_suffixW), + ok(len > ARRAY_SIZE(scrrun_dll_suffixW) + && lstrcmpiW(path+len-ARRAY_SIZE(scrrun_dll_suffixW), scrrun_dll_suffixW), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n"); @@ -320,8 +320,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > sizeof(mshtml_tlb_suffixW)/sizeof(WCHAR) - && lstrcmpiW(path+len-sizeof(mshtml_tlb_suffixW)/sizeof(WCHAR), mshtml_tlb_suffixW), + ok(len > ARRAY_SIZE(mshtml_tlb_suffixW) + && lstrcmpiW(path+len-ARRAY_SIZE(mshtml_tlb_suffixW), mshtml_tlb_suffixW), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n");

1 0

Baruch Rutman : winmm: Attempt only once to load the default joystick driver.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: ebae298aa4d2711fef35d4ac60c6012438f36d61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebae298aa4d2711fef35d4ac… Author: Baruch Rutman <peterooch(a)gmail.com> Date: Fri Nov 9 00:45:19 2018 +0200 winmm: Attempt only once to load the default joystick driver. Signed-off-by: Baruch Rutman <peterooch(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 8a52942..5a12b36 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -68,12 +68,21 @@ static WINE_JOYSTICK JOY_Sticks[MAXJOYSTICK]; */ static BOOL JOY_LoadDriver(DWORD dwJoyID) { - if (dwJoyID >= MAXJOYSTICK) + static BOOL winejoystick_missing = FALSE; + + if (dwJoyID >= MAXJOYSTICK || winejoystick_missing) return FALSE; if (JOY_Sticks[dwJoyID].hDriver) return TRUE; JOY_Sticks[dwJoyID].hDriver = OpenDriverA("winejoystick.drv", 0, dwJoyID); + + if (!JOY_Sticks[dwJoyID].hDriver) + { + /* The default driver is missing, don't attempt to load it again */ + winejoystick_missing = TRUE; + } + return (JOY_Sticks[dwJoyID].hDriver != 0); }

1 0

Jacek Caban : widl: Don't make proxy vtbl const in interpreted mode.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: a514aa7653d96afd8c49f0d28c8e207b6707c800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a514aa7653d96afd8c49f0d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 11 20:42:55 2018 +0100 widl: Don't make proxy vtbl const in interpreted mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 4c7d85d..87c27be 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -664,7 +664,8 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) /* proxy vtable */ print_proxy( "static %sCINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", - need_delegation_indirect(iface) ? "" : "const ", count, iface->name); + (get_stub_mode() != MODE_Os || need_delegation_indirect(iface)) ? "" : "const ", + count, iface->name); print_proxy( "{\n"); indent++; print_proxy( "{\n");

1 0

Alex Henrie : atl: Turn variable 'mshtml_prefixW' into a static constant.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: b6e87cd48cd4441d387d292e8f91be8e34a19440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6e87cd48cd4441d387d292e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 11 20:51:15 2018 -0700 atl: Turn variable 'mshtml_prefixW' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl_ax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index ff627cc..8121278 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1001,9 +1001,9 @@ enum content static enum content get_content_type(LPCOLESTR name, CLSID *control_id) { + static const WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':',0}; WCHAR new_urlW[MAX_PATH]; DWORD size = MAX_PATH; - WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':','\0'}; if (!name || !name[0]) {

1 0

Alex Henrie : d3dcompiler_43: Turn variable 'c' into a static constant.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: cbae62ba9e427216a45cfd88f113178684169d59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbae62ba9e427216a45cfd88… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 11 20:51:37 2018 -0700 d3dcompiler_43: Turn variable 'c' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 748501f..bda41c4 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2176,7 +2176,7 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) } else { - char c[] = {'x', 'y', 'z', 'w'}; + static const char c[] = {'x', 'y', 'z', 'w'}; for (i = 0; i < swizzle->node.data_type->dimx; ++i) TRACE("%c", c[(swizzle->swizzle >> i * 2) & 0x3]);

1 0

Alex Henrie : dbghelp: Turn variable 'code' into a static constant.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: f333c4a210e25bbb8af2adeeae0dbe006354519b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f333c4a210e25bbb8af2adee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 11 20:51:58 2018 -0700 dbghelp: Turn variable 'code' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/minidump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 1a5dca9..975bb45 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -670,7 +670,7 @@ static unsigned dump_system_info(struct dump_context* dc) /* write Wine specific system information just behind the structure, and before any string */ if (wine_extra) { - char code[] = {'W','I','N','E'}; + static const char code[] = {'W','I','N','E'}; WriteFile(dc->hFile, code, 4, &written, NULL); /* number of sub-info, so that we can extend structure if needed */

1 0

Alex Henrie : winhttp: Make constant 'cookieW' static.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: aaca286cf8ea993a28091d27dd44137e744317e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaca286cf8ea993a28091d27… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 11 20:52:13 2018 -0700 winhttp: Make constant 'cookieW' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 0a7f7f0..88365f5 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -344,7 +344,7 @@ BOOL add_cookie_headers( request_t *request ) if (strstrW( request->path, cookie->path ) == request->path) { - const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; + static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; int len, len_cookie = ARRAY_SIZE( cookieW ), len_name = strlenW( cookie->name ); WCHAR *header;

1 0

Andre Heider : server: Fix keyboard hardware message regression.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 27ff04e2ab9d50c42c4d4ab4bf12b9aeb1cdc990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ff04e2ab9d50c42c4d4ab4… Author: Andre Heider <a.heider(a)gmail.com> Date: Sat Nov 10 21:59:07 2018 +0100 server: Fix keyboard hardware message regression. Signed-off-by: Andre Heider <a.heider(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index 9dfbd1e..545991b 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1775,11 +1775,11 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c break; } - if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; - msg_data = msg->data; - if ((device = current->process->rawinput_kbd)) { + if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; + msg_data = msg->data; + msg->win = device->target; msg->msg = WM_INPUT; msg->wparam = RIM_INPUT; @@ -1793,6 +1793,9 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c queue_hardware_message( desktop, msg, 0 ); } + if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; + msg_data = msg->data; + msg->win = get_user_full_handle( win ); msg->msg = message_code; msg->lparam = (input->kbd.scan << 16) | 1u; /* repeat count */

1 0

André Hentschel : ntdll: Call system hook in LdrResolveDelayLoadedAPI when dll hook is missing.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 95fa795fa1f8b416af097b6186859ec32ea316d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95fa795fa1f8b416af097b61… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 10 22:29:27 2018 +0100 ntdll: Call system hook in LdrResolveDelayLoadedAPI when dll hook is missing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46089 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 53 +++++++++++++++++++++++++++++++++++++++----- dlls/ntdll/loader.c | 18 +++++++++++++-- include/delayloadhandler.h | 1 + 3 files changed, 64 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index bc88c5f..01c7cfa 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -48,7 +48,7 @@ struct PROCESS_BASIC_INFORMATION_PRIVATE }; static LONG *child_failures; -static WORD cb_count; +static WORD cb_count, cb_count_sys; static DWORD page_size; static BOOL is_win64 = sizeof(void *) > sizeof(int); static BOOL is_wow64; @@ -70,7 +70,8 @@ static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, - PDELAYLOAD_FAILURE_DLL_CALLBACK, PVOID, + PDELAYLOAD_FAILURE_DLL_CALLBACK, + PDELAYLOAD_FAILURE_SYSTEM_ROUTINE, PIMAGE_THUNK_DATA ThunkAddress,ULONG); static PVOID (WINAPI *pRtlImageDirectoryEntryToData)(HMODULE,BOOL,WORD,ULONG *); static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); @@ -3339,6 +3340,14 @@ static PVOID WINAPI failuredllhook(ULONG ul, DELAYLOAD_INFO* pd) return (void*)0xdeadbeef; } +static PVOID WINAPI failuresyshook(const char *dll, const char *function) +{ + ok(!strcmp(dll, "secur32.dll"), "wrong dll: %s\n", dll); + ok(!((ULONG_PTR)function >> 16), "expected ordinal, got %p\n", function); + cb_count_sys++; + return (void*)0x12345678; +} + static void test_ResolveDelayLoadedAPI(void) { static const char test_dll[] = "secur32.dll"; @@ -3573,8 +3582,9 @@ static void test_ResolveDelayLoadedAPI(void) load = (void *)GetProcAddress(htarget, (char*)iibn->Name); } - cb_count = 0; - ret = pResolveDelayLoadedAPI(hlib, delaydir, failuredllhook, NULL, &itda[i], 0); + /* test without failure dll callback */ + cb_count = cb_count_sys = 0; + ret = pResolveDelayLoadedAPI(hlib, delaydir, NULL, failuresyshook, &itda[i], 0); if (td[i].succeeds) { ok(ret != NULL, "Test %u: ResolveDelayLoadedAPI failed\n", i); @@ -3582,11 +3592,42 @@ static void test_ResolveDelayLoadedAPI(void) ok(ret == (void*)itda[i].u1.AddressOfData, "Test %u: expected %p, got %p\n", i, ret, (void*)itda[i].u1.AddressOfData); ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); } else { - ok(ret == (void*)0xdeadbeef, "Test %u: ResolveDelayLoadedAPI succeeded with %p\n", i, ret); - ok(cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(ret == (void*)0x12345678, "Test %u: ResolveDelayLoadedAPI succeeded with %p\n", i, ret); + ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(cb_count_sys == 1, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + + /* test with failure dll callback */ + cb_count = cb_count_sys = 0; + ret = pResolveDelayLoadedAPI(hlib, delaydir, failuredllhook, failuresyshook, &itda[i], 0); + if (td[i].succeeds) + { + ok(ret != NULL, "Test %u: ResolveDelayLoadedAPI failed\n", i); + ok(ret == load, "Test %u: expected %p, got %p\n", i, load, ret); + ok(ret == (void*)itda[i].u1.AddressOfData, "Test %u: expected %p, got %p\n", + i, ret, (void*)itda[i].u1.AddressOfData); + ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + else + { + if (ret == (void*)0x12345678) + { + /* Win10+ sometimes buffers the address of the stub function */ + ok(!cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + else if (ret == (void*)0xdeadbeef) + { + ok(cb_count == 1, "Test %u: Wrong callback count: %d\n", i, cb_count); + ok(!cb_count_sys, "Test %u: Wrong sys callback count: %d\n", i, cb_count_sys); + } + else + ok(0, "Test %u: ResolveDelayLoadedAPI succeeded with %p\n", i, ret); } } delaydir++; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c5e8d0d..b00a5f8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2934,7 +2934,8 @@ BOOLEAN WINAPI RtlDllShutdownInProgress(void) * LdrResolveDelayLoadedAPI (NTDLL.@) */ void* WINAPI LdrResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIPTOR* desc, - PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, void* syshook, + PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, + PDELAYLOAD_FAILURE_SYSTEM_ROUTINE syshook, IMAGE_THUNK_DATA* addr, ULONG flags ) { IMAGE_THUNK_DATA *pIAT, *pINT; @@ -2992,7 +2993,20 @@ fail: delayinfo.TargetModuleBase = *phmod; delayinfo.Unused = NULL; delayinfo.LastError = nts; - return dllhook(4, &delayinfo); + + if (dllhook) + return dllhook(4, &delayinfo); + + if (IMAGE_SNAP_BY_ORDINAL(pINT[id].u1.Ordinal)) + { + DWORD_PTR ord = LOWORD(pINT[id].u1.Ordinal); + return syshook(name, (const char *)ord); + } + else + { + const IMAGE_IMPORT_BY_NAME* iibn = get_rva(base, pINT[id].u1.AddressOfData); + return syshook(name, (const char *)iibn->Name); + } } /****************************************************************** diff --git a/include/delayloadhandler.h b/include/delayloadhandler.h index 06b6589..e833611 100644 --- a/include/delayloadhandler.h +++ b/include/delayloadhandler.h @@ -47,6 +47,7 @@ typedef struct _DELAYLOAD_INFO } DELAYLOAD_INFO, *PDELAYLOAD_INFO; typedef PVOID (WINAPI *PDELAYLOAD_FAILURE_DLL_CALLBACK)(ULONG, PDELAYLOAD_INFO); +typedef PVOID (WINAPI *PDELAYLOAD_FAILURE_SYSTEM_ROUTINE)(LPCSTR, LPCSTR); #ifdef __cplusplus }

1 0