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

Jarkko Korpi : widl: Fix overflow when left-shifting.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: bb9b2f33ae5894478ef509fae3f4b8e24267682a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9b2f33ae5894478ef509fae… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Tue Jun 21 09:23:22 2016 +0300 widl: Fix overflow when left-shifting. Signed-off-by: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/expr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index 0ada012..cf97c7e 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -222,8 +222,8 @@ expr_t *make_exprt(enum expr_type type, var_t *var, expr_t *expr) e->is_const = TRUE; if (is_signed_integer_type(tref)) { - cast_mask = (1 << (cast_type_bits - 1)) - 1; - if (expr->cval & (1 << (cast_type_bits - 1))) + cast_mask = (1u << (cast_type_bits - 1)) - 1; + if (expr->cval & (1u << (cast_type_bits - 1))) e->cval = -((-expr->cval) & cast_mask); else e->cval = expr->cval & cast_mask; @@ -231,8 +231,8 @@ expr_t *make_exprt(enum expr_type type, var_t *var, expr_t *expr) else { /* calculate ((1 << cast_type_bits) - 1) avoiding overflow */ - cast_mask = ((1 << (cast_type_bits - 1)) - 1) | - 1 << (cast_type_bits - 1); + cast_mask = ((1u << (cast_type_bits - 1)) - 1) | + 1u << (cast_type_bits - 1); e->cval = expr->cval & cast_mask; } }

1 0

Piotr Caban : msvcp90/tests: Remove unneeded casts.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: c6530fee82352573e12f3dc1e3bf5edbef10807f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6530fee82352573e12f3dc1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 23 10:24:20 2016 +0200 msvcp90/tests: Remove unneeded casts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 8 ++++---- dlls/msvcp90/tests/string.c | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 0c57ca1..91c546e 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1833,7 +1833,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &ss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); if (tests[i].telloff_ss != -1 && spos.off != -1) /* check if tell == seek but only if not hit EOF */ @@ -1860,7 +1860,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); if (tests[i].telloff_ss != -1 && spos.off != -1) /* check if tell == seek but only if not hit EOF */ @@ -1890,7 +1890,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &fs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); @@ -1913,7 +1913,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wfs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 8aea30a..9d46df0 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -409,9 +409,9 @@ static void test_basic_string_char_swap(void) { strcpy(atmp1, "qwerty"); call_func2(p_basic_string_char_ctor_cstr, &str1, atmp1); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_char_dtor, &str1); /* str1 allocated, str2 local */ @@ -420,11 +420,11 @@ static void test_basic_string_char_swap(void) { call_func2(p_basic_string_char_ctor_cstr, &str1, atmp1); call_func2(p_basic_string_char_ctor_cstr, &str2, atmp2); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_char_dtor, &str1); call_func1(p_basic_string_char_dtor, &str2); } @@ -607,8 +607,8 @@ static void test_basic_string_char_replace(void) { ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); ok(ret == &str, "str = %p ret = %p\n", ret, &str); - ok(strcmp(tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", - tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)); + ok(strcmp(tests[i].ret, call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", + tests[i].ret, (const char*)call_func1(p_basic_string_char_cstr, ret)); call_func1(p_basic_string_char_dtor, &str); } @@ -694,9 +694,9 @@ static void test_basic_string_wchar_swap(void) { mbstowcs(wtmp1, "qwerty", 32); call_func2(p_basic_string_wchar_ctor_cstr, &str1, wtmp1); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_wchar_dtor, &str1); /* str1 allocated, str2 local */ @@ -705,11 +705,11 @@ static void test_basic_string_wchar_swap(void) { call_func2(p_basic_string_wchar_ctor_cstr, &str1, wtmp1); call_func2(p_basic_string_wchar_ctor_cstr, &str2, wtmp2); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_wchar_dtor, &str1); call_func1(p_basic_string_wchar_dtor, &str2); }

1 0

Piotr Caban : msvcirt/tests: Remove unneeded casts.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 5c1b944a1c1c873c2090cbd7765a0a1ec3924f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1b944a1c1c873c2090cbd77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 23 10:24:06 2016 +0200 msvcirt/tests: Remove unneeded casts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 184 +++++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c1b944a1c1c873c2090c…

1 0

Andrey Gusev : winhttp/tests: Fix a typo in ok() message.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: a66f08db46ab7c6fb15b51473b15019d1d1fe154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66f08db46ab7c6fb15b51473… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 22 21:30:07 2016 +0300 winhttp/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index f81c07c..6be7598 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -617,7 +617,7 @@ static void test_WinHttpAddHeaders(void) test_header_name, NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICENT_BUFFER, go %u\n", GetLastError()); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICENT_BUFFER, got %u\n", GetLastError()); ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n");

