June 2012 - Wine-Commits - list.winehq.org

André Hentschel : config.php.sample: Add 1. 4 as stable branch
by Alexander Nicolaysen Sørnes June 10, 2012

June 10, 2012

Module: appdb Branch: master Commit: 9764374a1fece2c839f69fdb0186974e888a7ed5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9764374a1fece2c839f69fdb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 10 10:54:18 2012 +0000 config.php.sample: Add 1.4 as stable branch --- include/config.php.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/config.php.sample b/include/config.php.sample index 0eb1fc3..813379e 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -35,7 +35,7 @@ define("TESTDATA_AGED_THRESHOLD", 175); // Show versions from these branches even if they are not among the most recent ones // Separate by commas if there are more than one -define("STABLE_BRANCHES", "1.0.,1.2."); +define("STABLE_BRANCHES", "1.0.,1.2.,1.4."); /* * apps database info

1 0

Alexandre Julliard : Wine release 1.5.6
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: website Branch: master Commit: 2943ca2c6512c3b509988be7cd732470e383d74a URL: http://source.winehq.org/git/website.git/?a=commit;h=2943ca2c6512c3b509988b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 22:25:55 2012 +0200 Wine release 1.5.6 --- news/en/2012060801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2012060801.xml b/news/en/2012060801.xml new file mode 100644 index 0000000..a47671f --- /dev/null +++ b/news/en/2012060801.xml @@ -0,0 +1,18 @@ +<news> +<date>June 8, 2012</date> +<title>Wine 1.5.6 Released</title> +<body> + The Wine development release 1.5.6 is now available. + <a href="{$root}/announce/1.5.6">What's new</a> in this release: +<ul> + <li>Automatic installation of the Mono add-on package.</li> + <li>Control panel applet for joysticks.</li> + <li>Device bitmap rendering now done through the DIB engine.</li> + <li>Support for video rendering through DirectX (VMR-9).</li> + <li>First steps towards a D3D shader compiler.</li> + <li>Build fixes for DragonFly BSD.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.6.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>. +</body></news>

1 0

Tag wine-1.5.6 : Alexandre Julliard : Release 1.5.6
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: refs/tags/wine-1.5.6 Tag: 2a21f489aaee7f27395874f78a8b3d5957fc9e9e URL: http://source.winehq.org/git/wine.git/?a=tag;h=2a21f489aaee7f27395874f78a8b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 22:14:13 2012 +0200 Release 1.5.6

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 1edb046d9e89cabe9c325625fee9d96e26d519fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1edb046d9e89cabe9c325625f… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jun 7 22:27:31 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 32 ++++++++++++-------------------- 1 files changed, 12 insertions(+), 20 deletions(-) diff --git a/po/lt.po b/po/lt.po index 81d2f09..873d4c0 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-05-22 16:06+0300\n" +"PO-Revision-Date: 2012-06-08 21:40+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3432,59 +3432,51 @@ msgstr "Aukštos" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "Vairasvirtės" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" msgstr "&Išjungti" #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" -msgstr "įjun&gti" +msgstr "Įj&ungti" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "Atjungta" +msgstr "Prijungta" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "&Išjungti" +msgstr "Išjungta" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "Testuoti vairasvirtę" #: joy.rc:50 msgid "Buttons" -msgstr "" +msgstr "Mygtukai" #: joy.rc:51 msgid "X,Y" -msgstr "" +msgstr "X,Y" #: joy.rc:52 msgid "Rx,Ry" -msgstr "" +msgstr "Rx,Ry" #: joy.rc:53 msgid "Z, Rz" -msgstr "" +msgstr "Z, Rz" #: joy.rc:58 msgid "Test Force Feedback" -msgstr "" +msgstr "Testuoti „Force Feedback“" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "Sukurti valdiklį" +msgstr "Žaidimų valdikliai" #: jscript.rc:25 msgid "Error converting object to primitive type"

1 0

Alexandre Julliard : Release 1.5.6.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 7123e44176ec42bdf9e79181d796061b3ddb0631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7123e44176ec42bdf9e79181d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 22:14:10 2012 +0200 Release 1.5.6. --- ANNOUNCE | 902 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 403 insertions(+), 519 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7123e44176ec42bdf9e79…

1 0

Francois Gouget : iphlpapi: Don' t rely on the HAVE_XXX macros having a numeric values.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 562b277bb313f05a1ab4cd15381eed5ba697e389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=562b277bb313f05a1ab4cd153… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 8 15:12:57 2012 +0200 iphlpapi: Don't rely on the HAVE_XXX macros having a numeric values. --- dlls/iphlpapi/ipstats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 0edd011..009dd99 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -659,7 +659,7 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) } if (kc) kstat_close( kc ); } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (HAVE_STRUCT_IPSTAT_IPS_TOTAL || HAVE_STRUCT_IP_STATS_IPS_TOTAL) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) || defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL)) { int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))

1 0

