December 2015 - Wine-commits

Jared Smudde : winefile: Use own icon in run dialog.
by Alexandre Julliard 30 Dec '15

30 Dec '15

Module: wine Branch: master Commit: 6a9b4d16673fc6435a037f19f1df3e2d0123de5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9b4d16673fc6435a037f19f… Author: Jared Smudde <computerwhiz02(a)hotmail.com> Date: Tue Dec 29 13:22:00 2015 -0600 winefile: Use own icon in run dialog. Signed-off-by: Jared Smudde <computerwhiz02(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 7046ad0..34830c5 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1634,9 +1634,10 @@ static void WineFile_OnRun( HWND hwnd ) static const WCHAR shell32_dll[] = {'S','H','E','L','L','3','2','.','D','L','L',0}; void (WINAPI *pRunFileDlgAW )(HWND, HICON, LPWSTR, LPWSTR, LPWSTR, DWORD); HMODULE hshell = GetModuleHandleW( shell32_dll ); + HICON hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_WINEFILE)); pRunFileDlgAW = (void*)GetProcAddress(hshell, (LPCSTR)61); - if (pRunFileDlgAW) pRunFileDlgAW( hwnd, 0, NULL, NULL, NULL, RFF_NODEFAULT); + if (pRunFileDlgAW) pRunFileDlgAW( hwnd, hIcon, NULL, NULL, NULL, RFF_NODEFAULT); } static INT_PTR CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)

1 0

Austin English : pdh: Add PdhBindInputDataSourceA/W stubs.
by Alexandre Julliard 30 Dec '15

30 Dec '15

Module: wine Branch: master Commit: de71271347dd38849aa006fe88c4eaf6ce029783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de71271347dd38849aa006fe8… 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> --- 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 41900c8..72e6fa3 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 8854fd7..39f9f25 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1287,3 +1287,21 @@ PDH_STATUS WINAPI PdhGetLogFileTypeW(const WCHAR *log, DWORD *type) FIXME("%s, %p: stub\n", debugstr_w(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

Austin English : ndis.sys: Add NdisAllocateMemoryWithTag stub.
by Alexandre Julliard 30 Dec '15

30 Dec '15

Module: wine Branch: master Commit: 2bb17745dfc58b663323f9bba28a22465f3c29f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb17745dfc58b663323f9bba… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 23:56:01 2015 -0600 ndis.sys: Add NdisAllocateMemoryWithTag stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 7 +++++++ dlls/ndis.sys/ndis.sys.spec | 2 +- include/Makefile.in | 1 + include/ddk/ndis.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 820b4af..b2c1da4 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/ndis.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ndis); @@ -36,3 +37,9 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) return STATUS_SUCCESS; } + +NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **address, UINT length, ULONG tag) +{ + FIXME("(%p, %u, %u): stub\n", address, length, tag); + return NDIS_STATUS_FAILURE; +} diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index bd83b48..1017296 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -12,7 +12,7 @@ @ stub NdisAllocateBufferPool @ stub NdisAllocateFromBlockPool @ stub NdisAllocateMemory -@ stub NdisAllocateMemoryWithTag +@ stdcall NdisAllocateMemoryWithTag(ptr long long) @ stub NdisAllocatePacket @ stub NdisAllocatePacketPool @ stub NdisAllocatePacketPoolEx diff --git a/include/Makefile.in b/include/Makefile.in index ea0e3fd..129ff6d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -276,6 +276,7 @@ HEADER_SRCS = \ ddk/hidtypes.h \ ddk/imm.h \ ddk/mountmgr.h \ + ddk/ndis.h \ ddk/ntddcdvd.h \ ddk/ntddk.h \ ddk/ntddser.h \ diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h new file mode 100644 index 0000000..a57d9f8 --- /dev/null +++ b/include/ddk/ndis.h @@ -0,0 +1,30 @@ +/* + * ndis.h + * + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _NDIS_ +#define _NDIS_ + +typedef void *NDIS_HANDLE, *PNDIS_HANDLE; +typedef int NDIS_STATUS, *PNDIS_STATUS; + +#define NDIS_STATUS_FAILURE ((NDIS_STATUS) STATUS_UNSUCCESSFUL) + +NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **, UINT, ULONG); + +#endif /* _NDIS_ */

1 0

Austin English : api-ms-win-security-lsalookup-l1-1-1: Add dll.
by Alexandre Julliard 30 Dec '15

30 Dec '15

