September 2019 - Wine-Commits

Jacek Caban : ntdll: Handle interrupt exceptions in signal handler on x86_64.
by Alexandre Julliard Sept. 4, 2019

Sept. 4, 2019

Module: wine Branch: master Commit: 2fff34493f785ccafadbc39836abcc5c42793a94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fff34493f785ccafadbc398… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:46:23 2019 +0200 ntdll: Handle interrupt exceptions in signal handler on x86_64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index dc3091d..b368d51 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2664,16 +2664,6 @@ static void raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) set_cpu_context( context ); } break; - case EXCEPTION_BREAKPOINT: - switch (rec->ExceptionInformation[0]) - { - case 1: /* BREAKPOINT_PRINT */ - case 3: /* BREAKPOINT_LOAD_SYMBOLS */ - case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ - case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ - set_cpu_context( context ); - } - break; } status = NtRaiseException( rec, context, TRUE ); raise_status( status, rec ); @@ -2919,23 +2909,34 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) * * Handle an interrupt. */ -static inline BOOL handle_interrupt( unsigned int interrupt, EXCEPTION_RECORD *rec, CONTEXT *context ) +static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, CONTEXT *context ) { - switch(interrupt) + switch (ERROR_sig(sigcontext) >> 3) { case 0x2c: rec->ExceptionCode = STATUS_ASSERTION_FAILURE; - return TRUE; + break; case 0x2d: + switch (context->Rax) + { + case 1: /* BREAKPOINT_PRINT */ + case 3: /* BREAKPOINT_LOAD_SYMBOLS */ + case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ + case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ + RIP_sig(sigcontext) += 3; + return TRUE; + } context->Rip += 3; rec->ExceptionCode = EXCEPTION_BREAKPOINT; rec->ExceptionAddress = (void *)context->Rip; rec->NumberParameters = 1; rec->ExceptionInformation[0] = context->Rax; - return TRUE; + break; default: return FALSE; } + setup_raise_exception( sigcontext, rec, raise_generic_exception ); + return TRUE; } @@ -2992,7 +2993,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) CONTEXT *win_context = get_exception_context( rec ); WORD err = ERROR_sig(ucontext); if (!err && (rec->ExceptionCode = is_privileged_instr( win_context ))) break; - if ((err & 7) == 2 && handle_interrupt( err >> 3, rec, win_context )) break; + if ((err & 7) == 2 && handle_interrupt( ucontext, rec, win_context )) return; rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; rec->ExceptionInformation[0] = 0;

1 0

Francois Gouget : d3d10/tests: Spelling fixes in ok() messages.
by Alexandre Julliard Sept. 4, 2019

Sept. 4, 2019

Module: wine Branch: master Commit: 07da1dec4cd94679c27fa959c281db3d0d4e299b URL: https://source.winehq.org/git/wine.git/?a=commit;h=07da1dec4cd94679c27fa959… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 4 02:40:39 2019 +0200 d3d10/tests: Spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/device.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index d5ba0c1..c712d40 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -90,33 +90,33 @@ static void test_stateblock_mask(void) ok(result.VS == 0x66, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x33, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDifference(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, &result); ok(SUCCEEDED(hr), "D3D10StateBlockMaskIntersect failed, hr %#x.\n", hr); ok(result.VS == 0x11, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x88, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskIntersect(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, &result); ok(SUCCEEDED(hr), "D3D10StateBlockMaskUnion failed, hr %#x.\n", hr); ok(result.VS == 0x77, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xbb, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskUnion(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableAll(&result); @@ -124,7 +124,7 @@ static void test_stateblock_mask(void) ok(!result.VS, "Got unexpected result.VS %#x.\n", result.VS); ok(!result.Predication, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDisableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); memset(&result, 0, sizeof(result)); hr = D3D10StateBlockMaskEnableAll(&result); @@ -132,28 +132,28 @@ static void test_stateblock_mask(void) ok(result.VS == 0xff, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xff, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskEnableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); result.VS = 0xff; hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 1); ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); ok(result.VS == 0xfe, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskDisableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); result.VS = 0; hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 1); ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); ok(result.VS == 0x01, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D10StateBlockMaskEnableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(capture_test); ++i) { memset(&result, 0xff, sizeof(result)); @@ -162,7 +162,7 @@ static void test_stateblock_mask(void) ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_disable, 5), - "Got unexpect result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", + "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", result.VSShaderResources[0], result.VSShaderResources[1], result.VSShaderResources[2], result.VSShaderResources[3], result.VSShaderResources[4], i); @@ -173,7 +173,7 @@ static void test_stateblock_mask(void) ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_enable, 5), - "Got unexpect result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", + "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", result.VSShaderResources[0], result.VSShaderResources[1], result.VSShaderResources[2], result.VSShaderResources[3], result.VSShaderResources[4], i);

