February 2016 - Wine-commits

Stefan Dösinger : d3d8/tests: Test multisample flip.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 9307474f1d49881aa72032d38489a77f4d1ada55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9307474f1d49881aa72032d38… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 24 22:28:10 2016 +0000 d3d8/tests: Test multisample flip. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index bb644d3..8ba6ccd 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8067,6 +8067,51 @@ static void test_flip(void) refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisample flip test.\n"); + goto done; + } + + present_parameters.BackBufferCount = 2; + present_parameters.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; + present_parameters.Flags = 0; + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + + for (i = 0; i < present_parameters.BackBufferCount; ++i) + { + hr = IDirect3DDevice8_GetBackBuffer(device, i, D3DBACKBUFFER_TYPE_MONO, &back_buffers[i]); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + } + + hr = IDirect3DDevice8_SetRenderTarget(device, back_buffers[1], NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, TRUE, &test_surface); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DDevice8_CopyRects(device, back_buffers[0], NULL, 0, test_surface, NULL); + ok(SUCCEEDED(hr), "CopyRects failed, hr %#x.\n", hr); + + color = get_surface_color(test_surface, 1, 1); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + IDirect3DSurface8_Release(test_surface); + for (i = 0; i < present_parameters.BackBufferCount; ++i) + IDirect3DSurface8_Release(back_buffers[i]); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: IDirect3D8_Release(d3d); DestroyWindow(window); }

1 0

Stefan Dösinger : d3d10core/tests: Test swapchain buffer cycling.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 402ffb9c6060fd6362389916ffb84d54ff571a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402ffb9c6060fd6362389916f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 24 22:28:11 2016 +0000 d3d10core/tests: Test swapchain buffer cycling. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 344 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 316 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=402ffb9c6060fd6362389…

1 0

Frédéric Delanoy : dxgi/tests: Use todo_wine_if( ) in tests.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: d00254842b6af321a6e999b5b2ad789c0fabd634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00254842b6af321a6e999b5b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 27 14:44:21 2016 +0100 dxgi/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index dd5da83..7b052d3 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -478,19 +478,13 @@ static void test_createswapchain(void) hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - if (refresh_list[i].numerator_should_pass) + todo_wine_if (!refresh_list[i].numerator_should_pass) ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); - else - todo_wine ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, - "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); - if (refresh_list[i].denominator_should_pass) + todo_wine_if (!refresh_list[i].denominator_should_pass) ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, "Denominator %u is %u.\n", i ,result_desc.BufferDesc.RefreshRate.Denominator); - else - todo_wine ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, - "Denominator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Denominator); IDXGISwapChain_Release(swapchain); } @@ -508,19 +502,13 @@ static void test_createswapchain(void) hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - if (refresh_list[i].numerator_should_pass) + todo_wine_if (!refresh_list[i].numerator_should_pass) ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); - else - todo_wine ok(result_desc.BufferDesc.RefreshRate.Numerator == refresh_list[i].numerator, - "Numerator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Numerator); - if (refresh_list[i].denominator_should_pass) + todo_wine_if (!refresh_list[i].denominator_should_pass) ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, "Denominator %u is %u.\n", i ,result_desc.BufferDesc.RefreshRate.Denominator); - else - todo_wine ok(result_desc.BufferDesc.RefreshRate.Denominator == refresh_list[i].denominator, - "Denominator %u is %u.\n", i, result_desc.BufferDesc.RefreshRate.Denominator); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr);

1 0

Huw Davies : riched20/tests: Actually copy something to the clipboard.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 9a934a3198f72f2752b08d105cd20cb19edbd52a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a934a3198f72f2752b08d105… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 29 12:06:23 2016 +0000 riched20/tests: Actually copy something to the clipboard. Previously this test was relying on a quirk - pasting with an empty clipboard generated an undo event. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e32d403..85f057e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3281,11 +3281,12 @@ static void test_EM_SETUNDOLIMIT(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"x"); cr.cpMin = 0; - cr.cpMax = 1; + cr.cpMax = -1; + SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); + SendMessageA(hwndRichEdit, WM_COPY, 0, 0); /*Load "x" into the clipboard. Paste is an easy, undo'able operation. also, multiple pastes don't combine like WM_CHAR would */ - SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); /* first case - check the default */ SendMessageA(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0,0);

1 0

