July 2018 - Wine-Commits - list.winehq.org

Rafał Mużyło : d3d9: Expand rectangles in debug strings.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 764df64f3756ad6058e793d0625ce57a467fcec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=764df64f3756ad6058e793d0… Author: Rafał Mużyło <galtgendo(a)o2.pl> Date: Fri Jul 6 16:55:26 2018 +0200 d3d9: Expand rectangles in debug strings. Most debug lines - except these three - expand the rectangles; so this puts things simply in sync with the rest. Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a8d2652..a8dc709 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1014,8 +1014,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex * unsigned int i; HRESULT hr; - TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.\n", - iface, src_rect, dst_rect, dst_window_override, dirty_region); + TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", + iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region); if (device->device_state != D3D9_DEVICE_STATE_OK) return device->d3d_parent->extended ? S_PRESENT_OCCLUDED : D3DERR_DEVICELOST; @@ -1512,8 +1512,8 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, struct wined3d_box src_box; HRESULT hr; - TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n", - iface, src_surface, src_rect, dst_surface, dst_point); + TRACE("iface %p, src_surface %p, src_rect %s, dst_surface %p, dst_point %p.\n", + iface, src_surface, wine_dbgstr_rect(src_rect), dst_surface, dst_point); wined3d_mutex_lock(); @@ -1630,8 +1630,8 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect HRESULT hr = D3DERR_INVALIDCALL; RECT d, s; - TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", - iface, src_surface, src_rect, dst_surface, dst_rect, filter); + TRACE("iface %p, src_surface %p, src_rect %s, dst_surface %p, dst_rect %s, filter %#x.\n", + iface, src_surface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), filter); wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &dst_desc);

1 0

