January 2019 - Wine-Commits

Daniel Lehman : ucrtbase/tests: Add tests for C locale.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 20f5abf4fb269a2ee596456fac1aa249b67705a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20f5abf4fb269a2ee596456f… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Jan 28 12:08:27 2019 +0100 ucrtbase/tests: Add tests for C locale. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 34f5a78..38aa6b3 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <wchar.h> #include <stdio.h> +#include <locale.h> #include <windef.h> #include <winbase.h> @@ -90,6 +91,13 @@ static double (__cdecl *p_strtod)(const char*, char** end); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); static size_t (__cdecl *p___strncnt)(const char*, size_t); +static int (__cdecl *p_towlower)(wint_t); +static int (__cdecl *p__towlower_l)(wint_t, _locale_t); +static int (__cdecl *p_towupper)(wint_t); +static int (__cdecl *p__towupper_l)(wint_t, _locale_t); +static char* (__cdecl *p_setlocale)(int, const char*); +static _locale_t (__cdecl *p__create_locale)(int, const char*); +static void (__cdecl *p__free_locale)(_locale_t); static BOOL init(void) { @@ -107,6 +115,13 @@ static BOOL init(void) p__memicmp = (void*)GetProcAddress(module, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(module, "_memicmp_l"); p___strncnt = (void*)GetProcAddress(module, "__strncnt"); + p_towlower = (void*)GetProcAddress(module, "towlower"); + p__towlower_l = (void*)GetProcAddress(module, "_towlower_l"); + p_towupper = (void*)GetProcAddress(module, "towupper"); + p__towupper_l = (void*)GetProcAddress(module, "_towupper_l"); + p_setlocale = (void*)GetProcAddress(module, "setlocale"); + p__create_locale = (void*)GetProcAddress(module, "_create_locale"); + p__free_locale = (void*)GetProcAddress(module, "_free_locale"); return TRUE; } @@ -285,6 +300,63 @@ static void test___strncnt(void) "Cannot reset invalid parameter handler\n"); } +static void test_C_locale(void) +{ + int i, j; + wint_t ret, exp; + _locale_t locale; + static const char *locales[] = { NULL, "C" }; + + /* C locale only converts case for [a-zA-Z] */ + p_setlocale(LC_ALL, "C"); + for (i = 0; i <= 0xffff; i++) + { + ret = p_towlower(i); + if (i >= 'A' && i <= 'Z') + { + exp = i + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + + ret = p_towupper(i); + if (i >= 'a' && i <= 'z') + { + exp = i + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + } + + for (i = 0; i < ARRAY_SIZE(locales); i++) { + locale = locales[i] ? p__create_locale(LC_ALL, locales[i]) : NULL; + + for (j = 0; j <= 0xffff; j++) { + ret = p__towlower_l(j, locale); + if (j >= 'A' && j <= 'Z') + { + exp = j + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + + ret = p__towupper_l(j, locale); + if (j >= 'a' && j <= 'z') + { + exp = j + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + } + + p__free_locale(locale); + } +} + START_TEST(string) { if (!init()) return; @@ -292,4 +364,5 @@ START_TEST(string) test__memicmp(); test__memicmp_l(); test___strncnt(); + test_C_locale(); }

1 0