Module: wine Branch: master Commit: 213d1094893b34bfa4896f4aa96f85b492932495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=213d1094893b34bfa4896f4aa… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 23:20:50 2015 -0600 api-ms-win-security-lsalookup-l1-1-1: Add dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in | 1 + .../api-ms-win-security-lsalookup-l1-1-1.spec | 16 ++++++++++++++++ 4 files changed, 20 insertions(+) diff --git a/configure b/configure index ac6145a..a4c174a 100755 --- a/configure +++ b/configure @@ -957,6 +957,7 @@ enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 enable_api_ms_win_security_lsalookup_l1_1_0 +enable_api_ms_win_security_lsalookup_l1_1_1 enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_service_core_l1_1_1 enable_api_ms_win_service_management_l1_1_0 @@ -17352,6 +17353,7 @@ wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_d wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 +wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_service_management_l1_1_0 diff --git a/configure.ac b/configure.ac index a1d3f97..c4184cf 100644 --- a/configure.ac +++ b/configure.ac @@ -2689,6 +2689,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in b/dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in new file mode 100644 index 0000000..bdbf8d2 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-l1-1-1.dll diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec new file mode 100644 index 0000000..215c7b7 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec @@ -0,0 +1,16 @@ +@ stub EnumerateIdentityProviders +@ stub GetDefaultIdentityProvider +@ stub GetIdentityProviderInfoByGUID +@ stub GetIdentityProviderInfoByName +@ stub LookupAccountNameLocalA +@ stub LookupAccountNameLocalW +@ stub LookupAccountSidLocalA +@ stub LookupAccountSidLocalW +@ stub LsaLookupClose +@ stub LsaLookupFreeMemory +@ stub LsaLookupGetDomainInfo +@ stub LsaLookupManageSidNameMapping +@ stub LsaLookupOpenLocalPolicy +@ stub LsaLookupTranslateNames +@ stub LsaLookupTranslateSids +@ stub ReleaseIdentityProviderEnumContext

1 0

Nikolay Sivov : msxml3: Fix cloneNode() for document nodes.
by Alexandre Julliard 30 Dec '15

30 Dec '15

Module: wine Branch: master Commit: 02e0e122a56fa33d7738c059f34a3638bd6dc9fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e0e122a56fa33d7738c059f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 30 11:47:11 2015 +0300 msxml3: Fix cloneNode() for document nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 31 +++++++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 49 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 71 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e9f2504..3643219 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1244,8 +1244,31 @@ static HRESULT WINAPI domdoc_cloneNode( IXMLDOMNode** outNode) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); + xmlNodePtr clone; + TRACE("(%p)->(%d %p)\n", This, deep, outNode); - return node_clone( &This->node, deep, outNode ); + + if (!outNode) + return E_INVALIDARG; + + *outNode = NULL; + + clone = xmlCopyNode((xmlNodePtr)get_doc(This), deep ? 1 : 2); + if (!clone) + return E_FAIL; + + clone->doc->_private = create_priv(); + xmldoc_add_orphan(clone->doc, clone); + xmldoc_add_ref(clone->doc); + + priv_from_xmlDocPtr(clone->doc)->properties = copy_properties(This->properties); + if (!(*outNode = (IXMLDOMNode*)create_domdoc(clone))) + { + xmldoc_release(clone->doc); + return E_FAIL; + } + + return S_OK; } @@ -3640,16 +3663,16 @@ HRESULT DOMDocument_create(MSXML_VERSION version, void **ppObj) IUnknown* create_domdoc( xmlNodePtr document ) { - void* pObj = NULL; + IUnknown *obj = NULL; HRESULT hr; TRACE("(%p)\n", document); - hr = get_domdoc_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&pObj); + hr = get_domdoc_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&obj); if (FAILED(hr)) return NULL; - return pObj; + return obj; } #else diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 81b0256..788b39f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4821,7 +4821,8 @@ if (0) static void test_cloneNode(void ) { - IXMLDOMDocument *doc, *doc2; + IXMLDOMDocument2 *doc, *doc_clone; + IXMLDOMDocument *doc2; VARIANT_BOOL b; IXMLDOMNodeList *pList; IXMLDOMNamedNodeMap *mapAttr; @@ -4830,14 +4831,52 @@ static void test_cloneNode(void ) IXMLDOMNode *node, *attr; IXMLDOMNode *node_clone; IXMLDOMNode *node_first; + VARIANT v; HRESULT hr; - doc = create_document(&IID_IXMLDOMDocument); + doc = create_document(&IID_IXMLDOMDocument2); - ole_check(IXMLDOMDocument_loadXML(doc, _bstr_(complete4A), &b)); + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(complete4A), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE, "failed to load XML string\n"); - hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc/pr"), &node); + hr = IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionLanguage"), &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("XSLPattern")), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_BSTR(&v) = _bstr_("XPath"); + V_VT(&v) = VT_BSTR; + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), v); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&v); + + /* clone document node */ + hr = IXMLDOMDocument2_cloneNode(doc, VARIANT_TRUE, &node); + ok( hr == S_OK, "ret %08x\n", hr ); + ok( node != NULL, "node %p\n", node ); + + hr = IXMLDOMNode_get_childNodes(node, &pList); + ok( hr == S_OK, "ret %08x\n", hr ); + length = 0; + hr = IXMLDOMNodeList_get_length(pList, &length); + ok( hr == S_OK, "ret %08x\n", hr ); + ok(length == 2, "got %d\n", length); + IXMLDOMNodeList_Release(pList); + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMDocument2, (void**)&doc_clone); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* cloned document inherits properties */ + hr = IXMLDOMDocument2_getProperty(doc_clone, _bstr_("SelectionLanguage"), &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("XPath")), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + IXMLDOMDocument2_Release(doc_clone); + IXMLDOMNode_Release(node); + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("lc/pr"), &node); ok( hr == S_OK, "ret %08x\n", hr ); ok( node != NULL, "node %p\n", node ); @@ -4925,7 +4964,7 @@ static void test_cloneNode(void ) IXMLDOMNode_Release(node_clone); IXMLDOMNode_Release(node); - IXMLDOMDocument_Release(doc); + IXMLDOMDocument2_Release(doc); free_bstrs(); }

