September 2016 - Wine-Commits

Huw Davies : rpcrt4/tests: Win 8 and 10 do not correctly unmarshal a ranged enum16.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: f53c320f04114253955b509da294ef454864679d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53c320f04114253955b509da… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 6 12:56:49 2016 +0100 rpcrt4/tests: Win 8 and 10 do not correctly unmarshal a ranged enum16. In practice this bug is not observed since midl, unlike widl, does not generate ranges in inline stub mode. For interpreted stubs, where midl does generate ranges, the [out] parameters are zero-initialised by the runtime. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 6901f6b..f9a5a96 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1006,8 +1006,11 @@ basic_tests(void) if (!old_windows_version) { + re = 0xdeadbeef; get_ranged_enum(&re); - ok(re == RE3, "get_ranged_enum() returned %d instead of RE3\n", re); + ok(re == RE3 || + broken(re == MAKELONG(re, 0xdead)), /* Win 8, Win 10 */ + "get_ranged_enum() returned %x instead of RE3\n", re); } }

1 0

Jacek Caban : taskschd: Added ITaskDefinition:: get_Triggers implementation.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: 67abe79de009d06a92841e7774f90771f5b05cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=67abe79de009d06a92841e777… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 6 13:00:38 2016 +0200 taskschd: Added ITaskDefinition::get_Triggers implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 163 +++++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 11 +++ 2 files changed, 172 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index c33cda1..d77ffc8 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -37,6 +37,149 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); typedef struct { + ITriggerCollection ITriggerCollection_iface; + LONG ref; +} trigger_collection; + +static inline trigger_collection *impl_from_ITriggerCollection(ITriggerCollection *iface) +{ + return CONTAINING_RECORD(iface, trigger_collection, ITriggerCollection_iface); +} + +static HRESULT WINAPI TriggerCollection_QueryInterface(ITriggerCollection *iface, REFIID riid, void **ppv) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IDispatch, riid) || + IsEqualGUID(&IID_ITriggerCollection, riid)) { + *ppv = &This->ITriggerCollection_iface; + }else { + FIXME("unimplemented interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TriggerCollection_AddRef(ITriggerCollection *iface) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI TriggerCollection_Release(ITriggerCollection *iface) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI TriggerCollection_GetTypeInfoCount(ITriggerCollection *iface, UINT *count) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + FIXME("(%p)->(%p)\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI TriggerCollection_GetTypeInfo(ITriggerCollection *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + FIXME("(%p)->(%u %u %p)\n", This, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI TriggerCollection_GetIDsOfNames(ITriggerCollection *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI TriggerCollection_Invoke(ITriggerCollection *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + FIXME("(%p)->(%d %s %x %x %p %p %p %p)\n", This, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI TriggerCollection_get_Count(ITriggerCollection *iface, LONG *count) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + FIXME("(%p)->(%p)\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI TriggerCollection_get_Item(ITriggerCollection *iface, LONG index, ITrigger **trigger) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + FIXME("(%p)->(%d %p)\n", This, index, trigger); + return E_NOTIMPL; +} + +static HRESULT WINAPI TriggerCollection_get__NewEnum(ITriggerCollection *iface, IUnknown **penum) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + FIXME("(%p)->(%p)\n", This, penum); + return E_NOTIMPL; +} + +static HRESULT WINAPI TriggerCollection_Create(ITriggerCollection *iface, TASK_TRIGGER_TYPE2 type, ITrigger **trigger) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + FIXME("(%p)->(%d %p)\n", This, type, trigger); + return E_NOTIMPL; +} + +static HRESULT WINAPI TriggerCollection_Remove(ITriggerCollection *iface, VARIANT index) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&index)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TriggerCollection_Clear(ITriggerCollection *iface) +{ + trigger_collection *This = impl_from_ITriggerCollection(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const ITriggerCollectionVtbl TriggerCollection_vtbl = { + TriggerCollection_QueryInterface, + TriggerCollection_AddRef, + TriggerCollection_Release, + TriggerCollection_GetTypeInfoCount, + TriggerCollection_GetTypeInfo, + TriggerCollection_GetIDsOfNames, + TriggerCollection_Invoke, + TriggerCollection_get_Count, + TriggerCollection_get_Item, + TriggerCollection_get__NewEnum, + TriggerCollection_Create, + TriggerCollection_Remove, + TriggerCollection_Clear +}; + +typedef struct +{ IRegistrationInfo IRegistrationInfo_iface; LONG ref; WCHAR *description, *author, *version, *date, *documentation, *uri, *source; @@ -1072,8 +1215,24 @@ static HRESULT WINAPI TaskDefinition_put_RegistrationInfo(ITaskDefinition *iface static HRESULT WINAPI TaskDefinition_get_Triggers(ITaskDefinition *iface, ITriggerCollection **triggers) { - FIXME("%p,%p: stub\n", iface, triggers); - return E_NOTIMPL; + TaskDefinition *This = impl_from_ITaskDefinition(iface); + + TRACE("%p,%p\n", This, triggers); + + if (!This->triggers) + { + trigger_collection *collection; + + collection = heap_alloc(sizeof(*collection)); + if (!collection) return E_OUTOFMEMORY; + + collection->ITriggerCollection_iface.lpVtbl = &TriggerCollection_vtbl; + collection->ref = 1; + This->triggers = &collection->ITriggerCollection_iface; + } + + ITriggerCollection_AddRef(*triggers = This->triggers); + return S_OK; } static HRESULT WINAPI TaskDefinition_put_Triggers(ITaskDefinition *iface, ITriggerCollection *triggers) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 94d9b29..5ddc96f 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1291,6 +1291,7 @@ static void test_TaskDefinition(void) 100, 1, TASK_INSTANCES_STOP_EXISTING, TASK_COMPATIBILITY_V1, VARIANT_FALSE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_FALSE, VARIANT_TRUE, VARIANT_TRUE, VARIANT_FALSE, VARIANT_TRUE, VARIANT_TRUE, VARIANT_TRUE }; + ITriggerCollection *trigger_col, *trigger_col2; HRESULT hr; ITaskService *service; ITaskDefinition *taskdef; @@ -1418,6 +1419,16 @@ if (hr == S_OK) if (hr == S_OK) ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = ITaskDefinition_get_Triggers(taskdef, &trigger_col); + ok(hr == S_OK, "get_Triggers failed: %08x\n", hr); + ok(trigger_col != NULL, "Trigers = NULL\n"); + ITriggerCollection_Release(trigger_col); + + hr = ITaskDefinition_get_Triggers(taskdef, &trigger_col2); + ok(hr == S_OK, "get_Triggers failed: %08x\n", hr); + ok(trigger_col == trigger_col2, "Trigers = NULL\n"); + ITriggerCollection_Release(trigger_col2); + IRegistrationInfo_Release(reginfo); ITaskDefinition_Release(taskdef); ITaskService_Release(service);

1 0

David Keijser : kernel32: Forward CAL_RETURN_GENITIVE_NAMES to GetLocaleInfo().
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: 34a0c122cb5b767e17032d1d3e54e42cf1f536fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a0c122cb5b767e17032d1d3… Author: David Keijser <keijser(a)gmail.com> Date: Mon Sep 5 19:46:06 2016 +0300 kernel32: Forward CAL_RETURN_GENITIVE_NAMES to GetLocaleInfo(). Signed-off-by: David Keijser <keijser(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 0a5aa07..f4a1a35 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -916,6 +916,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, LOCALE_SMONTHDAY, 0, /* CAL_SABBREVERASTRING */ }; + DWORD localeflags = 0; CALTYPE calinfo; if (CalType & CAL_NOUSEROVERRIDE) @@ -943,6 +944,9 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, calinfo = CalType & 0xffff; + if (CalType & CAL_RETURN_GENITIVE_NAMES) + localeflags |= LOCALE_RETURN_GENITIVE_NAMES; + switch (calinfo) { case CAL_ICALINTVALUE: if (CalType & CAL_RETURN_NUMBER) @@ -1002,7 +1006,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SABBREVMONTHNAME12: case CAL_SABBREVMONTHNAME13: case CAL_SYEARMONTH: - return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo], lpCalData, cchData); + return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo] | localeflags, lpCalData, cchData); case CAL_ITWODIGITYEARMAX: if (CalType & CAL_RETURN_NUMBER) {

1 0

Huw Davies : user32/tests: ValidateRect(NULL, &rect) on >= Win 8 no longer invalidates all windows.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: 1c70de2a340640a85eda21ce7987f36ec43bb435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c70de2a340640a85eda21ce7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 5 10:45:11 2016 +0100 user32/tests: ValidateRect(NULL, &rect) on >= Win 8 no longer invalidates all windows. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ebd1c45..d4ca828 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6709,7 +6709,8 @@ static void test_paint_messages(void) */ trace("testing ValidateRect(0, NULL)\n"); SetRectEmpty( &rect ); - if (ValidateRect(0, &rect)) /* not supported on Win9x */ + if (ValidateRect(0, &rect) && /* not supported on Win9x */ + GetUpdateRect(hwnd, NULL, FALSE)) /* or >= Win 8 */ { check_update_rgn( hwnd, hrgn ); ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE );

1 0

Sebastian Lackner : jscript: Fix definition of JSSTR_MAX_LENGTH.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: d36ae568c186a9eee944ddf191b2c42088f0d59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36ae568c186a9eee944ddf19… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 5 16:55:57 2016 +0200 jscript: Fix definition of JSSTR_MAX_LENGTH. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 48fa2be..a14acc3 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -39,7 +39,7 @@ struct _jsstr_t { }; #define JSSTR_LENGTH_SHIFT 4 -#define JSSTR_MAX_LENGTH (1 << (32-JSSTR_LENGTH_SHIFT)) +#define JSSTR_MAX_LENGTH ((1 << (32-JSSTR_LENGTH_SHIFT))-1) #define JSSTR_FLAGS_MASK ((1 << JSSTR_LENGTH_SHIFT)-1) #define JSSTR_FLAG_LBIT 1

1 0

Andrey Gusev : api-ms-win-core-shlwapi-obsolete-l1-1-0: Add dll.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: b7e2e45f932b6dc302d03d3727cb706af390b722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e2e45f932b6dc302d03d372… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Sep 5 19:03:29 2016 +0300 api-ms-win-core-shlwapi-obsolete-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-shlwapi-obsolete-l1-1-0.spec | 61 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 66 insertions(+) diff --git a/configure b/configure index da08e8f..3ed4a60 100755 --- a/configure +++ b/configure @@ -929,6 +929,7 @@ enable_api_ms_win_core_registry_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 +enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 enable_api_ms_win_core_string_obsolete_l1_1_0 @@ -17475,6 +17476,7 @@ wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_regist wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtlsupport_l1_1_0 wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 +wine_fn_config_dll api-ms-win-core-shlwapi-obsolete-l1-1-0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 wine_fn_config_dll api-ms-win-core-string-obsolete-l1-1-0 enable_api_ms_win_core_string_obsolete_l1_1_0 diff --git a/configure.ac b/configure.ac index 0154baa..8d5116c 100644 --- a/configure.ac +++ b/configure.ac @@ -2694,6 +2694,7 @@ WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-obsolete-l1-1-0) diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/Makefile.in b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/Makefile.in new file mode 100644 index 0000000..6273403 --- /dev/null +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-shlwapi-obsolete-l1-1-0.dll diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec new file mode 100644 index 0000000..1b55281 --- /dev/null +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec @@ -0,0 +1,61 @@ +@ stdcall QISearch(long long long long) shlwapi.QISearch +@ stdcall SHLoadIndirectString(wstr ptr long ptr) shlwapi.SHLoadIndirectString +@ stdcall StrCatBuffA(str str long) shlwapi.StrCatBuffA +@ stdcall StrCatBuffW(wstr wstr long) shlwapi.StrCatBuffW +@ stdcall StrCatChainW(ptr long long wstr) shlwapi.StrCatChainW +@ stdcall StrChrA(str long) shlwapi.StrChrA +@ stdcall StrChrIA(str long) shlwapi.StrChrIA +@ stdcall StrChrIW(wstr long) shlwapi.StrChrIW +@ stub StrChrNIW +@ stdcall StrChrNW(wstr long long) shlwapi.StrChrNW +@ stdcall StrChrW(wstr long) shlwapi.StrChrW +@ stdcall StrCmpCA(str str) shlwapi.StrCmpCA +@ stdcall StrCmpCW(wstr wstr) shlwapi.StrCmpCW +@ stdcall StrCmpICA(str str) shlwapi.StrCmpICA +@ stdcall StrCmpICW(wstr wstr) shlwapi.StrCmpICW +@ stdcall StrCmpIW(wstr wstr) shlwapi.StrCmpIW +@ stdcall StrCmpLogicalW(wstr wstr) shlwapi.StrCmpLogicalW +@ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA +@ stdcall StrCmpNCA(str ptr long) shlwapi.StrCmpNCA +@ stdcall StrCmpNCW(wstr wstr long) shlwapi.StrCmpNCW +@ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA +@ stdcall StrCmpNICA(long long long) shlwapi.StrCmpNICA +@ stdcall StrCmpNICW(wstr wstr long) shlwapi.StrCmpNICW +@ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW +@ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW +@ stdcall StrCmpW(wstr wstr) shlwapi.StrCmpW +@ stdcall StrCpyNW(ptr wstr long) shlwapi.StrCpyNW +@ stdcall StrCpyNXA(ptr str long) shlwapi.StrCpyNXA +@ stdcall StrCpyNXW(ptr wstr long) shlwapi.StrCpyNXW +@ stdcall StrCSpnA(str str) shlwapi.StrCSpnA +@ stdcall StrCSpnIA(str str) shlwapi.StrCSpnIA +@ stdcall StrCSpnIW(wstr wstr) shlwapi.StrCSpnIW +@ stdcall StrCSpnW(wstr wstr) shlwapi.StrCSpnW +@ stdcall StrDupA(str) shlwapi.StrDupA +@ stdcall StrDupW(wstr) shlwapi.StrDupW +@ stdcall StrIsIntlEqualA(long str str long) shlwapi.StrIsIntlEqualA +@ stdcall StrIsIntlEqualW(long wstr wstr long) shlwapi.StrIsIntlEqualW +@ stdcall StrPBrkA(str str) shlwapi.StrPBrkA +@ stdcall StrPBrkW(wstr wstr) shlwapi.StrPBrkW +@ stdcall StrRChrA(str str long) shlwapi.StrRChrA +@ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA +@ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW +@ stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW +@ stdcall StrRStrIA(str str str) shlwapi.StrRStrIA +@ stdcall StrRStrIW(wstr wstr wstr) shlwapi.StrRStrIW +@ stdcall StrSpnA(str str) shlwapi.StrSpnA +@ stdcall StrSpnW(wstr wstr) shlwapi.StrSpnW +@ stdcall StrStrA(str str) shlwapi.StrStrA +@ stdcall StrStrIA(str str) shlwapi.StrStrIA +@ stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW +@ stdcall StrStrNIW(wstr wstr long) shlwapi.StrStrNIW +@ stdcall StrStrNW(wstr wstr long) shlwapi.StrStrNW +@ stdcall StrStrW(wstr wstr) shlwapi.StrStrW +@ stdcall StrToInt64ExA(str long ptr) shlwapi.StrToInt64ExA +@ stdcall StrToInt64ExW(wstr long ptr) shlwapi.StrToInt64ExW +@ stdcall StrToIntA(str) shlwapi.StrToIntA +@ stdcall StrToIntExA(str long ptr) shlwapi.StrToIntExA +@ stdcall StrToIntExW(wstr long ptr) shlwapi.StrToIntExW +@ stdcall StrToIntW(wstr) shlwapi.StrToIntW +@ stdcall StrTrimA(str str) shlwapi.StrTrimA +@ stdcall StrTrimW(wstr wstr) shlwapi.StrTrimW diff --git a/tools/make_specfiles b/tools/make_specfiles index ad8a357..57287ea 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -223,6 +223,7 @@ my @dll_groups = "api-ms-win-downlevel-shlwapi-l1-1-0", "api-ms-win-downlevel-shlwapi-l2-1-0", "api-ms-win-core-shlwapi-legacy-l1-1-0", + "api-ms-win-core-shlwapi-obsolete-l1-1-0", "api-ms-win-core-url-l1-1-0", ], [

1 0

Alexandre Julliard : user32: Synthesize text clipboard formats on the user32 side.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: 8865f4a4ec9f0c8ba001192ecbf509e4e62cd6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8865f4a4ec9f0c8ba001192ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 20:26:09 2016 +0900 user32: Synthesize text clipboard formats on the user32 side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 17 ++-- dlls/user32/clipboard.c | 197 +++++++++++++++++++++++++++++++++++++++--- dlls/user32/tests/clipboard.c | 40 ++++----- 3 files changed, 210 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8865f4a4ec9f0c8ba0011…

1 0

Alexandre Julliard : user32/tests: Add a few more tests for synthesized formats rendering.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: b1e8ed3e3b6efe9f69b41551a62b57d09543dfea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e8ed3e3b6efe9f69b41551a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 15:36:01 2016 +0900 user32/tests: Add a few more tests for synthesized formats rendering. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 79 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index cf6d744..ca81d72 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -561,6 +561,24 @@ static HBITMAP create_dib( BOOL v5 ) return ret; } +static LRESULT CALLBACK renderer_winproc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + static UINT rendered; + UINT ret; + + switch (msg) + { + case WM_RENDERFORMAT: + if (wp < 32) rendered |= (1 << wp); + break; + case WM_USER: + ret = rendered; + rendered = 0; + return ret; + } + return DefWindowProcA( hwnd, msg, wp, lp ); +} + static void test_synthesized(void) { static const struct test @@ -583,8 +601,12 @@ static void test_synthesized(void) HGLOBAL h, htext; HENHMETAFILE emf; BOOL r; - UINT cf, i, j, count; + UINT cf, i, j, count, rendered; HANDLE data; + HWND hwnd; + + hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)renderer_winproc ); htext = create_textA(); emf = create_emf(); @@ -653,6 +675,28 @@ static void test_synthesized(void) r = EmptyClipboard(); ok(r, "gle %d\n", GetLastError()); + SetClipboardData( CF_UNICODETEXT, create_textW() ); + SetClipboardData( CF_TEXT, create_textA() ); + SetClipboardData( CF_OEMTEXT, create_textA() ); + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + r = OpenClipboard( NULL ); + ok(r, "gle %d\n", GetLastError()); + cf = EnumClipboardFormats(0); + ok( cf == CF_UNICODETEXT, "cf %08x\n", cf ); + cf = EnumClipboardFormats(cf); + ok( cf == CF_TEXT, "cf %08x\n", cf ); + cf = EnumClipboardFormats(cf); + ok( cf == CF_OEMTEXT, "cf %08x\n", cf ); + cf = EnumClipboardFormats(cf); + todo_wine ok( cf == CF_LOCALE, "cf %08x\n", cf ); + if (cf == CF_LOCALE) cf = EnumClipboardFormats( cf ); + ok( cf == 0, "cf %08x\n", cf ); + + r = EmptyClipboard(); + ok(r, "gle %d\n", GetLastError()); + r = CloseClipboard(); ok(r, "gle %d\n", GetLastError()); @@ -703,7 +747,7 @@ static void test_synthesized(void) todo_wine_if (tests[i].todo) ok( count == j, "%u: count %u instead of %u\n", i, count, j ); - r = OpenClipboard(NULL); + r = OpenClipboard( hwnd ); ok(r, "%u: gle %d\n", i, GetLastError()); cf = 0; for (j = 0; tests[i].expected[j]; j++) @@ -739,13 +783,20 @@ static void test_synthesized(void) r = EmptyClipboard(); ok(r, "%u: gle %d\n", i, GetLastError()); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + SetClipboardData( tests[i].format, 0 ); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); count = CountClipboardFormats(); ok( count == 1, "%u: count %u\n", i, count ); r = CloseClipboard(); ok(r, "%u: gle %d\n", i, GetLastError()); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); count = CountClipboardFormats(); for (j = 0; tests[i].expected[j]; j++) @@ -756,6 +807,8 @@ static void test_synthesized(void) } todo_wine_if (tests[i].todo) ok( count == j, "%u: count %u instead of %u\n", i, count, j ); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); r = OpenClipboard(NULL); ok(r, "%u: gle %d\n", i, GetLastError()); @@ -767,11 +820,28 @@ static void test_synthesized(void) ok(cf == tests[i].expected[j], "%u.%u: got %04x instead of %04x\n", i, j, cf, tests[i].expected[j] ); if (cf != tests[i].expected[j]) break; + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u.%u: formats %08x have been rendered\n", i, j, rendered ); data = GetClipboardData( cf ); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); if (cf == CF_LOCALE) + { ok(data != NULL, "%u: CF_LOCALE no data\n", i); + ok( !rendered, "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + } else + { ok(!data, "%u: format %04x got data %p\n", i, cf, data); + todo_wine_if( tests[i].format == CF_ENHMETAFILE && tests[i].expected[j] == CF_METAFILEPICT ) + ok( rendered == (1 << tests[i].format), + "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + /* try to render a second time */ + data = GetClipboardData( cf ); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + todo_wine_if( i > 2 && j == 1 ) + ok( rendered == (1 << tests[i].format), + "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + } } if (!tests[i].expected[j]) { @@ -780,6 +850,8 @@ static void test_synthesized(void) } r = CloseClipboard(); ok(r, "%u: gle %d\n", i, GetLastError()); + rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); + ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); } r = OpenClipboard(NULL); @@ -788,6 +860,7 @@ static void test_synthesized(void) ok(r, "gle %d\n", GetLastError()); r = CloseClipboard(); ok(r, "gle %d\n", GetLastError()); + DestroyWindow( hwnd ); } static CRITICAL_SECTION clipboard_cs; @@ -1622,6 +1695,8 @@ static void test_handles( HWND hwnd ) ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( CF_UNICODETEXT ); ok( is_fixed( data ), "expected fixed mem %p\n", data ); + data = GetClipboardData( CF_LOCALE ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( CF_BITMAP ); ok( data == bitmap, "expected bitmap %p\n", data ); data = GetClipboardData( CF_PALETTE );

1 0

Alexandre Julliard : user32: Implement GetUpdatedClipboardFormats.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: fa06ecbfceac64bf979f0d08550af0677e2a8b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa06ecbfceac64bf979f0d085… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 15:35:49 2016 +0900 user32: Implement GetUpdatedClipboardFormats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 30 +++++++++++ dlls/user32/tests/clipboard.c | 113 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 4 files changed, 145 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 8e53a9f..8ca4dd5 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -407,6 +407,36 @@ BOOL WINAPI IsClipboardFormatAvailable(UINT wFormat) /************************************************************************** + * GetUpdatedClipboardFormats (USER32.@) + */ +BOOL WINAPI GetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ) +{ + UINT i = 0, cf = 0; + + if (!out_size) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + if (!(*out_size = CountClipboardFormats())) return TRUE; /* nothing else to do */ + + if (!formats) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + if (size < *out_size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + /* FIXME: format list could change in the meantime */ + while ((cf = USER_Driver->pEnumClipboardFormats( cf ))) formats[i++] = cf; + return TRUE; +} + + +/************************************************************************** * GetClipboardData (USER32.@) */ HANDLE WINAPI GetClipboardData(UINT wFormat) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 845e5e4..cf6d744 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -29,6 +29,7 @@ static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); static BOOL (WINAPI *pRemoveClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); +static BOOL (WINAPI *pGetUpdatedClipboardFormats)( UINT *formats, UINT count, UINT *out_count ); static const BOOL is_win64 = sizeof(void *) > sizeof(int); static int thread_from_line; @@ -1806,6 +1807,116 @@ static void test_data_handles(void) DestroyWindow( hwnd ); } +static void test_GetUpdatedClipboardFormats(void) +{ + BOOL r; + UINT count, formats[256]; + + if (!pGetUpdatedClipboardFormats) + { + win_skip( "GetUpdatedClipboardFormats not supported\n" ); + return; + } + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( NULL, 0, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( !count, "wrong count %u\n", count ); + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( NULL, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( !count, "wrong count %u\n", count ); + + SetLastError( 0xdeadbeef ); + r = pGetUpdatedClipboardFormats( formats, 256, NULL ); + ok( !r, "succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( formats, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( !count, "wrong count %u\n", count ); + + r = OpenClipboard( 0 ); + ok( r, "gle %d\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( formats, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( !count, "wrong count %u\n", count ); + + SetClipboardData( CF_UNICODETEXT, 0 ); + + count = 0xdeadbeef; + memset( formats, 0xcc, sizeof(formats) ); + r = pGetUpdatedClipboardFormats( formats, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( count == 1, "wrong count %u\n", count ); + ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); + ok( formats[1] == 0xcccccccc, "wrong format %u\n", formats[1] ); + + SetClipboardData( CF_TEXT, 0 ); + count = 0xdeadbeef; + memset( formats, 0xcc, sizeof(formats) ); + r = pGetUpdatedClipboardFormats( formats, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + ok( count == 2, "wrong count %u\n", count ); + ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); + ok( formats[1] == CF_TEXT, "wrong format %u\n", formats[1] ); + ok( formats[2] == 0xcccccccc, "wrong format %u\n", formats[2] ); + + SetLastError( 0xdeadbeef ); + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( formats, 0, &count ); + ok( !r, "succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %u\n", GetLastError() ); + ok( count == 2, "wrong count %u\n", count ); + + SetLastError( 0xdeadbeef ); + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( formats, 1, &count ); + ok( !r, "succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %u\n", GetLastError() ); + ok( count == 2, "wrong count %u\n", count ); + + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + count = 0xdeadbeef; + memset( formats, 0xcc, sizeof(formats) ); + r = pGetUpdatedClipboardFormats( formats, 256, &count ); + ok( r, "gle %d\n", GetLastError() ); + todo_wine ok( count == 4, "wrong count %u\n", count ); + ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); + ok( formats[1] == CF_TEXT, "wrong format %u\n", formats[1] ); + todo_wine ok( formats[2] == CF_LOCALE, "wrong format %u\n", formats[2] ); + todo_wine ok( formats[3] == CF_OEMTEXT, "wrong format %u\n", formats[3] ); + ok( formats[4] == 0xcccccccc, "wrong format %u\n", formats[4] ); + + count = 0xdeadbeef; + memset( formats, 0xcc, sizeof(formats) ); + r = pGetUpdatedClipboardFormats( formats, 2, &count ); + ok( !r, "gle %d\n", GetLastError() ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %u\n", GetLastError() ); + todo_wine ok( count == 4, "wrong count %u\n", count ); + ok( formats[0] == 0xcccccccc, "wrong format %u\n", formats[0] ); + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( NULL, 256, &count ); + ok( !r, "gle %d\n", GetLastError() ); + ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); + todo_wine ok( count == 4, "wrong count %u\n", count ); + + count = 0xdeadbeef; + r = pGetUpdatedClipboardFormats( NULL, 256, &count ); + ok( !r, "gle %d\n", GetLastError() ); + ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); + todo_wine ok( count == 4, "wrong count %u\n", count ); +} + START_TEST(clipboard) { char **argv; @@ -1816,6 +1927,7 @@ START_TEST(clipboard) pAddClipboardFormatListener = (void *)GetProcAddress( mod, "AddClipboardFormatListener" ); pRemoveClipboardFormatListener = (void *)GetProcAddress( mod, "RemoveClipboardFormatListener" ); pGetClipboardSequenceNumber = (void *)GetProcAddress( mod, "GetClipboardSequenceNumber" ); + pGetUpdatedClipboardFormats = (void *)GetProcAddress( mod, "GetUpdatedClipboardFormats" ); if (argc == 4 && !strcmp( argv[2], "set_clipboard_data" )) { @@ -1838,4 +1950,5 @@ START_TEST(clipboard) test_synthesized(); test_messages(); test_data_handles(); + test_GetUpdatedClipboardFormats(); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index aa10a80..65a5bfe 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -374,6 +374,7 @@ @ stdcall GetTopWindow(long) @ stdcall GetUpdateRect(long ptr long) @ stdcall GetUpdateRgn(long long long) +@ stdcall GetUpdatedClipboardFormats(ptr long ptr) @ stdcall GetUserObjectInformationA (long long ptr long ptr) @ stdcall GetUserObjectInformationW (long long ptr long ptr) @ stdcall GetUserObjectSecurity (long ptr ptr long ptr) diff --git a/include/winuser.h b/include/winuser.h index 4955964..cb7c37b 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3695,6 +3695,7 @@ WINUSERAPI HDESK WINAPI GetThreadDesktop(DWORD); WINUSERAPI HWND WINAPI GetTopWindow(HWND); WINUSERAPI BOOL WINAPI GetUpdateRect(HWND,LPRECT,BOOL); WINUSERAPI INT WINAPI GetUpdateRgn(HWND,HRGN,BOOL); +WINUSERAPI BOOL WINAPI GetUpdatedClipboardFormats(UINT*,UINT,UINT*); WINUSERAPI BOOL WINAPI GetUserObjectInformationA(HANDLE,INT,LPVOID,DWORD,LPDWORD); WINUSERAPI BOOL WINAPI GetUserObjectInformationW(HANDLE,INT,LPVOID,DWORD,LPDWORD); #define GetUserObjectInformation WINELIB_NAME_AW(GetUserObjectInformation)

1 0

Huw Davies : user32/tests: On Win 8 and later, moving a window off-screen doesn't crop its update region.
by Alexandre Julliard Sept. 6, 2016

Sept. 6, 2016

Module: wine Branch: master Commit: 5942625a003f5f01a31b05561ca91d9f2fc1b486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5942625a003f5f01a31b05561… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 5 10:45:12 2016 +0100 user32/tests: On Win 8 and later, moving a window off-screen doesn't crop its update region. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d4ca828..72614eb 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6644,7 +6644,7 @@ static const struct message WmSetParentStyle[] = { static void test_paint_messages(void) { BOOL ret; - RECT rect; + RECT rect, rect2; POINT pt; MSG msg; HWND hparent, hchild; @@ -7184,15 +7184,21 @@ static void test_paint_messages(void) SetRectRgn( hrgn, 10, 10, 40, 40 ); check_update_rgn( hchild, hrgn ); MoveWindow( hparent, -20, -20, 200, 200, FALSE ); - SetRectRgn( hrgn, 20, 20, 100, 100 ); + GetUpdateRect( hparent, &rect2, FALSE ); + if (!EqualRect( &rect2, &rect )) /* Win 8 and later don't crop update to screen */ + { + rect.left += 20; + rect.top += 20; + } + SetRectRgn( hrgn, rect.left, rect.top, rect.right, rect.bottom ); check_update_rgn( hparent, hrgn ); - SetRectRgn( hrgn, 30, 30, 40, 40 ); + SetRectRgn( hrgn, rect.left + 10, rect.top + 10, 40, 40 ); check_update_rgn( hchild, hrgn ); /* invalidated region is cropped by the parent rects */ SetRect( &rect, 0, 0, 50, 50 ); RedrawWindow( hchild, &rect, 0, RDW_INVALIDATE | RDW_ERASE ); - SetRectRgn( hrgn, 30, 30, 50, 50 ); + SetRectRgn( hrgn, rect2.left + 10, rect2.top + 10, 50, 50 ); check_update_rgn( hchild, hrgn ); DestroyWindow( hparent );

1 0