wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Gijs Vermeulen : msvcr120: Add [to]wctrans.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 32290748247ceff1c2d55ddbe9f56311ad7a9abd URL: https://source.winehq.org/git/wine.git/?a=commit;h=32290748247ceff1c2d55ddb… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Mar 21 16:30:21 2019 +0100 msvcr120: Add [to]wctrans. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46848 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 4 +-- dlls/msvcr120/tests/msvcr120.c | 37 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 4 +-- dlls/msvcrt/locale.c | 27 ++++++++++++++++ dlls/msvcrt/msvcrt.h | 3 ++ dlls/ucrtbase/ucrtbase.spec | 4 +-- 8 files changed, 75 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index a72ec0a..1b877e3 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -119,4 +119,4 @@ @ cdecl wctob(long) ucrtbase.wctob @ cdecl wctomb(ptr long) ucrtbase.wctomb @ cdecl wctomb_s(ptr ptr long long) ucrtbase.wctomb_s -@ stub wctrans +@ cdecl wctrans(str) ucrtbase.wctrans diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 0a61576..7854437 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -151,7 +151,7 @@ @ cdecl strxfrm(ptr str long) ucrtbase.strxfrm @ cdecl tolower(long) ucrtbase.tolower @ cdecl toupper(long) ucrtbase.toupper -@ stub towctrans +@ cdecl towctrans(long long) ucrtbase.towctrans @ cdecl towlower(long) ucrtbase.towlower @ cdecl towupper(long) ucrtbase.towupper @ cdecl wcscat(wstr wstr) ucrtbase.wcscat diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0e3d7bb..b4a0d7e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2414,7 +2414,7 @@ @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper -@ stub towctrans +@ cdecl towctrans(long long) MSVCR120_towctrans @ cdecl towlower(long) MSVCRT_towlower @ cdecl towupper(long) MSVCRT_towupper @ cdecl trunc(double) MSVCR120_trunc @@ -2486,7 +2486,7 @@ @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s -@ stub wctrans +@ cdecl wctrans(str) MSVCR120_wctrans @ cdecl wctype(str) @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 3077a18..be5df27 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <float.h> #include <limits.h> +#include <wctype.h> #include <windef.h> #include <winbase.h> @@ -205,6 +206,8 @@ static double (__cdecl *p_creal)(_Dcomplex); static double (__cdecl *p_nexttoward)(double, double); static float (__cdecl *p_nexttowardf)(float, double); static double (__cdecl *p_nexttowardl)(double, double); +static wctrans_t (__cdecl *p_wctrans)(const char*); +static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); /* make sure we use the correct errno */ #undef errno @@ -268,6 +271,8 @@ static BOOL init(void) SET(p_nexttoward, "nexttoward"); SET(p_nexttowardf, "nexttowardf"); SET(p_nexttowardl, "nexttowardl"); + SET(p_wctrans, "wctrans"); + SET(p_towctrans, "towctrans"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QEAA@XZ"); @@ -1052,6 +1057,37 @@ static void test_nexttoward(void) ok(e == -1, "Expected no error, got %d.\n", e); } +static void test_towctrans(void) +{ + wchar_t ret; + + ret = p_wctrans("tolower"); + ok(ret == 2, "wctrans returned %d, expected 2\n", ret); + ret = p_wctrans("toupper"); + ok(ret == 1, "wctrans returned %d, expected 1\n", ret); + ret = p_wctrans("toLower"); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + ret = p_wctrans(""); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + if(0) { /* crashes on windows */ + ret = p_wctrans(NULL); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + } + + ret = p_towctrans('t', 2); + ok(ret == 't', "towctrans('t', 2) returned %c, expected t\n", ret); + ret = p_towctrans('T', 2); + ok(ret == 't', "towctrans('T', 2) returned %c, expected t\n", ret); + ret = p_towctrans('T', 0); + ok(ret == 't', "towctrans('T', 0) returned %c, expected t\n", ret); + ret = p_towctrans('T', 3); + ok(ret == 't', "towctrans('T', 3) returned %c, expected t\n", ret); + ret = p_towctrans('t', 1); + ok(ret == 'T', "towctrans('t', 1) returned %c, expected T\n", ret); + ret = p_towctrans('T', 1); + ok(ret == 'T', "towctrans('T', 1) returned %c, expected T\n", ret); +} + START_TEST(msvcr120) { if (!init()) return; @@ -1072,4 +1108,5 @@ START_TEST(msvcr120) test_vsscanf(); test__Cbuild(); test_nexttoward(); + test_towctrans(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 5b1549b..2bb377b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2076,7 +2076,7 @@ @ cdecl tmpnam_s(ptr long) msvcr120.tmpnam_s @ cdecl tolower(long) msvcr120.tolower @ cdecl toupper(long) msvcr120.toupper -@ stub towctrans +@ cdecl towctrans(long long) msvcr120.towctrans @ cdecl towlower(long) msvcr120.towlower @ cdecl towupper(long) msvcr120.towupper @ cdecl trunc(double) msvcr120.trunc @@ -2148,7 +2148,7 @@ @ cdecl wctob(long) msvcr120.wctob @ cdecl wctomb(ptr long) msvcr120.wctomb @ cdecl wctomb_s(ptr ptr long long) msvcr120.wctomb_s -@ stub wctrans +@ cdecl wctrans(str) msvcr120.wctrans @ cdecl wctype(str) msvcr120.wctype @ cdecl wmemcpy_s(ptr long ptr long) msvcr120.wmemcpy_s @ cdecl wmemmove_s(ptr long ptr long) msvcr120.wmemmove_s diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index a1e827d..4282fed 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -2069,3 +2069,30 @@ BOOL msvcrt_init_locale(void) _setmbcp(_MB_CP_ANSI); return TRUE; } + +#if _MSVCR_VER >= 120 +/********************************************************************* + * wctrans (MSVCR120.@) + */ +MSVCRT_wctrans_t CDECL MSVCR120_wctrans(const char *property) +{ + static const char str_tolower[] = "tolower"; + static const char str_toupper[] = "toupper"; + + if(!strcmp(property, str_tolower)) + return 2; + if(!strcmp(property, str_toupper)) + return 1; + return 0; +} + +/********************************************************************* + * towctrans (MSVCR120.@) + */ +MSVCRT_wint_t CDECL MSVCR120_towctrans(MSVCRT_wint_t c, MSVCRT_wctrans_t category) +{ + if(category == 1) + return MSVCRT__towupper_l(c, NULL); + return MSVCRT__towlower_l(c, NULL); +} +#endif diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8df8e3b..ed12dee 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -63,6 +63,7 @@ typedef unsigned char MSVCRT_bool; typedef unsigned short MSVCRT_wchar_t; typedef unsigned short MSVCRT_wint_t; +typedef unsigned short MSVCRT_wctrans_t; typedef unsigned short MSVCRT_wctype_t; typedef unsigned short MSVCRT__ino_t; typedef unsigned int MSVCRT__fsize_t; @@ -1145,6 +1146,8 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); +int __cdecl MSVCRT__towupper_l(MSVCRT_wint_t,MSVCRT__locale_t); +int __cdecl MSVCRT__towlower_l(MSVCRT_wint_t,MSVCRT__locale_t); int __cdecl MSVCRT__strnicmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 770dd4f..544ebf8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2543,7 +2543,7 @@ @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper -@ stub towctrans +@ cdecl towctrans(long long) MSVCR120_towctrans @ cdecl towlower(long) MSVCRT_towlower @ cdecl towupper(long) MSVCRT_towupper @ cdecl trunc(double) MSVCR120_trunc @@ -2593,7 +2593,7 @@ @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s -@ stub wctrans +@ cdecl wctrans(str) MSVCR120_wctrans @ cdecl wctype(str) @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long)

