wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Henri Verbeet : wined3d: Introduce wined3d_texture_set_sub_resource_parent ().
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 5c1976c43b05c4ba8c83acd4ff53bebe3c4acfb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1976c43b05c4ba8c83acd4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:21 2016 +0100 wined3d: Introduce wined3d_texture_set_sub_resource_parent(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 +++--- dlls/wined3d/texture.c | 16 ++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a5b18a2..78d3b11 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1266,7 +1266,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, src_rtv, FALSE); wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; - wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); + wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); if (src_impl->sub_resource_idx) @@ -1297,7 +1297,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, src_rtv, FALSE); wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; - wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); + wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); ddraw_texture = prev_ddraw_texture; @@ -1314,7 +1314,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, tmp_rtv, FALSE); wined3d_rendertarget_view_set_parent(tmp_rtv, src_impl); src_impl->wined3d_rtv = tmp_rtv; - wined3d_resource_set_parent(wined3d_texture_get_sub_resource(texture, 0), src_impl); + wined3d_texture_set_sub_resource_parent(texture, 0, src_impl); wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); src_impl->wined3d_texture = texture; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0533f99..76cdc72 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1537,6 +1537,22 @@ void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *tex return texture->sub_resources[sub_resource_idx].resource->parent; } +void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, + unsigned int sub_resource_idx, void *parent) +{ + unsigned int sub_count = texture->level_count * texture->layer_count; + + TRACE("texture %p, sub_resource_idx %u, parent %p.\n", texture, sub_resource_idx, parent); + + if (sub_resource_idx >= sub_count) + { + WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + return; + } + + texture->sub_resources[sub_resource_idx].resource->parent = parent; +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c31ad7b..0d6ce42 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,6 +259,7 @@ @ cdecl wined3d_texture_set_color_key(ptr long ptr) @ cdecl wined3d_texture_set_lod(ptr long) @ cdecl wined3d_texture_set_overlay_position(ptr long long long) +@ cdecl wined3d_texture_set_sub_resource_parent(ptr long ptr) @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) @ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 44b54e0..b892102 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2458,6 +2458,8 @@ HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); HRESULT __cdecl wined3d_texture_set_overlay_position(struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG x, LONG y); +void __cdecl wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, + unsigned int sub_resource_idx, void *parent); HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality,

1 0