Zebediah Figura : wined3d: Store the pixel shader in the wined3d_stateblock_state structure.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 0e493a2d80d85ec07e51fd8927cb24b10cb4a6e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e493a2d80d85ec07e51fd89… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 22:44:56 2019 -0600 wined3d: Store the pixel shader in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 +++++++++++---- dlls/wined3d/stateblock.c | 28 ++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 331def2..28e113a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2534,21 +2534,28 @@ HRESULT CDECL wined3d_device_get_vs_consts_f(const struct wined3d_device *device void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_PIXEL]; + struct wined3d_shader *prev = device->state.shader[WINED3D_SHADER_TYPE_PIXEL]; TRACE("device %p, shader %p.\n", device, shader); + if (shader) + wined3d_shader_incref(shader); + if (device->update_stateblock_state->ps) + wined3d_shader_decref(device->update_stateblock_state->ps); + device->update_stateblock_state->ps = shader; if (device->recording) + { device->recording->changed.pixelShader = TRUE; + return; + } if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_PIXEL] = shader; - if (!device->recording) - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_PIXEL, shader); + device->state.shader[WINED3D_SHADER_TYPE_PIXEL] = shader; + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_PIXEL, shader); if (prev) wined3d_shader_decref(prev); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 112d8b7..2b916a9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -530,6 +530,12 @@ void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) state->vs = NULL; wined3d_shader_decref(shader); } + + if ((shader = state->ps)) + { + state->ps = NULL; + wined3d_shader_decref(shader); + } } void state_cleanup(struct wined3d_state *state) @@ -953,14 +959,13 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) stateblock->state.sampler_states[stage][state] = src_state->sampler_states[stage][state]; } - if (stateblock->changed.pixelShader && stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL] - != src_state->shader[WINED3D_SHADER_TYPE_PIXEL]) + if (stateblock->changed.pixelShader && stateblock->stateblock_state.ps != state->ps) { - if (src_state->shader[WINED3D_SHADER_TYPE_PIXEL]) - wined3d_shader_incref(src_state->shader[WINED3D_SHADER_TYPE_PIXEL]); - if (stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL]) - wined3d_shader_decref(stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL]); - stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL] = src_state->shader[WINED3D_SHADER_TYPE_PIXEL]; + if (state->ps) + wined3d_shader_incref(state->ps); + if (stateblock->stateblock_state.ps) + wined3d_shader_decref(stateblock->stateblock_state.ps); + stateblock->stateblock_state.ps = state->ps; } wined3d_state_record_lights(&stateblock->state, src_state); @@ -1028,7 +1033,14 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) apply_lights(device, &stateblock->state); if (stateblock->changed.pixelShader) - wined3d_device_set_pixel_shader(device, stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL]); + { + if (stateblock->stateblock_state.ps) + wined3d_shader_incref(stateblock->stateblock_state.ps); + if (state->ps) + wined3d_shader_decref(state->ps); + state->ps = stateblock->stateblock_state.ps; + wined3d_device_set_pixel_shader(device, stateblock->stateblock_state.ps); + } /* Pixel Shader Constants. */ for (i = 0; i < stateblock->num_contained_ps_consts_f; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 52106f2..b638d87 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2974,6 +2974,8 @@ struct wined3d_stateblock_state struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; BOOL vs_consts_b[WINED3D_MAX_CONSTS_B]; + + struct wined3d_shader *ps; }; struct wined3d_device

1 0