1 0

Alexandre Julliard : gdi32/tests: Get rid of the todo mechanism in the path tests.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: b2702b2d6f68fc28dd821d0d982157bf45901d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2702b2d6f68fc28dd821d0d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 23 12:26:04 2016 +0900 gdi32/tests: Get rid of the todo mechanism in the path tests. All the tests succeed now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/path.c | 242 ++++++++++++++++++++++-------------------------- 1 file changed, 112 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2702b2d6f68fc28dd821…

1 0

Hugh McMaster : regedit: Tokenize command-line input.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 53c9a7897054d8c6374e2db38c2634e102f57e2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c9a7897054d8c6374e2db38… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 22 12:59:13 2016 +0000 regedit: Tokenize command-line input. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 247 ++++++++++++++++++++------------------------- 1 file changed, 109 insertions(+), 138 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 175e926..d2ed891 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -56,81 +56,23 @@ static const char *usage = "regedit.\n"; typedef enum { - ACTION_UNDEF, ACTION_ADD, ACTION_EXPORT, ACTION_DELETE + ACTION_ADD, ACTION_EXPORT, ACTION_DELETE } REGEDIT_ACTION; -/****************************************************************************** - * Copies file name from command line string to the buffer. - * Rewinds the command line string pointer to the next non-space character - * after the file name. - * Buffer contains an empty string if no filename was found; - * - * params: - * command_line - command line current position pointer - * where *s[0] is the first symbol of the file name. - * file_name - buffer to write the file name to. - */ -static void get_file_name(CHAR **command_line, CHAR *file_name) -{ - CHAR *s = *command_line; - int pos = 0; /* position of pointer "s" in *command_line */ - file_name[0] = 0; - - if (!s[0]) { - return; - } - - if (s[0] == '"') { - s++; - (*command_line)++; - while(s[0] != '"') { - if (!s[0]) { - fprintf(stderr, "regedit: Unexpected end of file name!\n"); - exit(1); - } - s++; - pos++; - } - } else { - while(s[0] && !isspace(s[0])) { - s++; - pos++; - } - } - memcpy(file_name, *command_line, pos * sizeof((*command_line)[0])); - /* Terminate the string and remove the trailing backslash */ - if (pos > 0 && file_name[pos - 1] == '\\') { - file_name[pos - 1] = '\0'; - } else { - file_name[pos] = '\0'; - } - - if (s[0]) { - s++; - pos++; - } - while(s[0] && isspace(s[0])) { - s++; - pos++; - } - (*command_line) += pos; -} - -static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) +static BOOL PerformRegAction(REGEDIT_ACTION action, char **argv, int *i) { switch (action) { case ACTION_ADD: { - CHAR filename[MAX_PATH]; + char *filename = argv[*i]; FILE *reg_file; - get_file_name(&s, filename); if (!filename[0]) { fprintf(stderr, "regedit: No file name was specified\n"); fprintf(stderr,usage); exit(1); } - while(filename[0]) { + if (filename[0]) { char* realname = NULL; if (strcmp(filename, "-") == 0) @@ -167,14 +109,12 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) HeapFree(GetProcessHeap(),0,realname); fclose(reg_file); } - get_file_name(&s, filename); } break; } case ACTION_DELETE: { - CHAR reg_key_name[KEY_MAX_LEN]; + char *reg_key_name = argv[*i]; - get_file_name(&s, reg_key_name); if (!reg_key_name[0]) { fprintf(stderr, "regedit: No registry key was specified for removal\n"); fprintf(stderr,usage); @@ -188,11 +128,9 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) break; } case ACTION_EXPORT: { - CHAR filename[MAX_PATH]; + char *filename = argv[*i]; WCHAR* filenameW; - filename[0] = '\0'; - get_file_name(&s, filename); if (!filename[0]) { fprintf(stderr, "regedit: No filename was specified\n"); fprintf(stderr,usage); @@ -200,11 +138,10 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) } filenameW = GetWideString(filename); - if (s[0]) { - CHAR reg_key_name[KEY_MAX_LEN]; + if (filenameW[0]) { + char *reg_key_name = argv[++(*i)]; WCHAR* reg_key_nameW; - get_file_name(&s, reg_key_name); reg_key_nameW = GetWideString(reg_key_name); export_registry_key(filenameW, reg_key_nameW, REG_FORMAT_4); HeapFree(GetProcessHeap(), 0, reg_key_nameW); @@ -222,83 +159,117 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) return TRUE; } +char *get_token(char *input, char **next) +{ + char *ch = input; + char *str; + + while (*ch && isspace(*ch)) + ch++; + + str = ch; + + if (*ch == '"') { + ch++; + str = ch; + for (;;) { + while (*ch && (*ch != '"')) + ch++; + + if (!*ch) + break; + + if (*(ch - 1) == '\\') { + ch++; + continue; + } + break; + } + } + else { + while (*ch && !isspace(*ch)) + ch++; + } + + if (*ch) { + *ch = 0; + ch++; + } + + *next = ch; + return str; +} + BOOL ProcessCmdLine(LPSTR lpCmdLine) { - REGEDIT_ACTION action = ACTION_UNDEF; - LPSTR s = lpCmdLine; /* command line pointer */ - CHAR ch = *s; /* current character */ + char *s = lpCmdLine; + char **argv; + char *tok; + int argc = 0, i = 1; + REGEDIT_ACTION action = ACTION_ADD; - while (ch && ((ch == '-') || (ch == '/'))) { - char chu; - char ch2; + if (!*lpCmdLine) + return FALSE; + while (*s) { + if (isspace(*s)) + i++; s++; - ch = *s; - if (!ch || isspace(ch)) + } + + s = lpCmdLine; + argv = HeapAlloc(GetProcessHeap(), 0, i * sizeof(char *)); + + for (i = 0; *s; i++) + { + tok = get_token(s, &s); + argv[i] = HeapAlloc(GetProcessHeap(), 0, strlen(tok) + 1); + strcpy(argv[i], tok); + argc++; + } + + for (i = 0; i < argc; i++) + { + if (argv[i][0] != '/' && argv[i][0] != '-') + break; /* No flags specified. */ + + if (!argv[i][1] && argv[i][0] == '-') + break; /* '-' is a filename. It indicates we should use stdin. */ + + if (argv[i][1] && argv[i][2] && argv[i][2] != ':') + break; /* This is a file path beginning with '/'. */ + + switch (toupper(argv[i][1])) { - /* '-' is a file name. It indicates we should use stdin */ - s--; + case '?': + fprintf(stderr, usage); + exit(0); break; - } - ch2 = *(s+1); - chu = toupper(ch); - if (!ch2 || isspace(ch2)) { - if (chu == 'S' || chu == 'V') { - /* ignore these switches */ - } else { - switch (chu) { - case 'D': - action = ACTION_DELETE; - break; - case 'E': - action = ACTION_EXPORT; - break; - case '?': - fprintf(stderr,usage); - exit(0); - break; - default: - fprintf(stderr, "regedit: Invalid or unrecognized switch [/%c]\n", chu); - exit(1); - break; - } - } - s++; - } else { - if (ch2 == ':') { - switch (chu) { - case 'L': - /* fall through */ - case 'R': - s += 2; - while (*s && !isspace(*s)) { - s++; - } - break; - default: - fprintf(stderr, "regedit: Invalid or unrecognized switch [/%c]\n", chu); - exit(1); - break; - } - } else { - /* this is a file name, starting from '/' */ - s--; - break; - } - } - /* skip spaces to the next parameter */ - ch = *s; - while (ch && isspace(ch)) { - s++; - ch = *s; + case 'D': + action = ACTION_DELETE; + break; + case 'E': + action = ACTION_EXPORT; + break; + case 'L': + case 'R': + /* unhandled */; + break; + case 'S': + case 'V': + /* ignored */; + break; + default: + fprintf(stderr, "regedit: Invalid switch [%ls]\n", argv[i]); + exit(1); } } - if (*s && action == ACTION_UNDEF) - action = ACTION_ADD; + PerformRegAction(action, argv, &i); - if (action == ACTION_UNDEF) - return FALSE; + for (i = 0; i < argc; i++) + HeapFree(GetProcessHeap(), 0, argv[i]); + HeapFree(GetProcessHeap(), 0, argv); - return PerformRegAction(action, s); + return TRUE; }

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement:: onload property implementation.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 589248c1e28d415738084deae6a46f3e34136274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589248c1e28d415738084deae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 15:32:56 2016 +0200 mshtml: Added IHTMLLinkElement::onload property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmllink.c | 13 +++++++---- dlls/mshtml/tests/events.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 22ccd0e..d2097e7 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -242,15 +243,19 @@ static HRESULT WINAPI HTMLLinkElement_get_onreadystatechange(IHTMLLinkElement *i static HRESULT WINAPI HTMLLinkElement_put_onload(IHTMLLinkElement *iface, VARIANT v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->element.node, EVENTID_LOAD, &v); } static HRESULT WINAPI HTMLLinkElement_get_onload(IHTMLLinkElement *iface, VARIANT *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->element.node, EVENTID_LOAD, p); } static HRESULT WINAPI HTMLLinkElement_put_onerror(IHTMLLinkElement *iface, VARIANT v) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 79ec153..2bd85fc 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -73,6 +73,7 @@ DEFINE_EXPECT(iframe_onreadystatechange_complete); DEFINE_EXPECT(iframedoc_onreadystatechange); DEFINE_EXPECT(img_onload); DEFINE_EXPECT(img_onerror); +DEFINE_EXPECT(link_onload); DEFINE_EXPECT(input_onfocus); DEFINE_EXPECT(input_onblur); DEFINE_EXPECT(div_onfocusin); @@ -115,6 +116,9 @@ static const char readystate_doc_str[] = static const char img_doc_str[] = "<html><body><img id=\"imgid\"></img></body></html>"; +static const char link_doc_str[] = + "<html><body><link id=\"linkid\" rel=\"stylesheet\" type=\"text/css\"></link></body></html>"; + static const char input_doc_str[] = "<html><body><div id=\"divid\"><input id=\"inputid\"></input></div></body></html>"; @@ -948,6 +952,17 @@ static HRESULT WINAPI img_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD EVENT_HANDLER_FUNC_OBJ(img_onload); +static HRESULT WINAPI link_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(link_onload); + test_event_args(&DIID_DispHTMLLinkElement, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("LINK"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(link_onload); + static HRESULT WINAPI unattached_img_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1997,6 +2012,48 @@ static void test_imgload(IHTMLDocument2 *doc) IHTMLImgElement_Release(img); } +static void test_link_load(IHTMLDocument2 *doc) +{ + IHTMLLinkElement *link; + IHTMLElement *elem; + VARIANT v; + BSTR str; + HRESULT hres; + + elem = get_elem_id(doc, "linkid"); + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLLinkElement, (void**)&link); + IHTMLElement_Release(elem); + ok(hres == S_OK, "Could not get IHTMLLinkElement iface: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLLinkElement_get_onload(link, &v); + ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "V_VT(onload) = %d\n", V_VT(&v)); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&link_onload_obj; + hres = IHTMLLinkElement_put_onload(link, v); + ok(hres == S_OK, "put_onload failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLLinkElement_get_onload(link, &v); + ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onload) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&link_onload_obj, "V_DISPATCH(onload) != onloadkFunc\n"); + VariantClear(&v); + + str = a2bstr("http://test.winehq.org/tests/winehq_snapshot/index_files/styles.css"); + hres = IHTMLLinkElement_put_href(link, str); + ok(hres == S_OK, "put_src failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(link_onload); + pump_msgs(&called_link_onload); + CHECK_CALLED(link_onload); + + IHTMLLinkElement_Release(link); +} + static void test_focus(IHTMLDocument2 *doc) { IHTMLElement2 *elem2; @@ -3069,6 +3126,7 @@ START_TEST(events) run_test(click_doc_str, test_onclick); run_test(readystate_doc_str, test_onreadystatechange); run_test(img_doc_str, test_imgload); + run_test(link_doc_str, test_link_load); run_test(input_doc_str, test_focus); run_test(form_doc_str, test_submit); run_test(iframe_doc_str, test_iframe_connections);

1 0

Hugh McMaster : regedit: Hard-code "regedit" instead of passing getAppName () as an argument.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 493b5aab22cba6636c1e65505da0b06d4346bca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493b5aab22cba6636c1e65505… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 22 12:03:07 2016 +0000 regedit: Hard-code "regedit" instead of passing getAppName() as an argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 24 ++++++++--------------- programs/regedit/regproc.c | 49 +++++++++++++++++++--------------------------- programs/regedit/regproc.h | 2 -- 3 files changed, 28 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=493b5aab22cba6636c1e6…

1 0

Józef Kucia : wined3d: Add SV_ClipDistance semantic.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: cdd2469fca19bd5361f0c8031aaba1e4669cb675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd2469fca19bd5361f0c8031… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:07:58 2016 +0200 wined3d: Add SV_ClipDistance semantic. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 1 + include/wine/wined3d.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4a3f53d..1085fda 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -251,6 +251,7 @@ static const struct sysval_semantic_names[] = { {WINED3D_SV_POSITION, "SV_Position"}, + {WINED3D_SV_CLIP_DISTANCE, "SV_ClipDistance"}, {WINED3D_SV_VERTEX_ID, "SV_VertexID"}, {WINED3D_SV_INSTANCE_ID, "SV_InstanceID"}, {WINED3D_SV_PRIMITIVE_ID, "SV_PrimitiveID"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9becd6f..da102c6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -744,6 +744,7 @@ enum wined3d_decl_usage enum wined3d_sysval_semantic { WINED3D_SV_POSITION = 1, + WINED3D_SV_CLIP_DISTANCE = 2, WINED3D_SV_VERTEX_ID = 6, WINED3D_SV_PRIMITIVE_ID = 7, WINED3D_SV_INSTANCE_ID = 8,

1 0

Józef Kucia : wined3d: Introduce wined3d_buffer_drop_bo() helper function.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 0572f8ad9e4a299f56c1c6fb73f25f13f3e14360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0572f8ad9e4a299f56c1c6fb7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:07:57 2016 +0200 wined3d: Introduce wined3d_buffer_drop_bo() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6f66b97..8adc2a1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -540,6 +540,22 @@ static void buffer_unload(struct wined3d_resource *resource) resource_unload(resource); } +static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) +{ + struct wined3d_device *device = buffer->resource.device; + + buffer->flags &= ~WINED3D_BUFFER_USE_BO; + buffer_unload(&buffer->resource); + + /* The stream source state handler might have read the memory of + * the vertex buffer already and got the memory in the vbo which + * is not valid any longer. Dirtify the stream source to force a + * reload. This happens only once per changed vertexbuffer and + * should occur rather rarely. */ + if (buffer->resource.bind_count) + device_invalidate_state(device, STATE_STREAMSRC); +} + ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedDecrement(&buffer->resource.ref); @@ -789,17 +805,8 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (buffer->decl_change_count > VB_MAXDECLCHANGES || (buffer->conversion_map && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC))) { - FIXME("Too many declaration changes or converting dynamic buffer, stopping converting\n"); - - buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_unload(&buffer->resource); - - /* The stream source state handler might have read the memory of - * the vertex buffer already and got the memory in the vbo which - * is not valid any longer. Dirtify the stream source to force a - * reload. This happens only once per changed vertexbuffer and - * should occur rather rarely. */ - device_invalidate_state(device, STATE_STREAMSRC); + FIXME("Too many declaration changes or converting dynamic buffer, stopping converting.\n"); + wined3d_buffer_drop_bo(buffer); return; } @@ -824,10 +831,7 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (buffer->full_conversion_count > VB_MAXFULLCONVERSIONS) { FIXME("Too many full buffer conversions, stopping converting.\n"); - buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_unload(&buffer->resource); - if (buffer->resource.bind_count) - device_invalidate_state(device, STATE_STREAMSRC); + wined3d_buffer_drop_bo(buffer); return; } } @@ -938,7 +942,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN LONG count; BYTE *base; - TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); + TRACE("buffer %p, offset %u, size %u, data %p, flags %#x.\n", buffer, offset, size, data, flags); flags = wined3d_resource_sanitize_map_flags(&buffer->resource, flags); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 multitexture @@ -1003,17 +1007,14 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN { /* The extra copy is more expensive than not using VBOs at * all on the Nvidia Linux driver, which is the only driver - * that returns unaligned pointers + * that returns unaligned pointers. */ - TRACE("Dynamic buffer, dropping VBO\n"); - buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_unload(&buffer->resource); - if (buffer->resource.bind_count) - device_invalidate_state(device, STATE_STREAMSRC); + TRACE("Dynamic buffer, dropping VBO.\n"); + wined3d_buffer_drop_bo(buffer); } else { - TRACE("Falling back to doublebuffered operation\n"); + TRACE("Falling back to doublebuffered operation.\n"); buffer_get_sysmem(buffer, context); } TRACE("New pointer is %p.\n", buffer->resource.heap_memory); @@ -1357,14 +1358,14 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct struct wined3d_buffer *object; HRESULT hr; - TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p\n", + TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p.\n", device, desc, data, parent, parent_ops, buffer); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; - FIXME("Ignoring access flags (pool)\n"); + FIXME("Ignoring access flags (pool).\n"); hr = buffer_init(object, device, desc->byte_width, desc->usage, WINED3DFMT_UNKNOWN, WINED3D_POOL_MANAGED, GL_ARRAY_BUFFER_ARB, data, parent, parent_ops);

1 0