Francois Gouget : d3dcompiler_43: Make debug_{base, node}_type() static.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: b0a339707f4047840c47bee51e7801a317010ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a339707f4047840c47bee51… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 8 15:12:46 2012 +0200 d3dcompiler_43: Make debug_{base,node}_type() static. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 - dlls/d3dcompiler_43/utils.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 9f7fce1..5e5f1d3 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -834,7 +834,6 @@ BOOL pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, const char *entrypoint, char **messages) DECLSPEC_HIDDEN; -const char *debug_base_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; const char *debug_modifiers(DWORD modifiers) DECLSPEC_HIDDEN; void free_hlsl_type(struct hlsl_type *type) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index c890fd8..304f70c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -886,7 +886,7 @@ BOOL pop_scope(struct hlsl_parse_ctx *ctx) return TRUE; } -const char *debug_base_type(const struct hlsl_type *type) +static const char *debug_base_type(const struct hlsl_type *type) { const char *name = "(unknown)"; @@ -961,7 +961,7 @@ const char *debug_modifiers(DWORD modifiers) return wine_dbg_sprintf("%s", string[0] ? string + 1 : ""); } -const char *debug_node_type(enum hlsl_ir_node_type type) +static const char *debug_node_type(enum hlsl_ir_node_type type) { const char *names[] = {

1 0

Jacek Caban : widl: Added --help command line option.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 42e77c849f32946d1e6417dfb5d6c6d667482871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e77c849f32946d1e6417dfb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 8 11:15:17 2012 +0200 widl: Added --help command line option. --- tools/widl/widl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index b0e2b67..85d66d7 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -56,6 +56,7 @@ static const char usage[] = " -d n Set debug level to 'n'\n" " -D id[=val] Define preprocessor identifier id=val\n" " -E Preprocess only\n" +" --help Display this help and exit\n" " -h Generate headers\n" " -H file Name of header file (default is infile.h)\n" " -I path Set include search dir to path (multiple -I allowed)\n" @@ -149,6 +150,7 @@ enum { PREFIX_ALL_OPTION, PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, + PRINT_HELP, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, @@ -160,6 +162,7 @@ static const char short_options[] = static const struct option long_options[] = { { "dlldata", 1, NULL, DLLDATA_OPTION }, { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, + { "help", 0, NULL, PRINT_HELP }, { "local-stubs", 1, NULL, LOCAL_STUBS_OPTION }, { "oldnames", 0, NULL, OLDNAMES_OPTION }, { "output", 0, NULL, 'o' }, @@ -526,6 +529,9 @@ int main(int argc,char *argv[]) case PREFIX_SERVER_OPTION: prefix_server = xstrdup(optarg); break; + case PRINT_HELP: + fprintf(stderr, "%s", usage); + return 0; case WIN32_OPTION: do_win32 = 1; do_win64 = 0;

1 0

Jacek Caban : wininet: Skip security flags tests on too old wininet versions.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: e3dfbe33f6b1e77b2f3689849ff0454a15be853f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3dfbe33f6b1e77b2f3689849… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 8 15:02:51 2012 +0200 wininet: Skip security flags tests on too old wininet versions. --- dlls/wininet/tests/http.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1d82537..e7be839 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2933,8 +2933,8 @@ static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags) flags = 0xdeadbeef; size = sizeof(flags); res = InternetQueryOptionW(req, 98, &flags, &size); - ok_(__FILE__,line)(res, "InternetQueryOptionW(INTERNET_OPTION_SECURITY_FLAGS) failed: %u\n", GetLastError()); - ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS flags = %x, expected %x\n", flags, ex_flags); + ok_(__FILE__,line)(res, "InternetQueryOptionW(98) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS(98) flags = %x, expected %x\n", flags, ex_flags); } #define set_secflags(a,b,c) _set_secflags(__LINE__,a,b,c) @@ -2975,6 +2975,17 @@ static void test_security_flags(void) ok(req != NULL, "HttpOpenRequest failed\n"); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + flags = 0xdeadbeef; + size = sizeof(flags); + res = InternetQueryOptionW(req, 98, &flags, &size); + if(!res && GetLastError() == ERROR_INVALID_PARAMETER) { + win_skip("Incomplete security flags support, skipping\n"); + + close_async_handle(ses, hCompleteEvent, 2); + CloseHandle(hCompleteEvent); + return; + } + test_secflags_option(req, 0); set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_REVOCATION);

1 0

Jacek Caban : wininet: Read status code directly from request object in InternetErrorDlg.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: 74f596c5edf95fc3677690b642a55070fc6c8f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f596c5edf95fc3677690b64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 8 10:52:42 2012 +0200 wininet: Read status code directly from request object in InternetErrorDlg. --- dlls/wininet/dialogs.c | 30 ++---------------------------- 1 files changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index e660e2b..a3235a4 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -477,28 +477,6 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( } /*********************************************************************** - * WININET_GetConnectionStatus - */ -static INT WININET_GetConnectionStatus( HINTERNET hRequest ) -{ - WCHAR szStatus[0x20]; - DWORD sz, index, dwStatus; - - TRACE("%p\n", hRequest ); - - sz = sizeof szStatus; - index = 0; - if( !HttpQueryInfoW( hRequest, HTTP_QUERY_STATUS_CODE, - szStatus, &sz, &index)) - return -1; - dwStatus = atoiW( szStatus ); - - TRACE("request %p status = %d\n", hRequest, dwStatus ); - - return dwStatus; -} - -/*********************************************************************** * InternetErrorDlg */ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, @@ -531,16 +509,12 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, { case ERROR_SUCCESS: case ERROR_INTERNET_INCORRECT_PASSWORD: { - DWORD dwStatus; - if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) ) break; if(!req) return ERROR_INVALID_HANDLE; - dwStatus = WININET_GetConnectionStatus( hRequest ); - switch (dwStatus) - { + switch(req->status_code) { case HTTP_STATUS_PROXY_AUTH_REQ: res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_PROXYDLG ), hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); @@ -550,7 +524,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, hWnd, WININET_PasswordDialog, (LPARAM) &params ); break; default: - WARN("unhandled status %u\n", dwStatus); + WARN("unhandled status %u\n", req->status_code); } break; }

1 0