Józef Kucia : d3d11/tests: Add test for unorm/ snorm immediate constants.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 7e46daa1bb072dd7086ab8970ce37319a25f783b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e46daa1bb072dd7086ab897… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 9 15:25:56 2018 +0200 d3d11/tests: Add test for unorm/snorm immediate constants. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ee8d465..be7c907 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18542,10 +18542,13 @@ static void test_uav_store_immediate_constant(void) { D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; ID3D11UnorderedAccessView *uav; ID3D11DeviceContext *context; struct resource_readback rb; + ID3D11Texture2D *texture; ID3D11ComputeShader *cs; + unsigned int uint_data; ID3D11Device *device; ID3D11Buffer *buffer; float float_data; @@ -18588,6 +18591,42 @@ static void test_uav_store_immediate_constant(void) 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, }; + static const DWORD cs_store_unorm_code[] = + { +#if 0 + RWTexture2D<unorm float> u; + + [numthreads(1, 1, 1)] + void main() + { + u[uint2(0, 0)] = 0.5f; + } +#endif + 0x43425844, 0x3623f1de, 0xe847109e, 0x8e3da13f, 0xb6787b06, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400189c, 0x0011e000, 0x00000000, 0x00001111, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, + }; + static const DWORD cs_store_snorm_code[] = + { +#if 0 + RWTexture2D<snorm float> u; + + [numthreads(1, 1, 1)] + void main() + { + u[uint2(0, 0)] = -0.5f; + } +#endif + 0x43425844, 0xce5397fc, 0x7464bc06, 0xc79aa56c, 0x881bd7ef, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400189c, 0x0011e000, 0x00000000, 0x00002222, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0xbf000000, 0xbf000000, 0xbf000000, 0xbf000000, 0x0100003e, + }; static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; static const unsigned int zero[4] = {0}; @@ -18635,7 +18674,57 @@ static void test_uav_store_immediate_constant(void) ok(float_data == 1.0f, "Got unexpected value %.8e.\n", float_data); release_resource_readback(&rb); + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)texture, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + + ID3D11ComputeShader_Release(cs); + hr = ID3D11Device_CreateComputeShader(device, cs_store_unorm_code, sizeof(cs_store_unorm_code), NULL, &cs); + ok(hr == S_OK, "Failed to create compute shader, hr %#x.\n", hr); + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_texture_readback(texture, 0, &rb); + uint_data = get_readback_color(&rb, 0, 0, 0); + ok(compare_color(uint_data, 0x80808080, 1), "Got unexpected color 0x%08x.\n", uint_data); + release_resource_readback(&rb); + + ID3D11Texture2D_Release(texture); + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_SNORM; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)texture, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + + ID3D11ComputeShader_Release(cs); + hr = ID3D11Device_CreateComputeShader(device, cs_store_snorm_code, sizeof(cs_store_snorm_code), NULL, &cs); + ok(hr == S_OK, "Failed to create compute shader, hr %#x.\n", hr); + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_texture_readback(texture, 0, &rb); + uint_data = get_readback_color(&rb, 0, 0, 0); + ok(compare_color(uint_data, 0xc0c0c0c0, 1), "Got unexpected color 0x%08x.\n", uint_data); + release_resource_readback(&rb); + ID3D11Buffer_Release(buffer); + ID3D11Texture2D_Release(texture); ID3D11ComputeShader_Release(cs); ID3D11UnorderedAccessView_Release(uav); release_test_context(&test_context);

1 0

Józef Kucia : wined3d: Fix snorm/ unorm immediate values for UAV writes.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 7f1fe9385b7df27f28a252039f2340b2b755e650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f1fe9385b7df27f28a25203… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 9 15:25:55 2018 +0200 wined3d: Fix snorm/unorm immediate values for UAV writes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index af50c8b..1e922c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3094,6 +3094,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_IMMCONST_SCALAR: switch (data_type) { + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) sprintf(register_name, "uintBitsToFloat(%#xu)", reg->u.immconst_data[0]); @@ -3117,6 +3119,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_IMMCONST_VEC4: switch (data_type) { + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) {

1 0

Józef Kucia : dxgi: Avoid possible NULL pointer access in d3d11_swapchain_SetFullscreenState( ).
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 80120d62eb60c9932d2322a08e2da62fb1ae6e15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80120d62eb60c9932d2322a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 9 15:25:54 2018 +0200 dxgi: Avoid possible NULL pointer access in d3d11_swapchain_SetFullscreenState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fb91eec..ae7bde7 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -252,12 +252,11 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen if (swapchain->target) IDXGIOutput_Release(swapchain->target); swapchain->target = target; - } - else - { - IDXGIOutput_Release(target); + return S_OK; } + if (target) + IDXGIOutput_Release(target); return hr; }

1 0

Fabian Maurer : ucrtbase: Add _crt_at_quick_exit stub.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: a63c8cab27aec2c83bd83234804b433d8232d857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a63c8cab27aec2c83bd83234… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jul 9 18:03:51 2018 +0200 ucrtbase: Add _crt_at_quick_exit stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45295 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 24014a6..4bc8df7 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -28,7 +28,7 @@ @ cdecl _control87(long long) ucrtbase._control87 @ cdecl _controlfp(long long) ucrtbase._controlfp @ cdecl _controlfp_s(ptr long long) ucrtbase._controlfp_s -@ stub _crt_at_quick_exit +@ cdecl _crt_at_quick_exit(ptr) ucrtbase._crt_at_quick_exit @ cdecl _crt_atexit(ptr) ucrtbase._crt_atexit @ cdecl _crt_debugger_hook(long) ucrtbase._crt_debugger_hook @ cdecl _endthread() ucrtbase._endthread diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 77743d5..2a83e34 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -406,6 +406,15 @@ int CDECL MSVCRT_atexit(void (__cdecl *func)(void)) #if _MSVCR_VER>=140 /********************************************************************* + * _crt_at_quick_exit (UCRTBASE.@) + */ +int CDECL MSVCRT__crt_at_quick_exit(void (__cdecl *func)(void)) +{ + FIXME("(%p) stub\n", func); + return -1; +} + +/********************************************************************* * _crt_atexit (UCRTBASE.@) */ int CDECL MSVCRT__crt_atexit(void (__cdecl *func)(void)) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b8e765c..83ac984 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -240,7 +240,7 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub _crt_at_quick_exit +@ cdecl _crt_at_quick_exit(ptr) MSVCRT__crt_at_quick_exit @ cdecl _crt_atexit(ptr) MSVCRT__crt_atexit @ cdecl _crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ cdecl _ctime32(ptr) MSVCRT__ctime32

