October 2016 - Wine-Commits

Piotr Caban : msvcp120: Add vtordisp field to classes with virtual base.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 69cb55c82edafd829135b208cd2f940fc99d65eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cb55c82edafd829135b208c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 5 16:28:58 2016 +0100 msvcp120: Add vtordisp field to classes with virtual base. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 367b30d8278684aaff373f5666b78264137d7a8f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/ios.c | 223 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 187 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69cb55c82edafd829135b…

1 0

Austin English : apphelp: Add SdbGetAppPatchDir stub.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: eb3f1521af805056db603872e0ec1f5282df0483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3f1521af805056db603872e… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 26 21:10:08 2016 -0500 apphelp: Add SdbGetAppPatchDir stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 48091559b50c28b2a9fd9a6cbc390363d38d24b9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/apphelp/apphelp.c | 6 ++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 64dcd87..0ff74aa 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -111,3 +111,9 @@ void WINAPI SdbCloseDatabase(PDB pdb) { FIXME("stub: %p\n", pdb); } + +void WINAPI SdbGetAppPatchDir(HSDB hsdb, WCHAR *path, DWORD size) +{ + FIXME("stub: %p %p %d\n", hsdb, path, size); + if (size && path) *path = 0; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index a658e5c..2b0e0c6 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -49,7 +49,7 @@ @ stub SdbFreeFileInfo @ stub SdbFreeFlagInfo @ stub SdbGetAppCompatDataSize -@ stub SdbGetAppPatchDir +@ stdcall SdbGetAppPatchDir(long ptr long) @ stub SdbGetBinaryTagData @ stub SdbGetDatabaseID @ stub SdbGetDatabaseInformation

1 0

Austin English : pdh: Add PdhBindInputDataSourceA/W stubs.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 08c560be7e5a8342661b09b25fe3588713213432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c560be7e5a8342661b09b25… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Dec 26 22:44:02 2015 -0600 pdh: Add PdhBindInputDataSourceA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit de71271347dd38849aa006fe88c4eaf6ce029783) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 18 ++++++++++++++++++ include/pdh.h | 3 +++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 529b92d..9de9436 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -5,8 +5,8 @@ @ stdcall PdhAddCounterW(ptr wstr long ptr) @ stdcall PdhAddEnglishCounterA(ptr str long ptr) @ stdcall PdhAddEnglishCounterW(ptr wstr long ptr) -@ stub PdhBindInputDataSourceA -@ stub PdhBindInputDataSourceW +@ stdcall PdhBindInputDataSourceA(ptr str) +@ stdcall PdhBindInputDataSourceW(ptr wstr) @ stub PdhBrowseCountersA @ stub PdhBrowseCountersHA @ stub PdhBrowseCountersHW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 036d28b..149eb88 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1287,3 +1287,21 @@ PDH_STATUS WINAPI PdhGetLogFileTypeW(PDH_HLOG log, DWORD *type) FIXME("%p, %p: stub\n", log, type); return PDH_NOT_IMPLEMENTED; } + +/*********************************************************************** + * PdhBindInputDataSourceA (PDH.@) + */ +PDH_STATUS WINAPI PdhBindInputDataSourceA(PDH_HLOG *source, const char *filenamelist) +{ + FIXME("%p %s: stub\n", source, debugstr_a(filenamelist)); + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhBindInputDataSourceW (PDH.@) + */ +PDH_STATUS WINAPI PdhBindInputDataSourceW(PDH_HLOG *source, const WCHAR *filenamelist) +{ + FIXME("%p %s: stub\n", source, debugstr_w(filenamelist)); + return PDH_NOT_IMPLEMENTED; +} diff --git a/include/pdh.h b/include/pdh.h index a25eb2e..3d688bd 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -200,6 +200,9 @@ PDH_STATUS WINAPI PdhAddCounterW(PDH_HQUERY, LPCWSTR, DWORD_PTR, PDH_HCOUNTER *) PDH_STATUS WINAPI PdhAddEnglishCounterA(PDH_HQUERY, LPCSTR, DWORD_PTR, PDH_HCOUNTER *); PDH_STATUS WINAPI PdhAddEnglishCounterW(PDH_HQUERY, LPCWSTR, DWORD_PTR, PDH_HCOUNTER *); #define PdhAddEnglishCounter WINELIB_NAME_AW(PdhAddEnglishCounter) +PDH_STATUS WINAPI PdhBindInputDataSourceA(PDH_HLOG *, const char *); +PDH_STATUS WINAPI PdhBindInputDataSourceW(PDH_HLOG *, const WCHAR *); +#define PdhBindInputDataSource WINELIB_NAME_AW(PdhBindInputDataSource) PDH_STATUS WINAPI PdhCloseQuery(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryData(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryDataEx(PDH_HQUERY, DWORD, HANDLE);

1 0

Jacek Caban : mshtml: Properly convert VT_NULL to string in get_elem_attr_value_by_dispid.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 2c9f131ba2fd314de8a60d8d25341edb0ba6b656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9f131ba2fd314de8a60d8d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 5 18:53:21 2016 +0100 mshtml: Properly convert VT_NULL to string in get_elem_attr_value_by_dispid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f394dca92a014fa07e0cec59f97fb9fd2ba157da) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmlelem.c | 8 ++++++++ dlls/mshtml/tests/dom.c | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6c948d3..f5cddb7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -644,6 +644,8 @@ HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, DWORD fl EXCEPINFO excep; HRESULT hres; + static const WCHAR nullW[] = {'n','u','l','l',0}; + hres = IDispatchEx_InvokeEx(&elem->node.event_target.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); if(FAILED(hres)) @@ -653,6 +655,12 @@ HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, DWORD fl switch(V_VT(ret)) { case VT_BSTR: break; + case VT_NULL: + V_BSTR(ret) = SysAllocString(nullW); + if(!V_BSTR(ret)) + return E_OUTOFMEMORY; + V_VT(ret) = VT_BSTR; + break; case VT_DISPATCH: IDispatch_Release(V_DISPATCH(ret)); V_VT(ret) = VT_BSTR; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b892ac0..1ce731a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1411,8 +1411,19 @@ static void test_get_set_attr(IHTMLDocument2 *doc) ok(V_VT(&val) == VT_BOOL, "variant type should have been VT_BOOL (0x%x), was: 0x%x\n", VT_BOOL, V_VT(&val)); ok(V_BOOL(&val) == VARIANT_TRUE, "variant value should have been VARIANT_TRUE (0x%x), was %d\n", VARIANT_TRUE, V_BOOL(&val)); VariantClear(&val); - SysFreeString(bstr); + /* overwrite the attribute with null */ + V_VT(&val) = VT_NULL; + hres = IHTMLElement_setAttribute(elem, bstr, val, 0); + ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + + hres = IHTMLElement_getAttribute(elem, bstr, 2, &val); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&val) == VT_BSTR, "V_VT(val) = %u, expected VT_BSTR", V_VT(&val)); + ok(!strcmp_wa(V_BSTR(&val), "null"), "V_BSTR(val) = %s, expected \"null\"\n", wine_dbgstr_w(V_BSTR(&val))); + VariantClear(&val); + + SysFreeString(bstr); IHTMLElement_Release(elem); }