1 0

Thomas Faber : msi: Use the intended attributes when overwriting the target file in cabinet_copy_file.
by Alexandre Julliard 29 Dec '15

29 Dec '15

Module: wine Branch: master Commit: 689f04849737433e282d19b535e8dcc819061138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689f04849737433e282d19b53… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Nov 23 14:00:54 2015 +0100 msi: Use the intended attributes when overwriting the target file in cabinet_copy_file. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index d75f59f..1357a64 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -476,7 +476,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, { TRACE("removing read-only attribute on %s\n", debugstr_w(path)); SetFileAttributesW( path, attrs2 & ~FILE_ATTRIBUTE_READONLY ); - handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs2, NULL); + handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); if (handle != INVALID_HANDLE_VALUE) goto done; err = GetLastError();

1 0

Thomas Faber : quartz: Don' t cache IFilterMapper2 interface in FilterGraph2.
by Alexandre Julliard 29 Dec '15

29 Dec '15

Module: wine Branch: master Commit: 3b48ba6c1da9f2b88f5413efcb09e954ee331131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b48ba6c1da9f2b88f5413efc… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 20 15:07:52 2015 +0100 quartz: Don't cache IFilterMapper2 interface in FilterGraph2. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 43 ++++++++++++++++++++++++++--------------- dlls/quartz/tests/filtergraph.c | 2 -- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 495f4be..9f072a8 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -176,7 +176,6 @@ typedef struct _IFilterGraphImpl { IUnknown *outer_unk; LONG ref; IUnknown *punkFilterMapper2; - IFilterMapper2 * pFilterMapper2; IBaseFilter ** ppFiltersInGraph; LPWSTR * pFilterNames; ULONG nFilters; @@ -265,11 +264,11 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri TRACE(" requesting IFilterMapper interface from aggregated filtermapper (%p)\n", *ppvObj); return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper2, riid)) { - *ppvObj = This->pFilterMapper2; TRACE(" returning IFilterMapper2 interface from aggregated filtermapper (%p)\n", *ppvObj); + return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper3, riid)) { - *ppvObj = This->pFilterMapper2; TRACE(" returning IFilterMapper3 interface from aggregated filtermapper (%p)\n", *ppvObj); + return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { *ppvObj = &This->IGraphConfig_iface; TRACE(" returning IGraphConfig interface (%p)\n", *ppvObj); @@ -319,9 +318,6 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) IUnknown_Release(This->ItfCacheEntries[i].iface); } - /* AddRef on controlling IUnknown, to compensate for Release of cached IFilterMapper2 */ - IUnknown_AddRef(This->outer_unk); - IFilterMapper2_Release(This->pFilterMapper2); IUnknown_Release(This->punkFilterMapper2); if (This->pSite) IUnknown_Release(This->pSite); @@ -910,6 +906,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, CLSID FilterCLSID; PIN_DIRECTION dir; unsigned int i = 0; + IFilterMapper2 *pFilterMapper2 = NULL; TRACE("(%p/%p)->(%p, %p)\n", This, iface, ppinOut, ppinIn); @@ -999,10 +996,16 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, TRACE("MajorType %s\n", debugstr_guid(&mt->majortype)); TRACE("SubType %s\n", debugstr_guid(&mt->subtype)); + hr = IUnknown_QueryInterface(This->punkFilterMapper2, &IID_IFilterMapper2, (void**)&pFilterMapper2); + if (FAILED(hr)) { + WARN("Unable to get IFilterMapper2 (%x)\n", hr); + goto out; + } + /* Try to find a suitable filter that can connect to the pin to render */ tab[0] = mt->majortype; tab[1] = mt->subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { WARN("Unable to enum filters (%x)\n", hr); goto out; @@ -1172,6 +1175,8 @@ error: IEnumMoniker_Release(pEnumMoniker); out: + if (pFilterMapper2) + IFilterMapper2_Release(pFilterMapper2); if (penummt) IEnumMediaTypes_Release(penummt); if (mt) @@ -1267,6 +1272,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) ULONG nb; IMoniker* pMoniker; INT x; + IFilterMapper2 *pFilterMapper2 = NULL; TRACE("(%p/%p)->(%p)\n", This, iface, ppinOut); @@ -1376,10 +1382,20 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) continue; } + if (pFilterMapper2 == NULL) + { + hr = IUnknown_QueryInterface(This->punkFilterMapper2, &IID_IFilterMapper2, (void**)&pFilterMapper2); + if (FAILED(hr)) + { + WARN("Unable to query IFilterMapper2 (%x)\n", hr); + break; + } + } + /* Try to find a suitable renderer with the same media type */ tab[0] = mt->majortype; tab[1] = mt->subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { WARN("Unable to enum filters (%x)\n", hr); @@ -1493,6 +1509,9 @@ error: hr = S_OK; } + if (pFilterMapper2) + IFilterMapper2_Release(pFilterMapper2); + IEnumMediaTypes_Release(penummt); return hr; } @@ -5708,14 +5727,6 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) hr = CoCreateInstance(&CLSID_FilterMapper2, fimpl->outer_unk, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&fimpl->punkFilterMapper2); - if (SUCCEEDED(hr)) - hr = IUnknown_QueryInterface(fimpl->punkFilterMapper2, &IID_IFilterMapper2, - (void**)&fimpl->pFilterMapper2); - - if (SUCCEEDED(hr)) - /* Release controlling IUnknown - compensate refcount increase from caching IFilterMapper2 interface. */ - IUnknown_Release(fimpl->outer_unk); - if (FAILED(hr)) { ERR("Unable to create filter mapper (%x)\n", hr); if (fimpl->punkFilterMapper2) IUnknown_Release(fimpl->punkFilterMapper2); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f3af03e..39d6e88 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1942,9 +1942,7 @@ static void test_aggregate_filter_graph(void) ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); -todo_wine ok(unk_outer.AddRef_called == 0, "IUnknownImpl_AddRef called %d times\n", unk_outer.AddRef_called); -todo_wine ok(unk_outer.Release_called == 0, "IUnknownImpl_Release called %d times\n", unk_outer.Release_called); unk_outer.AddRef_called = 0; unk_outer.Release_called = 0;

