February 2016 - Wine-commits

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

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

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 : winemono.php: Set default version to 4.6.0.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: tools Branch: master Commit: 469e5f61871de1f70c6f8bd6149ab305d67c3ced URL: http://source.winehq.org/git/tools.git/?a=commit;h=469e5f61871de1f70c6f8bd6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 26 13:11:41 2016 -0600 winemono.php: Set default version to 4.6.0. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winemono.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winemono.php b/winemono.php index 799c3d7..9938574 100644 --- a/winemono.php +++ b/winemono.php @@ -4,7 +4,7 @@ */ // Default version if none given -$sVersion = '4.5.6'; +$sVersion = '4.6.0'; // Suffix appended to base name of file $sFileSuffix = '';

1 0

Francois Gouget : testbot: Better identify and diagnose task errors.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: tools Branch: master Commit: 363811afaca48bf69ec473b65e18b00d48390b6a URL: http://source.winehq.org/git/tools.git/?a=commit;h=363811afaca48bf69ec473b6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 29 01:32:52 2016 +0100 testbot: Better identify and diagnose task errors. In particular when a TestAgent error occurs and the VM host is not accessible anymore, mark it as offline and requeue the task so it is re-run later on. Also check if the VM is still running and report accordingly. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 348 +++++++++++++++++++++---------------- testbot/bin/WineRunReconfig.pl | 349 +++++++++++++++++++++---------------- testbot/bin/WineRunTask.pl | 380 ++++++++++++++++++++++++----------------- 3 files changed, 632 insertions(+), 445 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=363811afaca48bf69ec4…

1 0