1 0

André Hentschel : msvcrt: Don' t continue on demangle failure (Coverity).
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 74711f31db91e42ec451056da8bb88394f2749f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74711f31db91e42ec451056da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:35:04 2015 +0100 msvcrt: Don't continue on demangle failure (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 51098fcd94457b46945a03131c4cd1f049682d17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/undname.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index ec2c2dd..5972320 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1380,6 +1380,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->current++; str_array_init(&pmt); demangle_datatype(sym, &ct, &pmt, FALSE); + if (!demangle_datatype(sym, &ct, NULL, FALSE)) + goto done; function_name = str_printf(sym, "%s%s `RTTI Type Descriptor'", ct.left, ct.right); sym->current--;

1 0

Piotr Caban : msvcp60: Export more complex numbers operators.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: bda2bd289a0f0cb372f0a597f4e4501eedcf6197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda2bd289a0f0cb372f0a597f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 14 15:55:27 2016 +0100 msvcp60: Export more complex numbers operators. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 14529012da91580119c1712cd24fcf67c780789b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp60/msvcp60.spec | 240 +++++++++++++++++++++++----------------------- 1 file changed, 120 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bda2bd289a0f0cb372f0a…

1 0

Piotr Caban : msvcp100: Add numeric_limits<*>::lowest implementation.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 3a5960ce6b34e2ff106f8d2b78ab54d95018bf6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5960ce6b34e2ff106f8d2b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 14 15:55:16 2016 +0100 msvcp100: Add numeric_limits<*>::lowest implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2633496a7473baf4f0ae2f6a812f8a5e39e094ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 32 +++++++++++++++--------------- dlls/msvcp90/math.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index d2b75f4..357ca83 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2113,22 +2113,22 @@ @ cdecl -arch=win64 ?length@?$codecvt(a)GDH@std@@QEBAHAEBHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_length @ thiscall -arch=win32 ?length@?$codecvt(a)_WDH@std@@QBEHABHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_length @ cdecl -arch=win64 ?length@?$codecvt(a)_WDH@std@@QEBAHAEBHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_length -@ stub ?lowest@?$numeric_limits(a)C@std@@SACXZ -@ stub ?lowest@?$numeric_limits(a)D@std@@SADXZ -@ stub ?lowest@?$numeric_limits(a)E@std@@SAEXZ -@ stub ?lowest@?$numeric_limits(a)F@std@@SAFXZ -@ stub ?lowest@?$numeric_limits(a)G@std@@SAGXZ -@ stub ?lowest@?$numeric_limits(a)H@std@@SAHXZ -@ stub ?lowest@?$numeric_limits(a)I@std@@SAIXZ -@ stub ?lowest@?$numeric_limits(a)J@std@@SAJXZ -@ stub ?lowest@?$numeric_limits(a)K@std@@SAKXZ -@ stub ?lowest@?$numeric_limits(a)M@std@@SAMXZ -@ stub ?lowest@?$numeric_limits(a)N@std@@SANXZ -@ stub ?lowest@?$numeric_limits(a)O@std@@SAOXZ -@ stub ?lowest@?$numeric_limits(a)_J@std@@SA_JXZ -@ stub ?lowest@?$numeric_limits(a)_K@std@@SA_KXZ -@ stub ?lowest@?$numeric_limits(a)_N@std@@SA_NXZ -@ stub ?lowest@?$numeric_limits(a)_W@std@@SA_WXZ +@ cdecl ?lowest@?$numeric_limits(a)C@std@@SACXZ() std_numeric_limits_signed_char_lowest +@ cdecl ?lowest@?$numeric_limits(a)D@std@@SADXZ() std_numeric_limits_char_lowest +@ cdecl ?lowest@?$numeric_limits(a)E@std@@SAEXZ() std_numeric_limits_unsigned_char_lowest +@ cdecl ?lowest@?$numeric_limits(a)F@std@@SAFXZ() std_numeric_limits_short_lowest +@ cdecl ?lowest@?$numeric_limits(a)G@std@@SAGXZ() std_numeric_limits_unsigned_short_lowest +@ cdecl ?lowest@?$numeric_limits(a)H@std@@SAHXZ() std_numeric_limits_int_lowest +@ cdecl ?lowest@?$numeric_limits(a)I@std@@SAIXZ() std_numeric_limits_unsigned_int_lowest +@ cdecl ?lowest@?$numeric_limits(a)J@std@@SAJXZ() std_numeric_limits_long_lowest +@ cdecl ?lowest@?$numeric_limits(a)K@std@@SAKXZ() std_numeric_limits_unsigned_long_lowest +@ cdecl ?lowest@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_lowest +@ cdecl ?lowest@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_lowest +@ cdecl ?lowest@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_lowest +@ cdecl -ret64 ?lowest@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_lowest +@ cdecl -ret64 ?lowest@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_lowest +@ cdecl ?lowest@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_lowest +@ cdecl ?lowest@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_lowest @ cdecl ?max@?$numeric_limits(a)C@std@@SACXZ() std_numeric_limits_signed_char_max @ cdecl ?max@?$numeric_limits(a)D@std@@SADXZ() std_numeric_limits_char_max @ cdecl ?max@?$numeric_limits(a)E@std@@SAEXZ() std_numeric_limits_unsigned_char_max diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 6c3a33a..99f6727 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -659,6 +659,54 @@ BOOLEAN __cdecl std_numeric_limits_bool_min(void) { return FALSE; } /* ?min@?$numeric_limits(a)_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::min(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_min(void) { return 0; } +/* ?lowest@?$numeric_limits(a)C@std@@SACXZ */ +signed char __cdecl std_numeric_limits_signed_char_lowest(void) { return SCHAR_MIN; } + +/* ?lowest@?$numeric_limits(a)D@std@@SADXZ */ +char __cdecl std_numeric_limits_char_lowest(void) { return CHAR_MIN; } + +/* ?lowest@?$numeric_limits(a)E@std@@SAEXZ */ +unsigned char __cdecl std_numeric_limits_unsigned_char_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)F@std@@SAFXZ */ +short __cdecl std_numeric_limits_short_lowest(void) { return SHRT_MIN; } + +/* ?lowest@?$numeric_limits(a)G@std@@SAGXZ */ +unsigned short __cdecl std_numeric_limits_unsigned_short_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)H@std@@SAHXZ */ +int __cdecl std_numeric_limits_int_lowest(void) { return INT_MIN; } + +/* ?lowest@?$numeric_limits(a)I@std@@SAIXZ */ +unsigned int __cdecl std_numeric_limits_unsigned_int_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)J@std@@SAJXZ */ +LONG __cdecl std_numeric_limits_long_lowest(void) { return LONG_MIN; } + +/* ?lowest@?$numeric_limits(a)K@std@@SAKXZ */ +ULONG __cdecl std_numeric_limits_unsigned_long_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)M@std@@SAMXZ */ +float __cdecl std_numeric_limits_float_lowest(void) { return -FLT_MAX; } + +/* ?lowest@?$numeric_limits(a)N@std@@SANXZ */ +double __cdecl std_numeric_limits_double_lowest(void) { return -DBL_MAX; } + +/* ?lowest@?$numeric_limits(a)O@std@@SAOXZ */ +LDOUBLE __cdecl std_numeric_limits_long_double_lowest(void) { return -LDBL_MAX; } + +/* ?lowest@?$numeric_limits(a)_J@std@@SA_JXZ */ +__int64 __cdecl std_numeric_limits_int64_lowest(void) { return I64_MIN; } + +/* ?lowest@?$numeric_limits(a)_K@std@@SA_KXZ */ +unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)_N@std@@SA_NXZ */ +BOOLEAN __cdecl std_numeric_limits_bool_lowest(void) { return FALSE; } + +/* ?lowest@?$numeric_limits(a)_W@std@@SA_WXZ */ +WCHAR __cdecl std_numeric_limits_wchar_t_lowest(void) { return 0; } + /* ?quiet_NaN@?$numeric_limits(a)C@std@@SACXZ -> public: static signed char __cdecl std::numeric_limits<signed char>::quiet_NaN(void) */ signed char __cdecl std_numeric_limits_signed_char_quiet_NaN(void) { return 0; }

