October 2014 - Wine-commits

Austin English : kernel32: Add a stub for CancelTimerQueueTimer.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 1ade676968244d17a03647e8c8d93bab66429100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ade676968244d17a03647e8c… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 25 01:03:01 2014 -0500 kernel32: Add a stub for CancelTimerQueueTimer. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d08f90c..2b01df1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -182,7 +182,7 @@ @ stub CancelDeviceWakeupRequest @ stdcall CancelIo(long) @ stdcall CancelIoEx(long ptr) -# @ stub CancelTimerQueueTimer +@ stdcall CancelTimerQueueTimer(ptr ptr) @ stdcall CancelWaitableTimer(long) @ stdcall ChangeTimerQueueTimer(ptr ptr long long) # @ stub CheckNameLegalDOS8Dot3A diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d399b82..04b3270 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1300,6 +1300,15 @@ BOOL WINAPI ChangeTimerQueueTimer( HANDLE TimerQueue, HANDLE Timer, } /*********************************************************************** + * CancelTimerQueueTimer (KERNEL32.@) + */ +BOOL WINAPI CancelTimerQueueTimer(HANDLE queue, HANDLE timer) +{ + FIXME("stub: %p %p\n", queue, timer); + return FALSE; +} + +/*********************************************************************** * DeleteTimerQueueTimer (KERNEL32.@) * * Cancels a timer-queue timer.

1 0