1 0

Jacek Caban : ntdll: Move setup_exception implementation.
by Alexandre Julliard Sept. 4, 2019

Sept. 4, 2019

Module: wine Branch: master Commit: bd836a6f3e4f8fffccd9609c070b133bb7c0a823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd836a6f3e4f8fffccd9609c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:45:27 2019 +0200 ntdll: Move setup_exception implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 234 ++++++++++++++++++++++----------------------- 1 file changed, 117 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd836a6f3e4f8fffccd9…

1 0

Jacek Caban : ntdll: Factor out setup_raise_exception.
by Alexandre Julliard Sept. 4, 2019

Sept. 4, 2019

Module: wine Branch: master Commit: be7a8d6b7abea386399789b5dc7e3988c762d1a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be7a8d6b7abea386399789b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:45:39 2019 +0200 ntdll: Factor out setup_raise_exception. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 62 ++++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 399c8ad..39a13be 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2733,6 +2733,17 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, "call *%rdx\n\t" "int $3") +struct stack_layout +{ + CONTEXT context; + EXCEPTION_RECORD rec; + ULONG64 rsi; + ULONG64 rdi; + ULONG64 rbp; + ULONG64 rip; + ULONG64 red_zone[16]; +}; + /*********************************************************************** * setup_exception * @@ -2740,19 +2751,9 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, * sigcontext so that the return from the signal handler will call * the raise function. */ -static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func func ) +static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext ) { - struct stack_layout - { - CONTEXT context; - EXCEPTION_RECORD rec; - ULONG64 rsi; - ULONG64 rdi; - ULONG64 rbp; - ULONG64 rip; - ULONG64 red_zone[16]; - } *stack; - ULONG64 *rsp_ptr; + struct stack_layout *stack; DWORD exception_code = 0; stack = (struct stack_layout *)(RSP_sig(sigcontext) & ~15); @@ -2818,6 +2819,14 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun stack->rec.NumberParameters = 0; save_context( &stack->context, sigcontext ); + return &stack->rec; +} + +static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, raise_func func ) +{ + struct stack_layout *stack = CONTAINING_RECORD( rec, struct stack_layout, rec ); + ULONG64 *rsp_ptr; + /* store return address and %rbp without aligning, so that the offset is fixed */ rsp_ptr = (ULONG64 *)RSP_sig(sigcontext) - 16; *(--rsp_ptr) = RIP_sig(sigcontext); @@ -2834,8 +2843,6 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun RSP_sig(sigcontext) = (ULONG_PTR)stack; /* clear single-step, direction, and align check flag */ EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); - - return &stack->rec; } @@ -2962,14 +2969,19 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case 1: /* handled */ return; case -1: /* overflow */ - rec = setup_exception( sigcontext, raise_segv_exception ); + rec = setup_exception( sigcontext ); rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; + setup_raise_exception( sigcontext, rec, raise_segv_exception ); return; } } - rec = setup_exception( sigcontext, raise_segv_exception ); - if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; + rec = setup_exception( sigcontext ); + if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) + { + setup_raise_exception( sigcontext, rec, raise_segv_exception ); + return; + } switch(TRAP_sig(ucontext)) { @@ -3020,6 +3032,8 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; } + + setup_raise_exception( sigcontext, rec, raise_segv_exception ); } /********************************************************************** @@ -3029,7 +3043,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_trap_exception ); + EXCEPTION_RECORD *rec = setup_exception( sigcontext ); switch (siginfo->si_code) { @@ -3055,6 +3069,8 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionInformation[0] = 0; break; } + + setup_raise_exception( sigcontext, rec, raise_trap_exception ); } /********************************************************************** @@ -3064,7 +3080,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); + EXCEPTION_RECORD *rec = setup_exception( sigcontext ); switch (siginfo->si_code) { @@ -3094,6 +3110,8 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec->ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } + + setup_raise_exception( sigcontext, rec, raise_generic_exception ); } /********************************************************************** @@ -3105,8 +3123,9 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { if (!dispatch_signal(SIGINT)) { - EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); + EXCEPTION_RECORD *rec = setup_exception( sigcontext ); rec->ExceptionCode = CONTROL_C_EXIT; + setup_raise_exception( sigcontext, rec, raise_generic_exception ); } } @@ -3118,9 +3137,10 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); + EXCEPTION_RECORD *rec = setup_exception( sigcontext ); rec->ExceptionCode = EXCEPTION_WINE_ASSERTION; rec->ExceptionFlags = EH_NONCONTINUABLE; + setup_raise_exception( sigcontext, rec, raise_generic_exception ); }

1 0

Francois Gouget : d3d8/tests: Spelling fixes in ok() messages.
by Alexandre Julliard Sept. 4, 2019

Sept. 4, 2019

Module: wine Branch: master Commit: 89d2fb97678b16dcdfa72b4ea89f6805f72e2d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89d2fb97678b16dcdfa72b4e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 4 02:39:00 2019 +0200 d3d8/tests: Spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 1e7b988..819c1cd 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2987,7 +2987,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); /* I have to minimize and restore the focus window, otherwise native d3d8 fails @@ -3011,7 +3011,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = reset_device(device, &device_desc); @@ -3035,8 +3035,8 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); - ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); + ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpected width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected height %u.\n", devmode.dmPelsHeight); /* SW_SHOWMINNOACTIVE is needed to make FVWM happy. SW_SHOWNOACTIVATE is needed to make windows * send SIZE_RESTORED after ShowWindow(SW_SHOWMINNOACTIVE). */

