October 2019 - Wine-Commits

Zebediah Figura : winegstreamer: Use strmbase_dump_media_type() where appropriate.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: 6c8cb0abaca77b124ccd1f754ac276cd8ba47f2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c8cb0abaca77b124ccd1f75… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 5 19:18:53 2019 -0500 winegstreamer: Use strmbase_dump_media_type() where appropriate. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 3 --- dlls/winegstreamer/gstdemux.c | 2 +- dlls/winegstreamer/gsttffilter.c | 3 --- dlls/winegstreamer/main.c | 9 --------- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 596724cf26..122e4c1037 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -35,9 +35,6 @@ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) -/* enum media */ -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); - IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 4a685b1bd5..f20455c2be 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1976,7 +1976,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, HRESULT hr = S_OK; TRACE("filter %p, peer %p, mt %p.\n", filter, pReceivePin, pmt); - dump_AM_MEDIA_TYPE(pmt); + strmbase_dump_media_type(pmt); mark_wine_thread(); diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 1a40ec6856..8619cc6b3f 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -509,7 +509,6 @@ static HRESULT WINAPI Gstreamer_Mp3_QueryConnect(TransformFilter *iface, const A { GstTfImpl *This = (GstTfImpl*)iface; TRACE("%p %p\n", This, amt); - dump_AM_MEDIA_TYPE(amt); if ( (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) && !IsEqualGUID(&amt->majortype, &MEDIATYPE_Stream)) || @@ -649,7 +648,6 @@ static HRESULT WINAPI Gstreamer_YUV_QueryConnect(TransformFilter *iface, const A { GstTfImpl *This = (GstTfImpl*)iface; TRACE("%p %p\n", This, amt); - dump_AM_MEDIA_TYPE(amt); if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Video) || (!IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo) && @@ -885,7 +883,6 @@ static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface { GstTfImpl *This = (GstTfImpl*)iface; TRACE("%p %p\n", This, amt); - dump_AM_MEDIA_TYPE(amt); if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) || !IsEqualGUID(&amt->subtype, &MEDIASUBTYPE_PCM) || diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 5a8e05e887..379f54ab4e 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -412,15 +412,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return hr; } -/* GStreamer common functions */ - -void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) -{ - if (!pmt) - return; - TRACE("\t%s\n\t%s\n\t...\n\t%s\n", debugstr_guid(&pmt->majortype), debugstr_guid(&pmt->subtype), debugstr_guid(&pmt->formattype)); -} - static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ctx) { BOOL *status = param;

1 0

Dmitry Timoshkov : wshom.ocx: Actually wait for process termination in IWshShell3::Run().
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: 57961e5e78ceb573303b7374639ee31d3794face URL: https://source.winehq.org/git/wine.git/?a=commit;h=57961e5e78ceb573303b7374… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 12:59:40 2019 +0800 wshom.ocx: Actually wait for process termination in IWshShell3::Run(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 5d58ac74ed..d423856ce7 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1297,6 +1297,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, { if (waitforprocess) { + WaitForSingleObject(info.hProcess, INFINITE); GetExitCodeProcess(info.hProcess, exit_code); CloseHandle(info.hProcess); }

1 0

Joseph Kogut : ncrypt: Add NCryptFreeBuffer stub.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: ff885a810dd44901b8528c0c7365741e1c815c4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff885a810dd44901b8528c0c… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Fri Oct 4 18:27:08 2019 -0700 ncrypt: Add NCryptFreeBuffer stub. Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 6 ++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 1e8fe93244..6022d20ca0 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -89,6 +89,12 @@ SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) return NTE_NOT_SUPPORTED; } +SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) +{ + FIXME("(%p): stub\n", buf); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) { FIXME("(0x%lx): stub\n", object); diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index d4482d5b40..1c06935bed 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -72,7 +72,7 @@ @ stub NCryptEnumStorageProviders @ stub NCryptExportKey @ stdcall NCryptFinalizeKey(long long) -@ stub NCryptFreeBuffer +@ stdcall NCryptFreeBuffer(ptr) @ stdcall NCryptFreeObject(long) @ stub NCryptGetProperty @ stub NCryptGetProtectionDescriptorInfo

1 0

Sven Baars : scrrun/tests: Fix some test failures on Windows 2003.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: 673e130c4ff3a904faae4a23829dddaa6ae49864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=673e130c4ff3a904faae4a23… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 5 19:25:00 2019 +0200 scrrun/tests: Fix some test failures on Windows 2003. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index ed49856921..46d452f113 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1897,7 +1897,7 @@ todo_wine lstrcatW(buffW, crlfW); str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -1920,7 +1920,7 @@ todo_wine lstrcatW(buffW, L"123"); str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -1942,7 +1942,7 @@ todo_wine str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!wcscmp(str, L"123"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream); @@ -1960,7 +1960,7 @@ todo_wine str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!wcscmp(str, L"test"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream); @@ -1981,7 +1981,7 @@ todo_wine str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!lstrcmpW(L"test123", str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -2003,7 +2003,7 @@ todo_wine str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!wcscmp(str, L"test string"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream);

1 0

Zebediah Figura : widl: Also compute buffer size for non-ref arrays.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: 8746bf094f87c2cd389e94bd76866f3884fb6b20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8746bf094f87c2cd389e94bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 4 23:43:36 2019 -0500 widl: Also compute buffer size for non-ref arrays. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47886 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c4ccd99771..f37c7b0d67 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3865,16 +3865,13 @@ static unsigned int get_required_buffer_size_type( } case TGT_ARRAY: - if (get_pointer_fc(type, attrs, toplevel_param) == FC_RP) + switch (get_array_fc(type)) { - switch (get_array_fc(type)) - { - case FC_SMFARRAY: - case FC_LGFARRAY: - return type_array_get_dim(type) * - get_required_buffer_size_type(type_array_get_element_type(type), name, - NULL, FALSE, alignment); - } + case FC_SMFARRAY: + case FC_LGFARRAY: + return type_array_get_dim(type) * + get_required_buffer_size_type(type_array_get_element_type(type), name, + NULL, FALSE, alignment); } break;

1 0

Sven Baars : wbemprox: Fix a leak on error path (Coverity).
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: 11470a7763afc1404a830a5ad1c53f65806f5a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=11470a7763afc1404a830a5a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:42 2019 +0200 wbemprox: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 0f7eada9af..f46dcd922f 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -57,7 +57,11 @@ HRESULT create_view( enum view_type type, const WCHAR *path, const struct keywor struct table *table = grab_table( class ); HRESULT hr; - if (table && (hr = append_table( view, table )) != S_OK) return hr; + if (table && (hr = append_table( view, table )) != S_OK) + { + heap_free( view ); + return hr; + } view->proplist = proplist; view->cond = cond; break;

1 0

Sven Baars : wbemprox: Fix a string leak (Valgrind).
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: e4f078681668b0f393eb756472682e9b3a25622f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f078681668b0f393eb7564… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:39 2019 +0200 wbemprox: Fix a string leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 0f43412473..0f7eada9af 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -632,6 +632,7 @@ done: if (query) release_query( query ); free_path( path ); SysFreeString( antecedent ); + heap_free( str ); return hr; }

1 0

Sven Baars : wbemprox/tests: Remove some unused variables.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: 62a5e16eec17194def60e1f0f89aae46571a3c16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62a5e16eec17194def60e1f0… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:41 2019 +0200 wbemprox/tests: Remove some unused variables. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1c6ffcaf8d..40eaefee4c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -750,7 +750,7 @@ static void test_StdRegProv( IWbemServices *services ) {'S','o','f','t','w','a','r','e','\\','S','t','d','R','e','g','P','r','o','v','T','e','s','t',0}; BSTR class = SysAllocString( stdregprovW ), method, name; IWbemClassObject *reg, *sig_in, *sig_out, *in, *out; - VARIANT defkey, subkey, retval, names, types, value, valuename; + VARIANT defkey, subkey, retval, valuename; CIMTYPE type; HRESULT hr; LONG res; @@ -854,7 +854,6 @@ static void test_StdRegProv( IWbemServices *services ) check_property( out, namesW, VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); - VariantClear( &names ); VariantClear( &subkey ); IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); @@ -893,8 +892,6 @@ static void test_StdRegProv( IWbemServices *services ) check_property( out, namesW, VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); check_property( out, typesW, VT_I4|VT_ARRAY, CIM_SINT32|CIM_FLAG_ARRAY ); - VariantClear( &types ); - VariantClear( &names ); VariantClear( &subkey ); IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); @@ -937,7 +934,6 @@ static void test_StdRegProv( IWbemServices *services ) check_property( out, valueW, VT_BSTR, CIM_STRING ); - VariantClear( &value ); VariantClear( &valuename ); VariantClear( &subkey ); IWbemClassObject_Release( in );

