October 2014 - Wine-commits

Jeremy Newman : set open graph image based on news type
by Jeremy Newman 31 Oct '14

31 Oct '14

Module: website Branch: master Commit: 5557aa9fcc6518811564acbb9f1921cf3f3ecb7a URL: http://source.winehq.org/git/website.git/?a=commit;h=5557aa9fcc6518811564ac… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 31 14:36:33 2014 -0500 set open graph image based on news type --- include/plugins/news.php | 9 +++++++++ templates/en/news.template | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index bc9deb7..b8c4da8 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -26,6 +26,15 @@ switch (true) // set open graph tags $html->meta_og['title'] = trim($vars['title']); + $ogmode = preg_replace('/^(.*)({\$root}\/)(wwn|announce)(\/)(.*)$/ms', '$3', $vars['body']); + switch ($ogmode) + { + case 'wwn': + $html->meta_og['image'] = "http://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-world-wine-…"; + break; + default: + $html->meta_og['image'] = "http://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announcemen…"; + } // add page title $html->page_title .= " - {$html->meta_og['title']}"; diff --git a/templates/en/news.template b/templates/en/news.template index 8ea824f..0443453 100644 --- a/templates/en/news.template +++ b/templates/en/news.template @@ -1,12 +1,11 @@   - <h1 class="title">News</h1>  -<hr /> +<hr> <div class="link-container"> <p><a href="{$root}/wwn/">World Wine News Archive</a></p>

1 0

Jeremy Newman : use open graph image for news posts
by Jeremy Newman 31 Oct '14

31 Oct '14

Module: website Branch: master Commit: 11334311207ec50da265a4146c7b101200033f1a URL: http://source.winehq.org/git/website.git/?a=commit;h=11334311207ec50da265a4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 31 14:18:50 2014 -0500 use open graph image for news posts --- templates/en/news.template | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/en/news.template b/templates/en/news.template index 38aabe1..8ea824f 100644 --- a/templates/en/news.template +++ b/templates/en/news.template @@ -1,5 +1,6 @@   + <h1 class="title">News</h1>

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman 31 Oct '14

31 Oct '14

Module: website Branch: master Commit: a441ed6f4ed5ef8839874d26ea8224b9e5d4aec8 URL: http://source.winehq.org/git/website.git/?a=commit;h=a441ed6f4ed5ef8839874d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 31 14:19:23 2014 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Alexandre Julliard : Wine release 1.7.30
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: website Branch: master Commit: cd3b53a5e627bb0581c4e25c5366ab30596edb1c URL: http://source.winehq.org/git/website.git/?a=commit;h=cd3b53a5e627bb0581c4e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 22:45:33 2014 +0900 Wine release 1.7.30 --- news/en/2014103101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014103101.xml b/news/en/2014103101.xml new file mode 100644 index 0000000..b9c923b --- /dev/null +++ b/news/en/2014103101.xml @@ -0,0 +1,16 @@ +<news> +<date>October 31, 2014</date> +<title>Wine 1.7.30 Released</title> +<body> +<p> The Wine development release 1.7.30 is now available.</p> +<p> <a href="{$root}/announce/1.7.30">What's new</a> in this release: +<ul> + <li>More support for fonts in DirectWrite.</li> + <li>Improved ATL thunk support.</li> + <li>A few more C runtime functions.</li> + <li>Regedit import/export fixes.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.30.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Alexandre Julliard : Release 1.7.30.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 288f1868b7e32b1dd4f35caaed2239e66c2bafd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288f1868b7e32b1dd4f35caae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 22:43:41 2014 +0900 Release 1.7.30. --- ANNOUNCE | 522 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +-- 3 files changed, 270 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=288f1868b7e32b1dd4f35…

1 0

Tag wine-1.7.30 : Alexandre Julliard : Release 1.7.30
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: refs/tags/wine-1.7.30 Tag: 3a37002eee767c5fd8371715f2753ced43988712 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3a37002eee767c5fd8371715f275… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 22:43:41 2014 +0900 Release 1.7.30

1 0