1 0

Francois Gouget : d3d9/tests: Spelling fixes in ok() messages and a comment.
by Alexandre Julliard Sept. 4, 2019

Sept. 4, 2019

Module: wine Branch: master Commit: a11f1b7f79ebd95cee8b229cf252c49ff079d422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a11f1b7f79ebd95cee8b229c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 4 02:40:04 2019 +0200 d3d9/tests: Spelling fixes in ok() messages and a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 8 ++++---- dlls/d3d9/tests/device.c | 8 ++++---- dlls/d3d9/tests/visual.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 354a51d..2639d20 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2986,7 +2986,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); /* In d3d9ex the device and focus windows have to be minimized and restored, @@ -3015,7 +3015,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == d3d_width - && devmode.dmPelsHeight == d3d_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == d3d_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = reset_device(device, &device_desc); @@ -3039,8 +3039,8 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); - ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); + ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpected width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected height %u.\n", devmode.dmPelsHeight); /* SW_SHOWMINNOACTIVE is needed to make FVWM happy. SW_SHOWNOACTIVATE is needed to make windows * send SIZE_RESTORED after ShowWindow(SW_SHOWMINNOACTIVE). */ diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f05aded..1e8133b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4015,7 +4015,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); /* This is needed on native with D3DCREATE_NOWINDOWCHANGES, and it needs to be @@ -4050,7 +4050,7 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = reset_device(device, &device_desc); @@ -4074,8 +4074,8 @@ static void test_wndproc(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); - ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); + ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpected width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected height %u.\n", devmode.dmPelsHeight); /* SW_SHOWMINNOACTIVE is needed to make FVWM happy. SW_SHOWNOACTIVATE is needed to make windows * send SIZE_RESTORED after ShowWindow(SW_SHOWMINNOACTIVE). */ diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9907028..121b50f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14139,7 +14139,7 @@ static void sincos_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_Present returned %#x.\n", hr); - /* TODO: Find a way to properly validate the lines. Precicion issues make this a kinda nasty task */ + /* TODO: Find a way to properly validate the lines. Precision issues make this a kinda nasty task */ IDirect3DVertexShader9_Release(sin_shader); IDirect3DVertexShader9_Release(cos_shader);