1 0

Nikolay Sivov : shell32/tests: Basic tests for SHCreateSessionKey().
by Alexandre Julliard 29 Dec '15

29 Dec '15

Module: wine Branch: master Commit: 2e4954eb69b8f3baf33d8e61ec4490009aac2a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4954eb69b8f3baf33d8e61e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 27 16:26:18 2015 +0300 shell32/tests: Basic tests for SHCreateSessionKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellole.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 71ba477..e8cf744 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -75,6 +75,7 @@ static HRESULT (WINAPI *pSHPropStgReadMultiple)(IPropertyStorage*, UINT, static HRESULT (WINAPI *pSHPropStgWriteMultiple)(IPropertyStorage*, UINT*, ULONG, const PROPSPEC*, PROPVARIANT*, PROPID); static HRESULT (WINAPI *pSHCreateQueryCancelAutoPlayMoniker)(IMoniker**); +static HRESULT (WINAPI *pSHCreateSessionKey)(REGSAM, HKEY*); static void init(void) { @@ -84,6 +85,7 @@ static void init(void) pSHPropStgReadMultiple = (void*)GetProcAddress(hmod, "SHPropStgReadMultiple"); pSHPropStgWriteMultiple = (void*)GetProcAddress(hmod, "SHPropStgWriteMultiple"); pSHCreateQueryCancelAutoPlayMoniker = (void*)GetProcAddress(hmod, "SHCreateQueryCancelAutoPlayMoniker"); + pSHCreateSessionKey = (void*)GetProcAddress(hmod, (char*)723); } static HRESULT WINAPI PropertyStorage_QueryInterface(IPropertyStorage *This, @@ -858,6 +860,36 @@ static void test_DragQueryFile(void) } #undef DROPTEST_FILENAME +static void test_SHCreateSessionKey(void) +{ + HKEY hkey, hkey2; + HRESULT hr; + + if (!pSHCreateSessionKey) + { + skip("SHCreateSessionKey is not implemented\n"); + return; + } + +if (0) /* crashes on native */ + hr = pSHCreateSessionKey(KEY_READ, NULL); + + hkey = (HKEY)0xdeadbeef; + hr = pSHCreateSessionKey(0, &hkey); + ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + ok(hkey == NULL, "got %p\n", hkey); + + hr = pSHCreateSessionKey(KEY_READ, &hkey); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pSHCreateSessionKey(KEY_READ, &hkey2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); + + RegCloseKey(hkey); + RegCloseKey(hkey2); +} + START_TEST(shellole) { init(); @@ -865,4 +897,5 @@ START_TEST(shellole) test_SHPropStg_functions(); test_SHCreateQueryCancelAutoPlayMoniker(); test_DragQueryFile(); + test_SHCreateSessionKey(); }

1 0

Nikolay Sivov : dwrite/tests: Fix test failures on older versions.
by Alexandre Julliard 29 Dec '15

29 Dec '15

Module: wine Branch: master Commit: 8165cba0f8c774c29ef794ac49e667250d122505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8165cba0f8c774c29ef794ac4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 28 07:35:10 2015 +0300 dwrite/tests: Fix test failures on older versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 637a8ea..13ce6f8 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2058,7 +2058,8 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); - ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length); + ok((range.startPosition == 0 && range.length == ~0u) || + broken(range.startPosition == 0 && range.length == 4) /* vista/win7 */, "got %u,%u\n", range.startPosition, range.length); /* check what's returned for positions after the text */ buffW[0] = 0; @@ -2067,7 +2068,8 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); - ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length); + ok((range.startPosition == 0 && range.length == ~0u) || + broken(range.startPosition == 4 && range.length == ~0u-4) /* vista/win7 */, "got %u,%u\n", range.startPosition, range.length); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Nikolay Sivov : dwrite/tests: Some tests for SetUnderline().
by Alexandre Julliard 29 Dec '15

