January 2014 - Wine-Commits

Piotr Caban : msvcrt: Don't validate parameters in _itoa function.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: dce5c1f8e0f259837e6eabb0f8fd4ca20ccc8c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce5c1f8e0f259837e6eabb0f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 15 16:29:00 2013 +0200 msvcrt: Don't validate parameters in _itoa function. (cherry picked from commit f906be9ef46635e55d96944de0e45b5618c7e979) --- dlls/msvcrt/string.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 082029d..7225395 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -991,10 +991,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int bas return MSVCRT_strtoui64_l(nptr, endptr, base, NULL); } -/********************************************************************* - * _ltoa_s (MSVCRT.@) - */ -int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) +static int ltoa_helper(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) { MSVCRT_ulong val; unsigned int digit; @@ -1002,14 +999,6 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) char buffer[33], *pos; size_t len; - if (!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL; - if (!MSVCRT_CHECK_PMT(size > 0)) return MSVCRT_EINVAL; - if (!MSVCRT_CHECK_PMT(radix >= 2 && radix <= 36)) - { - str[0] = '\0'; - return MSVCRT_EINVAL; - } - if (value < 0 && radix == 10) { is_negative = 1; @@ -1067,6 +1056,22 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _ltoa_s (MSVCRT.@) + */ +int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) +{ + if (!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(size > 0)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(radix >= 2 && radix <= 36)) + { + str[0] = '\0'; + return MSVCRT_EINVAL; + } + + return ltoa_helper(value, str, size, radix); +} + +/********************************************************************* * _ltow_s (MSVCRT.@) */ int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) @@ -1150,6 +1155,14 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _itoa (MSVCRT.@) + */ +char* CDECL _itoa(int value, char *str, int radix) +{ + return ltoa_helper(value, str, MSVCRT_SIZE_MAX, radix) ? NULL : str; +} + +/********************************************************************* * _itow_s (MSVCRT.@) */ int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)

1 0

Erich E. Hoover : hhctrl.ocx: Do not destroy the HTML Help window when HH_HELP_CONTEXT finds no context id of 0.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 357fcf732d64283661f7ee3643fb7a698bf19f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=357fcf732d64283661f7ee364… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Nov 6 11:59:16 2013 -0700 hhctrl.ocx: Do not destroy the HTML Help window when HH_HELP_CONTEXT finds no context id of 0. (cherry picked from commit 87b1115db1aeb39d09fa5cdf349b1c0d6fea7d9f) --- dlls/hhctrl.ocx/hhctrl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 3392715..8b42569 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -273,6 +273,8 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat url = FindContextAlias(info->pCHMInfo, data); if(!url) { + if(!data) /* there may legitimately be no context alias for id 0 */ + return info->WinType.hwndHelp; ReleaseHelpViewer(info); return NULL; }

1 0