Bruno Jesus : msi: Remove duplicate if condition.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 8f79f5f54b03bcc0bd3208fa6e7fdbc3b1c1f2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f79f5f54b03bcc0bd3208fa6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 15:09:27 2014 -0200 msi: Remove duplicate if condition. --- dlls/msi/msi.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 70a8134..433776d 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1762,10 +1762,6 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, datakey = patch; szProperty = szInstalled; } - else if (!strcmpW( szProperty, INSTALLPROPERTY_LOCALPACKAGEW )) - { - datakey = udpatch; - } else if (!strcmpW( szProperty, INSTALLPROPERTY_UNINSTALLABLEW ) || !strcmpW( szProperty, INSTALLPROPERTY_PATCHSTATEW ) || !strcmpW( szProperty, INSTALLPROPERTY_DISPLAYNAMEW ) ||

1 0

Jonathan Vollebregt : reg/tests: Test key formats.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: f8445249a61f07c29a6089391b77bdb1a88178df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8445249a61f07c29a6089391… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Fri Oct 24 20:48:36 2014 +0200 reg/tests: Test key formats. --- programs/reg/tests/reg.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3ba1e3a..3de6f70 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -102,6 +102,29 @@ static void test_add(void) err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add \\\\HKCU\\" KEY_BASE "\\keytest1 /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %u\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3", 0, KEY_READ, &hkey); + ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); + RegCloseKey(hkey); + + run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4", 0, KEY_READ, &hkey); + ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); + RegCloseKey(hkey); + + err = RegDeleteTreeA(HKEY_CURRENT_USER, KEY_BASE); + ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Mathew Hodson : patches: Prevent the green color of OK testbot jobs from being overridden.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: tools Branch: master Commit: 36a6dc3793d969cf9f515ddbc5de8dc01390d0e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=36a6dc3793d969cf9f515ddb… Author: Mathew Hodson <mathew.hodson(a)gmail.com> Date: Sun Oct 26 22:28:27 2014 -0400 patches: Prevent the green color of OK testbot jobs from being overridden. --- patches/patches.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/patches.css b/patches/patches.css index f988f11..745ec75 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -149,7 +149,6 @@ tr.odd { background-color: #f8e8e8; } .nil, .nil :link, .nil :visited { color: blue; font-weight: bold; } .pending, .pending :link, .pending :visited { color: blue; } .committed, .committed :link, .committed :visited { color: green; } -.testbot, .testbot :link, .testbot :visited { color: green; } .depend, .depend :link, .depend :visited { color: #e08000; } .superseded, .superseded :link, .superseded :visited { color: #e08000; } .sequence, .sequence :link, .sequence :visited { color: #e08000; } @@ -163,4 +162,5 @@ tr.odd { background-color: #f8e8e8; } .rejected, .rejected :link, .rejected :visited { color: red; } .split, .split :link, .split :visited { color: red; } .testfail, .testfail :link, .testfail :visited { color: red; } +.testbot, .testbot :link, .testbot :visited { color: green; } .botfail, .botfail :link, .botfail :visited { color: red; }

1 0

André Hentschel : Add WWN 378
by Jeremy Newman 25 Oct '14

25 Oct '14

Module: website Branch: master Commit: a2bcdfadf492def2e3e6f45dc2c7ae2773c7616c URL: http://source.winehq.org/git/website.git/?a=commit;h=a2bcdfadf492def2e3e6f4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 25 00:13:06 2014 +0200 Add WWN 378 --- news/de/2014102401.xml | 10 + news/en/2014102401.xml | 10 + wwn/en/wn20141024_378.xml | 636 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 656 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=a2bcdfadf492def2e3…

1 0

Jeremy Newman : add some additional information
by Jeremy Newman 24 Oct '14

24 Oct '14

Module: website Branch: master Commit: d177101c72ea74ced5a1a34380fc1f2c063351ea URL: http://source.winehq.org/git/website.git/?a=commit;h=d177101c72ea74ced5a1a3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 24 09:05:01 2014 -0500 add some additional information * font used in logo, and where the svg version of the logo is * the codebase needs php 5.3 or higher --- README | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/README b/README index 6419b54..6cb89bb 100644 --- a/README +++ b/README @@ -6,10 +6,10 @@ by Jeremy Newman <jnewman(a)codeweavers.com> Installation Requirements: * Apache 2.0 or higher * mod_rewrite enabled in Apache config - * PHP 5.0 or higher + * PHP 5.3 or higher -Setting Up. --------------- +Setting Up: +----------------------------------------------------------------------- 1. cp include/htaccess.sample .htaccess 2. edit .htaccess * change Rewritebase to the subdir path from the root of your website. @@ -21,8 +21,8 @@ Setting Up. 5. cp include/globals.conf.sample include/globals.conf 6. edit include/globals.conf -Templates. --------------- +Templates: +----------------------------------------------------------------------- For any path in your website, create a .template file in templates/en/ For example, http://www.example.com/winehq_org/new_page is templates/en/new_page.template @@ -39,3 +39,10 @@ You can also add global vars to include/globals.conf and they will be availbe as {$config_[key]} where [key] is the name you defined in globals.conf +Notes: +----------------------------------------------------------------------- + + * The font used in the WineHQ logo is: Ocean Sans Pro + * A SVG version of the logo is available at: + http://ftp.winehq.org/pub/wine/logos/wine_logo.svg +

1 0

Amine Khaldi : rpcrt4/tests: Remove unused if3_table and if4_table (Clang) .
by Alexandre Julliard 24 Oct '14

24 Oct '14

Module: wine Branch: master Commit: 19254eb4381f075dc4939d527cf9d306076f0355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19254eb4381f075dc4939d527… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Thu Oct 23 19:12:18 2014 +0100 rpcrt4/tests: Remove unused if3_table and if4_table (Clang). --- dlls/rpcrt4/tests/cstub.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index ad723de..de0c224 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -288,12 +288,6 @@ static const MIDL_SERVER_INFO if3_server_info = 0, 0}; - -static const PRPC_STUB_FUNCTION if3_table[] = -{ - if1_fn1_Stub -}; - static CInterfaceStubVtbl if3_stub_vtbl = { { @@ -338,15 +332,6 @@ static const MIDL_SERVER_INFO if4_server_info = 0, 0}; - -static const PRPC_STUB_FUNCTION if4_table[] = -{ - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, - STUB_FORWARDING_FUNCTION, -}; - static CInterfaceStubVtbl if4_stub_vtbl = { {

1 0

Bruno Jesus : winecfg: No need to cut a backslash if it does not exist.
by Alexandre Julliard 24 Oct '14

24 Oct '14

Module: wine Branch: master Commit: c5aacafeeaa2cf15612fc5318262140cbd92bd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5aacafeeaa2cf15612fc5318… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 01:37:00 2014 -0200 winecfg: No need to cut a backslash if it does not exist. --- programs/winecfg/appdefaults.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 6106b23..7dd3900 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -377,19 +377,17 @@ static void on_remove_app_click(HWND dialog) { HWND listview = GetDlgItem(dialog, IDC_APP_LISTVIEW); int selection = get_listview_selection(listview); - char *section = keypath(""); /* AppDefaults\\whatever.exe\\ */ LVITEMW item; item.iItem = selection; item.iSubItem = 0; item.mask = LVIF_PARAM; - WINE_TRACE("selection=%d, section=%s\n", selection, section); - + WINE_TRACE("selection=%d\n", selection); + assert( selection != 0 ); /* user cannot click this button when "default settings" is selected */ - section[strlen(section)] = '\0'; /* remove last backslash */ - set_reg_key(config_key, section, NULL, NULL); /* delete the section */ + set_reg_key(config_key, keypath(""), NULL, NULL); /* delete the section */ SendMessageW(listview, LVM_GETITEMW, 0, (LPARAM) &item); HeapFree (GetProcessHeap(), 0, (void*)item.lParam); SendMessageW(listview, LVM_DELETEITEM, selection, 0);

1 0

Bruno Jesus : iphlpapi: Fix a one counter for two loops error (PVS-Studio) .
by Alexandre Julliard 24 Oct '14

24 Oct '14

Module: wine Branch: master Commit: 794d52273efccf5ef6e5ed56783b3f4c7130cc4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=794d52273efccf5ef6e5ed567… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 01:47:02 2014 -0200 iphlpapi: Fix a one counter for two loops error (PVS-Studio). --- dlls/iphlpapi/iphlpapi_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 88db25a..4d18711 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -983,6 +983,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index struct WS_sockaddr_in6 *sa; const IN6_ADDR *addr, *mask; BOOL done = FALSE; + ULONG k; prefix->u.s.Length = sizeof(*prefix); prefix->u.s.Flags = 0; @@ -1000,11 +1001,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index sa->sin6_scope_id = 0; prefix->PrefixLength = 0; - for (i = 0; i < 8 && !done; i++) + for (k = 0; k < 8 && !done; k++) { for (j = 0; j < sizeof(WORD) * 8 && !done; j++) { - if (mask->u.Word[i] & 1 << j) prefix->PrefixLength++; + if (mask->u.Word[k] & 1 << j) prefix->PrefixLength++; else done = TRUE; } }

1 0

Alexandre Julliard : iphlpapi: Avoid an uninitialized variable warning.
by Alexandre Julliard 24 Oct '14

24 Oct '14

Module: wine Branch: master Commit: c7924e530d87e69ae48fbbe2c1582c934700eb89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7924e530d87e69ae48fbbe2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 24 13:42:37 2014 +0900 iphlpapi: Avoid an uninitialized variable warning. --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4d18711..4d66810 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1251,7 +1251,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P PIP_ADAPTER_ADDRESSES aa, PULONG buflen) { InterfaceIndexTable *table; - ULONG i, size, dns_server_size, dns_suffix_size, total_size, ret = ERROR_NO_DATA; + ULONG i, size, dns_server_size = 0, dns_suffix_size, total_size, ret = ERROR_NO_DATA; TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); @@ -1308,7 +1308,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P size = bytes_left -= size; } } - if (!(flags & GAA_FLAG_SKIP_DNS_SERVER) && dns_server_size) + if (dns_server_size) { firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)first_aa + total_size - dns_server_size - dns_suffix_size); get_dns_server_addresses(firstDns, &dns_server_size);

1 0