1 0

Andrew Church : dinput: Report DIDOI_ASPECTPOSITION flag for axes objects.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: c3502c8fbdcb87367b105c327c0cc11ed3eaa97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3502c8fbdcb87367b105c327… Author: Andrew Church <achurch(a)achurch.org> Date: Tue Aug 16 17:28:34 2016 -0300 dinput: Report DIDOI_ASPECTPOSITION flag for axes objects. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ce8a1a91b5462bc90629385d618ceb6b75cd2c9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 807199d..c02a559 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -498,9 +498,10 @@ HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - if (pdidoi->dwType & DIDFT_AXIS) + if (pdidoi->dwType & DIDFT_AXIS) { sprintfW(pdidoi->tszName, axisW, DIDFT_GETINSTANCE(pdidoi->dwType)); - else if (pdidoi->dwType & DIDFT_POV) + pdidoi->dwFlags |= DIDOI_ASPECTPOSITION; + } else if (pdidoi->dwType & DIDFT_POV) sprintfW(pdidoi->tszName, povW, DIDFT_GETINSTANCE(pdidoi->dwType)); else if (pdidoi->dwType & DIDFT_BUTTON) sprintfW(pdidoi->tszName, buttonW, DIDFT_GETINSTANCE(pdidoi->dwType));

1 0