1 0

Fabian Maurer : ucrtbase: Implement quick_exit and _crt_at_quick_exit.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 89b8f3d712777e8b36b026e3e71ec54a862cc8be URL: https://source.winehq.org/git/wine.git/?a=commit;h=89b8f3d712777e8b36b026e3… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jul 9 18:04:09 2018 +0200 ucrtbase: Implement quick_exit and _crt_at_quick_exit. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 12 +++++-- dlls/ucrtbase/tests/misc.c | 85 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 90efb76..b84c50a 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -40,6 +40,10 @@ typedef struct MSVCRT__onexit_table_t static MSVCRT__onexit_table_t MSVCRT_atexit_table; +#if _MSVCR_VER>=140 +static MSVCRT__onexit_table_t MSVCRT_quick_exit_table; +#endif + typedef void (__stdcall *_tls_callback_type)(void*,ULONG,void*); static _tls_callback_type tls_atexit_callback; @@ -410,8 +414,8 @@ int CDECL MSVCRT_atexit(void (__cdecl *func)(void)) */ int CDECL MSVCRT__crt_at_quick_exit(void (__cdecl *func)(void)) { - FIXME("(%p) stub\n", func); - return -1; + TRACE("(%p)\n", func); + return register_onexit_function(&MSVCRT_quick_exit_table, (MSVCRT__onexit_t)func); } /********************************************************************* @@ -419,7 +423,9 @@ int CDECL MSVCRT__crt_at_quick_exit(void (__cdecl *func)(void)) */ void CDECL MSVCRT_quick_exit(int exitcode) { - FIXME("(%d) semi-stub\n", exitcode); + TRACE("(%d)\n", exitcode); + + execute_onexit_table(&MSVCRT_quick_exit_table); MSVCRT__exit(exitcode); } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index fad9311..555dc2d 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -127,6 +127,8 @@ static int* (CDECL *p_errno)(void); static char* (CDECL *p_asctime)(const struct tm *); static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); +static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); +static void (__cdecl *p_quick_exit)(int exitcode); static void test__initialize_onexit_table(void) { @@ -433,6 +435,8 @@ static BOOL init(void) p_asctime = (void*)GetProcAddress(module, "asctime"); p__crt_atexit = (void*)GetProcAddress(module, "_crt_atexit"); p_exit = (void*)GetProcAddress(module, "exit"); + p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); + p_quick_exit = (void*)GetProcAddress(module, "quick_exit"); return TRUE; } @@ -797,11 +801,12 @@ static void test_exit(const char *argv0) PROCESS_INFORMATION proc; STARTUPINFOA startup = {0}; char path[MAX_PATH]; - HANDLE failures_map, exit_event; + HANDLE failures_map, exit_event, quick_exit_event; LONG *failures; DWORD ret; exit_event = CreateEventA(NULL, FALSE, FALSE, "exit_event"); + quick_exit_event = CreateEventA(NULL, FALSE, FALSE, "quick_exit_event"); failures = get_failures_counter(&failures_map); sprintf(path, "%s misc exit", argv0); @@ -819,11 +824,15 @@ static void test_exit(const char *argv0) ret = WaitForSingleObject(exit_event, 0); ok(ret == WAIT_OBJECT_0, "exit_event was not set (%x)\n", ret); + ret = WaitForSingleObject(quick_exit_event, 0); + ok(ret == WAIT_TIMEOUT, "quick_exit_event should not have be set (%x)\n", ret); CloseHandle(exit_event); + CloseHandle(quick_exit_event); } static int atexit_called; + static void CDECL at_exit_func1(void) { HANDLE exit_event = CreateEventA(NULL, FALSE, FALSE, "exit_event"); @@ -843,14 +852,85 @@ static void CDECL at_exit_func2(void) set_failures_counter(winetest_get_failures()); } +static int atquick_exit_called; + +static void CDECL at_quick_exit_func1(void) +{ + HANDLE quick_exit_event = CreateEventA(NULL, FALSE, FALSE, "quick_exit_event"); + + ok(quick_exit_event != NULL, "CreateEvent failed: %d\n", GetLastError()); + ok(atquick_exit_called == 1, "atquick_exit_called = %d\n", atquick_exit_called); + atquick_exit_called++; + SetEvent(quick_exit_event); + CloseHandle(quick_exit_event); + set_failures_counter(winetest_get_failures()); +} + +static void CDECL at_quick_exit_func2(void) +{ + ok(!atquick_exit_called, "atquick_exit_called = %d\n", atquick_exit_called); + atquick_exit_called++; + set_failures_counter(winetest_get_failures()); +} + static void test_call_exit(void) { ok(!p__crt_atexit(at_exit_func1), "_crt_atexit failed\n"); ok(!p__crt_atexit(at_exit_func2), "_crt_atexit failed\n"); + + ok(!p_crt_at_quick_exit(at_quick_exit_func1), "_crt_at_quick_exit failed\n"); + ok(!p_crt_at_quick_exit(at_quick_exit_func2), "_crt_at_quick_exit failed\n"); + set_failures_counter(winetest_get_failures()); p_exit(1); } +static void test_call_quick_exit(void) +{ + ok(!p__crt_atexit(at_exit_func1), "_crt_atexit failed\n"); + ok(!p__crt_atexit(at_exit_func2), "_crt_atexit failed\n"); + + ok(!p_crt_at_quick_exit(at_quick_exit_func1), "_crt_at_quick_exit failed\n"); + ok(!p_crt_at_quick_exit(at_quick_exit_func2), "_crt_at_quick_exit failed\n"); + + set_failures_counter(winetest_get_failures()); + p_quick_exit(2); +} + +static void test_quick_exit(const char *argv0) +{ + PROCESS_INFORMATION proc; + STARTUPINFOA startup = {0}; + char path[MAX_PATH]; + HANDLE failures_map, exit_event, quick_exit_event; + LONG *failures; + DWORD ret; + + exit_event = CreateEventA(NULL, FALSE, FALSE, "exit_event"); + quick_exit_event = CreateEventA(NULL, FALSE, FALSE, "quick_exit_event"); + + failures = get_failures_counter(&failures_map); + sprintf(path, "%s misc quick_exit", argv0); + startup.cb = sizeof(startup); + CreateProcessA(NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &proc); + ret = WaitForSingleObject(proc.hProcess, INFINITE); + ok(ret == WAIT_OBJECT_0, "child process wait failed\n"); + GetExitCodeProcess(proc.hProcess, &ret); + ok(ret == 2, "child process exited with code %d\n", ret); + CloseHandle(proc.hProcess); + CloseHandle(proc.hThread); + ok(!*failures, "%d tests failed in child process\n", *failures); + free_failures_counter(failures, failures_map); + + ret = WaitForSingleObject(quick_exit_event, 0); + ok(ret == WAIT_OBJECT_0, "quick_exit_event was not set (%x)\n", ret); + ret = WaitForSingleObject(exit_event, 0); + ok(ret == WAIT_TIMEOUT, "exit_event should not have be set (%x)\n", ret); + + CloseHandle(exit_event); + CloseHandle(quick_exit_event); +} + START_TEST(misc) { int arg_c; @@ -865,6 +945,8 @@ START_TEST(misc) test__get_narrow_winmain_command_line(NULL); else if(!strcmp(arg_v[2], "exit")) test_call_exit(); + else if(!strcmp(arg_v[2], "quick_exit")) + test_call_quick_exit(); return; } @@ -881,4 +963,5 @@ START_TEST(misc) test_math_errors(); test_asctime(); test_exit(arg_v[0]); + test_quick_exit(arg_v[0]); }