Dmitry Timoshkov : wininet: Make GetUrlCacheConfigInfo() return actual dwQuota and dwCacheSize.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: ca29ac4650f7f9a96cfaa75a7919ef007306cbbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca29ac4650f7f9a96cfaa75a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 28 09:49:09 2019 +0800 wininet: Make GetUrlCacheConfigInfo() return actual dwQuota and dwCacheSize. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/urlcache.c | 71 ++++++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 28 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 4d422c9..4971fcd 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3762,33 +3762,10 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, return FALSE; } -/*********************************************************************** - * GetUrlCacheConfigInfoW (WININET.@) - */ -BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD size, DWORD flags) +static cache_container *find_container(DWORD flags) { cache_container *container; - FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); - - if (!info) - { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - info->dwContainer = 0; - info->dwQuota = 0x3e800; /* FIXME */ - info->dwReserved4 = 0; - info->fPerUser = TRUE; - info->dwSyncMode = 0; - info->dwNumCachePaths = 1; - info->dwNormalUsage = 0; - info->dwExemptUsage = 0; - - info->u.s.CachePath[0] = 0; - info->u.s.dwCacheSize = 0x3e800; /* FIXME */ - LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) { switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) @@ -3796,17 +3773,17 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD s case 0: case CACHE_CONFIG_CONTENT_PATHS_FC: if (container->default_entry_type == NORMAL_CACHE_ENTRY) - lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + return container; break; case CACHE_CONFIG_COOKIES_PATHS_FC: if (container->default_entry_type == COOKIE_CACHE_ENTRY) - lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + return container; break; case CACHE_CONFIG_HISTORY_PATHS_FC: if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) - lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + return container; break; default: @@ -3815,6 +3792,45 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD s } } + return NULL; +} + +/*********************************************************************** + * GetUrlCacheConfigInfoW (WININET.@) + */ +BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD size, DWORD flags) +{ + cache_container *container; + DWORD error; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info || !(container = find_container(flags))) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + error = cache_container_open_index(container, MIN_BLOCK_NO); + if (error != ERROR_SUCCESS) + { + INTERNET_SetLastError(error); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = FILE_SIZE(MAX_BLOCK_NO) / 1024; + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + info->u.s.dwCacheSize = container->file_size / 1024; + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + + cache_container_close_index(container); + TRACE("CachePath %s\n", debugstr_w(info->u.s.CachePath)); return TRUE; @@ -3847,7 +3863,6 @@ BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD s info->dwNumCachePaths = infoW.dwNumCachePaths; info->dwNormalUsage = infoW.dwNormalUsage; info->dwExemptUsage = infoW.dwExemptUsage; - info->u.s.dwCacheSize = infoW.u.s.dwCacheSize; WideCharToMultiByte(CP_ACP, 0, infoW.u.s.CachePath, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL);

1 0

Matteo Bruni : d3d9/tests: Test D3D9Ex vertex buffer lock address stability.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 2feea1a4b1fb582fbb0c383e05b7da1c4a5f95dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2feea1a4b1fb582fbb0c383e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:04 2019 +0100 d3d9/tests: Test D3D9Ex vertex buffer lock address stability. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 3e94c2b..5260fcd 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -33,6 +33,7 @@ static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_NOWINDOWCHANGES 0x02 +#define CREATE_DEVICE_SWVP_ONLY 0x04 struct device_desc { @@ -178,6 +179,8 @@ static IDirect3DDevice9Ex *create_device(HWND focus_window, const struct device_ present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); if (desc->flags & CREATE_DEVICE_NOWINDOWCHANGES) behavior_flags |= D3DCREATE_NOWINDOWCHANGES; + if (desc->flags & CREATE_DEVICE_SWVP_ONLY) + behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; } mode.Size = sizeof(mode); @@ -4753,6 +4756,99 @@ static void test_sysmem_draw(void) DestroyWindow(window); } +static void test_pinned_buffers(void) +{ + static const struct + { + DWORD device_flags; + DWORD usage; + D3DPOOL pool; + } + tests[] = + { + {CREATE_DEVICE_SWVP_ONLY, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DPOOL_DEFAULT}, + {0, 0, D3DPOOL_SYSTEMMEM}, + }; + static const unsigned int vertex_count = 1024; + struct device_desc device_desc; + IDirect3DVertexBuffer9 *buffer; + IDirect3DDevice9Ex *device; + D3DVERTEXBUFFER_DESC desc; + unsigned int i, test; + struct vec3 + { + float x, y, z; + } *ptr, *ptr2; + UINT refcount; + HWND window; + HRESULT hr; + + window = create_window(); + + for (test = 0; test < ARRAY_SIZE(tests); ++test) + { + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = tests[test].device_flags; + if (!(device = create_device(window, &device_desc))) + { + skip("Test %u: failed to create a D3D device.\n", test); + continue; + } + + hr = IDirect3DDevice9Ex_CreateVertexBuffer(device, vertex_count * sizeof(*ptr), + tests[test].usage, 0, tests[test].pool, &buffer, NULL); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DVertexBuffer9_GetDesc(buffer, &desc); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + ok(desc.Pool == tests[test].pool, "Test %u: got unexpected pool %#x.\n", test, desc.Pool); + ok(desc.Usage == tests[test].usage, "Test %u: got unexpected usage %#x.\n", test, desc.Usage); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, vertex_count * sizeof(*ptr), (void **)&ptr, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + for (i = 0; i < vertex_count; ++i) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + + hr = IDirect3DDevice9Ex_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_SetStreamSource(device, 0, buffer, 0, sizeof(*ptr)); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_BeginScene(device); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_EndScene(device); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, vertex_count * sizeof(*ptr2), (void **)&ptr2, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + ok(ptr2 == ptr, "Test %u: got unexpected ptr2 %p, expected %p.\n", test, ptr2, ptr); + for (i = 0; i < vertex_count; ++i) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Test %u: got unexpected vertex %u {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n", + test, i, ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Test %u: device has %u references left.\n", test, refcount); + } + DestroyWindow(window); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4806,4 +4902,5 @@ START_TEST(d3d9ex) test_frame_latency(); test_resource_access(); test_sysmem_draw(); + test_pinned_buffers(); }

1 0

Nikolay Sivov : ole32/tests: Test flags passed to spy methods.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: fbe23bdd99b7fce480a51f86754f515da8e3c870 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbe23bdd99b7fce480a51f86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 25 07:07:53 2019 +0300 ole32/tests: Test flags passed to spy methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 4c51ee6..b4dd83e 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3308,14 +3308,14 @@ static ULONG WINAPI testinitialize_Release(IInitializeSpy *iface) static HRESULT WINAPI testinitialize_PreInitialize(IInitializeSpy *iface, DWORD coinit, DWORD aptrefs) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + ok(coinit == (COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE), "Unexpected init flags %#x.\n", coinit); + return S_OK; } static HRESULT WINAPI testinitialize_PostInitialize(IInitializeSpy *iface, HRESULT hr, DWORD coinit, DWORD aptrefs) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + ok(coinit == (COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE), "Unexpected init flags %#x.\n", coinit); + return hr; } static HRESULT WINAPI testinitialize_PreUninitialize(IInitializeSpy *iface, DWORD aptrefs) @@ -3398,6 +3398,9 @@ static void test_IInitializeSpy(void) GetCurrentThreadId()); ok(cookie1.LowPart == 1, "got wrong low part 0x%x\n", cookie1.LowPart); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); + ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); + hr = CoRevokeInitializeSpy(cookie); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3406,6 +3409,8 @@ static void test_IInitializeSpy(void) hr = CoRevokeInitializeSpy(cookie2); ok(hr == S_OK, "got 0x%08x\n", hr); + + CoUninitialize(); } static HRESULT g_persistfile_qi_ret;

