February 2016 - Wine-Commits

Stefan Dösinger : d3d9/tests: Test multisample flip.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: ae5931a62e1f873ce963a20cfab2bbd7524b7c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5931a62e1f873ce963a20cf… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 24 22:28:09 2016 +0000 d3d9/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/d3d9/tests/visual.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b96ccd1..f531dc5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20211,6 +20211,51 @@ static void test_flip(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) + { + 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 = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + + for (i = 0; i < present_parameters.BackBufferCount; ++i) + { + hr = IDirect3DDevice9_GetBackBuffer(device, 0, i, D3DBACKBUFFER_TYPE_MONO, &back_buffers[i]); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, back_buffers[1]); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff808080, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &test_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_StretchRect(device, back_buffers[0], NULL, test_surface, NULL, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + + color = getPixelColorFromSurface(test_surface, 1, 1); + ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); + + IDirect3DSurface9_Release(test_surface); + for (i = 0; i < present_parameters.BackBufferCount; ++i) + IDirect3DSurface9_Release(back_buffers[i]); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0

Sebastian Lackner : wined3d: Fix TRACE in wined3d_texture_update_desc function.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 210069d9dcd4cfeb13c4a80e7f603a7b239d03ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=210069d9dcd4cfeb13c4a80e7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 26 08:00:06 2016 +0100 wined3d: Fix TRACE in wined3d_texture_update_desc function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ea19a2d..4b24c21 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -611,7 +611,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT TRACE("texture %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u, " "mem %p, pitch %u.\n", - texture, width, height, debug_d3dformat(format_id), multisample_type, multisample_type, mem, pitch); + texture, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality, mem, pitch); if (!resource_size) return WINED3DERR_INVALIDCALL;

1 0

Henri Verbeet : ddraw: Get the texture format from the texture in d3d_device3_SetTexture().
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 3d2fb4c94847c32525f70adbe9fec55f03705568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d2fb4c94847c32525f70adbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:24 2016 +0100 ddraw: Get the texture format from the texture in d3d_device3_SetTexture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a5b8445..2474e49 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4723,17 +4723,13 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) { - struct wined3d_resource *sub_resource; + struct wined3d_resource_desc desc; - if ((sub_resource = wined3d_texture_get_sub_resource(tex, 0))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(sub_resource, &desc); - ddfmt.dwSize = sizeof(ddfmt); - ddrawformat_from_wined3dformat(&ddfmt, desc.format); - if (ddfmt.u5.dwRGBAlphaBitMask) tex_alpha = TRUE; - } + wined3d_resource_get_desc(wined3d_texture_get_resource(tex), &desc); + ddfmt.dwSize = sizeof(ddfmt); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); + if (ddfmt.u5.dwRGBAlphaBitMask) + tex_alpha = TRUE; } /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */

1 0