1 0

Piotr Caban : ucrtbase: Report child process test failures in exit() tests.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: f90a32d5abf04bfc3a2249662f25f1d4aab9850c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f90a32d5abf04bfc3a224966… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 9 18:03:29 2018 +0200 ucrtbase: Report child process test failures in exit() tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 99b9fd2..fad9311 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -769,16 +769,41 @@ static void test_asctime(void) ok(!strcmp(ret, "Thu Jan 1 00:00:00 1970\n"), "asctime returned %s\n", ret); } +static LONG* get_failures_counter(HANDLE *map) +{ + *map = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, + 0, sizeof(LONG), "winetest_failures_counter"); + return MapViewOfFile(*map, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(LONG)); +} + +static void free_failures_counter(LONG *mem, HANDLE map) +{ + UnmapViewOfFile(mem); + CloseHandle(map); +} + +static void set_failures_counter(LONG add) +{ + HANDLE failures_map; + LONG *failures; + + failures = get_failures_counter(&failures_map); + *failures = add; + free_failures_counter(failures, failures_map); +} + static void test_exit(const char *argv0) { PROCESS_INFORMATION proc; STARTUPINFOA startup = {0}; char path[MAX_PATH]; - HANDLE exit_event; + HANDLE failures_map, exit_event; + LONG *failures; DWORD ret; exit_event = CreateEventA(NULL, FALSE, FALSE, "exit_event"); + failures = get_failures_counter(&failures_map); sprintf(path, "%s misc exit", argv0); startup.cb = sizeof(startup); CreateProcessA(NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &proc); @@ -788,6 +813,9 @@ static void test_exit(const char *argv0) ok(ret == 1, "child process exited with code %d\n", ret); CloseHandle(proc.hProcess); CloseHandle(proc.hThread); + ok(!*failures, "%d tests failed in child process\n", *failures); + free_failures_counter(failures, failures_map); + ret = WaitForSingleObject(exit_event, 0); ok(ret == WAIT_OBJECT_0, "exit_event was not set (%x)\n", ret); @@ -805,18 +833,21 @@ static void CDECL at_exit_func1(void) atexit_called++; SetEvent(exit_event); CloseHandle(exit_event); + set_failures_counter(winetest_get_failures()); } static void CDECL at_exit_func2(void) { ok(!atexit_called, "atexit_called = %d\n", atexit_called); atexit_called++; + set_failures_counter(winetest_get_failures()); } static void test_call_exit(void) { ok(!p__crt_atexit(at_exit_func1), "_crt_atexit failed\n"); ok(!p__crt_atexit(at_exit_func2), "_crt_atexit failed\n"); + set_failures_counter(winetest_get_failures()); p_exit(1); }

