April 2017 - Wine-commits - list.winehq.org

Jacek Caban : mshtml.idl: Added HTMLSelectElement coclass declaration.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 9689cbcb181234028d7c32728381385653c9f246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9689cbcb181234028d7c32728… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:35:51 2017 +0200 mshtml.idl: Added HTMLSelectElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlselect.c | 4 ++-- include/mshtml.idl | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 2d58326..7b63d9e 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -33,13 +33,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLSelectElement { HTMLElement element; IHTMLSelectElement IHTMLSelectElement_iface; nsIDOMHTMLSelectElement *nsselect; -} HTMLSelectElement; +}; static inline HTMLSelectElement *impl_from_IHTMLSelectElement(IHTMLSelectElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index a6072a6..b34d7be 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -10373,6 +10373,27 @@ methods: } /***************************************************************************** + * HTMLSelectElement coclass + */ +[ + noncreatable, + uuid(3050f245-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLSelectElement +{ + [default] dispinterface DispHTMLSelectElement; + /* [source, default] dispinterface HTMLSelectElementEvents; */ + /* [source] dispinterface HTMLSelectElementEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLSelectElement; + /* interface IHTMLSelectElement2; */ + /* interface IHTMLSelectElement4; */ + /* interface IHTMLSelectElement5; */ + /* interface IHTMLSelectElement6; */ +} + +/***************************************************************************** * IHTMLSelectionObject interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLInputElement coclass declaration.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 85e9e2867cca8a830c65f705dffbb617739c3f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e9e2867cca8a830c65f705d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:36:00 2017 +0200 mshtml.idl: Added HTMLInputElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 4 ++-- include/mshtml.idl | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 3a03611..607e24f 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -34,14 +34,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLInputElement { HTMLElement element; IHTMLInputElement IHTMLInputElement_iface; IHTMLInputTextElement IHTMLInputTextElement_iface; nsIDOMHTMLInputElement *nsinput; -} HTMLInputElement; +}; static const WCHAR forW[] = {'f','o','r',0}; diff --git a/include/mshtml.idl b/include/mshtml.idl index b34d7be..91d38cb 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11148,6 +11148,35 @@ methods: } /***************************************************************************** + * HTMLInputElement coclass + */ +[ + noncreatable, + uuid(3050f5d8-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLInputElement +{ + [default] dispinterface DispHTMLInputElement; + /* [source, default] dispinterface HTMLInputTextElementEvents; */ + /* [source] dispinterface HTMLInputTextElementEvents2; */ + /* [source] dispinterface HTMLOptionButtonElementEvents; */ + /* [source] dispinterface HTMLButtonElementEvents; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLInputElement; + /* interface IHTMLInputElement2; */ + interface IHTMLInputTextElement; + /* interface IHTMLInputTextElement2; */ + /* interface IHTMLInputHiddenElement; */ + /* interface IHTMLInputButtonElement; */ + /* interface IHTMLInputFileElement; */ + /* interface IHTMLOptionButtonElement; */ + /* interface IHTMLInputImage; */ + /* interface IHTMLInputElement3; */ + /* interface IHTMLInputRangeElement; */ +} + +/***************************************************************************** * IHTMLTextAreaElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLTextAreaElement coclass declaration.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 41a2d62d5a40077fff8b6b468050f649b9cfa9c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a2d62d5a40077fff8b6b468… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:36:08 2017 +0200 mshtml.idl: Added HTMLTextAreaElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltextarea.c | 4 ++-- include/mshtml.idl | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index e464819..d26de22 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -32,13 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLTextAreaElement { HTMLElement element; IHTMLTextAreaElement IHTMLTextAreaElement_iface; nsIDOMHTMLTextAreaElement *nstextarea; -} HTMLTextAreaElement; +}; static inline HTMLTextAreaElement *impl_from_IHTMLTextAreaElement(IHTMLTextAreaElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 91d38cb..b6922c7 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11353,6 +11353,27 @@ methods: } /***************************************************************************** + * HTMLTextAreaElement coclass + */ +[ + noncreatable, + uuid(3050f2ac-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLTextAreaElement +{ + [default] dispinterface DispHTMLTextAreaElement; + /* [source, default] dispinterface HTMLInputTextElementEvents; */ + /* [source] dispinterface HTMLInputTextElementEvents2; */ + [source] dispinterface HTMLTextContainerEvents; + [source] dispinterface HTMLTextContainerEvents2; + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLTextContainer; + interface IHTMLTextAreaElement; + /* interface IHTMLTextAreaElement2; */ +} + +/***************************************************************************** * IHTMLButtonElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLButtonElement coclass declaration.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 735147ad809d66ad383364c7a087b33b98b2b4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=735147ad809d66ad383364c7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:36:20 2017 +0200 mshtml.idl: Added HTMLButtonElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 4 ++-- include/mshtml.idl | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 607e24f..196a47f 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1559,13 +1559,13 @@ HRESULT HTMLLabelElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem return S_OK; } -typedef struct { +struct HTMLButtonElement { HTMLElement element; IHTMLButtonElement IHTMLButtonElement_iface; nsIDOMHTMLButtonElement *nsbutton; -} HTMLButtonElement; +}; static inline HTMLButtonElement *impl_from_IHTMLButtonElement(IHTMLButtonElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index b6922c7..3834bd1 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11460,6 +11460,25 @@ methods: } /***************************************************************************** + * HTMLButtonElement coclass + */ +[ + noncreatable, + uuid(3050f2c6-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLButtonElement +{ + [default] dispinterface DispHTMLButtonElement; + /* [source, default] dispinterface HTMLButtonElementEvents; */ + /* [source] dispinterface HTMLButtonElementEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLTextContainer; + interface IHTMLButtonElement; + /* interface IHTMLButtonElement2; */ +} + +/***************************************************************************** * IHTMLHtmlElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLHtmlElement coclass declaration.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 9111c8a0e2f1aca12cc174931575fb74f3513bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=9111c8a0e2f1aca12cc174931… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:36:28 2017 +0200 mshtml.idl: Added HTMLHtmlElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlhead.c | 4 ++-- include/mshtml.idl | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 9f735eb..1a37fe3 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -191,11 +191,11 @@ HRESULT HTMLTitleElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem return S_OK; } -typedef struct { +struct HTMLHtmlElement { HTMLElement element; IHTMLHtmlElement IHTMLHtmlElement_iface; -} HTMLHtmlElement; +}; static inline HTMLHtmlElement *impl_from_IHTMLHtmlElement(IHTMLHtmlElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 3834bd1..660ed53 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11649,6 +11649,22 @@ methods: } /***************************************************************************** + * HTMLHtmlElement coclass + */ +[ + noncreatable, + uuid(3050f491-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLHtmlElement +{ + [default] dispinterface DispHTMLHtmlElement; + [source, default] dispinterface HTMLElementEvents; + [source] dispinterface HTMLElementEvents2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLHtmlElement; +} + +/***************************************************************************** * DispHTMLHeadElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLHeadElement coclass declaration.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: fd7f3b34057b48ba114a6d31060aa7c0cdba3242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7f3b34057b48ba114a6d310… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:36:36 2017 +0200 mshtml.idl: Added HTMLHeadElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlhead.c | 4 ++-- include/mshtml.idl | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 1a37fe3..e391396 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -374,11 +374,11 @@ HRESULT HTMLHtmlElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, return S_OK; } -typedef struct { +struct HTMLHeadElement { HTMLElement element; IHTMLHeadElement IHTMLHeadElement_iface; -} HTMLHeadElement; +}; static inline HTMLHeadElement *impl_from_IHTMLHeadElement(IHTMLHeadElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 660ed53..e3bf2e7 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11691,6 +11691,23 @@ methods: } /***************************************************************************** + * HTMLHeadElement coclass + */ +[ + noncreatable, + uuid(3050f493-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLHeadElement +{ + [default] dispinterface DispHTMLHeadElement; + [source, default] dispinterface HTMLElementEvents; + [source] dispinterface HTMLElementEvents2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLHeadElement; + interface IHTMLHeadElement2; +} + +/***************************************************************************** * DispHTMLTitleElement interface */ [

1 0

Daniel Lehman : msvcp90: Update exception RTTI data to reflect it' s part of std namespace.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 307e5e8f6af46e8bc5b53e696848ba2d275ab3a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307e5e8f6af46e8bc5b53e696… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Apr 12 10:08:00 2017 -0700 msvcp90: Update exception RTTI data to reflect it's part of std namespace. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index d323ded..0812ba9 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -206,7 +206,7 @@ const char* __thiscall MSVCP_exception_what(exception * this) return this->name ? this->name : "Unknown exception"; } -#ifdef _MSVCIRT +#if _MSVCP_VER >= 80 DEFINE_RTTI_DATA0(exception, 0, ".?AVexception(a)std@@") #else DEFINE_RTTI_DATA0(exception, 0, ".?AVexception@@") @@ -409,7 +409,7 @@ const char* __thiscall MSVCP_logic_error_what(logic_error *this) #endif } -#ifdef _MSVCIRT +#if _MSVCP_VER >= 80 DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error(a)std@@") #else DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error@@")

1 0

Piotr Caban : msvcr120: Add wctype implementation.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 42ccd8d9ecb386bb9da311c1faa5c14a12d26de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ccd8d9ecb386bb9da311c1f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 14 18:21:21 2017 +0200 msvcr120: Add wctype implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 32 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/ctype.c | 30 ++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 66 insertions(+), 4 deletions(-) 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 0f30b05..1daaadc 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 @@ -173,6 +173,6 @@ @ cdecl wcstok(wstr wstr) ucrtbase.wcstok @ cdecl wcstok_s(ptr wstr ptr) ucrtbase.wcstok_s @ cdecl wcsxfrm(ptr wstr long) ucrtbase.wcsxfrm -@ stub wctype +@ cdecl wctype(str) ucrtbase.wctype @ cdecl wmemcpy_s(ptr long ptr long) ucrtbase.wmemcpy_s @ cdecl wmemmove_s(ptr long ptr long) ucrtbase.wmemmove_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d73a603..96afa6f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2487,7 +2487,7 @@ @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s @ stub wctrans -@ stub wctype +@ cdecl wctype(str) @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long) @ varargs wprintf(wstr) MSVCRT_wprintf diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 13f3672..de0ccc4 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -182,6 +182,7 @@ static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); +static unsigned short (__cdecl *p_wctype)(const char*); /* make sure we use the correct errno */ #undef errno @@ -236,6 +237,7 @@ static BOOL init(void) p_errno = (void*)GetProcAddress(module, "_errno"); p_wcreate_locale = (void*)GetProcAddress(module, "_wcreate_locale"); p_free_locale = (void*)GetProcAddress(module, "_free_locale"); + SET(p_wctype, "wctype"); SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); if(sizeof(void*) == 8) { /* 64-bit initialization */ @@ -880,6 +882,35 @@ static void test__Condition_variable(void) CloseHandle(thread_initialized); } +static void test_wctype(void) +{ + static const struct { + const char *name; + unsigned short mask; + } properties[] = { + { "alnum", 0x107 }, + { "alpha", 0x103 }, + { "cntrl", 0x020 }, + { "digit", 0x004 }, + { "graph", 0x117 }, + { "lower", 0x002 }, + { "print", 0x157 }, + { "punct", 0x010 }, + { "space", 0x008 }, + { "upper", 0x001 }, + { "xdigit", 0x080 }, + { "ALNUM", 0x000 }, + { "Alnum", 0x000 }, + { "", 0x000 } + }; + int i, ret; + + for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) { + ret = p_wctype(properties[i].name); + ok(properties[i].mask == ret, "%d - Expected %x, got %x\n", i, properties[i].mask, ret); + } +} + START_TEST(msvcr120) { if (!init()) return; @@ -896,4 +927,5 @@ START_TEST(msvcr120) test_fegetenv(); test__wcreate_locale(); test__Condition_variable(); + test_wctype(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 942d212..c12dcbc 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2149,7 +2149,7 @@ @ cdecl wctomb(ptr long) msvcr120.wctomb @ cdecl wctomb_s(ptr ptr long long) msvcr120.wctomb_s @ stub wctrans -@ stub wctype +@ 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 @ varargs wprintf(wstr) msvcr120.wprintf diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index eb9891a..e076d89 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -468,3 +468,33 @@ int CDECL MSVCRT__tolower(int c) { return c + 0x20; /* sic */ } + +/********************************************************************* + * wctype (MSVCR120.@) + */ +unsigned short __cdecl wctype(const char *property) +{ + static const struct { + const char *name; + unsigned short mask; + } properties[] = { + { "alnum", MSVCRT__DIGIT|MSVCRT__ALPHA }, + { "alpha", MSVCRT__ALPHA }, + { "cntrl", MSVCRT__CONTROL }, + { "digit", MSVCRT__DIGIT }, + { "graph", MSVCRT__DIGIT|MSVCRT__PUNCT|MSVCRT__ALPHA }, + { "lower", MSVCRT__LOWER }, + { "print", MSVCRT__DIGIT|MSVCRT__PUNCT|MSVCRT__BLANK|MSVCRT__ALPHA }, + { "punct", MSVCRT__PUNCT }, + { "space", MSVCRT__SPACE }, + { "upper", MSVCRT__UPPER }, + { "xdigit", MSVCRT__HEX } + }; + unsigned int i; + + for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) + if(!strcmp(property, properties[i].name)) + return properties[i].mask; + + return 0; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 79ba494..dbc418c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2594,6 +2594,6 @@ @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s @ stub wctrans -@ stub wctype +@ cdecl wctype(str) @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long)

1 0

Paul Gofman : d3dx9/tests: Add tests for cross effect handles usage.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 69f8d4852594f110f54501e7eaebcbfab2834df2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f8d4852594f110f54501e7e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 14 13:17:05 2017 +0300 d3dx9/tests: Add tests for cross effect handles usage. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 96 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 82 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index de5ae69..9e357d5 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4494,7 +4494,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) &op_tests[i]); } -static void test_isparameterused_children(ID3DXEffect *effect, D3DXHANDLE tech, D3DXHANDLE param) +static void test_isparameterused_children(unsigned int line, ID3DXEffect *effect, + D3DXHANDLE tech, D3DXHANDLE param) { D3DXPARAMETER_DESC desc; D3DXHANDLE param_child; @@ -4502,31 +4503,41 @@ static void test_isparameterused_children(ID3DXEffect *effect, D3DXHANDLE tech, HRESULT hr; hr = effect->lpVtbl->GetParameterDesc(effect, param, &desc); - ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "GetParameterDesc failed, result %#x.\n", hr); child_count = desc.Elements ? desc.Elements : desc.StructMembers; for (i = 0; i < child_count; ++i) { param_child = desc.Elements ? effect->lpVtbl->GetParameterElement(effect, param, i) : effect->lpVtbl->GetParameter(effect, param, i); - ok(!!param_child, "Failed getting child parameter %s[%u].\n", desc.Name, i); - ok(!effect->lpVtbl->IsParameterUsed(effect, param_child, tech), + ok_(__FILE__, line)(!!param_child, "Failed getting child parameter %s[%u].\n", desc.Name, i); + ok_(__FILE__, line)(!effect->lpVtbl->IsParameterUsed(effect, param_child, tech), "Unexpected IsParameterUsed() result for %s[%u].\n", desc.Name, i); - test_isparameterused_children(effect, tech, param_child); + test_isparameterused_children(line, effect, tech, param_child); } } -static void test_isparameterused_param_with_children(ID3DXEffect *effect, D3DXHANDLE tech, const char *name, - BOOL expected_result) +#define test_isparameterused_param_with_children(args...) \ + test_isparameterused_param_with_children_(__LINE__, args) +static void test_isparameterused_param_with_children_(unsigned int line, ID3DXEffect *effect, + ID3DXEffect *effect2, D3DXHANDLE tech, const char *name, BOOL expected_result) { D3DXHANDLE param; - param = effect->lpVtbl->GetParameterByName(effect, NULL, name); - ok(!!param, "GetParameterByName failed for %s.\n", name); + ok_(__FILE__, line)(effect->lpVtbl->IsParameterUsed(effect, (D3DXHANDLE)name, tech) + == expected_result, "Unexpected IsParameterUsed() result for %s (referenced by name).\n", name); + + if (effect2) + param = effect2->lpVtbl->GetParameterByName(effect2, NULL, name); + else + param = effect->lpVtbl->GetParameterByName(effect, NULL, name); + ok_(__FILE__, line)(!!param, "GetParameterByName failed for %s.\n", name); - ok(!effect->lpVtbl->IsParameterUsed(effect, param, tech) == !expected_result, - "Unexpected IsParameterUsed() result for %s.\n", name); + todo_wine_if(effect2 && expected_result) + ok_(__FILE__, line)(effect->lpVtbl->IsParameterUsed(effect, param, tech) == expected_result, + "Unexpected IsParameterUsed() result for %s (referenced by handle).\n", name); - test_isparameterused_children(effect, tech, param); + if (!effect2) + test_isparameterused_children(line, effect, tech, param); } static void test_effect_isparameterused(IDirect3DDevice9 *device) @@ -4555,7 +4566,7 @@ static void test_effect_isparameterused(IDirect3DDevice9 *device) {"ts2", TRUE}, {"ts3", TRUE}, }; - ID3DXEffect *effect; + ID3DXEffect *effect, *effect2; HRESULT hr; D3DXHANDLE tech; unsigned int i; @@ -4568,9 +4579,26 @@ static void test_effect_isparameterused(IDirect3DDevice9 *device) ok(!!tech, "GetTechniqueByName failed.\n"); for (i = 0; i < ARRAY_SIZE(check_parameters); ++i) - test_isparameterused_param_with_children(effect, tech, check_parameters[i].name, + test_isparameterused_param_with_children(effect, NULL, tech, check_parameters[i].name, + check_parameters[i].expected_result); + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect2, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(check_parameters); ++i) + test_isparameterused_param_with_children(effect, effect2, tech, check_parameters[i].name, check_parameters[i].expected_result); + effect2->lpVtbl->Release(effect2); + + hr = D3DXCreateEffect(device, test_effect_states_effect_blob, sizeof(test_effect_states_effect_blob), + NULL, NULL, 0, NULL, &effect2, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_isparameterused_param_with_children(effect, effect2, tech, "sampler1", TRUE); + effect2->lpVtbl->Release(effect2); + effect->lpVtbl->Release(effect); } @@ -5681,6 +5709,45 @@ static void test_effect_state_manager(IDirect3DDevice9 *device) ok(!refcount, "State manager was not properly freed, refcount %u.\n", refcount); } +static void test_cross_effect_handle(IDirect3DDevice9 *device) +{ + ID3DXEffect *effect1, *effect2; + D3DXHANDLE param1, param2; + static int expected_ivect[4] = {28, 29, 30, 31}; + int ivect[4]; + HRESULT hr; + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect1, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect2, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ok(effect1 != effect2, "Got same effect unexpectedly.\n"); + + param1 = effect1->lpVtbl->GetParameterByName(effect1, NULL, "g_iVect"); + ok(!!param1, "GetParameterByName failed.\n"); + + param2 = effect2->lpVtbl->GetParameterByName(effect2, NULL, "g_iVect"); + ok(!!param2, "GetParameterByName failed.\n"); + + ok(param1 != param2, "Got same parameter handle unexpectedly.\n"); + + hr = effect2->lpVtbl->SetValue(effect2, param1, expected_ivect, sizeof(expected_ivect)); + todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect1->lpVtbl->GetValue(effect1, param1, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + todo_wine + ok(!memcmp(ivect, expected_ivect, sizeof(expected_ivect)), "Vector value mismatch.\n"); + + effect2->lpVtbl->Release(effect2); + effect1->lpVtbl->Release(effect1); +} + START_TEST(effect) { HWND wnd; @@ -5728,6 +5795,7 @@ START_TEST(effect) test_effect_commitchanges(device); test_effect_preshader_relative_addressing(device); test_effect_state_manager(device); + test_cross_effect_handle(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Paul Gofman : d3dx9: Use magic number instead of parameter tables for parameter handles.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 5029c2c0fd4f8998d3ed462f969b4b7fb8e02e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5029c2c0fd4f8998d3ed462f9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 14 13:17:06 2017 +0300 d3dx9: Use magic number instead of parameter tables for parameter handles. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 3 +- dlls/d3dx9_36/effect.c | 95 ++++++++----------------------------------- dlls/d3dx9_36/tests/effect.c | 2 - 3 files changed, 18 insertions(+), 82 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index e50f4d3..145ab80 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -196,6 +196,7 @@ struct d3dx_param_eval struct d3dx_parameter { + char magic_string[4]; char *name; char *semantic; void *data; @@ -211,8 +212,6 @@ struct d3dx_parameter DWORD runtime_flags; DWORD object_id; - D3DXHANDLE handle; - struct d3dx_parameter *annotations; struct d3dx_parameter *members; diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 813b57e..49e8a88 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -27,7 +27,7 @@ #define INT_FLOAT_MULTI 255.0f #define INT_FLOAT_MULTI_INVERSE (1/INT_FLOAT_MULTI) -#define INITIAL_PARAM_TABLE_SIZE 16 +static const char parameter_magic_string[4] = {'@', '!', '#', '\xFF'}; WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -137,12 +137,6 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; -struct param_table -{ - struct d3dx_parameter **table; - unsigned int count, size; -}; - struct d3dx9_base_effect { struct ID3DXEffectImpl *effect; @@ -154,8 +148,6 @@ struct d3dx9_base_effect struct d3dx_parameter *parameters; struct d3dx_technique *techniques; struct d3dx_object *objects; - - struct param_table param_table; }; struct ID3DXEffectImpl @@ -419,17 +411,17 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) static inline D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) { - return parameter ? parameter->handle : NULL; + return (D3DXHANDLE)parameter; } static inline D3DXHANDLE get_technique_handle(struct d3dx_technique *technique) { - return (D3DXHANDLE) technique; + return (D3DXHANDLE)technique; } static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) { - return (D3DXHANDLE) pass; + return (D3DXHANDLE)pass; } static struct d3dx_technique *get_technique_by_name(struct d3dx9_base_effect *base, const char *name) @@ -480,10 +472,11 @@ static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHAND static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base, D3DXHANDLE parameter) { - struct d3dx_parameter **handle_param = (struct d3dx_parameter **)parameter; + struct d3dx_parameter *handle_param = (struct d3dx_parameter *)parameter; - if (handle_param >= base->param_table.table && handle_param < base->param_table.table + base->param_table.count) - return *handle_param; + if (handle_param && !strncmp(handle_param->magic_string, parameter_magic_string, + sizeof(parameter_magic_string))) + return handle_param; return get_parameter_by_name(base, NULL, parameter); } @@ -655,8 +648,6 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) TRACE("base %p.\n", base); - HeapFree(GetProcessHeap(), 0, base->param_table.table); - if (base->parameters) { for (i = 0; i < base->parameter_count; ++i) @@ -2573,7 +2564,7 @@ static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct { unsigned int array_idx; static const struct d3dx_parameter array_idx_param = - {NULL, NULL, NULL, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 0, 0, 0, 0, sizeof(array_idx)}; + {"", NULL, NULL, NULL, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 0, 0, 0, 0, sizeof(array_idx)}; HRESULT hr; struct d3dx_parameter *ref_param, *selected_param; @@ -5068,59 +5059,9 @@ static HRESULT d3dx9_copy_data(struct d3dx9_base_effect *base, unsigned int obje return D3D_OK; } -static void add_param_to_table(struct d3dx9_base_effect *base, struct d3dx_parameter *param) +static void param_set_magic_number(struct d3dx_parameter *param) { - struct param_table *table = &base->param_table; - - if (table->count >= table->size) - { - unsigned int new_size; - struct d3dx_parameter **new_alloc; - - if (!table->size) - { - new_size = INITIAL_PARAM_TABLE_SIZE; - new_alloc = HeapAlloc(GetProcessHeap(), 0, sizeof(*table->table) * new_size); - if (!new_alloc) - { - ERR("Out of memory.\n"); - return; - } - } - else - { - new_size = table->size * 2; - new_alloc = HeapReAlloc(GetProcessHeap(), 0, table->table, sizeof(*table->table) * new_size); - if (!new_alloc) - { - ERR("Out of memory.\n"); - return; - } - } - table->table = new_alloc; - table->size = new_size; - } - - table->table[table->count++] = param; -} - -static void sync_param_handles(struct d3dx9_base_effect *base) -{ - struct param_table *table = &base->param_table; - struct d3dx_parameter **new_alloc; - unsigned int i; - - if (table->count) - { - new_alloc = HeapReAlloc(GetProcessHeap(), 0, table->table, sizeof(*table->table) * table->count); - if (new_alloc) - table->table = new_alloc; - else - ERR("Out of memory.\n"); - } - - for (i = 0; i < table->count; ++i) - table->table[i]->handle = (D3DXHANDLE)&table->table[i]; + memcpy(param->magic_string, parameter_magic_string, sizeof(parameter_magic_string)); } static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct d3dx_parameter *param, @@ -5257,7 +5198,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct { *ptr = save_ptr; - add_param_to_table(base, &param->members[i]); + param_set_magic_number(&param->members[i]); hr = d3dx9_parse_effect_typedef(base, &param->members[i], data, ptr, param, flags); if (hr != D3D_OK) { @@ -5282,7 +5223,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct for (i = 0; i < param->member_count; ++i) { - add_param_to_table(base, &param->members[i]); + param_set_magic_number(&param->members[i]); hr = d3dx9_parse_effect_typedef(base, &param->members[i], data, ptr, NULL, flags); if (hr != D3D_OK) { @@ -5440,7 +5381,7 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, stru for (i = 0; i < param->annotation_count; ++i) { - add_param_to_table(base, &param->annotations[i]); + param_set_magic_number(&param->annotations[i]); hr = d3dx9_parse_effect_annotation(base, &param->annotations[i], data, ptr, objects); if (hr != D3D_OK) { @@ -5502,7 +5443,7 @@ static HRESULT d3dx9_parse_effect_pass(struct d3dx9_base_effect *base, struct d3 for (i = 0; i < pass->annotation_count; ++i) { - add_param_to_table(base, &pass->annotations[i]); + param_set_magic_number(&pass->annotations[i]); hr = d3dx9_parse_effect_annotation(base, &pass->annotations[i], data, ptr, objects); if (hr != D3D_OK) { @@ -5598,7 +5539,7 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx9_base_effect *base, stru for (i = 0; i < technique->annotation_count; ++i) { - add_param_to_table(base, &technique->annotations[i]); + param_set_magic_number(&technique->annotations[i]); hr = d3dx9_parse_effect_annotation(base, &technique->annotations[i], data, ptr, objects); if (hr != D3D_OK) { @@ -5963,7 +5904,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da for (i = 0; i < base->parameter_count; ++i) { - add_param_to_table(base, &base->parameters[i]); + param_set_magic_number(&base->parameters[i]); hr = d3dx9_parse_effect_parameter(base, &base->parameters[i], data, &ptr, base->objects); if (hr != D3D_OK) { @@ -5996,8 +5937,6 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da } } - sync_param_handles(base); - read_dword(&ptr, &stringcount); TRACE("String count: %u\n", stringcount); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9e357d5..a21d4e1 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5735,13 +5735,11 @@ static void test_cross_effect_handle(IDirect3DDevice9 *device) ok(param1 != param2, "Got same parameter handle unexpectedly.\n"); hr = effect2->lpVtbl->SetValue(effect2, param1, expected_ivect, sizeof(expected_ivect)); - todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect1->lpVtbl->GetValue(effect1, param1, ivect, sizeof(ivect)); ok(hr == D3D_OK, "Got result %#x.\n", hr); - todo_wine ok(!memcmp(ivect, expected_ivect, sizeof(expected_ivect)), "Vector value mismatch.\n"); effect2->lpVtbl->Release(effect2);

1 0