29 Dec '15

Module: wine Branch: master Commit: ead6905ddb94d9d8a6dadade27f8cfa19d171a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead6905ddb94d9d8a6dadade2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 28 07:35:11 2015 +0300 dwrite/tests: Some tests for SetUnderline(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 13ce6f8..f1534bf 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4273,6 +4273,60 @@ static void test_SetOpticalAlignment(void) IDWriteFactory_Release(factory); } +static const struct drawcall_entry drawunderline_seq[] = { + { DRAW_GLYPHRUN, {'a','e',0x0300,0} }, /* reported runs can't mix different underline values */ + { DRAW_GLYPHRUN, {'d',0} }, + { DRAW_UNDERLINE }, + { DRAW_LAST_KIND } +}; + +static void test_SetUnderline(void) +{ + static const WCHAR strW[] = {'a','e',0x0300,'d',0}; /* accent grave */ + DWRITE_CLUSTER_METRICS clusters[4]; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + DWRITE_TEXT_RANGE range; + IDWriteFactory *factory; + UINT32 count; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, sizeof(clusters)/sizeof(clusters[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 3, "got %u\n", count); + + range.startPosition = 0; + range.length = 2; + hr = IDWriteTextLayout_SetUnderline(layout, TRUE, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, sizeof(clusters)/sizeof(clusters[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 3, "got %u\n", count); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, drawunderline_seq, "draw underline test", TRUE); + + IDWriteTextLayout_Release(layout); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -4323,6 +4377,7 @@ START_TEST(layout) test_SetTypography(); test_SetLastLineWrapping(); test_SetOpticalAlignment(); + test_SetUnderline(); IDWriteFactory_Release(factory); }

1 0