Nikolay Sivov : setupapi: Added CM_Get_Version().
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 5fd513741b3aa0d93b307e393ecddf86de67f792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd513741b3aa0d93b307e393… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 00:30:51 2016 +0300 setupapi: Added CM_Get_Version(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit af533d1eebd382d7ee72eaaef1cf7461356da9e5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/misc.c | 9 +++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/misc.c | 10 ++++++++++ include/cfgmgr32.h | 1 + 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 90a05ab..116180c 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -114,7 +114,7 @@ @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling @ stub CM_Get_Sibling_Ex -@ stub CM_Get_Version +@ stdcall CM_Get_Version() setupapi.CM_Get_Version @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index de73966..98a6ed7 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1751,3 +1751,12 @@ BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity) HeapFree(GetProcessHeap(), 0, msg); return ret; } + +/*********************************************************************** + * CM_Get_Version (SETUPAPI.@) + */ +WORD WINAPI CM_Get_Version(void) +{ + TRACE("()\n"); + return 0x0400; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 29065fc..9e4ad7c 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -125,7 +125,7 @@ @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling @ stub CM_Get_Sibling_Ex -@ stub CM_Get_Version +@ stdcall CM_Get_Version() @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 09e0fb8..04b2171 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -29,6 +29,7 @@ #include "winuser.h" #include "winreg.h" #include "setupapi.h" +#include "cfgmgr32.h" #include "wine/test.h" @@ -816,6 +817,14 @@ static void test_SetupLogError(void) SetupCloseLog(); } +static void test_CM_Get_Version(void) +{ + WORD ret; + + ret = CM_Get_Version(); + ok(ret == 0x0400, "got version %#x\n", ret); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -849,4 +858,5 @@ START_TEST(misc) test_defaultcallback(); test_SetupLogError(); + test_CM_Get_Version(); } diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index e3966f9..7dc31e1 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -192,6 +192,7 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI WORD WINAPI CM_Get_Version(void); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode)

1 0

Nikolay Sivov : oledb32: Support quoted values in initialisation strings.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 2a88eb97161901535c06c0384b53b0bf74bd4eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a88eb97161901535c06c0384… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 10:36:22 2016 +0300 oledb32: Support quoted values in initialisation strings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85c6afe4cec71a26dbfce7c6ac8d66205a2deb43) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledb32/datainit.c | 24 ++++++++++++++++++++---- dlls/oledb32/tests/database.c | 4 ++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 1ba0cb1..42d5dae 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -401,17 +401,33 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) while (start && (eq = strchrW(start, '='))) { static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; - WCHAR *scol = strchrW(eq+1, ';'); BSTR value, name; + WCHAR *delim; name = SysAllocStringLen(start, eq - start); /* skip equal sign to get value */ eq++; - value = SysAllocStringLen(eq, scol ? scol - eq : -1); + + if (*eq == '"') + { + /* for quoted value string, skip opening mark, look for terminating one */ + eq++; + delim = strchrW(eq, '"'); + } + else + delim = strchrW(eq, ';'); + + value = SysAllocStringLen(eq, delim ? delim - eq : -1); /* skip semicolon if present */ - if (scol) scol++; - start = scol; + if (delim) + { + if (*delim == '"') + delim++; + if (*delim == ';') + delim++; + } + start = delim; if (!strcmpiW(name, providerW)) { diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 483454e..8c531e4 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -291,6 +291,9 @@ static void test_database(void) static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; static WCHAR customprop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', 'c','u','s','t','o','m','p','r','o','p','=','1','2','3','.','4',';',0}; + static WCHAR extended_prop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', + 'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s','=','\"','D','R','I','V','E','R','=','A', + ' ','W','i','n','e',' ','O','D','B','C',' ','d','r','i','v','e','r',';','U','I','D','=','w','i','n','e',';','\"',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -307,6 +310,7 @@ static void test_database(void) test_GetDataSource(initstring_default); test_GetDataSource(initstring_lower); test_GetDataSource2(customprop); + test_GetDataSource2(extended_prop); } static void test_errorinfo(void)

1 0