1 0

Piotr Caban : ucrtbase: Test child process exit code.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 27de76e3df6b276c25eddb9788d509797f45d422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27de76e3df6b276c25eddb97… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 9 18:03:19 2018 +0200 ucrtbase: Test child process exit code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 1c56f73..99b9fd2 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -782,7 +782,12 @@ static void test_exit(const char *argv0) sprintf(path, "%s misc exit", argv0); startup.cb = sizeof(startup); CreateProcessA(NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &proc); - winetest_wait_child_process(proc.hProcess); + ret = WaitForSingleObject(proc.hProcess, INFINITE); + ok(ret == WAIT_OBJECT_0, "child process wait failed\n"); + GetExitCodeProcess(proc.hProcess, &ret); + ok(ret == 1, "child process exited with code %d\n", ret); + CloseHandle(proc.hProcess); + CloseHandle(proc.hThread); ret = WaitForSingleObject(exit_event, 0); ok(ret == WAIT_OBJECT_0, "exit_event was not set (%x)\n", ret); @@ -812,7 +817,7 @@ static void test_call_exit(void) { ok(!p__crt_atexit(at_exit_func1), "_crt_atexit failed\n"); ok(!p__crt_atexit(at_exit_func2), "_crt_atexit failed\n"); - p_exit(0); + p_exit(1); } START_TEST(misc)