Alexandre Julliard : crypt32: Add a root store path for Android.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 9640949cc38cb12086b29d352cda903974d3a3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9640949cc38cb12086b29d352… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 15:47:25 2014 +0900 crypt32: Add a root store path for Android. --- dlls/crypt32/rootstore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 641a2b7..5cee235 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -489,6 +489,7 @@ static const char * const CRYPT_knownLocations[] = { "/usr/share/ca-certificates/ca-bundle.crt", "/usr/local/share/certs/", "/etc/sfw/openssl/certs", + "/etc/security/cacerts", /* Android */ }; static const BYTE authenticode[] = {

1 0

Hans Leidekker : msvcrt: Implement _snprintf_l.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: ed79b3f9a52bcab2b748ceb417c06dd4c5cdc345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed79b3f9a52bcab2b748ceb41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 30 14:08:26 2014 +0100 msvcrt: Implement _snprintf_l. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d6c38f4..91805ee 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1289,7 +1289,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 02b6497..5de6965 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1647,7 +1647,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ce09f00..b7f0a86 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -969,7 +969,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e4302cf..a8ad25f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -944,7 +944,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f376db3..37046c3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -912,7 +912,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf # stub _snprintf_c(ptr long str) # stub _snprintf_c_l(ptr long str ptr) -# stub _snprintf_l(ptr long str ptr) +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s # stub _snprintf_s_l(ptr long long str ptr) @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4123d06..a6a4fe7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -818,6 +818,20 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) } /********************************************************************* + * _snprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__snprintf_l(char *str, unsigned int count, MSVCRT__locale_t locale, + const char *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = MSVCRT_vsnprintf_l(str, count, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * _snprintf_s (MSVCRT.@) */ int CDECL MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count,

1 0

Hans Leidekker : msi: Format registry values before interpreting value type.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 7f57d8f19a195e5283fea75c86d25d4a4bc0b838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f57d8f19a195e5283fea75c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 30 14:09:06 2014 +0100 msi: Format registry values before interpreting value type. --- dlls/msi/action.c | 24 ++++++++++-------------- dlls/msi/tests/action.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e310ba3..66c2858 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2438,9 +2438,9 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) return MSI_SetFeatureStates(package); } -static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD *type, DWORD *size ) +static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DWORD *type, DWORD *size ) { - BYTE *data = NULL; + BYTE *data; if (!value) { @@ -2529,19 +2529,18 @@ static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD *type, else { const WCHAR *ptr = value; - DWORD len; *type = REG_SZ; if (value[0] == '#') { - ptr++; + ptr++; len--; if (value[1] == '%') { - ptr++; + ptr++; len--; *type = REG_EXPAND_SZ; } } - len = deformat_string( package, ptr, (WCHAR **)&data ); + data = (BYTE *)msi_strdupW( ptr, len ); if (len > strlenW( (const WCHAR *)data )) *type = REG_MULTI_SZ; *size = (len + 1) * sizeof(WCHAR); } @@ -2872,14 +2871,11 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) msi_free(keypath); return ERROR_FUNCTION_FAILED; } - str = msi_record_get_string( row, 5, &len ); - if (str && len > strlenW( str )) - { - type = REG_MULTI_SZ; - new_size = (len + 1) * sizeof(WCHAR); - new_value = (BYTE *)msi_strdupW( str, len ); - } - else new_value = parse_value( package, str, &type, &new_size ); + str = msi_record_get_string( row, 5, NULL ); + len = deformat_string( package, str, &deformated ); + new_value = parse_value( package, deformated, len, &type, &new_size ); + + msi_free( deformated ); deformat_string(package, name, &deformated); if (!is_special_entry( name )) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 9f1651d..a8903d9 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -186,7 +186,8 @@ static const char property_dat[] = "SERVNAME2\tTestService2\n" "SERVDISP\tTestServiceDisp\n" "SERVDISP2\tTestServiceDisp2\n" - "MSIFASTINSTALL\t1\n"; + "MSIFASTINSTALL\t1\n" + "regdata15\t#x01\n"; static const char environment_dat[] = "Environment\tName\tValue\tComponent_\n" @@ -514,7 +515,11 @@ static const char wrv_registry_dat[] = "regdata8\t2\tSOFTWARE\\Wine\\msitest\tValue4\tone[~]two\taugustus\n" "regdata9\t2\tSOFTWARE\\Wine\\msitest\tValue5\t[~]one[~]two[~]three\taugustus\n" "regdata10\t2\tSOFTWARE\\Wine\\msitest\tValue6\t[~]\taugustus\n" - "regdata11\t2\tSOFTWARE\\Wine\\msitest\tValue7\t[~]two\taugustus\n"; + "regdata11\t2\tSOFTWARE\\Wine\\msitest\tValue7\t[~]two\taugustus\n" + "regdata12\t2\tSOFTWARE\\Wine\\msitest\tValue8\t#1\taugustus\n" + "regdata13\t2\tSOFTWARE\\Wine\\msitest\tValue9\t#x1\taugustus\n" + "regdata14\t2\tSOFTWARE\\Wine\\msitest\tValue10\t#x01\taugustus\n" + "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -4923,6 +4928,7 @@ static void test_write_registry_values(void) HKEY hkey; DWORD type, size; CHAR path[MAX_PATH]; + BYTE buf[8]; if (is_process_limited()) { @@ -5055,6 +5061,42 @@ static void test_write_registry_values(void) ok(size == 5, "Expected 5, got %d\n", size); ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value8", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(*(DWORD *)buf == 1, "got %u\n", *(DWORD *)buf); + ok(size == 4, "got %u\n", size); + ok(type == REG_DWORD, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value9", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value10", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value11", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + RegDeleteValueA(hkey, "Value"); RegDeleteValueA(hkey, "Value1"); RegDeleteValueA(hkey, "Value2"); @@ -5063,6 +5105,10 @@ static void test_write_registry_values(void) RegDeleteValueA(hkey, "Value5"); RegDeleteValueA(hkey, "Value6"); RegDeleteValueA(hkey, "Value7"); + RegDeleteValueA(hkey, "Value8"); + RegDeleteValueA(hkey, "Value9"); + RegDeleteValueA(hkey, "Value10"); + RegDeleteValueA(hkey, "Value11"); RegCloseKey(hkey); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest");

1 0

Michael Stefaniuc : comdlg32: Use the proper macro to create an int atom ( PVS-Studio).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 50a877d69fbbd3fa1bf3ab76966fa47850868690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a877d69fbbd3fa1bf3ab769… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:39:44 2014 +0100 comdlg32: Use the proper macro to create an int atom (PVS-Studio). --- dlls/comdlg32/cdlg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index c437183..886804c 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -24,7 +24,7 @@ #include "dlgs.h" /* Common dialogs implementation globals */ -#define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ +#define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */ extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN;

1 0