1 0

Akihiro Sagawa : ucrtbase: Add strtoumax and _strtoumax_l.
by Alexandre Julliard Sept. 4, 2019

Sept. 4, 2019

Module: wine Branch: master Commit: cee3a25dd6d6b0a3e5f5b8b69d4b12f7bb324449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee3a25dd6d6b0a3e5f5b8b6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 4 22:43:18 2019 +0900 ucrtbase: Add strtoumax and _strtoumax_l. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index 06acf25..f5b77d6 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -41,7 +41,7 @@ @ cdecl -ret64 _strtoui64_l(str ptr long ptr) ucrtbase._strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) ucrtbase._strtoul_l @ cdecl -ret64 _strtoull_l(str ptr long ptr) ucrtbase._strtoull_l -@ stub _strtoumax_l +@ cdecl -ret64 _strtoumax_l(str ptr long ptr) ucrtbase._strtoumax_l @ cdecl _ui64toa(int64 ptr long) ucrtbase._ui64toa @ cdecl _ui64toa_s(int64 ptr long long) ucrtbase._ui64toa_s @ cdecl _ui64tow(int64 ptr long) ucrtbase._ui64tow @@ -100,7 +100,7 @@ @ cdecl -ret64 strtoll(str ptr long) ucrtbase.strtoll @ cdecl strtoul(str ptr long) ucrtbase.strtoul @ cdecl -ret64 strtoull(str ptr long) ucrtbase.strtoull -@ stub strtoumax +@ cdecl -ret64 strtoumax(str ptr long) ucrtbase.strtoumax @ cdecl wcrtomb(ptr long ptr) ucrtbase.wcrtomb @ stub wcrtomb_s @ cdecl wcsrtombs(ptr ptr long ptr) ucrtbase.wcsrtombs diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a47c8ff..6b7a140 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1960,7 +1960,7 @@ @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l @ cdecl -ret64 _strtoull_l(str ptr long ptr) MSVCRT_strtoui64_l -@ stub _strtoumax_l +@ cdecl -ret64 _strtoumax_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @@ -2526,7 +2526,7 @@ @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 -@ stub strtoumax +@ cdecl -ret64 strtoumax(str ptr long) MSVCRT_strtoui64 @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ cdecl system(str) MSVCRT_system @ cdecl tan(double) MSVCRT_tan

1 0

Jacek Caban : ntdll: Handle single step exception in setup_raise_exception on x86_64.
by Alexandre Julliard Sept. 4, 2019

Sept. 4, 2019