1 0

Michał Janiszewski : msvcrt: Update size checks for secure scanf versions.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 08d98f0ff83d664fa08208fed19cb90140e2ff10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d98f0ff83d664fa08208fe… Author: Michał Janiszewski <janisozaur(a)gmail.com> Date: Mon Jul 9 14:45:28 2018 +0200 msvcrt: Update size checks for secure scanf versions. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 4 ++-- dlls/msvcrt/tests/scanf.c | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 734fe8b..0903d69 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -548,13 +548,13 @@ _FUNCTION_ { while (width && (nch != _EOF_)) { if (!suppress) { - *str++ = _CHAR2SUPPORTED_(nch); if(size) size--; else { _UNLOCK_FILE_(file); *pstr = 0; return rd; } + *str++ = _CHAR2SUPPORTED_(nch); } st++; width--; @@ -574,13 +574,13 @@ _FUNCTION_ { while (width && (nch != _EOF_)) { if (!suppress) { - *str++ = _WIDE2SUPPORTED_(nch); if(size) size--; else { _UNLOCK_FILE_(file); *pstr = 0; return rd; } + *str++ = _WIDE2SUPPORTED_(nch); } st++; width--; diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 359b079..b724483 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -282,10 +282,17 @@ static void test_sscanf_s(void) ok(ret == 0, "Wrong number of arguments read: %d\n", ret); ok(buf[0]=='\0', "buf = %s\n", buf); - buf[0] = 'a'; + memset(buf, 'a', sizeof(buf)); ret = psscanf_s("123", "%3c", buf, 2); ok(ret == 0, "Wrong number of arguments read: %d\n", ret); ok(buf[0]=='\0', "buf = %s\n", buf); + ok(buf[1]=='2', "buf[1] = %d\n", buf[1]); + ok(buf[2]=='a', "buf[2] = %d\n", buf[2]); + + buf[3] = 'a'; + buf[4] = 0; + ret = psscanf_s("123", "%3c", buf, 3); + ok(!strcmp("123a", buf), "buf = %s\n", buf); i = 1; ret = psscanf_s("123 123", "%s %d", buf, 2, &i);

1 0

Fabian Maurer : ucrtbase: Add quick_exit.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 224f3312f87551cce4ea44381ab55e2bfa3e9734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=224f3312f87551cce4ea4438… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jul 9 18:04:03 2018 +0200 ucrtbase: Add quick_exit. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 4bc8df7..74d682b 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -97,7 +97,7 @@ @ cdecl fesetround(long) ucrtbase.fesetround @ stub fetestexcept @ cdecl perror(str) ucrtbase.perror -@ stub quick_exit +@ cdecl quick_exit(long) ucrtbase.quick_exit @ cdecl raise(long) ucrtbase.raise @ cdecl set_terminate(ptr) ucrtbase.set_terminate @ cdecl signal(long long) ucrtbase.signal diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 2a83e34..90efb76 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -415,6 +415,15 @@ int CDECL MSVCRT__crt_at_quick_exit(void (__cdecl *func)(void)) } /********************************************************************* + * quick_exit (MSVCRT.@) + */ +void CDECL MSVCRT_quick_exit(int exitcode) +{ + FIXME("(%d) semi-stub\n", exitcode); + MSVCRT__exit(exitcode); +} + +/********************************************************************* * _crt_atexit (UCRTBASE.@) */ int CDECL MSVCRT__crt_atexit(void (__cdecl *func)(void)) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 83ac984..6304663 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2454,7 +2454,7 @@ @ cdecl putwchar(long) MSVCRT__fputwchar @ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s -@ stub quick_exit +@ cdecl quick_exit(long) MSVCRT_quick_exit @ cdecl raise(long) MSVCRT_raise @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s

1 0