October 2012 - Wine-Commits

Francois Gouget : shell32: Standardize on the ShellExecuteEx() terminology.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 68c1bf507d4c114c79660e010f0fb2a1f43ecdf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c1bf507d4c114c79660e010… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 17 23:25:56 2012 +0200 shell32: Standardize on the ShellExecuteEx() terminology. --- dlls/shell32/shlexec.c | 108 +++++++++++++++++++++--------------------- dlls/shell32/tests/shlexec.c | 16 +++--- 2 files changed, 62 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68c1bf507d4c114c79660…

1 0

Jacek Caban : vbscript: Added support for HTML comments.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 290f5631993ddd77df7be1b836f0948d6929d39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=290f5631993ddd77df7be1b83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 11:49:17 2012 +0200 vbscript: Added support for HTML comments. --- dlls/vbscript/compile.c | 4 ++-- dlls/vbscript/lex.c | 26 +++++++++++++++++++------- dlls/vbscript/parse.h | 3 ++- dlls/vbscript/parser.y | 5 ++++- dlls/vbscript/vbscript.c | 4 ++-- dlls/vbscript/vbscript.h | 2 +- 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 327d97b..58afdf4 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1644,7 +1644,7 @@ static void release_compiler(compile_ctx_t *ctx) release_vbscode(ctx->code); } -HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) +HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, vbscode_t **ret) { function_t *new_func; function_decl_t *func_decl; @@ -1653,7 +1653,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) vbscode_t *code; HRESULT hres; - hres = parse_script(&ctx.parser, src); + hres = parse_script(&ctx.parser, src, delimiter); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 8e971e2..65d2334 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -320,6 +320,16 @@ static void skip_spaces(parser_ctx_t *ctx) ctx->ptr++; } +static int comment_line(parser_ctx_t *ctx) +{ + ctx->ptr = strchrW(ctx->ptr, '\n'); + if(ctx->ptr) + ctx->ptr++; + else + ctx->ptr = ctx->end; + return tNL; +} + static int parse_next_token(void *lval, parser_ctx_t *ctx) { WCHAR c; @@ -347,18 +357,12 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) ctx->ptr++; return tNL; case '\'': - ctx->ptr = strchrW(ctx->ptr, '\n'); - if(ctx->ptr) - ctx->ptr++; - else - ctx->ptr = ctx->end; - return tNL; + return comment_line(ctx); case ':': case ')': case ',': case '=': case '+': - case '-': case '*': case '/': case '^': @@ -366,6 +370,11 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '.': case '_': return *ctx->ptr++; + case '-': + if(ctx->is_html && ctx->ptr[1] == '-' && ctx->ptr[2] == '>') + return comment_line(ctx); + ctx->ptr++; + return '-'; case '(': /* NOTE: * We resolve empty brackets in lexer instead of parser to avoid complex conflicts @@ -392,6 +401,9 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '=': ctx->ptr++; return tLTEQ; + case '!': + if(ctx->is_html && ctx->ptr[1] == '-' && ctx->ptr[2] == '-') + return comment_line(ctx); } return '<'; case '>': diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index df8f9b5..74e0a8a 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -253,6 +253,7 @@ typedef struct { BOOL option_explicit; BOOL parse_complete; + BOOL is_html; HRESULT hres; int last_token; @@ -265,7 +266,7 @@ typedef struct { vbsheap_t heap; } parser_ctx_t; -HRESULT parse_script(parser_ctx_t*,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; void *parser_alloc(parser_ctx_t*,size_t) DECLSPEC_HIDDEN; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3f86b04..8a2a9e3 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -919,8 +919,10 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) return ret; } -HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) +HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter) { + const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; + ctx->code = ctx->ptr = code; ctx->end = ctx->code + strlenW(ctx->code); @@ -934,6 +936,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) ctx->stats = ctx->stats_tail = NULL; ctx->class_decls = NULL; ctx->option_explicit = FALSE; + ctx->is_html = delimiter && !strcmpiW(delimiter, html_delimiterW); parser_parse(ctx); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 05132a6..1195f85 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -612,7 +612,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); if(FAILED(hres)) return hres; @@ -672,7 +672,7 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 41982da..2ce93b6 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -326,7 +326,7 @@ struct _vbscode_t { }; void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; -HRESULT compile_script(script_ctx_t*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,function_t*,IDispatch*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : advapi32: Only require a domain in the username for CRED_PERSIST_ENTERPRISE credentials .
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 860c335b2297d36830a85d4d659d5a8358a445ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=860c335b2297d36830a85d4d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 15:10:05 2012 +0200 advapi32: Only require a domain in the username for CRED_PERSIST_ENTERPRISE credentials. --- dlls/advapi32/cred.c | 8 +++++++- dlls/advapi32/tests/cred.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 98c4ba7..b2597b6 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -1804,13 +1804,19 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags) return FALSE; } + TRACE("Credential->Flags = 0x%08x\n", Credential->Flags); + TRACE("Credential->Type = %u\n", Credential->Type); TRACE("Credential->TargetName = %s\n", debugstr_w(Credential->TargetName)); + TRACE("Credential->Comment = %s\n", debugstr_w(Credential->Comment)); + TRACE("Credential->Persist = %u\n", Credential->Persist); + TRACE("Credential->TargetAlias = %s\n", debugstr_w(Credential->TargetAlias)); TRACE("Credential->UserName = %s\n", debugstr_w(Credential->UserName)); if (Credential->Type == CRED_TYPE_DOMAIN_PASSWORD) { if (!Credential->UserName || - (!strchrW(Credential->UserName, '\\') && !strchrW(Credential->UserName, '@'))) + (Credential->Persist == CRED_PERSIST_ENTERPRISE && + (!strchrW(Credential->UserName, '\\') && !strchrW(Credential->UserName, '@')))) { ERR("bad username %s\n", debugstr_w(Credential->UserName)); SetLastError(ERROR_BAD_USERNAME); diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 5762f1b..3d37a3c 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -121,6 +121,47 @@ static void test_CredWriteA(void) ok(!ret && GetLastError() == ERROR_BAD_USERNAME, "CredWriteA with NULL username should have failed with ERROR_BAD_USERNAME instead of %d\n", GetLastError()); + + new_cred.UserName = (char *)"winetest"; + new_cred.Persist = CRED_PERSIST_LOCAL_MACHINE; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.Type = CRED_TYPE_GENERIC; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.Persist = CRED_PERSIST_SESSION; + ret = pCredWriteA(&new_cred, 0); + ok(ret, "CredWriteA failed with error %u\n", GetLastError()); + + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + + new_cred.Type = CRED_TYPE_DOMAIN_PASSWORD; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.UserName = NULL; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(!ret, "CredWriteA succeeded\n"); + ok(GetLastError() == ERROR_BAD_USERNAME, "got %u\n", GetLastError()); } static void test_CredDeleteA(void)

1 0

Jacek Caban : jscript: Use jsstr_t for passing strings to regexp matching functions.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 2d962d03954e7c768b14cb98b25ae2af601d3b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d962d03954e7c768b14cb98b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 17:45:23 2012 +0200 jscript: Use jsstr_t for passing strings to regexp matching functions. --- dlls/jscript/jscript.h | 2 +- dlls/jscript/regexp.c | 50 +++++++++++++++++++---------------------------- dlls/jscript/string.c | 6 ++-- 3 files changed, 24 insertions(+), 34 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index d779c7b..2630ff0 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -416,7 +416,7 @@ HRESULT create_jscaller(script_ctx_t*) DECLSPEC_HIDDEN; #define REM_CHECK_GLOBAL 0x0001 #define REM_RESET_INDEX 0x0002 #define REM_NO_CTX_UPDATE 0x0004 -HRESULT regexp_match_next(script_ctx_t*,jsdisp_t*,DWORD,const WCHAR*,DWORD,const WCHAR**,match_result_t**, +HRESULT regexp_match_next(script_ctx_t*,jsdisp_t*,DWORD,jsstr_t*,const WCHAR**,match_result_t**, DWORD*,DWORD*,match_result_t*) DECLSPEC_HIDDEN; HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*) DECLSPEC_HIDDEN; HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,jsstr_t*,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index bdff445..4d29390 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3323,16 +3323,16 @@ static void set_last_index(RegExpInstance *This, DWORD last_index) } static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, DWORD rem_flags, - const WCHAR *str, DWORD len, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, + jsstr_t *str, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) { REMatchState *x, *result; REGlobalData gData; DWORD matchlen; - gData.cpbegin = str; - gData.cpend = str + len; - gData.start = *cp-str; + gData.cpbegin = str->str; + gData.cpend = str->str + jsstr_length(str); + gData.start = *cp-str->str; gData.skipped = 0; gData.pool = &ctx->tmp_heap; @@ -3370,16 +3370,9 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D } } - /* FIXME: We often already have a copy of input string that we could use to store last match */ - if(!(rem_flags & REM_NO_CTX_UPDATE) && - (!ctx->last_match || len != jsstr_length(ctx->last_match) || strncmpW(ctx->last_match->str, str, len))) { - jsstr_t *last_match; - - last_match = jsstr_alloc_len(str, len); - if(!last_match) - return E_OUTOFMEMORY; + if(!(rem_flags & REM_NO_CTX_UPDATE) && ctx->last_match != str) { jsstr_release(ctx->last_match); - ctx->last_match = last_match; + ctx->last_match = jsstr_addref(str); } if(parens) { @@ -3392,7 +3385,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D (*parens)[i].str = NULL; (*parens)[i].len = 0; }else { - (*parens)[i].str = str + result->parens[i].index; + (*parens)[i].str = str->str + result->parens[i].index; (*parens)[i].len = result->parens[i].length; } } @@ -3419,18 +3412,18 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D *cp = result->cp; ret->str = result->cp-matchlen; ret->len = matchlen; - set_last_index(regexp, result->cp-str); + set_last_index(regexp, result->cp-str->str); if(!(rem_flags & REM_NO_CTX_UPDATE)) { - ctx->last_match_index = ret->str-str; + ctx->last_match_index = ret->str-str->str; ctx->last_match_length = matchlen; } return S_OK; } -HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, const WCHAR *str, - DWORD len, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, +HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, jsstr_t *str, + const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) { RegExpInstance *regexp = (RegExpInstance*)dispex; @@ -3442,18 +3435,18 @@ HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, mark = jsheap_mark(&ctx->tmp_heap); - hres = do_regexp_match_next(ctx, regexp, rem_flags, str, len, cp, parens, parens_size, parens_cnt, ret); + hres = do_regexp_match_next(ctx, regexp, rem_flags, str, cp, parens, parens_size, parens_cnt, ret); jsheap_clear(mark); return hres; } -static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, const WCHAR *str, DWORD len, BOOL gflag, +static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *str, BOOL gflag, match_result_t **match_result, DWORD *result_cnt) { RegExpInstance *This = (RegExpInstance*)dispex; match_result_t *ret = NULL, cres; - const WCHAR *cp = str; + const WCHAR *cp = str->str; DWORD i=0, ret_size = 0; jsheap_t *mark; HRESULT hres; @@ -3461,7 +3454,7 @@ static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, const WCHAR *st mark = jsheap_mark(&ctx->tmp_heap); while(1) { - hres = do_regexp_match_next(ctx, This, 0, str, len, &cp, NULL, NULL, NULL, &cres); + hres = do_regexp_match_next(ctx, This, 0, str, &cp, NULL, NULL, NULL, &cres); if(hres == S_FALSE) { hres = S_OK; break; @@ -3658,7 +3651,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsstr_t match_result_t *match, match_result_t **parens, DWORD *parens_cnt, BOOL *ret) { RegExpInstance *regexp; - DWORD parens_size = 0, last_index = 0, length; + DWORD parens_size = 0, last_index = 0; const WCHAR *cp; jsstr_t *string; HRESULT hres; @@ -3673,7 +3666,6 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsstr_t hres = to_string(ctx, arg, &string); if(FAILED(hres)) return hres; - length = jsstr_length(string); if(regexp->jsregexp->flags & JSREG_GLOB) { if(regexp->last_index < 0) { @@ -3689,7 +3681,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsstr_t } cp = string->str + last_index; - hres = regexp_match_next(ctx, &regexp->dispex, REM_RESET_INDEX, string->str, length, &cp, parens, + hres = regexp_match_next(ctx, &regexp->dispex, REM_RESET_INDEX, string, &cp, parens, parens ? &parens_size : NULL, parens_cnt, match); if(FAILED(hres)) { jsstr_release(string); @@ -3929,18 +3921,16 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval RegExpInstance *regexp = (RegExpInstance*)re; match_result_t *match_result; - unsigned match_cnt, i, length; + unsigned match_cnt, i; jsdisp_t *array; HRESULT hres; - length = jsstr_length(str); - if(!(regexp->jsregexp->flags & JSREG_GLOB)) { match_result_t match, *parens = NULL; DWORD parens_cnt, parens_size = 0; const WCHAR *cp = str->str; - hres = regexp_match_next(ctx, &regexp->dispex, 0, str->str, length, &cp, &parens, &parens_size, &parens_cnt, &match); + hres = regexp_match_next(ctx, &regexp->dispex, 0, str, &cp, &parens, &parens_size, &parens_cnt, &match); if(FAILED(hres)) return hres; @@ -3960,7 +3950,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval return S_OK; } - hres = regexp_match(ctx, &regexp->dispex, str->str, length, FALSE, &match_result, &match_cnt); + hres = regexp_match(ctx, &regexp->dispex, str, FALSE, &match_result, &match_cnt); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 5972061..c7aaf64 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -745,7 +745,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un while(1) { if(regexp) { - hres = regexp_match_next(ctx, regexp, re_flags, str->str, jsstr_length(str), &cp, parens_ptr, + hres = regexp_match_next(ctx, regexp, re_flags, str, &cp, parens_ptr, &parens_size, &parens_cnt, &match); re_flags |= REM_CHECK_GLOBAL; @@ -933,7 +933,7 @@ static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } cp = str->str; - hres = regexp_match_next(ctx, regexp, REM_RESET_INDEX, str->str, jsstr_length(str), &cp, NULL, NULL, NULL, &match); + hres = regexp_match_next(ctx, regexp, REM_RESET_INDEX, str, &cp, NULL, NULL, NULL, &match); jsstr_release(str); jsdisp_release(regexp); if(FAILED(hres)) @@ -1090,7 +1090,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi ptr = cp = str->str; for(i=0; i<limit; i++) { if(regexp) { - hres = regexp_match_next(ctx, regexp, 0, str->str, length, &cp, NULL, NULL, NULL, &match_result); + hres = regexp_match_next(ctx, regexp, 0, str, &cp, NULL, NULL, NULL, &match_result); if(hres != S_OK) break; ptr2 = match_result.str;

1 0

Francois Gouget : msvcp100: Make MSVCP_basic_string_char_append_len_ch() static.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 8e6934fae78d2254bec52e2103c78d8e8083dba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6934fae78d2254bec52e210… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 17 23:24:37 2012 +0200 msvcp100: Make MSVCP_basic_string_char_append_len_ch() static. --- dlls/msvcp100/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp100/string.c b/dlls/msvcp100/string.c index ae597fb..7faf95f 100644 --- a/dlls/msvcp100/string.c +++ b/dlls/msvcp100/string.c @@ -399,7 +399,7 @@ MSVCP_size_t MSVCP_basic_string_char_length(const basic_string_char *this) /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ID@Z */ /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_KD@Z */ -basic_string_char* MSVCP_basic_string_char_append_len_ch(basic_string_char *this, MSVCP_size_t count, char ch) +static basic_string_char* MSVCP_basic_string_char_append_len_ch(basic_string_char *this, MSVCP_size_t count, char ch) { TRACE("%p %lu %c\n", this, count, ch);

1 0

Henri Verbeet : wined3d: Explcitly check the shader type in shader_glsl_get_sample_function().
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: cc0b1bb03f526ed06c27745fb8eb4704685246fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0b1bb03f526ed06c27745fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 23:08:00 2012 +0200 wined3d: Explcitly check the shader type in shader_glsl_get_sample_function(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a585b1d..b8218ae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1793,7 +1793,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context { enum wined3d_sampler_texture_type sampler_type = ctx->reg_maps->sampler_type[sampler_idx]; const struct wined3d_gl_info *gl_info = ctx->gl_info; - BOOL shadow = shader_is_pshader_version(ctx->reg_maps->shader_version.type) + BOOL shadow = ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL && (((const struct shader_glsl_ctx_priv *)ctx->backend_data)->cur_ps_args->shadow & (1 << sampler_idx)); BOOL projected = flags & WINED3D_GLSL_SAMPLE_PROJECTED; BOOL texrect = flags & WINED3D_GLSL_SAMPLE_RECT;

1 0

Jacek Caban : vbscript: Added HTML comments tests.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 214fab85689389d10ace7b8132254f8d05a8eda0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=214fab85689389d10ace7b813… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 11:49:35 2012 +0200 vbscript: Added HTML comments tests. --- dlls/vbscript/tests/run.c | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 24a3c8d..4c22cb0 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1419,7 +1419,7 @@ static void close_script(IActiveScript *script) ok(!ref, "ref=%u\n", ref); } -static HRESULT parse_script(DWORD flags, BSTR script_str) +static HRESULT parse_script(DWORD flags, BSTR script_str, const WCHAR *delim) { IActiveScriptParse *parser; IActiveScript *engine; @@ -1446,7 +1446,7 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) test_counter = 0; - hres = IActiveScriptParse_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, script_str, NULL, NULL, delim, 0, 0, 0, NULL, NULL); IActiveScript_Close(engine); @@ -1464,7 +1464,7 @@ static void parse_script_af(DWORD flags, const char *src) HRESULT hres; tmp = a2bstr(src); - hres = parse_script(flags, tmp); + hres = parse_script(flags, tmp, NULL); SysFreeString(tmp); ok(hres == S_OK, "parse_script failed: %08x\n", hres); } @@ -1475,7 +1475,7 @@ static HRESULT parse_script_ar(const char *src) HRESULT hres; tmp = a2bstr(src); - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, NULL); SysFreeString(tmp); return hres; } @@ -1485,6 +1485,20 @@ static void parse_script_a(const char *src) parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); } +#define parse_htmlscript_a(a) _parse_htmlscript_a(__LINE__,a) +static void _parse_htmlscript_a(unsigned line, const char *src) +{ + BSTR tmp; + HRESULT hres; + + static const WCHAR script_delimW[] = {'<','/','S','C','R','I','P','T','>',0}; + + tmp = a2bstr(src); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp, script_delimW); + SysFreeString(tmp); + ok_(__FILE__,line)(hres == S_OK, "parse_script failed: %08x\n", hres); +} + static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, const char *src) { IDispatchEx *dispex; @@ -1742,7 +1756,7 @@ static void run_from_file(const char *filename) return; strict_dispid_check = FALSE; - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str, NULL); SysFreeString(script_str); ok(hres == S_OK, "parse_script failed: %08x\n", hres); } @@ -1770,7 +1784,7 @@ static void run_from_res(const char *name) SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, str, NULL); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); @@ -1859,6 +1873,20 @@ static void run_tests(void) CHECK_CALLED(global_propargput1_d); CHECK_CALLED(global_propargput1_i); + parse_htmlscript_a(""); + parse_htmlscript_a("\n"); + parse_htmlscript_a("\n\n"); + + hres = parse_script_ar(" <>\nCall reportSuccess()\n-->\n"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + next_cnt = 0; SET_EXPECT(collectionobj_newenum_i); SET_EXPECT(Next);

1 0

Jacek Caban : mshtml: Added HTML comments in VBScript code tests.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: b5691b5e6335f3733a79e796001c791b0f9f2383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5691b5e6335f3733a79e7960… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 11:49:53 2012 +0200 mshtml: Added HTML comments in VBScript code tests. --- dlls/mshtml/tests/vbtest.html | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index 44212e7..c965f42 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -1,6 +1,7 @@ <html> <head> <script type="text/vbscript"> + </script> <script> ' Verifies that we're in VBScript although there is no type specified

1 0

Huw Davies : gdi32: Make get_glyph_bitmap return a dib_info structure in order to avoid code duplication .
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 64e2ad5709312c886e5cbff8740fce195f01561d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e2ad5709312c886e5cbff87… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 18 12:55:05 2012 +0100 gdi32: Make get_glyph_bitmap return a dib_info structure in order to avoid code duplication. --- dlls/gdi32/dibdrv/graphics.c | 74 +++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 846b08e..a811a75 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -441,24 +441,13 @@ static inline void get_text_bkgnd_masks( dibdrv_physdev *pdev, rop_mask *mask ) } static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHMETRICS *metrics, - const struct gdi_image_bits *image, DWORD text_color, + const dib_info *glyph_dib, DWORD text_color, const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; RECT rect, clipped_rect; POINT src_origin; - dib_info glyph_dib; - - glyph_dib.bit_count = 8; - glyph_dib.width = metrics->gmBlackBoxX; - glyph_dib.height = metrics->gmBlackBoxY; - glyph_dib.rect.left = 0; - glyph_dib.rect.top = 0; - glyph_dib.rect.right = metrics->gmBlackBoxX; - glyph_dib.rect.bottom = metrics->gmBlackBoxY; - glyph_dib.stride = get_dib_stride( metrics->gmBlackBoxX, 8 ); - glyph_dib.bits = *image; rect.left = origin->x + metrics->gmptGlyphOrigin.x; rect.top = origin->y - metrics->gmptGlyphOrigin.y; @@ -473,7 +462,7 @@ static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHME src_origin.x = clipped_rect.left - rect.left; src_origin.y = clipped_rect.top - rect.top; - pdev->dib.funcs->draw_glyph( &pdev->dib, &clipped_rect, &glyph_dib, &src_origin, + pdev->dib.funcs->draw_glyph( &pdev->dib, &clipped_rect, glyph_dib, &src_origin, text_color, ranges ); } } @@ -491,7 +480,7 @@ static const int padding[4] = {0, 3, 2, 1}; * using only values 0 or 16. */ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS *metrics, - struct gdi_image_bits *image ) + dib_info *glyph_dib ) { UINT ggo_flags = aa_flags | GGO_GLYPH_INDEX; static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; @@ -499,12 +488,12 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS int i, x, y; DWORD ret, size; BYTE *buf, *dst, *src; - int pad, stride; + int pad; - image->ptr = NULL; - image->is_copy = FALSE; - image->free = free_heap_bits; - image->param = NULL; + glyph_dib->bits.ptr = NULL; + glyph_dib->bits.is_copy = FALSE; + glyph_dib->bits.free = free_heap_bits; + glyph_dib->bits.param = NULL; indices[0] = index; @@ -519,9 +508,17 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS if (!ret) return ERROR_SUCCESS; /* empty glyph */ /* We'll convert non-antialiased 1-bpp bitmaps to 8-bpp, so these sizes relate to 8-bpp */ + glyph_dib->bit_count = 8; + glyph_dib->width = metrics->gmBlackBoxX; + glyph_dib->height = metrics->gmBlackBoxY; + glyph_dib->rect.left = 0; + glyph_dib->rect.top = 0; + glyph_dib->rect.right = metrics->gmBlackBoxX; + glyph_dib->rect.bottom = metrics->gmBlackBoxY; + glyph_dib->stride = get_dib_stride( metrics->gmBlackBoxX, glyph_dib->bit_count ); + pad = padding[ metrics->gmBlackBoxX % 4 ]; - stride = get_dib_stride( metrics->gmBlackBoxX, 8 ); - size = metrics->gmBlackBoxY * stride; + size = metrics->gmBlackBoxY * glyph_dib->stride; buf = HeapAlloc( GetProcessHeap(), 0, size ); if (!buf) return ERROR_OUTOFMEMORY; @@ -538,7 +535,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS for (y = metrics->gmBlackBoxY - 1; y >= 0; y--) { src = buf + y * get_dib_stride( metrics->gmBlackBoxX, 1 ); - dst = buf + y * stride; + dst = buf + y * glyph_dib->stride; if (pad) memset( dst + metrics->gmBlackBoxX, 0, pad ); @@ -548,11 +545,11 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS } else if (pad) { - for (y = 0, dst = buf; y < metrics->gmBlackBoxY; y++, dst += stride) + for (y = 0, dst = buf; y < metrics->gmBlackBoxY; y++, dst += glyph_dib->stride) memset( dst + metrics->gmBlackBoxX, 0, pad ); } - image->ptr = buf; + glyph_dib->bits.ptr = buf; return ERROR_SUCCESS; } @@ -592,26 +589,15 @@ BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits for (i = 0; i < count; i++) { GLYPHMETRICS metrics; - struct gdi_image_bits image; + dib_info glyph_dib; - err = get_glyph_bitmap( hdc, (UINT)str[i], aa_flags, &metrics, &image ); + err = get_glyph_bitmap( hdc, (UINT)str[i], aa_flags, &metrics, &glyph_dib ); if (err) continue; - if (image.ptr) + if (glyph_dib.bits.ptr) { RECT rect, clipped_rect; POINT src_origin; - dib_info glyph_dib; - - glyph_dib.bit_count = 8; - glyph_dib.width = metrics.gmBlackBoxX; - glyph_dib.height = metrics.gmBlackBoxY; - glyph_dib.rect.left = 0; - glyph_dib.rect.top = 0; - glyph_dib.rect.right = metrics.gmBlackBoxX; - glyph_dib.rect.bottom = metrics.gmBlackBoxY; - glyph_dib.stride = get_dib_stride( metrics.gmBlackBoxX, 8 ); - glyph_dib.bits = image; rect.left = x + metrics.gmptGlyphOrigin.x; rect.top = y - metrics.gmptGlyphOrigin.y; @@ -627,7 +613,7 @@ BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits fg_pixel, glyph_intensities ); } } - if (image.free) image.free( &image ); + free_dib_info( &glyph_dib ); if (dx) { @@ -698,15 +684,15 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, for (i = 0; i < count; i++) { GLYPHMETRICS metrics; - struct gdi_image_bits image; + dib_info glyph_dib; - err = get_glyph_bitmap( dev->hdc, (UINT)str[i], aa_flags, &metrics, &image ); + err = get_glyph_bitmap( dev->hdc, (UINT)str[i], aa_flags, &metrics, &glyph_dib ); if (err) continue; - if (image.ptr) - draw_glyph( pdev, &origin, &metrics, &image, text_color, ranges, &clipped_rects, &bounds ); + if (glyph_dib.bits.ptr) + draw_glyph( pdev, &origin, &metrics, &glyph_dib, text_color, ranges, &clipped_rects, &bounds ); - if (image.free) image.free( &image ); + free_dib_info( &glyph_dib ); if (dx) {

1 0

Hans Leidekker : credui: Show the save password checkbox if both CREDUI_FLAGS_DO_NOT_PERSIST and CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX are specified .
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: ab179341e2c1f1f833adc16b91ed7e3e24502209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab179341e2c1f1f833adc16b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 14:16:05 2012 +0200 credui: Show the save password checkbox if both CREDUI_FLAGS_DO_NOT_PERSIST and CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX are specified. --- dlls/credui/credui_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 5a8c05c..e3e964f 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -410,7 +410,9 @@ static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) SetWindowTextW(hwndDlg, title); } - if (params->dwFlags & (CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_PERSIST)) + if (params->dwFlags & CREDUI_FLAGS_PERSIST || + (params->dwFlags & CREDUI_FLAGS_DO_NOT_PERSIST && + !(params->dwFlags & CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX))) ShowWindow(GetDlgItem(hwndDlg, IDC_SAVE), SW_HIDE); else if (params->fSave) CheckDlgButton(hwndDlg, IDC_SAVE, BST_CHECKED);

1 0