wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Fabian Maurer : oleview: Add missing break (coverity).
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 180c033c1c704f8fcb941cdbe5b38a3d82723555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=180c033c1c704f8fcb941cdb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Sep 16 14:44:44 2018 +0200 oleview: Add missing break (coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/typelib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 4912a5f..99de87b 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -1598,6 +1598,7 @@ static LRESULT CALLBACK TypeLibProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM } case WM_COMMAND: TypeLibMenuCommand(LOWORD(wParam), hWnd); + break; case WM_MENUSELECT: UpdateTypeLibStatusBar(LOWORD(wParam)); break;

1 0

André Hentschel : qcap/tests: AVICo might be unavaiable on newer Win10.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 217d3d6d7fdc16b5cae4f00eebfa79f40ade58c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=217d3d6d7fdc16b5cae4f00e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Sep 15 14:47:32 2018 +0200 qcap/tests: AVICo might be unavaiable on newer Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/qcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index d7fe288..2f6fe1d 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1803,8 +1803,8 @@ static void test_AviCo(void) static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); - if(hres == REGDB_E_CLASSNOTREG) { - win_skip("CLSID_AVICo not registered\n"); + if(hres == REGDB_E_CLASSNOTREG || hres == CLASS_E_CLASSNOTAVAILABLE) { + win_skip("CLSID_AVICo not registered/available\n"); return; } ok(hres == S_OK, "Could not create CLSID_AVICo class: %08x\n", hres);

1 0

André Hentschel : advapi32/tests: Allow ERROR_ACCESS_DENIED for newer Win10.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 056c0039b2c533d93189020430ec8da92e598252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=056c0039b2c533d931890204… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Sep 15 14:47:13 2018 +0200 advapi32/tests: Allow ERROR_ACCESS_DENIED for newer Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3ca151d..41b1fe0 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6566,7 +6566,7 @@ static void test_system_security_access(void) /* privilege is checked on access */ err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); - todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD, "got %u\n", err ); + todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD || err == ERROR_ACCESS_DENIED, "got %u\n", err ); if (err == ERROR_SUCCESS) LocalFree( sd ); @@ -6603,7 +6603,7 @@ static void test_system_security_access(void) ok( res == ERROR_SUCCESS, "got %d\n", res ); err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); - todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD, "got %u\n", err ); + ok( err == ERROR_PRIVILEGE_NOT_HELD || err == ERROR_ACCESS_DENIED, "got %u\n", err ); RegCloseKey( hkey ); res = RegDeleteKeyW( HKEY_LOCAL_MACHINE, testkeyW );

1 0

