November 2019 - Wine-Commits

Francois Gouget : wbemprox: Fix the spelling of the free_associations() function name.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 81df49fadc25ef476b6cd6027b960cdf89c64b81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81df49fadc25ef476b6cd602… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:21:09 2019 +0100 wbemprox: Fix the spelling of the free_associations() function name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 53d4b169cd..1f8afb46fe 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2600,7 +2600,7 @@ struct association WCHAR *ref2; }; -static void free_assocations( struct association *assoc, UINT count ) +static void free_associations( struct association *assoc, UINT count ) { UINT i; if (!assoc) return; @@ -2652,7 +2652,7 @@ static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->result_count ); + if (!ret) free_associations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -2668,12 +2668,12 @@ static enum fill_status fill_diskdrivetodiskpartition( struct table *table, cons if (!(assoc = get_diskdrivetodiskpartition_pairs( &count ))) return FILL_STATUS_FAILED; if (!count) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_UNFILTERED; } if (!resize_table( table, count, sizeof(*rec) )) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_FAILED; } @@ -2953,7 +2953,7 @@ static struct association *get_logicaldisktopartition_pairs( UINT *count ) *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->result_count ); + if (!ret) free_associations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -2969,12 +2969,12 @@ static enum fill_status fill_logicaldisktopartition( struct table *table, const if (!(assoc = get_logicaldisktopartition_pairs( &count ))) return FILL_STATUS_FAILED; if (!count) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_UNFILTERED; } if (!resize_table( table, count, sizeof(*rec) )) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_FAILED; }

1 0

Alexandre Julliard : ntdll: Keep a valid DOS name if the initial current directory is a Unix dir.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: f2060812418bc049105c2a30ceb039ee6d5f0fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2060812418bc049105c2a30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 19:16:56 2019 +0100 ntdll: Keep a valid DOS name if the initial current directory is a Unix dir. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48114 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 79a1805618..ebeda01ff8 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -622,8 +622,17 @@ static void get_current_directory( UNICODE_STRING *dir ) if (!wine_unix_to_nt_file_name( &unix_name, &nt_name )) { /* skip the \??\ prefix */ - dir->Length = nt_name.Length - 4 * sizeof(WCHAR); - memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length ); + if (nt_name.Length > 6 * sizeof(WCHAR*) && nt_name.Buffer[5] == ':') + { + dir->Length = nt_name.Length - 4 * sizeof(WCHAR); + memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length ); + } + else /* change \??\ to \\?\ */ + { + dir->Length = nt_name.Length; + memcpy( dir->Buffer, nt_name.Buffer, dir->Length ); + dir->Buffer[1] = '\\'; + } RtlFreeUnicodeString( &nt_name ); } }

1 0

Francois Gouget : input: Fix the spelling of a parameter name in a function prototype.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 6e73cf2c17a9ffc8c559e2658fb26c692978a5c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e73cf2c17a9ffc8c559e265… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:28:28 2019 +0100 input: Fix the spelling of a parameter name in a function prototype. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/interactioncontext.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/interactioncontext.h b/include/interactioncontext.h index a3a5f34598..c0892855fd 100644 --- a/include/interactioncontext.h +++ b/include/interactioncontext.h @@ -184,7 +184,7 @@ HRESULT WINAPI SetInteractionConfigurationInteractionContext(HINTERACTIONCONTEXT UINT32 count, const INTERACTION_CONTEXT_CONFIGURATION *configuration); HRESULT WINAPI GetPropertyInteractionContext(HINTERACTIONCONTEXT context, - INTERACTION_CONTEXT_PROPERTY proerty, UINT32 *value); + INTERACTION_CONTEXT_PROPERTY property, UINT32 *value); HRESULT WINAPI SetPropertyInteractionContext(HINTERACTIONCONTEXT context, INTERACTION_CONTEXT_PROPERTY property, UINT32 value);

1 0

Nikolay Sivov : comctl32/combo: Remove unnecessary argument from button painting helper.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: d0f9e5e81603ef4b9732dd0b8565197e96b90140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0f9e5e81603ef4b9732dd0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 28 09:06:34 2019 +0300 comctl32/combo: Remove unnecessary argument from button painting helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 1fa5f5ef21..827da37c0c 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -545,10 +545,13 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG * * Paint combo button (normal, pressed, and disabled states). */ -static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) +static void CBPaintButton(HEADCOMBO *lphc, HDC hdc) { UINT buttonState = DFCS_SCROLLCOMBOBOX; + if (IsRectEmpty(&lphc->buttonRect)) + return; + if( lphc->wState & CBF_NOREDRAW ) return; @@ -559,7 +562,7 @@ static void CBPaintButton( LPHEADCOMBO lphc, HDC hdc, RECT rectButton) if (CB_DISABLED(lphc)) buttonState |= DFCS_INACTIVE; - DrawFrameControl(hdc, &rectButton, DFC_SCROLL, buttonState); + DrawFrameControl(hdc, &lphc->buttonRect, DFC_SCROLL, buttonState); } /*********************************************************************** @@ -815,8 +818,7 @@ static LRESULT COMBO_Paint(HEADCOMBO *lphc, HDC hdc) */ CBPaintBorder(lphc->self, lphc, hdc); - if (!IsRectEmpty(&lphc->buttonRect)) - CBPaintButton(lphc, hdc, lphc->buttonRect); + CBPaintButton(lphc, hdc); /* paint the edit control padding area */ if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST)

