September 2016 - Wine-commits

Huw Davies : webservices/tests: Initialise dictionary to NULL.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: f65b5e354b03b356ae7c3fdca93b0834f8de6ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65b5e354b03b356ae7c3fdca… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 6 10:39:25 2016 +0100 webservices/tests: Initialise dictionary to NULL. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d9c3fb1..ebe72fe 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -465,6 +465,7 @@ static void test_WsWriteStartAttribute(void) text.text.textType = WS_XML_TEXT_TYPE_UTF8; text.value.length = 1; text.value.bytes = (BYTE *)"0"; + text.value.dictionary = NULL; hr = WsWriteText( writer, &text.text, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "", __LINE__ ); @@ -1130,6 +1131,7 @@ static void test_WsWriteStartCData(void) text.text.textType = WS_XML_TEXT_TYPE_UTF8; text.value.bytes = (BYTE *)"<data>"; text.value.length = 6; + text.value.dictionary = NULL; hr = WsWriteText( writer, &text.text, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<t><![CDATA[<data>", __LINE__ ); @@ -1818,6 +1820,7 @@ static void test_WsWriteNode(void) utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; utf8.value.bytes = (BYTE *)"value"; utf8.value.length = sizeof("value") - 1; + utf8.value.dictionary = NULL; attr.singleQuote = TRUE; attr.isXmlNs = FALSE; @@ -1840,6 +1843,7 @@ static void test_WsWriteNode(void) comment.node.nodeType = WS_XML_NODE_TYPE_COMMENT; comment.value.bytes = (BYTE *)"comment"; comment.value.length = sizeof("comment") - 1; + comment.value.dictionary = NULL; hr = WsWriteNode( writer, (const WS_XML_NODE *)&comment, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1857,6 +1861,7 @@ static void test_WsWriteNode(void) utf8.value.bytes = (BYTE *)"cdata"; utf8.value.length = sizeof("cdata") - 1; + utf8.value.dictionary = NULL; text.node.nodeType = WS_XML_NODE_TYPE_TEXT; text.text = &utf8.text; hr = WsWriteNode( writer, (const WS_XML_NODE *)&text, NULL ); @@ -1868,6 +1873,7 @@ static void test_WsWriteNode(void) utf8.value.bytes = (BYTE *)"text"; utf8.value.length = sizeof("text") - 1; + utf8.value.dictionary = NULL; hr = WsWriteNode( writer, (const WS_XML_NODE *)&text, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2210,6 +2216,7 @@ static void test_WsWriteText(void) utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; utf8.value.bytes = (BYTE *)"test"; utf8.value.length = 4; + utf8.value.dictionary = NULL; hr = WsWriteText( writer, &utf8.text, NULL ); todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr );

1 0

Jacek Caban : taskschd: Added ITaskDefinition:: get_Triggers implementation.
by Alexandre Julliard 06 Sep '16

06 Sep '16

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

Jacek Caban : taskschd/tests: Fixed tests on win10.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: d62ab576e5dbf948087cadf002fb10fd3c1c8eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62ab576e5dbf948087cadf00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 6 13:35:33 2016 +0200 taskschd/tests: Fixed tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5ddc96f..20f8845 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -156,7 +156,8 @@ todo_wine hr = ITaskService_GetFolder(service, dot, &folder); todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, + "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, bslash, &folder); ok(hr == S_OK, "GetFolder error %#x\n", hr); @@ -201,7 +202,8 @@ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); - ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, + "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder); todo_wine @@ -351,7 +353,7 @@ todo_wine ok(hr == S_OK, "DeleteFolder error %#x\n", hr); hr = ITaskFolder_DeleteFolder(folder, Wine, 0); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == S_OK /* win7 */, "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_DeleteFolder(folder, NULL, 0); ok(hr == E_ACCESSDENIED || hr == E_INVALIDARG /* Vista */, "expected E_ACCESSDENIED, got %#x\n", hr); @@ -764,13 +766,15 @@ static void test_GetTask(void) ITaskFolder_DeleteFolder(root, Wine, 0); hr = ITaskFolder_GetTask(root, Wine_Task1, &task1); - ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, + "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_CreateFolder(root, Wine, v_null, &folder); ok(hr == S_OK, "CreateFolder error %#x\n", hr); hr = ITaskFolder_GetTask(root, Wine, &task1); - ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, + "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); @@ -938,7 +942,7 @@ todo_wine ok(hr == S_OK, "DeleteTask error %#x\n", hr); hr = ITaskFolder_DeleteTask(folder, Task2, 0); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == S_OK /* win7 */, "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == S_OK, "RegisterTask error %#x\n", hr);

1 0

Andrey Gusev : api-ms-win-core-shlwapi-obsolete-l1-1-0: Add dll.
by Alexandre Julliard 06 Sep '16

06 Sep '16

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

Huw Davies : rpcrt4/tests: Win 8 and 10 do not correctly unmarshal a ranged enum16.
by Alexandre Julliard 06 Sep '16

06 Sep '16

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

Michael Stefaniuc : mshtml: Avoid using the COM method implementations directly.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 0793d01d1c6e29eeaa1e9b2cccce04b4c8547308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0793d01d1c6e29eeaa1e9b2cc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 2 13:36:19 2016 +0200 mshtml: Avoid using the COM method implementations directly. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2b79226..407de0c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -524,7 +524,7 @@ static HRESULT WINAPI HTMLWindow2_get_frames(IHTMLWindow2 *iface, IHTMLFramesCol /* FIXME: Should return a separate Window object */ *p = (IHTMLFramesCollection2*)&This->IHTMLWindow2_iface; - HTMLWindow2_AddRef(iface); + IHTMLWindow2_AddRef(iface); return S_OK; }

1 0

Jacek Caban : dbghelp: Removed no longer needed wine_rb_destroy call.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: b15cccd2dc206aab25db6f1b9a28334b0fe09945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15cccd2dc206aab25db6f1b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 22:08:39 2016 +0200 dbghelp: Removed no longer needed wine_rb_destroy call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 55f123a..9df02df 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -679,7 +679,6 @@ BOOL module_remove(struct process* pcs, struct module* module) } hash_table_destroy(&module->ht_symbols); hash_table_destroy(&module->ht_types); - wine_rb_destroy(&module->sources_offsets_tree, NULL, NULL); HeapFree(GetProcessHeap(), 0, module->sources); HeapFree(GetProcessHeap(), 0, module->addr_sorttab); pool_destroy(&module->pool);

1 0

Nikolay Sivov : d2d1/tests: A DC target test for switching from one HDC to another.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 35bab5ce643773226393c8164737b078669f5861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35bab5ce643773226393c8164… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 2 15:02:01 2016 +0300 d2d1/tests: A DC target test for switching from one HDC to another. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/Makefile.in | 2 +- dlls/d2d1/tests/d2d1.c | 94 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/Makefile.in b/dlls/d2d1/tests/Makefile.in index 28b741f..91ede78 100644 --- a/dlls/d2d1/tests/Makefile.in +++ b/dlls/d2d1/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d2d1.dll -IMPORTS = d2d1 d3d10_1 dwrite dxguid uuid user32 advapi32 ole32 +IMPORTS = d2d1 d3d10_1 dwrite dxguid uuid user32 advapi32 ole32 gdi32 C_SRCS = \ d2d1.c diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7f9632f..dbbe7d0 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2626,6 +2626,26 @@ todo_wine DestroyWindow(window); } +static void create_target_dibsection(HDC hdc, UINT32 width, UINT32 height) +{ + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *bmi = (BITMAPINFO*)bmibuf; + HBITMAP hbm; + + memset(bmi, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = -height; + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + + hbm = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + ok(hbm != NULL, "Failed to create a dib section.\n"); + + DeleteObject(SelectObject(hdc, hbm)); +} + static void test_dc_target(void) { static const D2D1_PIXEL_FORMAT invalid_formats[] = @@ -2641,7 +2661,11 @@ static void test_dc_target(void) D2D1_COLOR_F color; D2D1_SIZE_F size; unsigned int i; + HDC hdc, hdc2; + COLORREF clr; HRESULT hr; + RECT rect; + D2D_RECT_F r; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); @@ -2687,6 +2711,76 @@ if (SUCCEEDED(hr)) ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1DCRenderTarget_Release(rt); + + /* BindDC() */ + hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt); + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + + hdc = CreateCompatibleDC(NULL); + ok(hdc != NULL, "Failed to create an HDC.\n"); + + create_target_dibsection(hdc, 16, 16); + + SetRect(&rect, 0, 0, 32, 32); + hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + hr = ID2D1DCRenderTarget_BindDC(rt, hdc, &rect); + ok(hr == S_OK, "BindDC() returned %#x.\n", hr); + + /* target size comes from specified dimensions, not from selected bitmap size */ + size = ID2D1DCRenderTarget_GetSize(rt); + ok(size.width == 32.0f, "got width %.08e.\n", size.width); + ok(size.height == 32.0f, "got height %.08e.\n", size.height); + + /* clear one HDC to red, switch to another one, partially fill it and test contents */ + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc, 0, 0); + ok(clr == RGB(255, 0, 0), "Got color %#x\n", clr); + + hdc2 = CreateCompatibleDC(NULL); + ok(hdc2 != NULL, "Failed to create an HDC.\n"); + + create_target_dibsection(hdc2, 16, 16); + + hr = ID2D1DCRenderTarget_BindDC(rt, hdc2, &rect); + ok(hr == S_OK, "BindDC() returned %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); + ok(clr == 0, "Got color %#x\n", clr); + + set_color(&color, 0.0f, 1.0f, 0.0f, 1.0f); + hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + r.left = r.top = 0.0f; + r.bottom = 16.0f; + r.right = 8.0f; + ID2D1DCRenderTarget_FillRectangle(rt, &r, (ID2D1Brush*)brush); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + ID2D1SolidColorBrush_Release(brush); + + clr = GetPixel(hdc2, 0, 0); + ok(clr == RGB(0, 255, 0), "Got color %#x\n", clr); + + clr = GetPixel(hdc2, 10, 0); + ok(clr == 0, "Got color %#x\n", clr); + + DeleteDC(hdc); + DeleteDC(hdc2); + ID2D1DCRenderTarget_Release(rt); } ID2D1Factory_Release(factory); }

1 0

Sebastian Lackner : jscript: Simplify jsstr_release implementation.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 736983632316d2b0dc426add0789e150792f0ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736983632316d2b0dc426add0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 5 16:47:02 2016 +0200 jscript: Simplify jsstr_release implementation. 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 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 2ad03f1..48fa2be 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -106,12 +106,8 @@ void jsstr_free(jsstr_t*) DECLSPEC_HIDDEN; static inline void jsstr_release(jsstr_t *str) { - if(!--str->ref) { - if(jsstr_is_inline(str)) - heap_free(str); - else - jsstr_free(str); - } + if(!--str->ref) + jsstr_free(str); } static inline jsstr_t *jsstr_addref(jsstr_t *str)

1 0

Frédéric Delanoy : French translation for release 1.8.4
by Jeremy Newman 06 Sep '16

06 Sep '16

Module: website Branch: master Commit: 1401d0206811adee42cf62f7a93a6e9f26141e41 URL: http://source.winehq.org/git/website.git/?a=commit;h=1401d0206811adee42cf62… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 3 16:54:59 2016 +0200 French translation for release 1.8.4 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016082201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/fr/2016082201.xml b/news/fr/2016082201.xml new file mode 100644 index 0000000..2552907 --- /dev/null +++ b/news/fr/2016082201.xml @@ -0,0 +1,12 @@ +<news> +<date>22 août 2016</date> +<title>Sortie de Wine 1.8.4</title> +<body> + La version de maintenance 1.8.4 de Wine est disponible. + <a href="{$root}/announce/1.8.4">Nouveautés</a> de cette version : +<ul> + <li>Diverses corrections de bugs.</li> + <li>Quelques cartes supplémentaires ajoutées dans la table de description de GPU.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.4.tar.bz3">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0