1 0

Zebediah Figura : wined3d: Introduce a separate structure for stateblock state and store vertex shader state therein.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: f2e7906d9cd17b4cdab28a71cc9ca8ecaaf0c26c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e7906d9cd17b4cdab28a71… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 22:44:52 2019 -0600 wined3d: Introduce a separate structure for stateblock state and store vertex shader state therein. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 25 +++++++++++++++++++++---- dlls/wined3d/stateblock.c | 40 +++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 10 ++++++++++ 3 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a7e274d..b7071db 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -486,6 +486,8 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) { UINT i; + wined3d_stateblock_state_cleanup(&device->stateblock_state); + wined3d_cs_destroy(device->cs); if (device->recording && wined3d_stateblock_decref(device->recording)) @@ -2208,21 +2210,29 @@ struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration( void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_VERTEX]; + struct wined3d_shader *prev = device->state.shader[WINED3D_SHADER_TYPE_VERTEX]; TRACE("device %p, shader %p.\n", device, shader); + if (shader) + wined3d_shader_incref(shader); + if (device->update_stateblock_state->vs) + wined3d_shader_decref(device->update_stateblock_state->vs); + device->update_stateblock_state->vs = shader; + if (device->recording) + { device->recording->changed.vertexShader = TRUE; + return; + } if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_VERTEX] = shader; - if (!device->recording) - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_VERTEX, shader); + device->state.shader[WINED3D_SHADER_TYPE_VERTEX] = shader; + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_VERTEX, shader); if (prev) wined3d_shader_decref(prev); } @@ -3552,6 +3562,7 @@ HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device) device->recording = stateblock; device->update_state = &stateblock->state; + device->update_stateblock_state = &stateblock->stateblock_state; TRACE("Recording stateblock %p.\n", stateblock); @@ -3577,6 +3588,7 @@ HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device, *stateblock = object; device->recording = NULL; device->update_state = &device->state; + device->update_stateblock_state = &device->stateblock_state; TRACE("Returning stateblock %p.\n", *stateblock); @@ -4998,6 +5010,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); + wined3d_stateblock_state_cleanup(&device->stateblock_state); if (device->d3d_initialized) wined3d_device_delete_opengl_contexts(device); @@ -5005,6 +5018,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; + memset(&device->stateblock_state, 0, sizeof(device->stateblock_state)); + device->update_stateblock_state = &device->stateblock_state; device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) @@ -5279,6 +5294,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; + device->update_stateblock_state = &device->stateblock_state; device->max_frame_latency = 3; @@ -5286,6 +5302,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, { WARN("Failed to create command stream.\n"); state_cleanup(&device->state); + wined3d_stateblock_state_cleanup(&device->stateblock_state); hr = E_FAIL; goto err; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9539ae0..4ead27b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -521,6 +521,17 @@ void state_unbind_resources(struct wined3d_state *state) } } +void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) +{ + struct wined3d_shader *shader; + + if ((shader = state->vs)) + { + state->vs = NULL; + wined3d_shader_decref(shader); + } +} + void state_cleanup(struct wined3d_state *state) { unsigned int counter; @@ -554,6 +565,7 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { state_cleanup(&stateblock->state); + wined3d_stateblock_state_cleanup(&stateblock->stateblock_state); heap_free(stateblock); } @@ -669,6 +681,7 @@ static void wined3d_state_record_lights(struct wined3d_state *dst_state, const s void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { + const struct wined3d_stateblock_state *state = &stateblock->device->stateblock_state; const struct wined3d_state *src_state = &stateblock->device->state; unsigned int i; DWORD map; @@ -677,18 +690,15 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) TRACE("Capturing state %p.\n", src_state); - if (stateblock->changed.vertexShader && stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX] - != src_state->shader[WINED3D_SHADER_TYPE_VERTEX]) + if (stateblock->changed.vertexShader && stateblock->stateblock_state.vs != state->vs) { - TRACE("Updating vertex shader from %p to %p\n", - stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX], - src_state->shader[WINED3D_SHADER_TYPE_VERTEX]); + TRACE("Updating vertex shader from %p to %p.\n", stateblock->stateblock_state.vs, state->vs); - if (src_state->shader[WINED3D_SHADER_TYPE_VERTEX]) - wined3d_shader_incref(src_state->shader[WINED3D_SHADER_TYPE_VERTEX]); - if (stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]) - wined3d_shader_decref(stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]); - stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX] = src_state->shader[WINED3D_SHADER_TYPE_VERTEX]; + if (state->vs) + wined3d_shader_incref(state->vs); + if (stateblock->stateblock_state.vs) + wined3d_shader_decref(stateblock->stateblock_state.vs); + stateblock->stateblock_state.vs = state->vs; } /* Vertex shader float constants. */ @@ -978,6 +988,7 @@ static void apply_lights(struct wined3d_device *device, const struct wined3d_sta void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) { + struct wined3d_stateblock_state *state = &stateblock->device->stateblock_state; struct wined3d_device *device = stateblock->device; unsigned int i; DWORD map; @@ -985,7 +996,14 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applying stateblock %p to device %p.\n", stateblock, device); if (stateblock->changed.vertexShader) - wined3d_device_set_vertex_shader(device, stateblock->state.shader[WINED3D_SHADER_TYPE_VERTEX]); + { + if (stateblock->stateblock_state.vs) + wined3d_shader_incref(stateblock->stateblock_state.vs); + if (state->vs) + wined3d_shader_decref(state->vs); + state->vs = stateblock->stateblock_state.vs; + wined3d_device_set_vertex_shader(device, stateblock->stateblock_state.vs); + } /* Vertex Shader Constants. */ for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7b265f3..e45ee7b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2968,6 +2968,11 @@ struct wined3d_dummy_textures * wined3d_device_create() ignores it. */ #define WINED3DCREATE_MULTITHREADED 0x00000004 +struct wined3d_stateblock_state +{ + struct wined3d_shader *vs; +}; + struct wined3d_device { LONG ref; @@ -3006,6 +3011,8 @@ struct wined3d_device struct wined3d_state state; struct wined3d_state *update_state; struct wined3d_stateblock *recording; + struct wined3d_stateblock_state stateblock_state; + struct wined3d_stateblock_state *update_stateblock_state; /* Internal use fields */ struct wined3d_device_creation_parameters create_parms; @@ -3556,6 +3563,7 @@ struct wined3d_stateblock /* Array indicating whether things have been set or changed */ struct wined3d_saved_states changed; struct wined3d_state state; + struct wined3d_stateblock_state stateblock_state; /* Contained state management */ DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; @@ -3582,6 +3590,8 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; +void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; + void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; void wined3d_state_enable_light(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, struct wined3d_light_info *light_info, BOOL enable) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Store vertex shader integer constants in the wined3d_stateblock_state structure.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 96d7437ada7cbd8f9c7d280e1eee695a118ff2f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96d7437ada7cbd8f9c7d280e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 22:44:54 2019 -0600 wined3d: Store vertex shader integer constants in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 +++++++++-------- dlls/wined3d/stateblock.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dcbdc3d..14cb620 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2445,23 +2445,24 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, if (count > WINED3D_MAX_CONSTS_I - start_idx) count = WINED3D_MAX_CONSTS_I - start_idx; - memcpy(&device->update_state->vs_consts_i[start_idx], constants, count * sizeof(*constants)); - if (TRACE_ON(d3d)) - { - for (i = 0; i < count; ++i) - TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); - } + memcpy(&device->update_stateblock_state->vs_consts_i[start_idx], constants, count * sizeof(*constants)); if (device->recording) { for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.vertexShaderConstantsI |= (1u << i); + return WINED3D_OK; } - else + + memcpy(&device->state.vs_consts_i[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) { - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants); + for (i = 0; i < count; ++i) + TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); } + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants); + return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f28c29c..dd1e638 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -716,9 +716,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { unsigned int idx = stateblock->contained_vs_consts_i[i]; - TRACE("Setting vs_consts[%u] to %s.\n", idx, debug_ivec4(&src_state->vs_consts_i[idx])); + TRACE("Setting vs_consts_i[%u] to %s.\n", idx, debug_ivec4(&state->vs_consts_i[idx])); - stateblock->state.vs_consts_i[idx] = src_state->vs_consts_i[idx]; + stateblock->stateblock_state.vs_consts_i[idx] = state->vs_consts_i[idx]; } /* Vertex shader boolean constants. */ @@ -1014,8 +1014,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) } for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { + state->vs_consts_i[i] = stateblock->stateblock_state.vs_consts_i[i]; wined3d_device_set_vs_consts_i(device, stateblock->contained_vs_consts_i[i], - 1, &stateblock->state.vs_consts_i[stateblock->contained_vs_consts_i[i]]); + 1, &stateblock->stateblock_state.vs_consts_i[stateblock->contained_vs_consts_i[i]]); } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 047439d..fedf2b8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2972,6 +2972,7 @@ struct wined3d_stateblock_state { struct wined3d_shader *vs; struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; + struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; }; struct wined3d_device

1 0

Zebediah Figura : wined3d: Store vertex shader floating point constants in the wined3d_stateblock_state structure.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 4de2da1d146248ed872ae45c30b8d485832f4ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4de2da1d146248ed872ae45c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 22:44:53 2019 -0600 wined3d: Store vertex shader floating point constants in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++++++------ dlls/wined3d/stateblock.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7071db..dcbdc3d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2493,18 +2493,22 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, || count > d3d_info->limits.vs_uniform_count - start_idx) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->vs_consts_f[start_idx], constants, count * sizeof(*constants)); + memcpy(&device->update_stateblock_state->vs_consts_f[start_idx], constants, count * sizeof(*constants)); + if (device->recording) + { + memset(&device->recording->changed.vs_consts_f[start_idx], 1, + count * sizeof(*device->recording->changed.vs_consts_f)); + return WINED3D_OK; + } + + memcpy(&device->state.vs_consts_f[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { for (i = 0; i < count; ++i) TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i])); } - if (device->recording) - memset(&device->recording->changed.vs_consts_f[start_idx], 1, - count * sizeof(*device->recording->changed.vs_consts_f)); - else - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4ead27b..f28c29c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -706,9 +706,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { unsigned int idx = stateblock->contained_vs_consts_f[i]; - TRACE("Setting vs_consts_f[%u] to %s.\n", idx, debug_vec4(&src_state->vs_consts_f[idx])); + TRACE("Setting vs_consts_f[%u] to %s.\n", idx, debug_vec4(&state->vs_consts_f[idx])); - stateblock->state.vs_consts_f[idx] = src_state->vs_consts_f[idx]; + stateblock->stateblock_state.vs_consts_f[idx] = state->vs_consts_f[idx]; } /* Vertex shader integer constants. */ @@ -1008,8 +1008,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Vertex Shader Constants. */ for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) { + state->vs_consts_f[i] = stateblock->stateblock_state.vs_consts_f[i]; wined3d_device_set_vs_consts_f(device, stateblock->contained_vs_consts_f[i], - 1, &stateblock->state.vs_consts_f[stateblock->contained_vs_consts_f[i]]); + 1, &stateblock->stateblock_state.vs_consts_f[stateblock->contained_vs_consts_f[i]]); } for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e45ee7b..047439d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2971,6 +2971,7 @@ struct wined3d_dummy_textures struct wined3d_stateblock_state { struct wined3d_shader *vs; + struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; }; struct wined3d_device