1 0

Nikolay Sivov : explorerframe: Return success from ThumbBarSetImageList().
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 27eee2d9ac5b9e373e10fc829f54e637e8b54e76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27eee2d9ac5b9e373e10fc82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 28 09:09:32 2019 +0300 explorerframe: Return success from ThumbBarSetImageList(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 10ad84b639..44b8a8ab91 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -216,7 +216,7 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarSetImageList(ITaskbarList4 { FIXME("iface %p, hwnd %p, himl %p stub!\n", iface, hwnd, himl); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_SetOverlayIcon(ITaskbarList4 *iface,

1 0

Alexandre Julliard : ntdll: Don't fail to load data file when the registry key is missing.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 1902ab4d85049d39a439c49a16fc4a5c2bceba3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1902ab4d85049d39a439c49a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 09:51:35 2019 +0100 ntdll: Don't fail to load data file when the registry key is missing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48188 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 26b2f4203c..16287c83a1 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -160,17 +160,19 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) RtlInitUnicodeString( &nameW, buffer ); RtlInitUnicodeString( &valueW, value ); InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); - if ((status = NtOpenKey( &handle, KEY_READ, &attr ))) return status; - info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; - size = sizeof(buffer) - sizeof(WCHAR); - status = NtQueryValueKey( handle, &valueW, KeyValuePartialInformation, info, size, &size ); - NtClose( handle ); - if (!status) + if (!(status = NtOpenKey( &handle, KEY_READ, &attr ))) { - ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; - name = (WCHAR *)info->Data; + info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + size = sizeof(buffer) - sizeof(WCHAR); + if (!(status = NtQueryValueKey( handle, &valueW, KeyValuePartialInformation, info, size, &size ))) + { + ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; + name = (WCHAR *)info->Data; + } + NtClose( handle ); } - else /* otherwise some hardcoded defaults */ + + if (!name) /* otherwise some hardcoded defaults */ { switch (type) {

1 0

Nikolay Sivov : comctl32/toolbar: Handle NULL string pointer from TBN_GETINFOTIPW.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: ae3b334695e4df1c22bb338dfe105970811ed11d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae3b334695e4df1c22bb338d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 28 10:14:39 2019 +0300 comctl32/toolbar: Handle NULL string pointer from TBN_GETINFOTIPW. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 4 ++++ dlls/comctl32/toolbar.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 41807258f4..3688394d71 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -159,6 +159,7 @@ static LRESULT parent_wnd_notify(LPARAM lParam) break; case TBN_GETINFOTIPA: + case TBN_GETINFOTIPW: { NMTBGETINFOTIPA *tbgit = (NMTBGETINFOTIPA*)lParam; @@ -2029,6 +2030,9 @@ static void test_tooltip(void) g_ResetDispTextPtr = TRUE; SendMessageA(hToolbar, WM_NOTIFY, 0, (LPARAM)&nmtti); + /* Same for TBN_GETINFOTIPW */ + SendMessageA(hToolbar, TB_SETUNICODEFORMAT, TRUE, 0); + SendMessageA(hToolbar, WM_NOTIFY, 0, (LPARAM)&nmtti); g_ResetDispTextPtr = FALSE; DestroyWindow(hToolbar); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ceab5328bc..c302e6c111 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6149,7 +6149,7 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm TRACE("TBN_GETINFOTIPW - got string %s\n", debugstr_w(tbgit.pszText)); - len = lstrlenW(tbgit.pszText); + len = tbgit.pszText ? lstrlenW(tbgit.pszText) : 0; if (len > ARRAY_SIZE(lpnmtdi->szText) - 1) { /* need to allocate temporary buffer in infoPtr as there

1 0

Alexandre Julliard : wininet: Handle http_proxy variable entirely in Unicode.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: cadad89d106186a9d0377607096a58677496ec50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cadad89d106186a9d0377607… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:49:07 2019 +0100 wininet: Handle http_proxy variable entirely in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c7e88c83ff..16dc200c13 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -541,7 +541,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) { HKEY key; DWORD type, len; - LPCSTR envproxy; + const WCHAR *envproxy; LONG ret; memset( lpwpi, 0, sizeof(*lpwpi) ); @@ -573,7 +573,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } } - if (!(envproxy = getenv( "http_proxy" )) || lpwpi->proxyEnabled) + if (!(envproxy = _wgetenv( L"http_proxy" )) || lpwpi->proxyEnabled) { /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, szProxyServer, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) @@ -615,18 +615,8 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } else if (envproxy) { - WCHAR *envproxyW; - - len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); - if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) - { - RegCloseKey( key ); - return ERROR_OUTOFMEMORY; - } - MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); - FreeProxyInfo( lpwpi ); - if (parse_proxy_url( lpwpi, envproxyW )) + if (parse_proxy_url( lpwpi, envproxy )) { TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); lpwpi->proxyEnabled = 1; @@ -634,19 +624,18 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } else { - WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxyW)); + WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxy)); lpwpi->proxyEnabled = 0; lpwpi->proxy = NULL; lpwpi->proxyBypass = NULL; } - heap_free( envproxyW ); } if (lpwpi->proxyEnabled) { TRACE("Proxy is enabled.\n"); - if (!(envproxy = getenv( "no_proxy" ))) + if (!(envproxy = _wgetenv( L"no_proxy" ))) { /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, szProxyOverride, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) @@ -677,13 +666,12 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) { WCHAR *envproxyW; - len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); - if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) + if (!(envproxyW = heap_alloc(lstrlenW(envproxy) * sizeof(WCHAR)))) { RegCloseKey( key ); return ERROR_OUTOFMEMORY; } - MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + lstrcpyW( envproxyW, envproxy ); heap_free( lpwpi->proxyBypass ); lpwpi->proxyBypass = envproxyW;

1 0

Alexandre Julliard : winhttp: Handle http_proxy variable entirely in Unicode.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 86f43b693a48f94f965ed088a82e20bd1ffde273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f43b693a48f94f965ed088… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:48:32 2019 +0100 winhttp: Handle http_proxy variable entirely in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3f8acf0e02..22aa285a44 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1534,7 +1534,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) LONG l; HKEY key; BOOL got_from_reg = FALSE, direct = TRUE; - char *envproxy; + WCHAR *envproxy; TRACE("%p\n", info); @@ -1610,37 +1610,30 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } RegCloseKey( key ); } - if (!got_from_reg && (envproxy = getenv( "http_proxy" ))) + if (!got_from_reg && (envproxy = _wgetenv( L"http_proxy" ))) { - char *colon, *http_proxy = NULL; + WCHAR *colon, *http_proxy = NULL; - if (!(colon = strchr( envproxy, ':' ))) http_proxy = envproxy; + if (!(colon = wcschr( envproxy, ':' ))) http_proxy = envproxy; else { if (*(colon + 1) == '/' && *(colon + 2) == '/') { /* It's a scheme, check that it's http */ - if (!strncmp( envproxy, "http://", 7 )) http_proxy = envproxy + 7; - else WARN("unsupported scheme in $http_proxy: %s\n", envproxy); + if (!wcsncmp( envproxy, L"http://", 7 )) http_proxy = envproxy + 7; + else WARN("unsupported scheme in $http_proxy: %s\n", debugstr_w(envproxy)); } else http_proxy = envproxy; } if (http_proxy && http_proxy[0]) { - WCHAR *http_proxyW; - int len; - - len = MultiByteToWideChar( CP_UNIXCP, 0, http_proxy, -1, NULL, 0 ); - if ((http_proxyW = GlobalAlloc( 0, len * sizeof(WCHAR)))) - { - MultiByteToWideChar( CP_UNIXCP, 0, http_proxy, -1, http_proxyW, len ); - direct = FALSE; - info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - info->lpszProxy = http_proxyW; - info->lpszProxyBypass = NULL; - TRACE("http proxy (from environment) = %s\n", debugstr_w(info->lpszProxy)); - } + direct = FALSE; + info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + info->lpszProxy = GlobalAlloc( 0, (lstrlenW(http_proxy) + 1) * sizeof(WCHAR) ); + wcscpy( info->lpszProxy, http_proxy ); + info->lpszProxyBypass = NULL; + TRACE("http proxy (from environment) = %s\n", debugstr_w(info->lpszProxy)); } } if (direct)

1 0

Zebediah Figura : strmbase: Don't hold the streaming lock in IPin::BeginFlush().
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 4be014239ccc3e04daa59690fbf25d29b823c067 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4be014239ccc3e04daa59690… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 19:27:18 2019 -0600 strmbase: Don't hold the streaming lock in IPin::BeginFlush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 50bd33715d..0ef9c5b225 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -115,7 +115,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) TRACE("iface %p.\n", iface); - EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); hr = BaseInputPinImpl_BeginFlush(iface); if (SUCCEEDED(hr)) @@ -124,7 +123,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) SetEvent(pFilter->flush_event); } LeaveCriticalSection(&pFilter->filter.csFilter); - LeaveCriticalSection(&pFilter->csRenderLock); return hr; }

1 0