wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Jarkko Korpi : widl: Fix overflow when left-shifting.
by Alexandre Julliard 23 Jun '16

23 Jun '16

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

Hugh McMaster : regedit: Use error handling for missing arguments.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: d418ece9d06865501d696458cf7d80033ad32c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d418ece9d06865501d696458c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 22 12:03:29 2016 +0000 regedit: Use error handling for missing arguments. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index d2ed891..5e873e1 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -66,12 +66,6 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, char **argv, int *i) char *filename = argv[*i]; FILE *reg_file; - if (!filename[0]) { - fprintf(stderr, "regedit: No file name was specified\n"); - fprintf(stderr,usage); - exit(1); - } - if (filename[0]) { char* realname = NULL; @@ -113,30 +107,16 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, char **argv, int *i) break; } case ACTION_DELETE: { - char *reg_key_name = argv[*i]; + WCHAR *reg_key_nameW = GetWideString(argv[*i]); - if (!reg_key_name[0]) { - fprintf(stderr, "regedit: No registry key was specified for removal\n"); - fprintf(stderr,usage); - exit(1); - } else - { - WCHAR* reg_key_nameW = GetWideString(reg_key_name); - delete_registry_key(reg_key_nameW); - HeapFree(GetProcessHeap(), 0, reg_key_nameW); - } + delete_registry_key(reg_key_nameW); + HeapFree(GetProcessHeap(), 0, reg_key_nameW); break; } case ACTION_EXPORT: { char *filename = argv[*i]; WCHAR* filenameW; - if (!filename[0]) { - fprintf(stderr, "regedit: No filename was specified\n"); - fprintf(stderr,usage); - exit(1); - } - filenameW = GetWideString(filename); if (filenameW[0]) { char *reg_key_name = argv[++(*i)]; @@ -265,6 +245,22 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) } } + if (i == argc) + { + switch (action) + { + case ACTION_ADD: + case ACTION_EXPORT: + fprintf(stderr, "regedit: No file name was specified\n\n"); + break; + case ACTION_DELETE: + fprintf(stderr,"regedit: No registry key was specified for removal\n\n"); + break; + } + fprintf(stderr, usage); + exit(1); + } + PerformRegAction(action, argv, &i); for (i = 0; i < argc; i++)

1 0

Hugh McMaster : regedit: Tokenize command-line input.
by Alexandre Julliard 23 Jun '16

23 Jun '16

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

Hugh McMaster : regedit: Hard-code "regedit" instead of passing getAppName () as an argument.
by Alexandre Julliard 23 Jun '16

23 Jun '16

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

Hugh McMaster : regedit: Replace error_unknown_switch() with simpler error handling.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 7e72247d07014feb61843f24c4e45c4177b7825f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e72247d07014feb61843f24c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 22 12:02:56 2016 +0000 regedit: Replace error_unknown_switch() with simpler error handling. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 2cbd4bb..050a031 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -230,24 +230,6 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) return TRUE; } -/** - * Process unknown switch. - * - * Params: - * chu - the switch character in upper-case. - * s - the command line string where s points to the switch character. - */ -static void error_unknown_switch(char chu, char *s) -{ - if (isalpha(chu)) { - fprintf(stderr,"%s: Undefined switch /%c!\n", getAppName(), chu); - } else { - fprintf(stderr,"%s: Alphabetic character is expected after '%c' " - "in switch specification\n", getAppName(), *(s - 1)); - } - exit(1); -} - BOOL ProcessCmdLine(LPSTR lpCmdLine) { REGEDIT_ACTION action = ACTION_UNDEF; @@ -284,7 +266,8 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) exit(0); break; default: - error_unknown_switch(chu, s); + fprintf(stderr, "regedit: Invalid or unrecognized switch [/%c]\n", chu); + exit(1); break; } } @@ -301,7 +284,8 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) } break; default: - error_unknown_switch(chu, s); + fprintf(stderr, "regedit: Invalid or unrecognized switch [/%c]\n", chu); + exit(1); break; } } else {

1 0

Andrey Gusev : setupapi/tests: Fix a typo in comment.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 3e8d4e31030e33817071a0aa1a71e4896723803d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8d4e31030e33817071a0aa1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 23 14:34:59 2016 +0300 setupapi/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index d12d683..5015e31 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -656,7 +656,7 @@ static void test_inffilelist(void) ok(ERROR_DIRECTORY == GetLastError(), "expected error ERROR_DIRECTORY, got %d\n", GetLastError()); - /* now check the buffer content of a vaild call + /* now check the buffer contents of a valid call */ *ptr = 0; expected = 3 + strlen(inffile) + strlen(inffile2);

1 0

Andrey Gusev : kernel32/tests: Fix a typo in skip() message.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: e1a42658672d7c632821ae46dac09fef241d86d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a42658672d7c632821ae46d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 23 14:31:03 2016 +0300 kernel32/tests: Fix a typo in skip() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f42e7ec..4f472db 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4717,7 +4717,7 @@ static void test_GetSystemPreferredUILanguages(void) size_buffer = max(size_id, size_name); if(!size_buffer) { - skip("No vaild buffer size\n"); + skip("No valid buffer size\n"); return; }

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement:: onload property implementation.
by Alexandre Julliard 23 Jun '16

23 Jun '16

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

Iván Matellanes : msvcirt: Set the error flag in writepad without locking.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 3be6ac0d338f6908ca5cbd2e10fc0fb87238e618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be6ac0d338f6908ca5cbd2e1… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jun 23 10:46:59 2016 +0100 msvcirt: Set the error flag in writepad without locking. writepad() is always called between opfx() and osfx(), so the ios object is already locked. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 666c44c..5f44854 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2572,22 +2572,22 @@ ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char /* left of the padding */ if (base->flags & (FLAGS_left|FLAGS_internal)) { if (streambuf_sputn(base->sb, str1, len1) != len1) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; if (!(base->flags & FLAGS_internal)) if (streambuf_sputn(base->sb, str2, len2) != len2) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; } /* add padding to fill the width */ for (i = len1 + len2; i < base->width; i++) if (streambuf_sputc(base->sb, base->fill) == EOF) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; /* right of the padding */ if ((base->flags & (FLAGS_left|FLAGS_internal)) != FLAGS_left) { if (!(base->flags & (FLAGS_left|FLAGS_internal))) if (streambuf_sputn(base->sb, str1, len1) != len1) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; if (streambuf_sputn(base->sb, str2, len2) != len2) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; } return this; }