Alistair Leslie-Hughes : kernel32/tests: Tests for ProcessCookie in NtQueryInformationProcess.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 0a7293a8e3af1c596847a13bf4ee9a7e468e31b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a7293a8e3af1c596847a13b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Sep 16 23:24:27 2018 +0000 kernel32/tests: Tests for ProcessCookie in NtQueryInformationProcess. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 51 ++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0eb113b..9f99720 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3461,7 +3461,7 @@ static void test_session_info(void) trace("active_session = %x\n", active_session); } -static void test_process_info(void) +static void test_process_info(HANDLE hproc) { char buf[4096]; static const ULONG info_size[] = @@ -3502,7 +3502,7 @@ static void test_process_info(void) sizeof(ULONG) /* ProcessIoPriority */, sizeof(ULONG) /* ProcessExecuteFlags */, 0 /* FIXME: sizeof(?) ProcessTlsInformation */, - 0 /* FIXME: sizeof(?) ProcessCookie */, + sizeof(ULONG) /* ProcessCookie */, sizeof(SECTION_IMAGE_INFORMATION) /* ProcessImageInformation */, 0 /* FIXME: sizeof(PROCESS_CYCLE_TIME_INFORMATION) ProcessCycleTime */, sizeof(ULONG) /* ProcessPagePriority */, @@ -3541,8 +3541,8 @@ static void test_process_info(void) sizeof(PROCESS_JOB_MEMORY_INFO) /* ProcessJobMemoryInformation */, #endif }; - HANDLE hproc; ULONG i, status, ret_len, size; + BOOL is_current = hproc == GetCurrentProcess(); if (!pNtQueryInformationProcess) { @@ -3550,13 +3550,6 @@ static void test_process_info(void) return; } - hproc = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentProcessId()); - if (!hproc) - { - win_skip("PROCESS_QUERY_LIMITED_INFORMATION is not supported on this platform\n"); - return; - } - for (i = 0; i < MaxProcessInfoClass; i++) { size = info_size[i]; @@ -3598,22 +3591,36 @@ static void test_process_info(void) ok(status == STATUS_ACCESS_DENIED || status == STATUS_PORT_NOT_SET, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; - + case ProcessCookie: + if (is_current) + ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER /* before win8 */, + "for info %u got %08x (ret_len %u)\n", i, status, ret_len); + else + ok(status == STATUS_INVALID_PARAMETER /* before win8 */ || status == STATUS_ACCESS_DENIED, + "for info %u got %08x (ret_len %u)\n", i, status, ret_len); + break; case ProcessExecuteFlags: case ProcessDebugPort: case ProcessDebugFlags: - case ProcessCookie: + if (is_current) + ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, + "for info %u, got %08x (ret_len %u)\n", i, status, ret_len); + else todo_wine - ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); + ok(status == STATUS_ACCESS_DENIED, + "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; default: - ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); + if (is_current) + ok(status == STATUS_SUCCESS || status == STATUS_UNSUCCESSFUL || status == STATUS_INVALID_PARAMETER, + "for info %u, got %08x (ret_len %u)\n", i, status, ret_len); + else + ok(status == STATUS_ACCESS_DENIED, + "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; } } - - CloseHandle(hproc); } static void test_GetLogicalProcessorInformationEx(void) @@ -3780,6 +3787,7 @@ static void test_ProcThreadAttributeList(void) START_TEST(process) { HANDLE job; + HANDLE hproc; BOOL b = init(); ok(b, "Basic init of CreateProcess test\n"); if (!b) return; @@ -3824,7 +3832,16 @@ START_TEST(process) return; } - test_process_info(); + hproc = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentProcessId()); + if (hproc) + { + test_process_info(hproc); + CloseHandle(hproc); + } + else + win_skip("PROCESS_QUERY_LIMITED_INFORMATION is not supported on this platform\n"); + test_process_info(GetCurrentProcess()); + test_TerminateProcess(); test_Startup(); test_CommandLine();

1 0

Andrew Wesie : ntdll: Stub for ProcessCookie in NtQueryInformationProcess.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 86878fe00bcae8dffe0e85ac8607d9be4d863d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=86878fe00bcae8dffe0e85ac… Author: Andrew Wesie <awesie(a)gmail.com> Date: Sun Sep 16 23:24:25 2018 +0000 ntdll: Stub for ProcessCookie in NtQueryInformationProcess. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index b299287..c5057da 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -572,6 +572,22 @@ NTSTATUS WINAPI NtQueryInformationProcess( else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessCookie: + FIXME("ProcessCookie (%p,%p,0x%08x,%p) stub\n", + ProcessHandle,ProcessInformation, + ProcessInformationLength,ReturnLength); + + if(ProcessHandle == NtCurrentProcess()) + { + len = sizeof(ULONG); + if (ProcessInformationLength == len) + *(ULONG *)ProcessInformation = 0; + else + ret = STATUS_INFO_LENGTH_MISMATCH; + } + else + ret = STATUS_INVALID_PARAMETER; + break; default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", ProcessHandle,ProcessInformationClass,

1 0

Dmitry Timoshkov : windowscodecs: IWICMetadataQueryReader:: GetMetadataByName() should accept NULL for returned value.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 1593f146ec55d96b3e56b1b8688bf32fa1dd9f42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1593f146ec55d96b3e56b1b8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Sep 16 18:01:41 2018 +0800 windowscodecs: IWICMetadataQueryReader::GetMetadataByName() should accept NULL for returned value. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 2 +- dlls/windowscodecs/tests/metadata.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 2d7c918..c4c188d 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -589,7 +589,7 @@ static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCW PropVariantClear(&tk_id); PropVariantClear(&tk_schema); - if (hr == S_OK) + if (hr == S_OK && value) *value = new_value; else PropVariantClear(&new_value); diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index eb846db..b434648 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1606,6 +1606,10 @@ static void test_metadata_gif(void) if (winetest_debug > 1) trace("query: %s\n", decoder_data[i].query); MultiByteToWideChar(CP_ACP, 0, decoder_data[i].query, -1, queryW, 256); + + hr = IWICMetadataQueryReader_GetMetadataByName(queryreader, queryW, NULL); + ok(hr == decoder_data[i].hr, "GetMetadataByName(%s) returned %#x, expected %#x\n", wine_dbgstr_w(queryW), hr, decoder_data[i].hr); + PropVariantInit(&value); hr = IWICMetadataQueryReader_GetMetadataByName(queryreader, queryW, &value); ok(hr == decoder_data[i].hr, "GetMetadataByName(%s) returned %#x, expected %#x\n", wine_dbgstr_w(queryW), hr, decoder_data[i].hr);

1 0

Nikolay Sivov : xmllite/writer: Fix "xml:space" output.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 2d5d3a892faf6655441db2e51d06c0f256c4179c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d5d3a892faf6655441db2e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 17 07:00:29 2018 +0300 xmllite/writer: Fix "xml:space" output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 14 ++++++++++++++ dlls/xmllite/writer.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 7f731be..2cd9cea 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1637,6 +1637,12 @@ static void test_WriteAttributeString(void) { "prefix", "xmlns", "uri", "", "<e prefix:xmlns=\"\" xmlns:prefix=\"uri\" />", "<e prefix:xmlns=\"\"" }, { "prefix", "xmlns", NULL, "uri", "<e xmlns=\"uri\" />", "<e xmlns=\"uri\"" }, { "prefix", "xmlns", "", "uri", "<e xmlns=\"uri\" />", "<e xmlns=\"uri\"" }, + { "xml", "space", NULL, "preserve", "<e xml:space=\"preserve\" />", "<e xml:space=\"preserve\"" }, + { "xml", "space", "", "preserve", "<e xml:space=\"preserve\" />", "<e xml:space=\"preserve\"" }, + { "xml", "space", NULL, "default", "<e xml:space=\"default\" />", "<e xml:space=\"default\"" }, + { "xml", "space", "", "default", "<e xml:space=\"default\" />", "<e xml:space=\"default\"" }, + { "xml", "a", NULL, "value", "<e xml:a=\"value\" />", "<e xml:a=\"value\"" }, + { "xml", "a", "", "value", "<e xml:a=\"value\" />", "<e xml:a=\"value\"" }, /* Autogenerated prefix names. */ { NULL, "a", "defuri", NULL, "<e p1:a=\"\" xmlns:p1=\"defuri\" />", "<e p1:a=\"\"", S_OK, 1, 1, 1 }, @@ -1655,6 +1661,7 @@ static void test_WriteAttributeString(void) { "prefix", NULL, "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", E_INVALIDARG }, { "prefix", NULL, NULL, "b", "<e />", "<e", E_INVALIDARG }, { "prefix", NULL, "uri", NULL, "<e />", "<e", E_INVALIDARG }, + { "xml", NULL, NULL, "value", "<e />", "<e", E_INVALIDARG }, { "xmlns", "a", "defuri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, { "xmlns", "a", "b", "uri", "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, { NULL, "xmlns", "uri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION, 0, 0, 1 }, @@ -1666,6 +1673,13 @@ static void test_WriteAttributeString(void) { "xmlns", NULL, "", "uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, { "xmlns", "", NULL, "uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, { "xmlns", "", "", "uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, + { "xml", "space", "", "value", "<e />", "<e", WR_E_INVALIDXMLSPACE }, + { "xml", "space", NULL, "value", "<e />", "<e", WR_E_INVALIDXMLSPACE }, + { "xml", "a", "uri", "value", "<e />", "<e", WR_E_XMLPREFIXDECLARATION }, + { "xml", "space", NULL, "preServe", "<e />", "<e", WR_E_INVALIDXMLSPACE }, + { "xml", "space", NULL, "defAult", "<e />", "<e", WR_E_INVALIDXMLSPACE }, + { "xml", "space", NULL, NULL, "<e />", "<e", WR_E_INVALIDXMLSPACE }, + { "xml", "space", NULL, "", "<e />", "<e", WR_E_INVALIDXMLSPACE }, }; IXmlWriter *writer; diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index e9ad941..bf2a751 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -825,10 +825,23 @@ static void write_output_attribute(xmlwriter *writer, const WCHAR *prefix, int p write_output_buffer_quoted(writer->output, value, -1); } +static BOOL is_valid_xml_space_value(const WCHAR *value) +{ + static const WCHAR preserveW[] = {'p','r','e','s','e','r','v','e',0}; + static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; + + if (!value) + return FALSE; + + return !strcmpW(value, preserveW) || !strcmpW(value, defaultW); +} + static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR prefix, LPCWSTR local, LPCWSTR uri, LPCWSTR value) { + static const WCHAR spaceattrW[] = {'s','p','a','c','e',0}; static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; xmlwriter *This = impl_from_IXmlWriter(iface); int prefix_len, local_len; BOOL is_xmlns_prefix; @@ -873,6 +886,22 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR return S_OK; } + /* Predefined "xml" prefix. */ + if (prefix_len && !strcmpW(prefix, xmlW)) + { + /* Valid "space" value is enforced. */ + if (!strcmpW(local, spaceattrW) && !is_valid_xml_space_value(value)) + return WR_E_INVALIDXMLSPACE; + + /* Redefinition is not allowed. */ + if (!is_empty_string(uri)) + return WR_E_XMLPREFIXDECLARATION; + + write_output_attribute(This, prefix, prefix_len, local, local_len, value); + + return S_OK; + } + if (is_xmlns_prefix || (prefix_len == 0 && uri && !strcmpW(uri, xmlnsuriW))) { if (prefix_len && !is_empty_string(uri))

1 0

Nikolay Sivov : propsys: Add InitPropVariantFromCLSID().
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 6fbf6c330b3a9eb038cc380fd1c54199b7ce2e47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fbf6c330b3a9eb038cc380f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 16 16:48:41 2018 +0300 propsys: Add InitPropVariantFromCLSID(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45347 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 13 +++++++++++++ dlls/propsys/tests/propsys.c | 19 +++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index db20fd3..bbc7165 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -29,7 +29,7 @@ @ stdcall -private DllUnregisterServer() @ stub InitPropVariantFromBooleanVector @ stdcall InitPropVariantFromBuffer(ptr long ptr) -@ stub InitPropVariantFromCLSID +@ stdcall InitPropVariantFromCLSID(ptr ptr) @ stub InitPropVariantFromDoubleVector @ stub InitPropVariantFromFileTime @ stub InitPropVariantFromFileTimeVector diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index e6d4eba..ae96e4e 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -570,6 +570,19 @@ HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *p return S_OK; } +HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar) +{ + TRACE("(%s %p)\n", debugstr_guid(clsid), ppropvar); + + ppropvar->u.puuid = CoTaskMemAlloc(sizeof(*ppropvar->u.puuid)); + if(!ppropvar->u.puuid) + return E_OUTOFMEMORY; + + ppropvar->vt = VT_CLSID; + memcpy(ppropvar->u.puuid, clsid, sizeof(*ppropvar->u.puuid)); + return S_OK; +} + HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) { SAFEARRAY *arr; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index e899ff9..34c51b3 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1230,6 +1230,24 @@ static void test_PropVariantChangeType_LPWSTR(void) PropVariantClear(&src); } +static void test_InitPropVariantFromCLSID(void) +{ + PROPVARIANT propvar; + GUID clsid; + HRESULT hr; + + memset(&propvar, 0, sizeof(propvar)); + propvar.vt = VT_I4; + propvar.u.lVal = 15; + + memset(&clsid, 0xcc, sizeof(clsid)); + hr = InitPropVariantFromCLSID(&clsid, &propvar); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(propvar.vt == VT_CLSID, "Unexpected type %d.\n", propvar.vt); + ok(IsEqualGUID(propvar.u.puuid, &clsid), "Unexpected puuid value.\n"); + PropVariantClear(&propvar); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1244,4 +1262,5 @@ START_TEST(propsys) test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean(); test_PropVariantToStringWithDefault(); + test_InitPropVariantFromCLSID(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index ced51ec..0285caf 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -64,6 +64,7 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); +HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar); HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid);

1 0

Nikolay Sivov : comctl32/button: Fix text buffer leak (Coverity).
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: ec09119f2e76a6d4e86290ee7981a1d69d620c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec09119f2e76a6d4e86290ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 16 16:23:03 2018 +0300 comctl32/button: Fix text buffer leak (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 5621fda..56a4730 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1293,7 +1293,6 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la /* Get text rect */ maxTextWidth = labelRc->right - labelRc->left; textRect = BUTTON_GetTextRect(infoPtr, hdc, text, maxTextWidth); - heap_free(text); /* Show image and text */ if (show_image_and_text(infoPtr)) @@ -1361,6 +1360,7 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la SetRectEmpty(&imageRect); } } + heap_free(text); CopyRect(labelRc, &labelRect); CopyRect(imageRc, &imageRect);

1 0

Zebediah Figura : quartz/filtergraph: Return correct interface for IID_IGraphVersion.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 06c5e950b122694a2213c03e41eabd9319a55b90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06c5e950b122694a2213c03e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 14 18:57:43 2018 -0500 quartz/filtergraph: Return correct interface for IID_IGraphVersion. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index aa4b0c9..59b7124 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -270,8 +270,8 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri 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); + *ppvObj = &This->IGraphVersion_iface; + TRACE(" returning IGraphVersion interface (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid));

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2018