Francois Gouget : testbot/RevertVM: Fix a few error messages.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: tools Branch: master Commit: ed211ed0f09a7f3a2dedfe2555e06290ddfe0a36 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ed211ed0f09a7f3a2dedfe25… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 29 01:33:07 2016 +0100 testbot/RevertVM: Fix a few error messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/RevertVM.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index e8e7a87..da43f22 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -59,7 +59,7 @@ sub Error(@) sub FatalError($$) { my ($ErrMessage, $VM) = @_; - Error "$Name0:error: $ErrMessage"; + Error $ErrMessage; # Get the up-to-date VM status and update it if nobody else changed it my $VMKey = $VM->GetKey(); @@ -176,7 +176,7 @@ Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); $ErrMessage = $VM->RevertToSnapshot($VM->IdleSnapshot); if (defined($ErrMessage)) { - FatalError "Can't revert $VMKey to " . $VM->IdleSnapshot . ": $ErrMessage", + FatalError "Could not revert $VMKey to " . $VM->IdleSnapshot . ": $ErrMessage\n", $VM; } @@ -187,7 +187,7 @@ $VM->Status("sleeping"); (my $ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) { - FatalError "Can't change status for VM $VMKey: $ErrMessage", $VM; + FatalError "Could not change status for VM $VMKey: $ErrMessage\n", $VM; } Debug(Elapsed($Start), " Trying the TestAgent connection\n"); @@ -199,7 +199,7 @@ $TA->Disconnect(); if (!$Success) { $ErrMessage = $TA->GetLastError(); - FatalError "Tools in $VMKey not responding: $ErrMessage", $VM; + FatalError "Tools in $VMKey not responding: $ErrMessage\n", $VM; } if ($SleepAfterRevert != 0) @@ -218,7 +218,7 @@ $VM->ChildPid(undef); ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) { - FatalError "Can't change status for VM $VMKey: $ErrMessage", $VM; + FatalError "Could not change status for VM $VMKey: $ErrMessage\n", $VM; } LogMsg "Revert of $VMKey completed\n";

1 0

Jeremy Newman : fix dev guide redir
by Jeremy Newman 26 Feb '16

26 Feb '16

Module: website Branch: master Commit: c2ab97f26e19a7d814c8ff941ffdf1e38406e7f0 URL: http://source.winehq.org/git/website.git/?a=commit;h=c2ab97f26e19a7d814c8ff… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 26 11:02:58 2016 -0600 fix dev guide redir Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/htaccess.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index 5d47559..9478290 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -73,7 +73,7 @@ RedirectMatch ^/wineconf/?$ https://wiki.winehq.org/WineConf # fix documentation links RedirectMatch ^/docs/wineusr-guide$ https://wiki.winehq.org/Wine_User%27s_Guide RedirectMatch ^/docs/winelib-guide$ https://wiki.winehq.org/Winelib_User%27s_Guide -RedirectMatch ^/docs/winedev-guide$ https://wiki.winehq.org/Developer%27s_Guide +RedirectMatch ^/docs/winedev-guide$ https://wiki.winehq.org/Wine_Developer%27s_Guide RedirectMatch ^/site/docs$ https://www.winehq.org/documentation RedirectMatch ^/docs$ https://www.winehq.org/documentation RedirectMatch ^/Docs/(\w+-\w+)/$ https://www.winehq.org/docs/$1/index

1 0

Jeremy Newman : encode the urls
by Jeremy Newman 26 Feb '16

26 Feb '16

Module: website Branch: master Commit: 2842efec2a707f765c457711184adf49ebb05720 URL: http://source.winehq.org/git/website.git/?a=commit;h=2842efec2a707f765c4577… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 26 10:59:51 2016 -0600 encode the urls Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/htaccess.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index c62e4fa..5d47559 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -71,9 +71,9 @@ RedirectMatch ^/site/wineconf/?$ https://wiki.winehq.org/WineConf RedirectMatch ^/wineconf/?$ https://wiki.winehq.org/WineConf # fix documentation links -RedirectMatch ^/docs/wineusr-guide$ https://wiki.winehq.org/Wine User's Guide -RedirectMatch ^/docs/winelib-guide$ https://wiki.winehq.org/Winelib User's Guide -RedirectMatch ^/docs/winedev-guide$ https://wiki.winehq.org/Developer's Guide +RedirectMatch ^/docs/wineusr-guide$ https://wiki.winehq.org/Wine_User%27s_Guide +RedirectMatch ^/docs/winelib-guide$ https://wiki.winehq.org/Winelib_User%27s_Guide +RedirectMatch ^/docs/winedev-guide$ https://wiki.winehq.org/Developer%27s_Guide RedirectMatch ^/site/docs$ https://www.winehq.org/documentation RedirectMatch ^/docs$ https://www.winehq.org/documentation RedirectMatch ^/Docs/(\w+-\w+)/$ https://www.winehq.org/docs/$1/index

1 0

Rosanne DiMesio : Update redirects for guides
by Jeremy Newman 26 Feb '16

26 Feb '16

Module: website Branch: master Commit: f980d46b445b03feb1bae1355a5d4d3afd108e40 URL: http://source.winehq.org/git/website.git/?a=commit;h=f980d46b445b03feb1bae1… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Feb 26 10:50:37 2016 -0600 Update redirects for guides The Wine User's Guide, Winelib User's Guide, and Developer's Guide are now on the wiki. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/htaccess.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index e969153..c62e4fa 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -71,9 +71,9 @@ RedirectMatch ^/site/wineconf/?$ https://wiki.winehq.org/WineConf RedirectMatch ^/wineconf/?$ https://wiki.winehq.org/WineConf # fix documentation links -RedirectMatch ^/docs/wineusr-guide$ https://www.winehq.org/docs/wineusr-guide/index -RedirectMatch ^/docs/winelib-guide$ https://www.winehq.org/docs/winelib-guide/index -RedirectMatch ^/docs/winedev-guide$ https://www.winehq.org/docs/winedev-guide/index +RedirectMatch ^/docs/wineusr-guide$ https://wiki.winehq.org/Wine User's Guide +RedirectMatch ^/docs/winelib-guide$ https://wiki.winehq.org/Winelib User's Guide +RedirectMatch ^/docs/winedev-guide$ https://wiki.winehq.org/Developer's Guide RedirectMatch ^/site/docs$ https://www.winehq.org/documentation RedirectMatch ^/docs$ https://www.winehq.org/documentation RedirectMatch ^/Docs/(\w+-\w+)/$ https://www.winehq.org/docs/$1/index

1 0

Michael Müller : user32: Preserve beginning of extra data for MDI windows.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Module: wine Branch: master Commit: 3c888a74c5c5811c46f09fc9a598fad722e9727b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c888a74c5c5811c46f09fc9a… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 26 07:24:51 2016 +0100 user32: Preserve beginning of extra data for MDI windows. 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/user32/mdi.c | 1 + dlls/user32/tests/msg.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b5a0473..b360528 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -127,6 +127,7 @@ typedef struct * states it must keep coherency with USER32 on its own. This is true for * Windows as well. */ + LONG reserved; UINT nActiveChildren; HWND hwndChildMaximized; HWND hwndActiveChild; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 94fe4cb..98bf53d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3380,6 +3380,7 @@ static void test_mdi_messages(void) BOOL zoomed; RECT rc; HMENU hMenu = CreateMenu(); + LONG val; if (!mdi_RegisterWindowClasses()) assert(0); @@ -3408,8 +3409,9 @@ static void test_mdi_messages(void) rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, mdi_frame, 0, GetModuleHandleA(0), &client_cs); assert(mdi_client); - ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); + SetWindowLongA(mdi_client, 0, 0xdeadbeef); + ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow()); ok(GetFocus() == mdi_frame, "input focus should be on MDI frame not on %p\n", GetFocus()); @@ -3867,6 +3869,8 @@ static void test_mdi_messages(void) SetFocus(0); flush_sequence(); + val = GetWindowLongA(mdi_client, 0); + ok(val == 0xdeadbeef || broken(val == 0) /* >= Win Vista */, "Expected 0xdeadbeef, got 0x%x\n", val); DestroyWindow(mdi_client); ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE);

1 0