1 0

Józef Kucia : wined3d: Fix sample_d for array textures.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 0afcd1aeb3768b28ef234088abb71a112078b04f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0afcd1aeb3768b28ef234088a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:08:01 2016 +0200 wined3d: Fix sample_d for array textures. 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/glsl_shader.c | 51 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d22798f..c6b3c1b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -65,7 +65,8 @@ struct glsl_src_param struct glsl_sample_function { struct wined3d_string_buffer *name; - DWORD coord_mask; + unsigned int coord_mask; + unsigned int deriv_mask; enum wined3d_data_type data_type; BOOL output_single_component; unsigned int offset_size; @@ -2803,24 +2804,23 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context static const struct { unsigned int coord_size; - unsigned int offset_size; const char *type_part; } resource_types[] = { - {0, 0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ - {1, 0, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ - {1, 1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ - {2, 2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ - {2, 0, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ - {3, 3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ - {3, 0, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ - {2, 1, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ - {3, 2, "2DArray"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ - {3, 0, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ + {0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ + {1, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ + {1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ + {2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ + {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ + {3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ + {3, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ + {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ + {3, "2DArray"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ + {3, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ }; - struct shader_glsl_ctx_priv *priv = ctx->backend_data; enum wined3d_shader_resource_type resource_type = ctx->reg_maps->resource_info[resource_idx].type; + struct shader_glsl_ctx_priv *priv = ctx->backend_data; const struct wined3d_gl_info *gl_info = ctx->gl_info; BOOL shadow = glsl_is_shadow_sampler(ctx->shader, priv->cur_ps_args, resource_idx, sampler_idx); BOOL projected = flags & WINED3D_GLSL_SAMPLE_PROJECTED; @@ -2831,7 +2831,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context BOOL grad = flags & WINED3D_GLSL_SAMPLE_GRAD; BOOL offset = flags & WINED3D_GLSL_SAMPLE_OFFSET; const char *base = "texture", *type_part = "", *suffix = ""; - unsigned int coord_size; + unsigned int coord_size, deriv_size; + BOOL array; sample_function->data_type = ctx->reg_maps->resource_info[resource_idx].data_type; @@ -2840,6 +2841,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context ERR("Unexpected resource type %#x.\n", resource_type); resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; } + array = resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY + || resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY; /* Note that there's no such thing as a projected cube texture. */ if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE) @@ -2875,21 +2878,19 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context type_part = ""; } - sample_function->offset_size = offset ? resource_types[resource_type].offset_size : 0; - if (offset && !sample_function->offset_size) - { - FIXME("Offset not supported for resource type %#x.\n", resource_type); - offset = FALSE; - } - sample_function->name = string_buffer_get(priv->string_buffers); string_buffer_sprintf(sample_function->name, "%s%s%s%s%s%s", base, type_part, projected ? "Proj" : "", lod ? "Lod" : grad ? "Grad" : "", offset ? "Offset" : "", suffix); coord_size = resource_types[resource_type].coord_size; + deriv_size = coord_size; if (shadow) ++coord_size; + if (array) + --deriv_size; + sample_function->offset_size = offset ? deriv_size : 0; sample_function->coord_mask = (1u << coord_size) - 1; + sample_function->deriv_mask = (1u << deriv_size) - 1; sample_function->output_single_component = shadow && !needs_legacy_glsl_syntax(gl_info); } @@ -4464,8 +4465,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, WINED3D_GLSL_SAMPLE_GRAD, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); - shader_glsl_add_src_param(ins, &ins->src[2], sample_function.coord_mask, &dx_param); - shader_glsl_add_src_param(ins, &ins->src[3], sample_function.coord_mask, &dy_param); + shader_glsl_add_src_param(ins, &ins->src[2], sample_function.deriv_mask, &dx_param); + shader_glsl_add_src_param(ins, &ins->src[3], sample_function.deriv_mask, &dy_param); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, swizzle, dx_param.param_str, dy_param.param_str, NULL, NULL, "%s", coord_param.param_str); @@ -4641,8 +4642,8 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) lod_param_str = lod_param.param_str; break; case WINED3DSIH_SAMPLE_GRAD: - shader_glsl_add_src_param(ins, &ins->src[3], sample_function.coord_mask, &dx_param); - shader_glsl_add_src_param(ins, &ins->src[4], sample_function.coord_mask, &dy_param); + shader_glsl_add_src_param(ins, &ins->src[3], sample_function.deriv_mask, &dx_param); + shader_glsl_add_src_param(ins, &ins->src[4], sample_function.deriv_mask, &dy_param); dx_param_str = dx_param.param_str; dy_param_str = dy_param.param_str; break;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2016