Sebastian Lackner : shlwapi: Fix UrlCombineW for URLs containing a quotation mark.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 0fabd379fe805f77615599c719d9aa17b5aee9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fabd379fe805f77615599c71… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 6 23:01:42 2013 +0100 shlwapi: Fix UrlCombineW for URLs containing a quotation mark. (cherry picked from commit 7ee2c24a8cb0ea3ca50d62634fc5772438c2ae39) --- dlls/shlwapi/url.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 102faf5..11589e4 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -665,6 +665,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, DWORD i, len, res1, res2, process_case = 0; LPWSTR work, preliminary, mbase, mrelative; static const WCHAR myfilestr[] = {'f','i','l','e',':','/','/','/','\0'}; + static const WCHAR fragquerystr[] = {'#','?',0}; HRESULT ret; TRACE("(base %s, Relative %s, Combine size %d, flags %08x)\n", @@ -736,17 +737,19 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, } } - /* If there is a '#' and the characters immediately preceding it are - * ".htm[l]", then begin looking for the last leaf starting from - * the '#'. Otherwise the '#' is not meaningful and just start - * looking from the end. */ - if ((work = strchrW(base.pszSuffix + sizeloc, '#'))) { + /* If there is a '?', then the remaining part can only contain a + * query string or fragment, so start looking for the last leaf + * from the '?'. Otherwise, if there is a '#' and the characters + * immediately preceding it are ".htm[l]", then begin looking for + * the last leaf starting from the '#'. Otherwise the '#' is not + * meaningful and just start looking from the end. */ + if ((work = strpbrkW(base.pszSuffix + sizeloc, fragquerystr))) { const WCHAR htmlW[] = {'.','h','t','m','l',0}; const int len_htmlW = 5; const WCHAR htmW[] = {'.','h','t','m',0}; const int len_htmW = 4; - if (base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) + if (*work == '?' || base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) manual_search = TRUE; else if (work - base.pszSuffix > len_htmW) { work -= len_htmW;

1 0

Qian Hong : wscript: Get extension name by strrchrW instead of strchrW.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: f2c1c3fe484335d2f801240d3d957d5639bd0969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c1c3fe484335d2f801240d3… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Nov 12 16:19:59 2013 +0800 wscript: Get extension name by strrchrW instead of strchrW. (cherry picked from commit fa9fec618d647e22da3e33b7ad8c7b7053d73fe7) --- programs/wscript/main.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 3d97bde..cebabed 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -361,7 +361,7 @@ static BOOL set_host_properties(const WCHAR *prop) int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { - const WCHAR *ext, *filename = NULL; + WCHAR *ext, *filepart, *filename = NULL; IActiveScriptParse *parser; IActiveScript *script; WCHAR **argv; @@ -391,14 +391,12 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_FIXME("No file name specified\n"); return 1; } - res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, NULL); + res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, &filepart); if(!res || res > sizeof(scriptFullName)/sizeof(WCHAR)) return 1; - ext = strchrW(filename, '.'); - if(!ext) - ext = filename; - if(!get_engine_clsid(ext, &clsid)) { + ext = strrchrW(filepart, '.'); + if(!ext || !get_engine_clsid(ext, &clsid)) { WINE_FIXME("Could not find engine for %s\n", wine_dbgstr_w(ext)); return 1; }

1 0

Alexander Dorofeyev : wined3d: Fix resultarg state handling in nvrc/ nvts code.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 773a6f3c70ee27511c1ec24fa4dd6842e528b7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=773a6f3c70ee27511c1ec24fa… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sat Nov 2 08:14:46 2013 +0200 wined3d: Fix resultarg state handling in nvrc/nvts code. Resultarg affects both rgb and alpha register combiner output. Ensure that changing resultarg updates both. (cherry picked from commit a14793f50ba3acb0b99bb166b8534b255ff09ca2) --- dlls/wined3d/nvidia_texture_shader.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=773a6f3c70ee27511c1ec…

1 0

Piotr Caban : url: Add support for http protocol handling in FileProtocolHandlerA.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 6d47e09b913d0d42bbcec346778c6c6ac04b6c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d47e09b913d0d42bbcec3467… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 17 12:54:31 2013 +0200 url: Add support for http protocol handling in FileProtocolHandlerA. (cherry picked from commit f5ea78f6a1d67c68fb4cef89e0891933c72b624b) --- dlls/url/url_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index b65aa02..8ad413b 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -88,8 +88,7 @@ BOOL WINAPI InetIsOffline(DWORD flags) * int nShowCmd - How to display the operation. */ -HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, - int nShowCmd) +void WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, int nShowCmd) { CHAR pszPath[MAX_PATH]; DWORD size = MAX_PATH; @@ -97,12 +96,7 @@ HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, TRACE("(%p, %s, %d)\n",hWnd,debugstr_a(pszUrl),nShowCmd); - if(createpath != S_OK) - return E_FAIL; - - ShellExecuteA(hWnd,NULL,pszPath,NULL,NULL,nShowCmd); - - return S_OK; + ShellExecuteA(hWnd, NULL, createpath==S_OK ? pszPath : pszUrl, NULL, NULL, nShowCmd); } /***********************************************************************

1 0

Nikolay Sivov : rsaenh: Fail on unsupported flag values only in CryptHashData().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: fa4cd5b4ee44db881cdd7f4614c4b3a6e42b53f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4cd5b4ee44db881cdd7f461… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 17 22:36:36 2013 +0400 rsaenh: Fail on unsupported flag values only in CryptHashData(). (cherry picked from commit bfd2c533beef454a61b24f92790f91099e607365) --- dlls/rsaenh/rsaenh.c | 2 +- include/wincrypt.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index b4e4b35..210ef19 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4084,7 +4084,7 @@ BOOL WINAPI RSAENH_CPHashData(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pb TRACE("(hProv=%08lx, hHash=%08lx, pbData=%p, dwDataLen=%d, dwFlags=%08x)\n", hProv, hHash, pbData, dwDataLen, dwFlags); - if (dwFlags) + if (dwFlags & ~CRYPT_USERDATA) { SetLastError(NTE_BAD_FLAGS); return FALSE; diff --git a/include/wincrypt.h b/include/wincrypt.h index 617a9b9..d3d9f66 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3890,6 +3890,8 @@ typedef BOOL (WINAPI *PFN_CMSG_IMPORT_KEY_TRANS)( #define EXPORT_PRIVATE_KEYS 0x00000004 #define PKCS12_EXPORT_RESERVED_MASK 0xffff0000 +#define CRYPT_USERDATA 0x00000001 + /* function declarations */ /* advapi32.dll */ WINADVAPI BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *, LPCSTR, LPCSTR, DWORD, DWORD);

1 0