1 0

Zebediah Figura : ntoskrnl.exe: Implement plain spinlock functions on top of DPC-level ones.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: 05f5cce6c8b8bf527f1c15ee0f87c27370b301eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=05f5cce6c8b8bf527f1c15ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 20:45:33 2019 -0600 ntoskrnl.exe: Implement plain spinlock functions on top of DPC-level ones. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 31a3ad7..2a4685c 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -421,7 +421,7 @@ void WINAPI KeReleaseSpinLockFromDpcLevel( KSPIN_LOCK *lock ) void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) { TRACE("lock %p, irql %u.\n", lock, irql); - InterlockedExchangePointer( (void **)lock, 0 ); + KeReleaseSpinLockFromDpcLevel( lock ); } /*********************************************************************** @@ -430,8 +430,7 @@ void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) KIRQL WINAPI KeAcquireSpinLockRaiseToDpc( KSPIN_LOCK *lock ) { TRACE("lock %p.\n", lock); - while (!InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) - small_pause(); + KeAcquireSpinLockAtDpcLevel( lock ); return 0; } #endif

1 0

Gijs Vermeulen : msvcp: Return ERROR_INVALID_PARAMETER on NULL input in _Copy_file.
by Alexandre Julliard Jan. 28, 2019

Jan. 28, 2019

Module: wine Branch: master Commit: e978b3aa84b1d8d411e27d8d77f2e8e6b499e45f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e978b3aa84b1d8d411e27d8d… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Jan 26 22:17:55 2019 +0100 msvcp: Return ERROR_INVALID_PARAMETER on NULL input in _Copy_file. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 28 +++++++++++++--------------- dlls/msvcp90/ios.c | 3 +++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 534c015..70fc0c1 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1426,19 +1426,18 @@ static void test_tr2_sys__Copy_file(void) MSVCP_bool fail_if_exists; int last_error; int last_error2; - MSVCP_bool is_todo; } tests[] = { - { "f1", "f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_FILE_EXISTS, ERROR_FILE_EXISTS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", FALSE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, - { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED, FALSE }, - { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED, FALSE }, - { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER, TRUE }, - { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER, TRUE }, - { "not_exist", "tr2_test_dir", TRUE, ERROR_FILE_NOT_FOUND, ERROR_FILE_NOT_FOUND, FALSE }, - { "f1", "not_exist_dir\\f1_copy", TRUE, ERROR_PATH_NOT_FOUND, ERROR_FILE_NOT_FOUND, FALSE }, - { "f1", "tr2_test_dir", TRUE, ERROR_ACCESS_DENIED, ERROR_FILE_EXISTS, FALSE } + { "f1", "f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS }, + { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS }, + { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_FILE_EXISTS, ERROR_FILE_EXISTS }, + { "f1", "tr2_test_dir\\f1_copy", FALSE, ERROR_SUCCESS, ERROR_SUCCESS }, + { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, + { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, + { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER }, + { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER }, + { "not_exist", "tr2_test_dir", TRUE, ERROR_FILE_NOT_FOUND, ERROR_FILE_NOT_FOUND }, + { "f1", "not_exist_dir\\f1_copy", TRUE, ERROR_PATH_NOT_FOUND, ERROR_FILE_NOT_FOUND }, + { "f1", "tr2_test_dir", TRUE, ERROR_ACCESS_DENIED, ERROR_FILE_EXISTS } }; ret = p_tr2_sys__Make_dir("tr2_test_dir"); @@ -1453,9 +1452,8 @@ static void test_tr2_sys__Copy_file(void) for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); - todo_wine_if(tests[i].is_todo) - ok(ret == tests[i].last_error || ret == tests[i].last_error2, - "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); + ok(ret == tests[i].last_error || ret == tests[i].last_error2, + "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 743e4ca..7f792d6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14767,6 +14767,9 @@ int __cdecl tr2_sys__Copy_file(char const* source, char const* dest, MSVCP_bool { TRACE("(%s %s %x)\n", debugstr_a(source), debugstr_a(dest), fail_if_exists); + if(!source || !dest) + return ERROR_INVALID_PARAMETER; + if(CopyFileA(source, dest, fail_if_exists)) return ERROR_SUCCESS; return GetLastError();

1 0