1 0

Jacek Caban : mshtml.idl: Add DispHTMLW3CComputedStyle declaration.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 2dffeef20a7ad150f9d9fb257edc50b576c4af43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dffeef20a7ad150f9d9fb25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 21 19:03:05 2019 +0100 mshtml.idl: Add DispHTMLW3CComputedStyle declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 141 ++++ include/mshtml.idl | 2230 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 2366 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2dffeef20a7ad150f9d9…

1 0

Jacek Caban : jscript: Use parse_decimal for parsing JSON numeric literals starting with 0.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: b9a57de04840c6b234ff4102e25f6978f8f60c1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a57de04840c6b234ff4102… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 21 14:55:55 2019 +0100 jscript: Use parse_decimal for parsing JSON numeric literals starting with 0. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/json.c | 15 ++++----------- dlls/jscript/tests/api.js | 5 ++++- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index b5e6e10..5a0ec14 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -261,19 +261,12 @@ static HRESULT parse_json_value(json_parse_ctx_t *ctx, jsval_t *r) skip_spaces(ctx); } - if(!isdigitW(*ctx->ptr)) + if(*ctx->ptr == '0' && ctx->ptr + 1 < ctx->end && isdigitW(ctx->ptr[1])) break; - if(*ctx->ptr == '0') { - ctx->ptr++; - n = 0; - if(is_identifier_char(*ctx->ptr)) - break; - }else { - hres = parse_decimal(&ctx->ptr, ctx->end, &n); - if(FAILED(hres)) - return hres; - } + hres = parse_decimal(&ctx->ptr, ctx->end, &n); + if(FAILED(hres)) + break; *r = jsval_number(sign*n); return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ff6a6b7..38b2e66 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1887,7 +1887,10 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); ["[false,{},{\"x\": []}]", [false,{},{x:[]}]], ["0", 0], ["- 1", -1], - ["1e2147483648", Infinity] + ["1e2147483648", Infinity], + ["0.5", 0.5], + ["0e5", 0], + [".5", 0.5] ]; function json_cmp(x, y) {

1 0

Jacek Caban : mshtml: Use get_parentWindow for IHTMLDocument2:: get_Script implementation.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 9240ed581f5e1f35bb40537bada0b43d9a93b396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9240ed581f5e1f35bb40537b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 21 14:41:02 2019 +0100 mshtml: Use get_parentWindow for IHTMLDocument2::get_Script implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/tests/dom.c | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 690ab08..20d1c74 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -213,12 +213,12 @@ static HRESULT WINAPI HTMLDocument_Invoke(IHTMLDocument2 *iface, DISPID dispIdMe static HRESULT WINAPI HTMLDocument_get_Script(IHTMLDocument2 *iface, IDispatch **p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - *p = (IDispatch*)&This->window->base.IHTMLWindow2_iface; - IDispatch_AddRef(*p); - return S_OK; + hres = IHTMLDocument7_get_parentWindow(&This->IHTMLDocument7_iface, (IHTMLWindow2**)p); + return hres == S_OK && !*p ? E_PENDING : hres; } static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCollection **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c4d30ca..8c7548a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6925,6 +6925,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc) IHTMLDocument7 *new_document; IHTMLLocation *location; IHTMLWindow2 *window; + IDispatch *disp; str = a2bstr("test"); hres = IHTMLDOMImplementation2_createHTMLDocument(dom_implementation2, str, &new_document); @@ -6947,6 +6948,9 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_parentWindow(new_document2, &window); ok(hres == E_FAIL, "get_parentWindow returned: %08x\n", hres); + hres = IHTMLDocument2_get_Script(new_document2, &disp); + ok(hres == E_PENDING, "get_Script returned: %08x\n", hres); + hres = IHTMLDocument2_get_location(new_document2, &location); ok(hres == E_UNEXPECTED, "get_location returned: %08x\n", hres);

1 0

Jacek Caban : mshtml: Return NULL for document not attached to window in IHTMLDocument7:: get_defaultView.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 51e6cbdbd87293bbcb8f2c45d1a23a0167e8175d URL: https://source.winehq.org/git/wine.git/?a=commit;h=51e6cbdbd87293bbcb8f2c45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 21 14:40:54 2019 +0100 mshtml: Return NULL for document not attached to window in IHTMLDocument7::get_defaultView. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 14 ++++++++++---- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f08db09..690ab08 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1627,10 +1627,12 @@ static HRESULT WINAPI HTMLDocument_elementFromPoint(IHTMLDocument2 *iface, LONG static HRESULT WINAPI HTMLDocument_get_parentWindow(IHTMLDocument2 *iface, IHTMLWindow2 **p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - return IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p); + hres = IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p); + return hres == S_OK && !*p ? E_FAIL : hres; } static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface, @@ -3248,12 +3250,16 @@ static HRESULT WINAPI HTMLDocument7_Invoke(IHTMLDocument7 *iface, DISPID dispIdM static HRESULT WINAPI HTMLDocument7_get_defaultView(IHTMLDocument7 *iface, IHTMLWindow2 **p) { - HTMLDocument *This = impl_from_IHTMLDocument7(iface); + HTMLDocumentNode *This = impl_from_IHTMLDocument7(iface)->doc_node; TRACE("(%p)->(%p)\n", This, p); - *p = &This->window->base.IHTMLWindow2_iface; - IHTMLWindow2_AddRef(*p); + if(This->window && This->window->base.outer_window) { + *p = &This->window->base.outer_window->base.IHTMLWindow2_iface; + IHTMLWindow2_AddRef(*p); + }else { + *p = NULL; + } return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 52d353f..c4d30ca 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6924,6 +6924,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc) IHTMLDocument2 *new_document2; IHTMLDocument7 *new_document; IHTMLLocation *location; + IHTMLWindow2 *window; str = a2bstr("test"); hres = IHTMLDOMImplementation2_createHTMLDocument(dom_implementation2, str, &new_document); @@ -6932,9 +6933,20 @@ static void test_dom_implementation(IHTMLDocument2 *doc) test_disp((IUnknown*)new_document, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, "[object]"); test_ifaces((IUnknown*)new_document, doc_node_iids); + hres = IHTMLDocument7_get_defaultView(new_document, &window); + ok(hres == S_OK, "get_defaultView returned: %08x\n", hres); + ok(!window, "window = %p\n", window); + + hres = IHTMLDocument7_get_parentWindow(new_document, &window); + ok(hres == S_OK, "get_parentWindow returned: %08x\n", hres); + ok(!window, "window = %p\n", window); + hres = IHTMLDocument7_QueryInterface(new_document, &IID_IHTMLDocument2, (void**)&new_document2); ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + hres = IHTMLDocument2_get_parentWindow(new_document2, &window); + ok(hres == E_FAIL, "get_parentWindow returned: %08x\n", hres); + hres = IHTMLDocument2_get_location(new_document2, &location); ok(hres == E_UNEXPECTED, "get_location returned: %08x\n", hres);

1 0

Jacek Caban : mshtml: Remove selection and range objects from document list when detaching.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: a124117f40c1c69f68959244bd2f390a617b0fd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a124117f40c1c69f68959244… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 21 14:40:44 2019 +0100 mshtml: Remove selection and range objects from document list when detaching. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/selection.c | 5 +++-- dlls/mshtml/txtrange.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index dfbb386..da8fbfa 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -364,9 +364,10 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect void detach_selection(HTMLDocumentNode *This) { - HTMLSelectionObject *iter; + HTMLSelectionObject *iter, *next; - LIST_FOR_EACH_ENTRY(iter, &This->selection_list, HTMLSelectionObject, entry) { + LIST_FOR_EACH_ENTRY_SAFE(iter, next, &This->selection_list, HTMLSelectionObject, entry) { iter->doc = NULL; + list_remove(&iter->entry); } } diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index bfabbf4..b377fad 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1760,9 +1760,10 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx void detach_ranges(HTMLDocumentNode *This) { - HTMLTxtRange *iter; + HTMLTxtRange *iter, *next; - LIST_FOR_EACH_ENTRY(iter, &This->range_list, HTMLTxtRange, entry) { + LIST_FOR_EACH_ENTRY_SAFE(iter, next, &This->range_list, HTMLTxtRange, entry) { iter->doc = NULL; + list_remove(&iter->entry); } }

1 0

Jacek Caban : mshtml: Set elem_vars to NULL when detaching.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 18e0225afb078b4460871c5732db41b1e66cb567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18e0225afb078b4460871c57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 21 14:40:36 2019 +0100 mshtml: Set elem_vars to NULL when detaching. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 013fffb..f08db09 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4905,7 +4905,8 @@ void detach_document_node(HTMLDocumentNode *doc) for(i=0; i < doc->elem_vars_cnt; i++) heap_free(doc->elem_vars[i]); heap_free(doc->elem_vars); - doc->elem_vars_cnt = 0; + doc->elem_vars_cnt = doc->elem_vars_size = 0; + doc->elem_vars = NULL; if(doc->catmgr) { ICatInformation_Release(doc->catmgr);

1 0

Detlef Riekenberg : devenum/tests: Accept ERROR_KEY_DOES_NOT_EXIST from IPropertyBag_Read.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 9ceb9720e8447b899b2bd4bfa5e5571b419db1f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ceb9720e8447b899b2bd4bf… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Mar 20 08:44:10 2019 +0100 devenum/tests: Accept ERROR_KEY_DOES_NOT_EXIST from IPropertyBag_Read. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index e31f65c..9fcfdcf 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -33,6 +33,7 @@ #include "mmddk.h" #include "vfw.h" #include "dmoreg.h" +#include "setupapi.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -122,7 +123,8 @@ static void test_devenum(IBindCtx *bind_ctx) ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); - ok(hr == S_OK, "IPropertyBag_Read failed: %#x\n", hr); + ok((hr == S_OK) | (hr == ERROR_KEY_DOES_NOT_EXIST), + "IPropertyBag_Read failed: %#x\n", hr); if (winetest_debug > 1) trace(" %s %s\n", wine_dbgstr_w(displayname), wine_dbgstr_w(V_BSTR(&var)));

1 0

Michael Stefaniuc : d3dx9: Move techniques out of struct d3dx9_base_effect.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 5fa06bbc302c0fdbf8a5e087b7f18445475add2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fa06bbc302c0fdbf8a5e087… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 20 17:46:31 2019 +0100 d3dx9: Move techniques out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 63 ++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 35 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 53317a0..0c28fae 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -152,8 +152,6 @@ struct d3dx9_base_effect { struct d3dx_effect *effect; - struct d3dx_technique *techniques; - struct d3dx_effect_pool *pool; DWORD flags; @@ -170,6 +168,7 @@ struct d3dx_effect unsigned int technique_count; unsigned int object_count; struct d3dx_top_level_parameter *parameters; + struct d3dx_technique *techniques; struct d3dx_object *objects; struct wine_rb_tree param_tree; char *full_name_tmp; @@ -453,15 +452,14 @@ static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) static struct d3dx_technique *get_technique_by_name(struct d3dx_effect *effect, const char *name) { - struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; if (!name) return NULL; for (i = 0; i < effect->technique_count; ++i) { - if (!strcmp(base->techniques[i].name, name)) - return &base->techniques[i]; + if (!strcmp(effect->techniques[i].name, name)) + return &effect->techniques[i]; } return NULL; @@ -469,13 +467,12 @@ static struct d3dx_technique *get_technique_by_name(struct d3dx_effect *effect, static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3DXHANDLE technique) { - struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; for (i = 0; i < effect->technique_count; ++i) { - if (get_technique_handle(&base->techniques[i]) == technique) - return &base->techniques[i]; + if (get_technique_handle(&effect->techniques[i]) == technique) + return &effect->techniques[i]; } return get_technique_by_name(effect, technique); @@ -483,12 +480,11 @@ static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3 static struct d3dx_pass *get_valid_pass(struct d3dx_effect *effect, D3DXHANDLE pass) { - struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i, k; for (i = 0; i < effect->technique_count; ++i) { - struct d3dx_technique *technique = &base->techniques[i]; + struct d3dx_technique *technique = &effect->techniques[i]; for (k = 0; k < technique->pass_count; ++k) { @@ -683,10 +679,9 @@ static void free_technique(struct d3dx_technique *technique) static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) { - struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; - TRACE("base %p.\n", base); + TRACE("Effect %p.\n", effect); heap_free(effect->full_name_tmp); @@ -698,12 +693,12 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) effect->parameters = NULL; } - if (base->techniques) + if (effect->techniques) { for (i = 0; i < effect->technique_count; ++i) - free_technique(&base->techniques[i]); - HeapFree(GetProcessHeap(), 0, base->techniques); - base->techniques = NULL; + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + effect->techniques = NULL; } if (effect->objects) @@ -1897,7 +1892,7 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL D3DXTECHNIQUE_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_technique *tech = technique ? get_valid_technique(effect, technique) : &effect->base_effect.techniques[0]; + struct d3dx_technique *tech = technique ? get_valid_technique(effect, technique) : &effect->techniques[0]; TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc); @@ -2127,9 +2122,9 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index return NULL; } - TRACE("Returning technique %p.\n", &effect->base_effect.techniques[index]); + TRACE("Returning technique %p.\n", &effect->techniques[index]); - return get_technique_handle(&effect->base_effect.techniques[index]); + return get_technique_handle(&effect->techniques[index]); } static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) @@ -3647,7 +3642,6 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D D3DXHANDLE *next_technique) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_technique *prev_tech, *tech; unsigned int i; @@ -3660,7 +3654,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D for (i = 0; i < effect->technique_count; ++i) { - tech = &base->techniques[i]; + tech = &effect->techniques[i]; if (tech == prev_tech) { ++i; @@ -3675,7 +3669,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D for (; i < effect->technique_count; ++i) { - tech = &base->techniques[i]; + tech = &effect->techniques[i]; if (SUCCEEDED(d3dx_effect_ValidateTechnique(iface, get_technique_handle(tech)))) { *next_technique = get_technique_handle(tech); @@ -3683,7 +3677,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D } } - *next_technique = get_technique_handle(&base->techniques[0]); + *next_technique = get_technique_handle(&effect->techniques[0]); return S_FALSE; } @@ -5774,7 +5768,6 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, const char **ptr, const char **skip_constants, unsigned int skip_constants_count) { - struct d3dx9_base_effect *base = &effect->base_effect; DWORD technique_index; DWORD index, state_index, usage, element_index; struct d3dx_state *state; @@ -5842,7 +5835,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, return E_FAIL; } - technique = &base->techniques[technique_index]; + technique = &effect->techniques[technique_index]; if (index >= technique->pass_count) { FIXME("Index out of bounds: index %u >= pass_count %u\n", index, technique->pass_count); @@ -6015,8 +6008,8 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U if (effect->technique_count) { - base->techniques = heap_alloc_zero(sizeof(*base->techniques) * effect->technique_count); - if (!base->techniques) + effect->techniques = heap_alloc_zero(sizeof(*effect->techniques) * effect->technique_count); + if (!effect->techniques) { ERR("Out of memory.\n"); hr = E_OUTOFMEMORY; @@ -6026,7 +6019,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U for (i = 0; i < effect->technique_count; ++i) { TRACE("Parsing technique %u.\n", i); - hr = d3dx_parse_effect_technique(effect, &base->techniques[i], data, &ptr, effect->objects); + hr = d3dx_parse_effect_technique(effect, &effect->techniques[i], data, &ptr, effect->objects); if (hr != D3D_OK) { WARN("Failed to parse technique %u.\n", i); @@ -6081,12 +6074,12 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U err_out: - if (base->techniques) + if (effect->techniques) { for (i = 0; i < effect->technique_count; ++i) - free_technique(&base->techniques[i]); - HeapFree(GetProcessHeap(), 0, base->techniques); - base->techniques = NULL; + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + effect->techniques = NULL; } if (effect->parameters) @@ -6288,7 +6281,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx_effect *effect, const char *da { for (j = 0; j < effect->technique_count; ++j) { - if (is_parameter_used(param, &base->techniques[j])) + if (is_parameter_used(param, &effect->techniques[j])) { WARN("skip_constants parameter %s is used in technique %u.\n", debugstr_a(skip_constants[i]), j); @@ -6342,9 +6335,9 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev } /* initialize defaults - check because of unsupported ascii effects */ - if (effect->base_effect.techniques) + if (effect->techniques) { - effect->active_technique = &effect->base_effect.techniques[0]; + effect->active_technique = &effect->techniques[0]; effect->active_pass = NULL; }

1 0

Michael Stefaniuc : d3dx9: Move parameters out of struct d3dx9_base_effect.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 4c134a66b0c3c10d4ed334477385a91440069024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c134a66b0c3c10d4ed33447… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 20 17:46:30 2019 +0100 d3dx9: Move parameters out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 53 ++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 17d97bb..53317a0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -152,7 +152,6 @@ struct d3dx9_base_effect { struct d3dx_effect *effect; - struct d3dx_top_level_parameter *parameters; struct d3dx_technique *techniques; struct d3dx_effect_pool *pool; @@ -170,6 +169,7 @@ struct d3dx_effect unsigned int parameter_count; unsigned int technique_count; unsigned int object_count; + struct d3dx_top_level_parameter *parameters; struct d3dx_object *objects; struct wine_rb_tree param_tree; char *full_name_tmp; @@ -690,12 +690,12 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) heap_free(effect->full_name_tmp); - if (base->parameters) + if (effect->parameters) { for (i = 0; i < effect->parameter_count; ++i) - free_top_level_parameter(&base->parameters[i]); - HeapFree(GetProcessHeap(), 0, base->parameters); - base->parameters = NULL; + free_top_level_parameter(&effect->parameters[i]); + heap_free(effect->parameters); + effect->parameters = NULL; } if (base->techniques) @@ -1984,8 +1984,8 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE { if (index < effect->parameter_count) { - TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); - return get_parameter_handle(&effect->base_effect.parameters[index].param); + TRACE("Returning parameter %p.\n", &effect->parameters[index]); + return get_parameter_handle(&effect->parameters[index].param); } } else @@ -2038,7 +2038,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, { for (i = 0; i < effect->parameter_count; ++i) { - temp_param = &effect->base_effect.parameters[i].param; + temp_param = &effect->parameters[i].param; if (!temp_param->semantic) { @@ -2097,8 +2097,8 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3D { if (index < effect->parameter_count) { - TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); - return get_parameter_handle(&effect->base_effect.parameters[index].param); + TRACE("Returning parameter %p.\n", &effect->parameters[index]); + return get_parameter_handle(&effect->parameters[index].param); } } else @@ -4019,13 +4019,12 @@ static BOOL param_on_lost_device(void *data, struct d3dx_parameter *param) static HRESULT WINAPI d3dx_effect_OnLostDevice(ID3DXEffect *iface) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; TRACE("iface %p.\n", iface); for (i = 0; i < effect->parameter_count; ++i) - walk_parameter_tree(&base->parameters[i].param, param_on_lost_device, NULL); + walk_parameter_tree(&effect->parameters[i].param, param_on_lost_device, NULL); return D3D_OK; } @@ -5809,7 +5808,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, return E_FAIL; } - parameter = &base->parameters[index].param; + parameter = &effect->parameters[index].param; if (element_index != 0xffffffff) { if (element_index >= parameter->element_count && parameter->element_count != 0) @@ -5992,9 +5991,8 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U wine_rb_init(&effect->param_tree, param_rb_compare); if (effect->parameter_count) { - base->parameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*base->parameters) * effect->parameter_count); - if (!base->parameters) + effect->parameters = heap_alloc_zero(sizeof(*effect->parameters) * effect->parameter_count); + if (!effect->parameters) { ERR("Out of memory.\n"); hr = E_OUTOFMEMORY; @@ -6003,16 +6001,15 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U for (i = 0; i < effect->parameter_count; ++i) { - param_set_magic_number(&base->parameters[i].param); - hr = d3dx_parse_effect_parameter(effect, &base->parameters[i], data, &ptr, effect->objects); + param_set_magic_number(&effect->parameters[i].param); + hr = d3dx_parse_effect_parameter(effect, &effect->parameters[i], data, &ptr, effect->objects); if (hr != D3D_OK) { WARN("Failed to parse parameter %u.\n", i); goto err_out; } - walk_parameter_tree(&base->parameters[i].param, param_set_top_level_param, - &base->parameters[i]); - add_param_to_tree(effect, &base->parameters[i].param, NULL, 0, 0); + walk_parameter_tree(&effect->parameters[i].param, param_set_top_level_param, &effect->parameters[i]); + add_param_to_tree(effect, &effect->parameters[i].param, NULL, 0, 0); } } @@ -6075,10 +6072,10 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U for (i = 0; i < effect->parameter_count; ++i) { - if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &base->parameters[i]))) + if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &effect->parameters[i]))) goto err_out; - base->parameters[i].version_counter = get_version_counter_ptr(effect); - set_dirty(&base->parameters[i].param); + effect->parameters[i].version_counter = get_version_counter_ptr(effect); + set_dirty(&effect->parameters[i].param); } return D3D_OK; @@ -6092,14 +6089,14 @@ err_out: base->techniques = NULL; } - if (base->parameters) + if (effect->parameters) { for (i = 0; i < effect->parameter_count; ++i) { - free_top_level_parameter(&base->parameters[i]); + free_top_level_parameter(&effect->parameters[i]); } - HeapFree(GetProcessHeap(), 0, base->parameters); - base->parameters = NULL; + heap_free(effect->parameters); + effect->parameters = NULL; } if (effect->objects)

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 March 2019