October 2014 - Wine-Commits

André Hentschel : urlmon/tests: Clarify ok() condition.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

Module: wine Branch: master Commit: 2bb59197ace6776e03bbc014cabc8fd7b7360615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb59197ace6776e03bbc014c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 25 16:35:31 2014 +0200 urlmon/tests: Clarify ok() condition. --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 5861127..3d10323 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -764,7 +764,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, } IHttpNegotiate2_Release(http_negotiate2); ok(hres == E_FAIL, "GetRootSecurityId failed: %08x, expected E_FAIL\n", hres); - ok(size == no_callback ? 512 : 13, "size=%d\n", size); + ok(size == (no_callback ? 512 : 13), "size=%d\n", size); if(!no_callback) { SET_EXPECT(QueryService_IHttpSecurity);

1 0

Jonathan Vollebregt : reg/tests: Test key formats.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

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

Bruno Jesus : msi: Remove duplicate if condition.
by Alexandre Julliard Oct. 27, 2014

Oct. 27, 2014

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

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

Oct. 27, 2014

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 Oct. 25, 2014

Oct. 25, 2014

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 Oct. 24, 2014

Oct. 24, 2014

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

Nikolay Sivov : dwrite/tests: Fix some test failures.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: fefb947516bbf8982842192270707191346db96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fefb947516bbf898284219227… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 24 11:39:16 2014 +0400 dwrite/tests: Fix some test failures. --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 77571f0..469be88 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -940,9 +940,9 @@ if (file) { /* local loader is not registered by default */ hr = IDWriteFactory_RegisterFontFileLoader(factory, loader); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr); hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr); IDWriteFontFileLoader_Release(loader); } ret = TRUE;

1 0

Hao Peng : mlang: Add gbk to Chinese Simplified codepage.
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Module: wine Branch: master Commit: be089ba2ee647fc5dce6adf1fa1ba44b43e170fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=be089ba2ee647fc5dce6adf1f… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Fri Oct 24 16:07:15 2014 +0800 mlang: Add gbk to Chinese Simplified codepage. --- dlls/mlang/mlang.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f4a689c..e44e862 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -122,7 +122,13 @@ static const MIME_CP_INFO chinese_simplified_cp[] = MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, - "gb2312", "gb2312", "gb2312" } + "gb2312", "gb2312", "gb2312" }, + { "Chinese Simplified (GBK)", + 936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | + MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | + MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | + MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, + "gbk", "gbk", "gbk" } }; static const MIME_CP_INFO chinese_traditional_cp[] = { @@ -953,7 +959,7 @@ HRESULT WINAPI ConvertINetMultiByteToUnicode( *pcDstSize = MultiByteToWideChar(dwEncoding, 0, pSrcStr, *pcSrcSize, NULL, 0); break; } - + if (!*pcDstSize) return E_FAIL; @@ -1344,7 +1350,7 @@ static HRESULT WINAPI MLANGCF_CreateInstance(IClassFactory *iface, IUnknown *pOu IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; - + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); *ppobj = NULL; @@ -2263,7 +2269,7 @@ static BOOL CALLBACK enum_locales_proc(LPWSTR locale) info->wszLocaleName[0] = 0; GetLocaleInfoW(info->lcid, LOCALE_SLANGUAGE, info->wszLocaleName, MAX_LOCALE_NAME); TRACE("ISO639: %s SLANGUAGE: %s\n", wine_dbgstr_w(info->wszRfc1766), wine_dbgstr_w(info->wszLocaleName)); - + data->total++; return TRUE; @@ -2869,7 +2875,7 @@ static HRESULT WINAPI fnIMultiLanguage3_ConvertStringToUnicodeEx( * * PARAMS * see ConvertStringToUnicode - * dwFlag + * dwFlag * lpFallBack if dwFlag contains MLCONVCHARF_USEDEFCHAR, lpFallBack string used * instead unconvertible characters. *

1 0

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

Oct. 24, 2014

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

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

Oct. 24, 2014

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