1 0

Sven Baars : wbemprox: Fix multiple leaks in parse_path (Coverity).
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: a3b6054afb00619254b2b95a1b7b317e541b2685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b6054afb00619254b2b95a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:43 2019 +0200 wbemprox: Fix multiple leaks in parse_path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/services.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index e1cd2466e4..5909c02e61 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -335,24 +335,42 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) DWORD server_len = ARRAY_SIZE(server); p++; - if (*p != '\\') return WBEM_E_INVALID_OBJECT_PATH; + if (*p != '\\') + { + heap_free( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } p++; q = p; while (*p && *p != '\\') p++; - if (!*p) return WBEM_E_INVALID_OBJECT_PATH; + if (!*p) + { + heap_free( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } len = p - q; if (!GetComputerNameW( server, &server_len ) || server_len != len || wcsnicmp( q, server, server_len )) + { + heap_free( path ); return WBEM_E_NOT_SUPPORTED; + } q = ++p; while (*p && *p != ':') p++; - if (!*p) return WBEM_E_INVALID_OBJECT_PATH; + if (!*p) + { + heap_free( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } len = p - q; if (len != ARRAY_SIZE(cimv2W) - 1 || wcsnicmp( q, cimv2W, ARRAY_SIZE(cimv2W) - 1 )) + { + heap_free( path ); return WBEM_E_INVALID_NAMESPACE; + } p++; }

1 0

Zebediah Figura : widl: Write pointer classes for explicitly declared arrays only if they are top-level parameters.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: dd35baa8e326462c1c3ea31b2023e62b2d8f6ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd35baa8e326462c1c3ea31b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 4 23:43:35 2019 -0500 widl: Write pointer classes for explicitly declared arrays only if they are top-level parameters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1ad3e63c6a..c4ccd99771 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3611,7 +3611,8 @@ static unsigned int write_type_tfs(FILE *file, const attr_list_t *attrs, { int ptr_type; ptr_type = get_pointer_fc_context(type, attrs, context); - if (ptr_type != FC_RP || type_array_is_decl_as_ptr(type)) + if (type_array_is_decl_as_ptr(type) + || (ptr_type != FC_RP && context == TYPE_CONTEXT_TOPLEVELPARAM)) { unsigned int absoff = type->typestring_offset; short reloff = absoff - (*typeformat_offset + 2);

1 0