Charles Davis : winebuild: Specify an object format to windres.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 77960ab755833f9e2eac01d3132c2206882d2698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77960ab755833f9e2eac01d31… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 29 01:49:58 2016 -0700 winebuild: Specify an object format to windres. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/res32.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index d459a5f..c59fa19 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -623,6 +623,7 @@ void output_res_o_file( DLLSPEC *spec ) { unsigned int i; char *res_file = NULL; + const char *format; int fd; struct strarray *args; @@ -681,7 +682,21 @@ void output_res_o_file( DLLSPEC *spec ) free( output_buffer ); args = find_tool( "windres", NULL ); + switch (target_cpu) + { + case CPU_x86: + format = "pe-i386"; + break; + case CPU_x86_64: + format = "pe-x86-64"; + break; + default: + format = NULL; + break; + } strarray_add( args, "-i", res_file, "-o", output_file_name, NULL ); + if (format) + strarray_add( args, "-F", format, NULL ); spawn( args ); strarray_free( args );

1 0

Charles Davis : configure: Check for __builtin_ms_va_list on all x86_64 platforms.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 7d295d381c003eb2e43e781b818e5eaeb8a27f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d295d381c003eb2e43e781b8… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 29 01:43:17 2016 -0700 configure: Check for __builtin_ms_va_list on all x86_64 platforms. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 33 +++++++++++---------------------- configure.ac | 31 +++++++++++-------------------- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/configure b/configure index be1e2f1..7bf9178 100755 --- a/configure +++ b/configure @@ -4965,25 +4965,15 @@ fi case $host in *-darwin*) - if test "x$enable_win64" = "xyes" - then - CC="$CC -m64" - CXX="$CXX -m64" - host_cpu="x86_64" - notice_platform="64-bit " - TARGETFLAGS="-m64" - - else - CC="$CC -m32" - CXX="$CXX -m32" - host_cpu="i386" - notice_platform="32-bit " - TARGETFLAGS="-m32" - - enable_win16=${enable_win16:-yes} - fi with_fontconfig=${with_fontconfig:-no} ;; + *-mingw32*|*-cygwin*) + enable_win16=${enable_win16:-no} + CFLAGS="$CFLAGS -D_WIN32" + ;; +esac + +case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then @@ -5040,11 +5030,14 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "You need gcc >= 4.4 to build Wine as 64-bit." "$LINENO" 5 + as_fn_error $? "You need gcc >= 4.4 or clang >= 3.8 to build Wine as 64-bit." "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + CC="$CC -m64" + CXX="$CXX -m64" host_cpu="x86_64" + notice_platform="64-bit " TARGETFLAGS="-m64" fi @@ -5077,10 +5070,6 @@ rm -f core conftest.err conftest.$ac_objext \ TARGETFLAGS="-marm" ;; - *-mingw32*|*-cygwin*) - enable_win16=${enable_win16:-no} - CFLAGS="$CFLAGS -D_WIN32" - ;; i[3456789]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/configure.ac b/configure.ac index e20cbe7..19abd08 100644 --- a/configure.ac +++ b/configure.ac @@ -127,23 +127,15 @@ AC_CHECK_TOOL(LD,ld) case $host in *-darwin*) - if test "x$enable_win64" = "xyes" - then - CC="$CC -m64" - CXX="$CXX -m64" - host_cpu="x86_64" - notice_platform="64-bit " - AC_SUBST(TARGETFLAGS,"-m64") - else - CC="$CC -m32" - CXX="$CXX -m32" - host_cpu="i386" - notice_platform="32-bit " - AC_SUBST(TARGETFLAGS,"-m32") - enable_win16=${enable_win16:-yes} - fi with_fontconfig=${with_fontconfig:-no} ;; + *-mingw32*|*-cygwin*) + enable_win16=${enable_win16:-no} + CFLAGS="$CFLAGS -D_WIN32" + ;; +esac + +case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then @@ -164,9 +156,12 @@ case $host in AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])]) + AC_MSG_ERROR([You need gcc >= 4.4 or clang >= 3.8 to build Wine as 64-bit.])]) fi + CC="$CC -m64" + CXX="$CXX -m64" host_cpu="x86_64" + notice_platform="64-bit " AC_SUBST(TARGETFLAGS,"-m64") fi ;; @@ -179,10 +174,6 @@ case $host in CFLAGS="$CFLAGS -marm" AC_SUBST(TARGETFLAGS,"-marm") ;; - *-mingw32*|*-cygwin*) - enable_win16=${enable_win16:-no} - CFLAGS="$CFLAGS -D_WIN32" - ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;;

1 0

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

29 Feb '16

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 29 Feb '16

29 Feb '16

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

Sebastian Lackner : oleaut32: Set DebugInfo for static CRITICAL_SECTION structure.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: f2e48c253603740cb7b0d5d81963c5c8c572181a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e48c253603740cb7b0d5d81… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 27 02:09:55 2016 +0100 oleaut32: Set DebugInfo for static CRITICAL_SECTION structure. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b31e8bc..6fbb320 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -45,6 +45,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); +static CRITICAL_SECTION cache_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &cache_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cache_cs") } +}; +static CRITICAL_SECTION cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, VARIANTARG* ps, VARTYPE vt) @@ -1490,7 +1499,6 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',',','$',0,'.',',' }; - static CRITICAL_SECTION csLastChars = { NULL, -1, 0, 0, 0, 0 }; static VARIANT_NUMBER_CHARS lastChars; static LCID lastLcid = -1; static DWORD lastFlags = 0; @@ -1498,14 +1506,14 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID WCHAR buff[4]; /* To make caching thread-safe, a critical section is needed */ - EnterCriticalSection(&csLastChars); + EnterCriticalSection(&cache_cs); /* Asking for default locale entries is very expensive: It is a registry server call. So cache one locally, as Microsoft does it too */ if(lcid == lastLcid && dwFlags == lastFlags) { memcpy(lpChars, &lastChars, sizeof(defaultChars)); - LeaveCriticalSection(&csLastChars); + LeaveCriticalSection(&cache_cs); return; } @@ -1532,7 +1540,7 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID memcpy(&lastChars, lpChars, sizeof(defaultChars)); lastLcid = lcid; lastFlags = dwFlags; - LeaveCriticalSection(&csLastChars); + LeaveCriticalSection(&cache_cs); } /* Number Parsing States */

1 0

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

29 Feb '16

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 29 Feb '16

29 Feb '16

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

Sebastian Lackner : advapi32: Simplify and clean up RegDeleteTree implementation.
by Alexandre Julliard 29 Feb '16

29 Feb '16

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2016