February 2016 - Wine-Commits

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

Feb. 29, 2016

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

Sebastian Lackner : advapi32/tests: Add tests for RegCopyTree.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

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

Sebastian Lackner : advapi32/tests: Improve RegDeleteTree tests.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

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

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

Feb. 29, 2016

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

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

Feb. 29, 2016

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

Vincent Povirk : winemono.php: Set default version to 4.6.0.
by Alexandre Julliard Feb. 29, 2016

Feb. 29, 2016

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

Jeremy Newman : fix dev guide redir
by Jeremy Newman Feb. 26, 2016

Feb. 26, 2016

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 Feb. 26, 2016

Feb. 26, 2016

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 Feb. 26, 2016

Feb. 26, 2016

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

Alistair Leslie-Hughes : inetcpl: Implement default page button.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: 1510b8b92af23a2305de95f074468c231dc11fa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1510b8b92af23a2305de95f07… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 25 18:51:17 2016 +1100 inetcpl: Implement default page button. Based on a patch by Jared Smudde. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/general.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c index 0691579..e0f473c 100644 --- a/dlls/inetcpl.cpl/general.c +++ b/dlls/inetcpl.cpl/general.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; +static const WCHAR default_page[] = {'D','e','f','a','u','l','t','_','P','a','g','e','_','U','R','L',0}; static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\', @@ -43,7 +44,6 @@ static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', /* list of unimplemented buttons */ static DWORD disabled_general_buttons[] = {IDC_HOME_CURRENT, - IDC_HOME_DEFAULT, IDC_HISTORY_SETTINGS, 0}; static DWORD disabled_delhist_buttons[] = {IDC_DELETE_FORM_DATA, @@ -175,6 +175,10 @@ static DWORD parse_url_from_outside(LPCWSTR url, LPWSTR out, DWORD maxlen) */ static INT_PTR general_on_command(HWND hwnd, WPARAM wparam) { + WCHAR buffer[INTERNET_MAX_URL_LENGTH]; + DWORD len; + DWORD type; + LONG res; switch (wparam) { @@ -187,6 +191,13 @@ static INT_PTR general_on_command(HWND hwnd, WPARAM wparam) SetDlgItemTextW(hwnd, IDC_HOME_EDIT, about_blank); break; + case MAKEWPARAM(IDC_HOME_DEFAULT, BN_CLICKED): + len = sizeof(buffer); + type = REG_SZ; + res = SHRegGetUSValueW(reg_ie_main, default_page, &type, buffer, &len, FALSE, (LPBYTE) about_blank, sizeof(about_blank)); + if (!res && (type == REG_SZ)) SetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer); + break; + case MAKEWPARAM(IDC_HISTORY_DELETE, BN_CLICKED): DialogBoxW(hcpl, MAKEINTRESOURCEW(IDD_DELETE_HISTORY), hwnd, delhist_dlgproc);

1 0