Jacek Caban : jscript: Improved error handling in numeric literal parser.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 8dcce6d50ada148ef65af0420bfd2fd2d275c014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcce6d50ada148ef65af0420… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 17:18:38 2013 +0100 jscript: Improved error handling in numeric literal parser. (cherry picked from commit 1a89ea7043e2ea10ff4a29c1c15f45ec80f3dbd7) --- dlls/jscript/lex.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index d6a0ba1..844ae91 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -456,6 +456,11 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li else exp += e; } + if(is_identifier_char(*ctx->ptr)) { + WARN("wrong char after zero\n"); + return lex_error(ctx, JS_E_MISSING_SEMICOLON); + } + *literal = new_double_literal(ctx, exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); return tNumericLiteral; } @@ -479,7 +484,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(ctx->ptr < ctx->end && is_identifier_char(*ctx->ptr)) { WARN("unexpected identifier char\n"); - return lex_error(ctx, E_FAIL); + return lex_error(ctx, JS_E_MISSING_SEMICOLON); } *literal = new_double_literal(ctx, l); @@ -514,9 +519,8 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); - return lex_error(ctx, E_FAIL); + return lex_error(ctx, JS_E_MISSING_SEMICOLON); } - } return parse_double_literal(ctx, l, literal);

1 0

Rico Schüller : wined3d: Use GL_EXT_texture_mirror_clamp when available.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 213fb721d23e76c66ed4aab52ce4e3c0c51662ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=213fb721d23e76c66ed4aab52… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Nov 6 21:33:15 2013 +0100 wined3d: Use GL_EXT_texture_mirror_clamp when available. (cherry picked from commit fb926490fed5d1d2dcfe71760c1c048fe2241d19) --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aa4d710..7cceede 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -179,6 +179,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, + {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, @@ -2948,6 +2949,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!counter_bits) gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; } + if (!gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] && gl_info->supported[EXT_TEXTURE_MIRROR_CLAMP]) + { + TRACE(" IMPLIED: ATI_texture_mirror_once support (by EXT_texture_mirror_clamp).\n"); + gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] = TRUE; + } if (!gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] && gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) { TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 50d9bab..9925dd8 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -128,6 +128,7 @@ enum wined3d_gl_extension EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_LOD_BIAS, + EXT_TEXTURE_MIRROR_CLAMP, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, EXT_VERTEX_ARRAY_BGRA,

1 0

Rico Schüller : opengl32: Use variables for file names.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 1e42c85a7b8a6f09e76a3faba706cc34f363b573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e42c85a7b8a6f09e76a3faba… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:05 2013 +0100 opengl32: Use variables for file names. (cherry picked from commit 3c08b95b3ba2438c6984678cb7340eef2901df39) --- dlls/opengl32/make_opengl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index fedf2a6..9817f8c 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -65,6 +65,8 @@ use strict; my $spec_file = "opengl32.spec"; my $norm_file = "opengl_norm.c"; my $ext_file = "opengl_ext.c"; +my $wgl_driver_file = "../../include/wine/wgl_driver.h"; +my $wgl_file = "../../include/wine/wgl.h"; # Set to 0 for removing the ENTER / LEAVE GL calls my $gen_thread_safe = 0; @@ -776,7 +778,7 @@ parse_enum_file( "enumext.spec", \%enums ); # Get the current wgl_driver.h version # my $wgl_version = 0; -open HEADER, "<../../include/wine/wgl_driver.h" or die "cannot open wgl_driver.h"; +open HEADER, "<$wgl_driver_file" or die "cannot open $wgl_driver_file"; while (<HEADER>) { next unless /^#define WINE_WGL_DRIVER_VERSION (\d+)/; @@ -788,8 +790,8 @@ close HEADER; # # Generate the wgl_driver.h file # -open HEADER, ">../../include/wine/wgl_driver.h" or die "cannot create wgl_driver.h"; -print HEADER "/* Automatically generated from http://www.opengl.org/registry/api files; DO NOT EDIT! */\n\n"; +open HEADER, ">$wgl_driver_file" or die "cannot create $wgl_driver_file"; +print HEADER "/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */\n\n"; print HEADER "#ifndef __WINE_WGL_DRIVER_H\n"; print HEADER "#define __WINE_WGL_DRIVER_H\n\n"; print HEADER "#ifndef WINE_GLAPI\n"; @@ -841,8 +843,8 @@ close HEADER; # # Generate the wgl.h file # -open HEADER, ">../../include/wine/wgl.h" or die "cannot create wgl.h"; -print HEADER "/* Automatically generated from http://www.opengl.org/registry/api files; DO NOT EDIT! */\n\n"; +open HEADER, ">$wgl_file" or die "cannot create $wgl_file"; +print HEADER "/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */\n\n"; print HEADER "#ifndef __WINE_WGL_H\n"; print HEADER "#define __WINE_WGL_H\n\n";

1 0