February 2020 - Wine-devel - list.winehq.org

[PATCH 1/6] jscript: Initialize the script context in SetScriptSite.
by Jacek Caban 20 Feb '20

20 Feb '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 98 +++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 50 deletions(-)

1 0

[PATCH] advapi32/tests: Simplify the name of the test unit for child processes.
by Francois Gouget 20 Feb '20

20 Feb '20

The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index afcdb6328e0..d003a7f1a0d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3010,7 +3010,7 @@ static void test_process_security(void) CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); test_group_equal( event, UsersSid, __LINE__ ); - sprintf(buffer, "%s tests/security.c test", myARGV[0]); + sprintf(buffer, "%s security test", myARGV[0]); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -7186,7 +7186,7 @@ static void test_token_security_descriptor(void) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - sprintf(buffer, "%s tests/security.c test_token_sd", myARGV[0]); + sprintf(buffer, "%s security test_token_sd", myARGV[0]); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); ok(ret, "CreateProcess failed with error %u\n", GetLastError()); winetest_wait_child_process(info.hProcess); -- 2.20.1

2 2

[PATCH 1/2] msvcrt: Add _CRT_INT_MAX to corecrt.h.
by Francois Gouget 20 Feb '20

20 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- include/msvcrt/corecrt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index cff4549d376..ea81e95db36 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -158,6 +158,7 @@ #endif #define _ARGMAX 100 +#define _CRT_INT_MAX 0x7fffffff #ifndef _MSVCRT_LONG_DEFINED #define _MSVCRT_LONG_DEFINED -- 2.20.1

1 1

[PATCH] winebrowser: Avoid recursively calling winebrowser forever
by Joshua Ashton 20 Feb '20

20 Feb '20

Signed-off-by: Joshua Ashton <joshua(a)froggi.es> --- programs/winebrowser/main.c | 40 +++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 11 deletions(-)

2 3

[PATCH 1/6] server: Use monotonic clock for relative timeouts.
by Piotr Caban 20 Feb '20

20 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- Relative timeouts are expected to wait given amount of time even if system clock is changed. It's also behaving incorrectly on daylight saving related time change. server/fd.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 9 deletions(-)

2 1

[PATCH 2/2] include: Include sys/stat.h from wchar.h.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/sys/stat.h | 4 -- include/msvcrt/wchar.h | 136 +------------------------------------- 2 files changed, 1 insertion(+), 139 deletions(-)

1 0

[PATCH 1/2] include: Add corecrt_wtime.h file.
by Jacek Caban 20 Feb '20

20 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_wtime.h | 48 ++++++++++++++++++++++++++++++++++ include/msvcrt/time.h | 39 +-------------------------- include/msvcrt/wchar.h | 38 +-------------------------- 3 files changed, 50 insertions(+), 75 deletions(-) create mode 100644 include/msvcrt/corecrt_wtime.h

1 0

[PATCH v2 2/2] dxgi: Check NULL output parameter in dxgi_adapter_EnumOutputs().
by Zhiyi Zhang 20 Feb '20

20 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/adapter.c | 3 +++ dlls/dxgi/tests/dxgi.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d2fc629c84..7cdf7bd0d6 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -128,6 +128,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); + if (!output) + return E_INVALIDARG; + if (output_idx > 0) { *output = NULL; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 3ff42c4bc6..e2b5df7b27 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1175,6 +1175,9 @@ static void test_output(void) hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) { -- 2.20.1

3 2

[PATCH v2 1/2] dxgi: Check NULL adapter parameter in dxgi_factory_EnumAdapterByLuid().
by Zhiyi Zhang 20 Feb '20

20 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 179059 dlls/dxgi/factory.c | 3 +++ dlls/dxgi/tests/dxgi.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a0038b4fe7..3f41df9e36 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -403,6 +403,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory TRACE("iface %p, luid %08x:%08x, iid %s, adapter %p.\n", iface, luid.HighPart, luid.LowPart, debugstr_guid(iid), adapter); + if (!adapter) + return DXGI_ERROR_INVALID_CALL; + adapter_index = 0; while ((hr = dxgi_factory_EnumAdapters1(iface, adapter_index, &adapter1)) == S_OK) { diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f8e63ea25e..3ff42c4bc6 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -912,6 +912,10 @@ static void test_adapter_luid(void) return; } + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, + &IID_IDXGIAdapter, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, (void **)&adapter); todo_wine ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); @@ -4949,6 +4953,9 @@ static void test_multi_adapter(void) return; } + hr = IDXGIFactory_EnumAdapters(factory, 0, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (hr == DXGI_ERROR_NOT_FOUND) { -- 2.20.1

2 1

[PATCH v3 1/8] d3d9: Use ARRAY_SIZE in d3d9_device_GetStreamSource().
by Zebediah Figura 20 Feb '20

20 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3b4c9d5277..53e27adf05 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3709,6 +3709,7 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, UINT stream_idx, IDirect3DVertexBuffer9 **buffer, UINT *offset, UINT *stride) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + const struct wined3d_stateblock_state *state; const struct wined3d_stream_state *stream; struct d3d9_vertexbuffer *buffer_impl; @@ -3718,14 +3719,15 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, if (!buffer) return D3DERR_INVALIDCALL; - if (stream_idx > WINED3D_MAX_STREAMS) + if (stream_idx >= ARRAY_SIZE(state->streams)) { WARN("Stream index %u out of range.\n", stream_idx); return WINED3DERR_INVALIDCALL; } wined3d_mutex_lock(); - stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + state = wined3d_stateblock_get_state(device->state); + stream = &state->streams[stream_idx]; if (stream->buffer) { buffer_impl = wined3d_buffer_get_parent(stream->buffer); -- 2.25.0

2 15