Huw Davies : riched20/tests: wAlignment should be compared to the PFA_ values.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: aec411ed3e45e466b710644641a1e6a74c70b00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec411ed3e45e466b71064464… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 29 12:06:24 2016 +0000 riched20/tests: wAlignment should be compared to the PFA_ values. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 85f057e..6e0585a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8220,7 +8220,7 @@ static void test_alignment_style(void) pf.cbSize = sizeof(PARAFORMAT2); pf.dwMask = -1; SendMessageW(richedit, EM_GETPARAFORMAT, SCF_SELECTION, (LPARAM)&pf); - ok(pf.wAlignment == ES_CENTER, "got %d expected ES_CENTER\n", pf.wAlignment); + ok(pf.wAlignment == PFA_LEFT, "got %d expected PFA_LEFT\n", pf.wAlignment); DestroyWindow(richedit); }

1 0

Huw Davies : riched20: Don' t apply paragraph formatting until the end of paragraph.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 372a16af63717cc2a66a5a981e39079b854bcda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=372a16af63717cc2a66a5a981… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 29 12:06:25 2016 +0000 riched20: Don't apply paragraph formatting until the end of paragraph. Specifically this means that if the final paragraph does not end in a trailing \par, then new formatting is not applied to that paragraph. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 252 ++++++++++++++++++------------------------- dlls/riched20/reader.c | 7 ++ dlls/riched20/rtf.h | 2 + dlls/riched20/tests/editor.c | 27 ++++- 4 files changed, 140 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=372a16af63717cc2a66a5…

1 0

Alexandre Julliard : makefiles: Don' t generate global rules in disabled directories.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: dcc16c7cac1cbf93096b072fe2f7b32ad08d1fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc16c7cac1cbf93096b072fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 29 15:06:42 2016 +0900 makefiles: Don't generate global rules in disabled directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + aclocal.m4 | 15 ++++++------- configure | 17 ++++++++------- tools/makedep.c | 66 ++++++++++++++++++++++++++++++++++----------------------- 4 files changed, 57 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcc16c7cac1cbf93096b0…

1 0