Charles Davis : Revert "winemac.drv: Actually make the GL context current even if no drawables were given.".
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 1eeec9513c9907439d9607c18b2ba96b1890465c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eeec9513c9907439d9607c18… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 29 01:39:07 2016 -0700 Revert "winemac.drv: Actually make the GL context current even if no drawables were given.". This reverts commits 38f579f9ba0aba49788c2ce84172ae5237929ef4 and 02416314ab6fb7238b28f0047089adfee4a52abd. No extant application uses this, nor are the wined3d maintainers interested in using it. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.m | 15 ++++++--------- dlls/winemac.drv/opengl.c | 8 +------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index e1aca77..ec2b191 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -227,18 +227,15 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) { WineOpenGLContext* currentContext = (WineOpenGLContext*)[WineOpenGLContext currentContext]; - [context removeFromViews:YES]; - - if (currentContext != context) + if ([currentContext isKindOfClass:[WineOpenGLContext class]]) { - if (context) - [context makeCurrentContext]; - else - [WineOpenGLContext clearCurrentContext]; - - if ([currentContext isKindOfClass:[WineOpenGLContext class]]) + [WineOpenGLContext clearCurrentContext]; + if (currentContext != context) [currentContext removeFromViews:YES]; } + + if (context) + [context removeFromViews:YES]; } [pool release]; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index f0c7048..ab79a82 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3057,13 +3057,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w return TRUE; } - if (!draw_hdc && !read_hdc) - { - context->draw_hwnd = NULL; - context->draw_view = NULL; - context->draw_pbuffer = NULL; - } - else if ((hwnd = WindowFromDC(draw_hdc))) + if ((hwnd = WindowFromDC(draw_hdc))) { if (!(data = get_win_data(hwnd))) {

1 0

Frédéric Delanoy : advapi32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 1bccc8b027e80e467a402f811aee349d08aee1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bccc8b027e80e467a402f811… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 27 15:27:31 2016 +0100 advapi32/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 658b356..4b3b4e9 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2665,8 +2665,8 @@ static void test_redirection(void) check_key_value( key, "Winetest", 0, ptr_size ); check_key_value( key, "Winetest", KEY_WOW64_64KEY, is_vista ? 64 : ptr_size ); dw = get_key_value( key, "Winetest", KEY_WOW64_32KEY ); - if (ptr_size == 32) ok( dw == 32, "wrong value %u\n", dw ); - else todo_wine ok( dw == 32, "wrong value %u\n", dw ); + todo_wine_if (ptr_size != 32) + ok( dw == 32, "wrong value %u\n", dw ); RegCloseKey( key ); if (ptr_size == 32)

1 0

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

Feb. 29, 2016

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

Vincent Povirk : mscoree/tests: Loading the runtime works on x86-64 now.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 870628fd2852aa527a59df0606e26b7742257a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=870628fd2852aa527a59df060… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 26 13:08:55 2016 -0600 mscoree/tests: Loading the runtime works on x86-64 now. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 6923f2a..abe105d 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -155,9 +155,6 @@ static BOOL runtime_is_usable(void) if (!ret || exitcode != 0) { -#ifndef __i386__ - todo_wine -#endif win_skip(".NET 4.0 runtime is not usable\n"); return FALSE; }

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.6.0.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: f1157511a7f256b8e2966ba429fc665b4a0fa57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1157511a7f256b8e2966ba42… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 26 13:08:54 2016 -0600 mscoree: Update Wine Mono to 4.6.0. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 648ca1e..a39d0fb 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.5.6" -#define MONO_SHA "12ec9a4fa5958426292effd40d9230c7acbba1e8" +#define MONO_VERSION "4.6.0" +#define MONO_SHA "3a494b5b74fd17adf675a620d46b2dc1d2482424" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 8b46fd5..7181b4b 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.5.6"; + static const char* mono_version = "4.6.0"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

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

Feb. 29, 2016

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: Simplify and clean up RegDeleteTree implementation.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

Module: wine Branch: master Commit: 3f5457accf5261be302ccc0059b442250033caec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5457accf5261be302ccc005… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 26 17:02:25 2016 +0100 advapi32: Simplify and clean up RegDeleteTree implementation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 101 +++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 1e7639c..172423b 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3016,91 +3016,90 @@ LSTATUS WINAPI RegDisablePredefinedCache(void) return ERROR_SUCCESS; } + /****************************************************************************** * RegDeleteTreeW [ADVAPI32.@] * */ -LSTATUS WINAPI RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) +LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey ) { + static const WCHAR emptyW[] = {0}; + DWORD name_size, max_name, max_subkey; + WCHAR *name_buf = NULL; LONG ret; - DWORD dwMaxSubkeyLen, dwMaxValueLen; - DWORD dwMaxLen, dwSize; - WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; - HKEY hSubKey = hKey; - TRACE("(hkey=%p,%p %s)\n", hKey, lpszSubKey, debugstr_w(lpszSubKey)); + TRACE( "(%p, %s)\n", hkey, debugstr_w(subkey) ); - if(lpszSubKey) + if (subkey) { - ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + ret = RegOpenKeyExW( hkey, subkey, 0, KEY_READ, &hkey ); if (ret) return ret; } - /* Get highest length for keys, values */ - ret = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, - &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); - if (ret) goto cleanup; + ret = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, &max_subkey, + NULL, NULL, &max_name, NULL, NULL, NULL ); + if (ret) + goto cleanup; - dwMaxSubkeyLen++; - dwMaxValueLen++; - dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); - if (dwMaxLen > sizeof(szNameBuf)/sizeof(WCHAR)) + max_name = max( max_subkey, max_name ) + 1; + if (!(name_buf = heap_alloc( max_name * sizeof(WCHAR) ))) { - /* Name too big: alloc a buffer for it */ - if (!(lpszName = heap_alloc( dwMaxLen*sizeof(WCHAR)))) - { - ret = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; } + /* Recursively delete subkeys */ + for (;;) + { + name_size = max_name; + ret = RegEnumKeyExW( hkey, 0, name_buf, &name_size, NULL, NULL, NULL, NULL ); + if (ret == ERROR_NO_MORE_ITEMS) break; + if (ret) goto cleanup; + ret = RegDeleteTreeW( hkey, name_buf ); + if (ret) goto cleanup; + } - /* Recursively delete all the subkeys */ - while (TRUE) + /* Delete the key itself */ + if (subkey) { - dwSize = dwMaxLen; - if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, - NULL, NULL, NULL)) break; + ret = RegDeleteKeyW( hkey, emptyW ); + goto cleanup; + } - ret = RegDeleteTreeW(hSubKey, lpszName); + /* Delete values */ + for (;;) + { + name_size = max_name; + ret = RegEnumValueW( hkey, 0, name_buf, &name_size, NULL, NULL, NULL, NULL ); + if (ret == ERROR_NO_MORE_ITEMS) break; + if (ret) goto cleanup; + ret = RegDeleteValueW( hkey, name_buf ); if (ret) goto cleanup; } - if (lpszSubKey) - ret = RegDeleteKeyW(hKey, lpszSubKey); - else - while (TRUE) - { - dwSize = dwMaxLen; - if (RegEnumValueW(hKey, 0, lpszName, &dwSize, - NULL, NULL, NULL, NULL)) break; - - ret = RegDeleteValueW(hKey, lpszName); - if (ret) goto cleanup; - } + ret = ERROR_SUCCESS; cleanup: - /* Free buffer if allocated */ - if (lpszName != szNameBuf) - heap_free( lpszName); - if(lpszSubKey) - RegCloseKey(hSubKey); + heap_free( name_buf ); + if (subkey) + RegCloseKey( hkey ); return ret; } + /****************************************************************************** * RegDeleteTreeA [ADVAPI32.@] * */ -LSTATUS WINAPI RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) +LSTATUS WINAPI RegDeleteTreeA( HKEY hkey, const char *subkey ) { + UNICODE_STRING subkeyW; LONG ret; - UNICODE_STRING lpszSubKeyW; - if (lpszSubKey) RtlCreateUnicodeStringFromAsciiz( &lpszSubKeyW, lpszSubKey); - else lpszSubKeyW.Buffer = NULL; - ret = RegDeleteTreeW( hKey, lpszSubKeyW.Buffer); - RtlFreeUnicodeString( &lpszSubKeyW ); + if (subkey) RtlCreateUnicodeStringFromAsciiz( &subkeyW, subkey ); + else subkeyW.Buffer = NULL; + ret = RegDeleteTreeW( hkey, subkeyW.Buffer ); + RtlFreeUnicodeString( &subkeyW ); return ret; }

1 0