Module: wine Branch: master Commit: b76df7fa6de72b7a5a2461436e4c4d191bbd8fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b76df7fa6de72b7a5a246143… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:45:56 2019 +0200 ntdll: Handle single step exception in setup_raise_exception on x86_64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 50 ++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 39a13be..dc3091d 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2681,36 +2681,6 @@ static void raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) /********************************************************************** - * raise_trap_exception - */ -static void raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - NTSTATUS status; - - if (rec->ExceptionCode == EXCEPTION_SINGLE_STEP) - { - /* when single stepping can't tell whether this is a hw bp or a - * single step interrupt. try to avoid as much overhead as possible - * and only do a server call if there is any hw bp enabled. */ - - if( !(context->EFlags & 0x100) || (amd64_thread_data()->dr7 & 0xff) ) - { - /* (possible) hardware breakpoint, fetch the debug registers */ - DWORD saved_flags = context->ContextFlags; - context->ContextFlags = CONTEXT_DEBUG_REGISTERS; - NtGetContextThread(GetCurrentThread(), context); - context->ContextFlags |= saved_flags; /* restore flags */ - } - - context->EFlags &= ~0x100; /* clear single-step flag */ - } - - status = NtRaiseException( rec, context, TRUE ); - raise_status( status, rec ); -} - - -/********************************************************************** * raise_generic_exception * * Generic raise function for exceptions that don't need special treatment. @@ -2827,6 +2797,24 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec struct stack_layout *stack = CONTAINING_RECORD( rec, struct stack_layout, rec ); ULONG64 *rsp_ptr; + if (rec->ExceptionCode == EXCEPTION_SINGLE_STEP) + { + /* when single stepping can't tell whether this is a hw bp or a + * single step interrupt. try to avoid as much overhead as possible + * and only do a server call if there is any hw bp enabled. */ + + if( !(stack->context.EFlags & 0x100) || (amd64_thread_data()->dr7 & 0xff) ) + { + /* (possible) hardware breakpoint, fetch the debug registers */ + DWORD saved_flags = stack->context.ContextFlags; + stack->context.ContextFlags = CONTEXT_DEBUG_REGISTERS; + NtGetContextThread(GetCurrentThread(), &stack->context); + stack->context.ContextFlags |= saved_flags; /* restore flags */ + } + + stack->context.EFlags &= ~0x100; /* clear single-step flag */ + } + /* store return address and %rbp without aligning, so that the offset is fixed */ rsp_ptr = (ULONG64 *)RSP_sig(sigcontext) - 16; *(--rsp_ptr) = RIP_sig(sigcontext); @@ -3070,7 +3058,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } - setup_raise_exception( sigcontext, rec, raise_trap_exception ); + setup_raise_exception( sigcontext, rec, raise_generic_exception ); } /**********************************************************************

1 0

Akihiro Sagawa : ucrtbase: Add strtoimax and _strtoimax_l.
by Alexandre Julliard Sept. 4, 2019

Sept. 4, 2019

Module: wine Branch: master Commit: ad9b25828e5b6224033f136f21fd12671d409a6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad9b25828e5b6224033f136f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 4 22:43:16 2019 +0900 ucrtbase: Add strtoimax and _strtoimax_l. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index 1b877e3..06acf25 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -33,7 +33,7 @@ @ cdecl _strtof_l(str ptr ptr) ucrtbase._strtof_l @ cdecl -ret64 _strtoi64(str ptr long) ucrtbase._strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) ucrtbase._strtoi64_l -@ stub _strtoimax_l +@ cdecl -ret64 _strtoimax_l(str ptr long ptr) ucrtbase._strtoimax_l @ cdecl _strtol_l(str ptr long ptr) ucrtbase._strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) ucrtbase._strtoll_l @@ -94,7 +94,7 @@ @ cdecl mbtowc(ptr str long) ucrtbase.mbtowc @ cdecl strtod(str ptr) ucrtbase.strtod @ cdecl strtof(str ptr) ucrtbase.strtof -@ stub strtoimax +@ cdecl -ret64 strtoimax(str ptr long) ucrtbase.strtoimax @ cdecl strtol(str ptr long) ucrtbase.strtol @ stub strtold @ cdecl -ret64 strtoll(str ptr long) ucrtbase.strtoll diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0d7616c..a47c8ff 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1952,7 +1952,7 @@ @ cdecl _strtof_l(str ptr ptr) MSVCRT__strtof_l @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ stub _strtoimax_l +@ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @@ -2518,7 +2518,7 @@ @ cdecl strstr(str str) MSVCRT_strstr @ cdecl strtod(str ptr) MSVCRT_strtod @ cdecl strtof(str ptr) MSVCRT_strtof -@ stub strtoimax +@ cdecl -ret64 strtoimax(str ptr long) MSVCRT_strtoi64 @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol

1 0

Daniel Lehman : wininet: Return error from HttpQueryInfo if number argument is invalid.
by Alexandre Julliard Sept. 4, 2019

Sept. 4, 2019

Module: wine Branch: master Commit: 968201424d92a2117d91ba0253f30a9c67018e7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=968201424d92a2117d91ba02… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Sep 3 18:41:32 2019 -0700 wininet: Return error from HttpQueryInfo if number argument is invalid. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 23 +++++++++++-- dlls/wininet/tests/http.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 538fc2b..065a8b7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -42,6 +42,7 @@ #include <stdio.h> #include <time.h> #include <assert.h> +#include <errno.h> #include "windef.h" #include "winbase.h" @@ -3724,9 +3725,25 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, /* coalesce value to requested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER && lpBuffer) { - *(int *)lpBuffer = atoiW(lphttpHdr->lpszValue); - TRACE(" returning number: %d\n", *(int *)lpBuffer); - } + unsigned long value; + + if (*lpdwBufferLength != sizeof(DWORD)) + { + LeaveCriticalSection( &request->headers_section ); + return ERROR_HTTP_INVALID_HEADER; + } + + errno = 0; + value = strtoulW( lphttpHdr->lpszValue, NULL, 10 ); + if (value > UINT_MAX || (value == ULONG_MAX && errno == ERANGE)) + { + LeaveCriticalSection( &request->headers_section ); + return ERROR_HTTP_INVALID_HEADER; + } + + *(DWORD *)lpBuffer = value; + TRACE(" returning number: %u\n", *(DWORD *)lpBuffer); + } else if (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME && lpBuffer) { time_t tmpTime; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cb96abe..fcbd95b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -2061,6 +2062,12 @@ static const char okmsg2[] = "Set-Cookie: two\r\n" "\r\n"; +static DWORD64 content_length; +static const char largemsg[] = +"HTTP/1.1 200 OK\r\n" +"Content-Length: %I64u\r\n" +"\r\n"; + static const char notokmsg[] = "HTTP/1.1 400 Bad Request\r\n" "Server: winetest\r\n" @@ -2455,6 +2462,12 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, okmsg, sizeof(okmsg)-1, 0); } + if (strstr(buffer, "HEAD /test_large_content")) + { + char msg[sizeof(largemsg) + 16]; + sprintf(msg, largemsg, content_length); + send(c, msg, strlen(msg), 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -5515,6 +5528,74 @@ static void test_remove_dot_segments(int port) close_request(&req); } +struct large_test +{ + DWORD64 content_length; + BOOL ret; +}; + +static void test_large_content(int port) +{ + struct large_test tests[] = { + { 0, TRUE }, + { UINT_MAX-1, TRUE }, + { UINT_MAX, TRUE }, + { (DWORD64)UINT_MAX+1, FALSE }, + { ~0, FALSE }, + }; + test_request_t req; + DWORD sizelen, len; + DWORD64 len64; + BOOL ret; + size_t i; + + open_simple_request(&req, "localhost", port, "HEAD", "/test_large_content"); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + content_length = tests[i].content_length; + ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + + len = ~0; + sizelen = sizeof(len); + SetLastError(0xdeadbeef); + ret = HttpQueryInfoA(req.request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &len, &sizelen, 0); + if (tests[i].ret) + { + ok(ret, "HttpQueryInfo should have succeeded\n"); + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* xp, 2k8, vista */ + "expected ERROR_SUCCESS, got %x\n", GetLastError()); + ok(len == (DWORD)tests[i].content_length, "expected %u, got %u\n", + (DWORD)tests[i].content_length, len); + } + else + { + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_INVALID_HEADER, + "expected ERROR_HTTP_INVALID_HEADER, got %x\n", GetLastError()); + ok(len == ~0, "expected ~0, got %u\n", len); + } + ok(sizelen == sizeof(DWORD), "sizelen %u\n", sizelen); + } + + /* test argument size */ + len64 = ~0; + sizelen = sizeof(len64); + SetLastError(0xdeadbeef); + ret = HttpQueryInfoA(req.request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &len64, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_INVALID_HEADER, + "expected ERROR_HTTP_INVALID_HEADER, got %x\n", GetLastError()); + ok(sizelen == sizeof(DWORD64), "sizelen %u\n", sizelen); + ok(len64 == ~0, "len64 %x%08x\n", (DWORD)(len64 >> 32), (DWORD)len64); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -5573,6 +5654,7 @@ static void test_http_connection(void) test_redirect(si.port); test_persistent_connection(si.port); test_remove_dot_segments(si.port); + test_large_content(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0