Sebastian Lackner : advapi32/tests: Improve RegDeleteTree tests.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: ae0dc70bb0a95c727d9ce6bba32fe61eae2dd03a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0dc70bb0a95c727d9ce6bba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 26 16:58:23 2016 +0100 advapi32/tests: Improve RegDeleteTree tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index ef5d989..183e538 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -41,7 +41,7 @@ static const char * sTestpath2 = "%FOO%\\subdir1"; static const DWORD ptr_size = 8 * sizeof(void*); static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); -static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); +static LONG (WINAPI *pRegDeleteTreeA)(HKEY,const char *); static DWORD (WINAPI *pRegDeleteKeyExA)(HKEY,LPCSTR,REGSAM,DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); @@ -2083,6 +2083,7 @@ static void test_reg_delete_tree(void) { CHAR buffer[MAX_PATH]; HKEY subkey, subkey2; + DWORD dwsize, type; LONG size, ret; if(!pRegDeleteTreeA) { @@ -2128,7 +2129,9 @@ static void test_reg_delete_tree(void) ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ret = RegCloseKey(subkey2); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - ret = RegSetValueA(subkey, "value", REG_SZ, "data2", 5); + ret = RegSetValueA(subkey, NULL, REG_SZ, "data", 4); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueExA(subkey, "value", 0, REG_SZ, (const BYTE *)"data2", 5); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ret = pRegDeleteTreeA(subkey, NULL); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); @@ -2143,8 +2146,8 @@ static void test_reg_delete_tree(void) ok(ret == ERROR_SUCCESS, "Default value of subkey is not present\n"); ok(!buffer[0], "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer); - size = MAX_PATH; - ok(RegQueryValueA(subkey, "value", buffer, &size), + dwsize = MAX_PATH; + ok(RegQueryValueExA(subkey, "value", NULL, &type, (BYTE *)buffer, &dwsize), "Value is still present\n"); ret = pRegDeleteTreeA(hkey_main, "not-here");

1 0

Sebastian Lackner : advapi32/tests: Add tests for RegCopyTree.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 8358fd1c263c5ce7f9e6e2121326bf1a5f334abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8358fd1c263c5ce7f9e6e2121… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 26 16:59:06 2016 +0100 advapi32/tests: Add tests for RegCopyTree. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 98 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 183e538..d29e131 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -41,6 +41,7 @@ static const char * sTestpath2 = "%FOO%\\subdir1"; static const DWORD ptr_size = 8 * sizeof(void*); static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); +static LONG (WINAPI *pRegCopyTreeA)(HKEY,const char *,HKEY); static LONG (WINAPI *pRegDeleteTreeA)(HKEY,const char *); static DWORD (WINAPI *pRegDeleteKeyExA)(HKEY,LPCSTR,REGSAM,DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); @@ -135,6 +136,7 @@ static void InitFunctionPtrs(void) /* This function was introduced with Windows 2003 SP1 */ ADVAPI32_GET_PROC(RegGetValueA); + ADVAPI32_GET_PROC(RegCopyTreeA); ADVAPI32_GET_PROC(RegDeleteTreeA); ADVAPI32_GET_PROC(RegDeleteKeyExA); ADVAPI32_GET_PROC(RegDeleteKeyValueA); @@ -2079,6 +2081,101 @@ static void test_string_termination(void) RegCloseKey(subkey); } +static void test_reg_copy_tree(void) +{ + HKEY src, dst, subkey; + CHAR buffer[MAX_PATH]; + DWORD dwsize, type; + LONG size, ret; + + if (!pRegCopyTreeA) + { + skip("Skipping RegCopyTreeA tests, function not present\n"); + return; + } + + ret = RegCreateKeyA(hkey_main, "src", &src); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCreateKeyA(hkey_main, "dst", &dst); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + /* Copy nonexistent subkey */ + ret = pRegCopyTreeA(src, "nonexistent_subkey", dst); + ok(ret == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret); + + /* Create test keys and values */ + ret = RegSetValueA(src, NULL, REG_SZ, "data", 4); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueExA(src, "value", 0, REG_SZ, (const BYTE *)"data2", 5); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegCreateKeyA(src, "subkey2", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueA(subkey, NULL, REG_SZ, "data3", 5); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueExA(subkey, "value", 0, REG_SZ, (const BYTE *)"data4", 5); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegCreateKeyA(src, "subkey3", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + /* Copy subkey */ + ret = pRegCopyTreeA(src, "subkey2", dst); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + size = MAX_PATH; + ret = RegQueryValueA(dst, NULL, buffer, &size); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!strcmp(buffer, "data3"), "Expected 'data3', got '%s'\n", buffer); + + dwsize = MAX_PATH; + ret = RegQueryValueExA(dst, "value", NULL, &type, (BYTE *)buffer, &dwsize); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); + ok(!strcmp(buffer, "data4"), "Expected 'data4', got '%s'\n", buffer); + + /* Copy full tree */ + ret = pRegCopyTreeA(src, NULL, dst); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + size = MAX_PATH; + ret = RegQueryValueA(dst, NULL, buffer, &size); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!strcmp(buffer, "data"), "Expected 'data', got '%s'\n", buffer); + + dwsize = MAX_PATH; + ret = RegQueryValueExA(dst, "value", NULL, &type, (BYTE *)buffer, &dwsize); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); + ok(!strcmp(buffer, "data2"), "Expected 'data2', got '%s'\n", buffer); + + ret = RegOpenKeyA(dst, "subkey2", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + size = MAX_PATH; + ret = RegQueryValueA(subkey, NULL, buffer, &size); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!strcmp(buffer, "data3"), "Expected 'data3', got '%s'\n", buffer); + dwsize = MAX_PATH; + ret = RegQueryValueExA(subkey, "value", NULL, &type, (BYTE *)buffer, &dwsize); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(type == REG_SZ, "Expected REG_SZ, got %u\n", type); + ok(!strcmp(buffer, "data4"), "Expected 'data4', got '%s'\n", buffer); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegOpenKeyA(dst, "subkey3", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + delete_key(src); + delete_key(dst); +} + static void test_reg_delete_tree(void) { CHAR buffer[MAX_PATH]; @@ -3320,6 +3417,7 @@ START_TEST(registry) test_reg_save_key(); test_reg_load_key(); test_reg_unload_key(); + test_reg_copy_tree(); test_reg_delete_tree(); test_rw_order(); test_deleted_key();

1 0

Michael Müller : advapi32: Implement RegCopyTreeA/W.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 6b7c576bc5abd8091ba6c41c28f92e91e380de4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b7c576bc5abd8091ba6c41c2… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 26 17:00:05 2016 +0100 advapi32: Implement RegCopyTreeA/W. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 +- dlls/advapi32/registry.c | 95 ++++++++++++++++++++++ dlls/advapi32/tests/registry.c | 2 +- .../api-ms-win-core-registry-l1-1-0.spec | 2 +- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- 5 files changed, 100 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 88f7fee..08f799d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -575,8 +575,8 @@ @ stdcall RegConnectRegistryW(wstr long ptr) # @ stub RegConnectRegistryExA # @ stub RegConnectRegistryExW -# @ stub RegCopyTreeA -# @ stub RegCopyTreeW +@ stdcall RegCopyTreeA(long str long) +@ stdcall RegCopyTreeW(long wstr long) @ stdcall RegCreateKeyA(long str ptr) @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 3508407..1e7639c 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3104,6 +3104,101 @@ LSTATUS WINAPI RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) return ret; } + +/****************************************************************************** + * RegCopyTreeW [ADVAPI32.@] + * + */ +LONG WINAPI RegCopyTreeW( HKEY hsrc, const WCHAR *subkey, HKEY hdst ) +{ + DWORD name_size, max_name; + DWORD value_size, max_value; + DWORD max_subkey, i, type; + WCHAR *name_buf = NULL; + BYTE *value_buf = NULL; + HKEY hkey; + LONG ret; + + TRACE( "(%p, %s, %p)\n", hsrc, debugstr_w(subkey), hdst ); + + if (subkey) + { + ret = RegOpenKeyExW( hsrc, subkey, 0, KEY_READ, &hsrc ); + if (ret) return ret; + } + + ret = RegQueryInfoKeyW( hsrc, NULL, NULL, NULL, NULL, &max_subkey, + NULL, NULL, &max_name, &max_value, NULL, NULL ); + if (ret) + goto cleanup; + + max_name = max( max_subkey, max_name ) + 1; + if (!(name_buf = heap_alloc( max_name * sizeof(WCHAR) ))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + + if (!(value_buf = heap_alloc( max_value ))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + + /* Copy values */ + for (i = 0;; i++) + { + name_size = max_name; + value_size = max_value; + ret = RegEnumValueW( hsrc, i, name_buf, &name_size, NULL, &type, value_buf, &value_size ); + if (ret == ERROR_NO_MORE_ITEMS) break; + if (ret) goto cleanup; + ret = RegSetValueExW( hdst, name_buf, 0, type, value_buf, value_size ); + if (ret) goto cleanup; + } + + /* Recursively copy subkeys */ + for (i = 0;; i++) + { + name_size = max_name; + ret = RegEnumKeyExW( hsrc, i, name_buf, &name_size, NULL, NULL, NULL, NULL ); + if (ret == ERROR_NO_MORE_ITEMS) break; + if (ret) goto cleanup; + ret = RegCreateKeyExW( hdst, name_buf, 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL ); + if (ret) goto cleanup; + ret = RegCopyTreeW( hsrc, name_buf, hkey ); + RegCloseKey( hkey ); + if (ret) goto cleanup; + } + + ret = ERROR_SUCCESS; + +cleanup: + heap_free( name_buf ); + heap_free( value_buf ); + if (subkey) + RegCloseKey( hsrc ); + return ret; +} + + +/****************************************************************************** + * RegCopyTreeA [ADVAPI32.@] + * + */ +LONG WINAPI RegCopyTreeA( HKEY hsrc, const char *subkey, HKEY hdst ) +{ + UNICODE_STRING subkeyW; + LONG ret; + + if (subkey) RtlCreateUnicodeStringFromAsciiz( &subkeyW, subkey ); + else subkeyW.Buffer = NULL; + ret = RegCopyTreeW( hsrc, subkeyW.Buffer, hdst ); + RtlFreeUnicodeString( &subkeyW ); + return ret; +} + + /****************************************************************************** * RegDisableReflectionKey [ADVAPI32.@] * diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d29e131..658b356 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2090,7 +2090,7 @@ static void test_reg_copy_tree(void) if (!pRegCopyTreeA) { - skip("Skipping RegCopyTreeA tests, function not present\n"); + win_skip("Skipping RegCopyTreeA tests, function not present\n"); return; } diff --git a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec index d83fbdd..91b1a94 100644 --- a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec +++ b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall RegCloseKey(long) advapi32.RegCloseKey -@ stub RegCopyTreeW +@ stdcall RegCopyTreeW(long wstr long) advapi32.RegCopyTreeW @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW @ stdcall RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 4105e59..e1b4663 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -84,7 +84,7 @@ @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) advapi32.PrivilegedServiceAuditAlarmW @ stub QuerySecurityAccessMask @ stdcall RegCloseKey(long) advapi32.RegCloseKey -@ stub RegCopyTreeW +@ stdcall RegCopyTreeW(long wstr long) advapi32.RegCopyTreeW @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW @ stdcall RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA

1 0