November 2019 - Wine-commits

Sven Baars : schannel/tests: Use a more reliable method for detecting a wrong SECPKG_INTERFACE_VERSION.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: b6424ca5a4f788a817b3aacb9faedbf42b60375e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6424ca5a4f788a817b3aacb… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Nov 28 00:07:55 2019 +0100 schannel/tests: Use a more reliable method for detecting a wrong SECPKG_INTERFACE_VERSION. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/tests/main.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 81a723c799..4b4b7b4f38 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -141,7 +141,7 @@ static void testInitialize(void) static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, ULONG Version) { - size_t size; + int detectedVersion = 0, size; PSECPKG_FUNCTION_TABLE pNextTable; if (Version == SECPKG_INTERFACE_VERSION) @@ -166,15 +166,41 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, } pNextTable = (PSECPKG_FUNCTION_TABLE)((PBYTE)pTable + size); - /* Win7 function tables appear to be SECPKG_INTERFACE_VERSION_6 format, - but unfortunately SpLsaModeInitialize returns SECPKG_INTERFACE_VERSION_3. - We detect that by comparing the "Initialize" pointer from the old table - to the "FreeCredentialsHandle" pointer of the new table. These functions - have different numbers of arguments, so they can't possibly point to the - same implementation */ - if (broken((void *) pTable->Initialize == (void *) pNextTable->FreeCredentialsHandle && - pNextTable->FreeCredentialsHandle != NULL)) + + /* For any version of Windows beyond Vista SpLsaModeInitialize returns + SECPKG_INTERFACE_VERSION_3, so try detecting the actual version here + by iterating until we find the Intitalize function */ + if (broken((void *) pTable->Initialize != (void *) pNextTable->Initialize && + pTable->Initialize != NULL)) { + for (size = 1; size <= SECPKG_FUNCTION_TABLE_SIZE_8; size++) + { + pNextTable = (PSECPKG_FUNCTION_TABLE)((PBYTE)pTable + size); + if ((void *) pTable->Initialize == (void *) pNextTable->Initialize) + { + if (size == SECPKG_FUNCTION_TABLE_SIZE_1) + detectedVersion = 1; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_2) + detectedVersion = 2; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_3) + detectedVersion = 3; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_4) + detectedVersion = 4; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_5) + detectedVersion = 5; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_6) + detectedVersion = 6; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_7) + detectedVersion = 7; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_8) + detectedVersion = 8; + else + trace("Unknown package version with size %u\n", size); + if (detectedVersion > 0) + trace("Detected SECPKG_INTERFACE_VERSION_%d\n", detectedVersion); + return pNextTable; + } + } win_skip("Invalid function pointers for next package\n"); return NULL; }

1 0

Vijay Kiran Kamuju : include: Add definitions for ShellLinkDataBlocks in shlobj.h.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 0af4323e41b020d81a2aaf944bb87b31603ed45c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0af4323e41b020d81a2aaf94… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Nov 27 20:09:20 2019 +0100 include: Add definitions for ShellLinkDataBlocks in shlobj.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlobj.h | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/include/shlobj.h b/include/shlobj.h index e963578d6c..9a7741a193 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1397,7 +1397,13 @@ typedef enum { SLDF_FORCE_NO_LINKTRACK = 0x00040000, SLDF_ENABLE_TARGET_METADATA = 0x00080000, SLDF_DISABLE_KNOWNFOLDER_RELATIVE_TRACKING = 0x00200000, - SLDF_VALID = 0x003ff7ff, + SDLF_NO_KF_ALIAS = 0x00400000, + SDLF_ALLOW_LINK_TO_LINK = 0x00800000, + SDLF_UNALIAS_ON_SAVE = 0x01000000, + SDLF_PREFER_ENVIRONMENT_PATH = 0x02000000, + SDLF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET = 0x04000000, + SDLF_PERSIST_VOLUME_ID_ACTIVE = 0x08000000, + SLDF_VALID = 0x0ffff7ff, SLDF_RESERVED = 0x80000000, } SHELL_LINK_DATA_FLAGS; @@ -1407,6 +1413,35 @@ typedef struct tagDATABLOCKHEADER DWORD dwSignature; } DATABLOCK_HEADER, *LPDATABLOCK_HEADER, *LPDBLIST; +typedef struct { + DATABLOCK_HEADER dbh; + WORD wFillAttribute; + WORD wPopupFillAttribute; + COORD dwScreenBufferSize; + COORD dwWindowSize; + COORD dwWindowOrigin; + DWORD nFont; + DWORD nInputBufferSize; + COORD dwFontSize; + UINT uFontFamily; + UINT uFontWeight; + WCHAR FaceName[LF_FACESIZE]; + UINT uCursorSize; + BOOL bFullScreen; + BOOL bQuickEdit; + BOOL bInsertMode; + BOOL bAutoPosition; + UINT uHistoryBufferSize; + UINT uNumberOfHistoryBuffers; + BOOL bHistoryNoDup; + COLORREF ColorTable[16]; +} NT_CONSOLE_PROPS, *LPNT_CONSOLE_PROPS; + +typedef struct { + DATABLOCK_HEADER dbh; + UINT uCodePage; +} NT_FE_CONSOLE_PROPS, *LPNT_FE_CONSOLE_PROPS; + typedef struct { DATABLOCK_HEADER dbh; CHAR szDarwinID[MAX_PATH];

1 0

Vijay Kiran Kamuju : shell32: Update the LINKHEADER based on binary file format.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: ec9eddf86b144cc0fcf975a9cc864cf08ba84eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9eddf86b144cc0fcf975a9… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Nov 27 20:09:21 2019 +0100 shell32: Update the LINKHEADER based on binary file format. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 51 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 9a61ea100d..0dfb81c6e7 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -73,15 +73,16 @@ typedef struct _LINK_HEADER GUID MagicGuid; /* 0x04 is CLSID_ShellLink */ DWORD dwFlags; /* 0x14 describes elements following */ DWORD dwFileAttr; /* 0x18 attributes of the target file */ - FILETIME Time1; /* 0x1c */ - FILETIME Time2; /* 0x24 */ - FILETIME Time3; /* 0x2c */ - DWORD dwFileLength; /* 0x34 File length */ - DWORD nIcon; /* 0x38 icon number */ - DWORD fStartup; /* 0x3c startup type */ - DWORD wHotKey; /* 0x40 hotkey */ - DWORD Unknown5; /* 0x44 */ - DWORD Unknown6; /* 0x48 */ + FILETIME CreationTime; /* 0x1c creation time of target file */ + FILETIME AccessTime; /* 0x24 access time of target file */ + FILETIME WriteTime; /* 0x2c write time of target file */ + DWORD dwFileSize; /* 0x34 File size of target file */ + DWORD nIcon; /* 0x38 icon number or index */ + DWORD fStartup; /* 0x3c startup type or window state of application */ + WORD wHotKey; /* 0x40 hotkey */ + WORD Reserved1; /* 0x42 reserved = 0 */ + DWORD Reserved2; /* 0x44 reserved = 0 */ + DWORD Reserved3; /* 0x48 reserved = 0 */ } LINK_HEADER, * PLINK_HEADER; #define SHLINK_LOCAL 0 @@ -134,9 +135,9 @@ typedef struct /* data structures according to the information in the link */ LPITEMIDLIST pPidl; WORD wHotKey; - SYSTEMTIME time1; - SYSTEMTIME time2; - SYSTEMTIME time3; + SYSTEMTIME CreationTime; + SYSTEMTIME AccessTime; + SYSTEMTIME WriteTime; DWORD iShowCmd; LPWSTR sIcoPath; @@ -774,20 +775,20 @@ static HRESULT WINAPI IPersistStream_fnLoad( heap_free(This->sComponent); This->sComponent = NULL; - This->wHotKey = (WORD)hdr.wHotKey; + This->wHotKey = hdr.wHotKey; This->iIcoNdx = hdr.nIcon; - FileTimeToSystemTime (&hdr.Time1, &This->time1); - FileTimeToSystemTime (&hdr.Time2, &This->time2); - FileTimeToSystemTime (&hdr.Time3, &This->time3); + FileTimeToSystemTime (&hdr.CreationTime, &This->CreationTime); + FileTimeToSystemTime (&hdr.AccessTime, &This->AccessTime); + FileTimeToSystemTime (&hdr.WriteTime, &This->WriteTime); if (TRACE_ON(shell)) { WCHAR sTemp[MAX_PATH]; - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->time1, NULL, sTemp, ARRAY_SIZE(sTemp)); - TRACE("-- time1: %s\n", debugstr_w(sTemp) ); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->time2, NULL, sTemp, ARRAY_SIZE(sTemp)); - TRACE("-- time2: %s\n", debugstr_w(sTemp) ); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->time3, NULL, sTemp, ARRAY_SIZE(sTemp)); - TRACE("-- time3: %s\n", debugstr_w(sTemp) ); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->CreationTime, NULL, sTemp, ARRAY_SIZE(sTemp)); + TRACE("-- CreationTime: %s\n", debugstr_w(sTemp) ); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->AccessTime, NULL, sTemp, ARRAY_SIZE(sTemp)); + TRACE("-- AccessTime: %s\n", debugstr_w(sTemp) ); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->WriteTime, NULL, sTemp, ARRAY_SIZE(sTemp)); + TRACE("-- WriteTime: %s\n", debugstr_w(sTemp) ); } /* load all the new stuff */ @@ -1041,9 +1042,9 @@ static HRESULT WINAPI IPersistStream_fnSave( if( This->sComponent ) header.dwFlags |= SLDF_HAS_DARWINID; - SystemTimeToFileTime ( &This->time1, &header.Time1 ); - SystemTimeToFileTime ( &This->time2, &header.Time2 ); - SystemTimeToFileTime ( &This->time3, &header.Time3 ); + SystemTimeToFileTime ( &This->CreationTime, &header.CreationTime ); + SystemTimeToFileTime ( &This->AccessTime, &header.AccessTime ); + SystemTimeToFileTime ( &This->WriteTime, &header.WriteTime ); /* write the Shortcut header */ r = IStream_Write( stm, &header, sizeof(header), &count );

1 0

Zebediah Figura : quartz/dsoundrender: Avoid taking the filter lock in IPin::EndOfStream().
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 09b39646b05b856727faabdeabbae514da628074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09b39646b05b856727faabde… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 19:27:14 2019 -0600 quartz/dsoundrender: Avoid taking the filter lock in IPin::EndOfStream(). IPin::EndOfStream() is called from a streaming thread. The streaming thread should never take the filter lock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 -- dlls/strmbase/renderer.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index fca1a710de..71851f6b4a 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -236,11 +236,9 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) break; This->in_loop = 1; - LeaveCriticalSection(&This->renderer.filter.csFilter); LeaveCriticalSection(&This->renderer.csRenderLock); WaitForSingleObject(This->renderer.flush_event, 10); EnterCriticalSection(&This->renderer.csRenderLock); - EnterCriticalSection(&This->renderer.filter.csFilter); This->in_loop = 0; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index dbb677e9ad..98d27cc83a 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -88,13 +88,11 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) TRACE("iface %p.\n", iface); EnterCriticalSection(&pFilter->csRenderLock); - EnterCriticalSection(&pFilter->filter.csFilter); pFilter->eos = TRUE; if (pFilter->pFuncsTable->pfnEndOfStream) hr = pFilter->pFuncsTable->pfnEndOfStream(pFilter); else hr = BaseRendererImpl_EndOfStream(pFilter); - LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; }

1 0

Zebediah Figura : strmbase: Get rid of BaseRendererImpl_BeginFlush().
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 0011be7fdd606134c6c155552e9aeea227a120af URL: https://source.winehq.org/git/wine.git/?a=commit;h=0011be7fdd606134c6c15555… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 19:27:15 2019 -0600 strmbase: Get rid of BaseRendererImpl_BeginFlush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 13 ++++--------- include/wine/strmbase.h | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 98d27cc83a..2f09cadf13 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -108,7 +108,10 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) EnterCriticalSection(&pFilter->filter.csFilter); hr = BaseInputPinImpl_BeginFlush(iface); if (SUCCEEDED(hr)) - hr = BaseRendererImpl_BeginFlush(pFilter); + { + BaseRendererImpl_ClearPendingSample(pFilter); + SetEvent(pFilter->flush_event); + } LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; @@ -476,14 +479,6 @@ HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *iface) return hr; } -HRESULT WINAPI BaseRendererImpl_BeginFlush(struct strmbase_renderer *iface) -{ - TRACE("(%p)\n", iface); - BaseRendererImpl_ClearPendingSample(iface); - SetEvent(iface->flush_event); - return S_OK; -} - HRESULT WINAPI BaseRendererImpl_EndFlush(struct strmbase_renderer *iface) { TRACE("(%p)\n", iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d0a0da1b10..cf209ae892 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -567,7 +567,6 @@ struct strmbase_renderer_ops HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); }; -HRESULT WINAPI BaseRendererImpl_BeginFlush(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_EndFlush(struct strmbase_renderer *filter);

1 0

Zebediah Figura : strmbase: Get rid of BaseRendererImpl_EndFlush().
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: dc8bd4598cdf81439b643af38753ce22325d8fc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc8bd4598cdf81439b643af3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 19:27:16 2019 -0600 strmbase: Get rid of BaseRendererImpl_EndFlush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 4 ---- dlls/strmbase/renderer.c | 15 ++++----------- include/wine/strmbase.h | 1 - 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 71851f6b4a..3979853b8b 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -520,10 +520,6 @@ static HRESULT WINAPI DSoundRender_EndFlush(struct strmbase_renderer *iface) { DSoundRenderImpl *This = impl_from_strmbase_renderer(iface); - TRACE("\n"); - - BaseRendererImpl_EndFlush(iface); - if (This->dsbuffer) { LPBYTE buffer; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 2f09cadf13..5aee4380f2 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -130,10 +130,12 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) hr = BaseInputPinImpl_EndFlush(iface); if (SUCCEEDED(hr)) { + QualityControlRender_Start(pFilter->qcimpl, pFilter->stream_start); + RendererPosPassThru_ResetMediaTime(pFilter->pPosition); + ResetEvent(pFilter->flush_event); + if (pFilter->pFuncsTable->pfnEndFlush) hr = pFilter->pFuncsTable->pfnEndFlush(pFilter); - else - hr = BaseRendererImpl_EndFlush(pFilter); } LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); @@ -479,15 +481,6 @@ HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *iface) return hr; } -HRESULT WINAPI BaseRendererImpl_EndFlush(struct strmbase_renderer *iface) -{ - TRACE("(%p)\n", iface); - QualityControlRender_Start(iface->qcimpl, iface->stream_start); - RendererPosPassThru_ResetMediaTime(iface->pPosition); - ResetEvent(iface->flush_event); - return S_OK; -} - HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *iface) { if (iface->pMediaSample) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cf209ae892..1dbc9ea4d8 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -569,7 +569,6 @@ struct strmbase_renderer_ops HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *filter); -HRESULT WINAPI BaseRendererImpl_EndFlush(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample); HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer,

1 0

Zebediah Figura : strmbase: Get rid of BaseRendererImpl_EndOfStream().
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 4d221c3108d4bc6528acbeef0616c8686d7d2d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d221c3108d4bc6528acbeef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 19:27:17 2019 -0600 strmbase: Get rid of BaseRendererImpl_EndOfStream(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 15 +------------ dlls/strmbase/renderer.c | 52 ++++++++++++++++++---------------------------- include/wine/strmbase.h | 1 - 3 files changed, 21 insertions(+), 47 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 3979853b8b..b6757fa76a 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -500,20 +500,7 @@ static HRESULT WINAPI DSoundRender_BreakConnect(struct strmbase_renderer *iface) static HRESULT WINAPI DSoundRender_EndOfStream(struct strmbase_renderer *iface) { DSoundRenderImpl *This = impl_from_strmbase_renderer(iface); - HRESULT hr; - - TRACE("(%p)->()\n",iface); - - hr = BaseRendererImpl_EndOfStream(iface); - if (hr != S_OK) - { - ERR("%08x\n", hr); - return hr; - } - - hr = DSoundRender_HandleEndOfStream(This); - - return hr; + return DSoundRender_HandleEndOfStream(This); } static HRESULT WINAPI DSoundRender_EndFlush(struct strmbase_renderer *iface) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 5aee4380f2..50bd33715d 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -82,18 +82,29 @@ static HRESULT WINAPI BaseRenderer_InputPin_Disconnect(IPin * iface) static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) { - struct strmbase_renderer *pFilter = impl_from_IPin(iface); - HRESULT hr; + struct strmbase_renderer *filter = impl_from_IPin(iface); + IFilterGraph *graph = filter->filter.filterInfo.pGraph; + IMediaEventSink *event_sink; + HRESULT hr = S_OK; TRACE("iface %p.\n", iface); - EnterCriticalSection(&pFilter->csRenderLock); - pFilter->eos = TRUE; - if (pFilter->pFuncsTable->pfnEndOfStream) - hr = pFilter->pFuncsTable->pfnEndOfStream(pFilter); - else - hr = BaseRendererImpl_EndOfStream(pFilter); - LeaveCriticalSection(&pFilter->csRenderLock); + EnterCriticalSection(&filter->csRenderLock); + filter->eos = TRUE; + + if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, + &IID_IMediaEventSink, (void **)&event_sink))) + { + IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter->filter.IBaseFilter_iface); + IMediaEventSink_Release(event_sink); + } + RendererPosPassThru_EOS(filter->pPosition); + SetEvent(filter->state_event); + + if (filter->pFuncsTable->pfnEndOfStream) + hr = filter->pFuncsTable->pfnEndOfStream(filter); + LeaveCriticalSection(&filter->csRenderLock); return hr; } @@ -458,29 +469,6 @@ static const IBaseFilterVtbl strmbase_renderer_vtbl = BaseFilterImpl_QueryVendorInfo }; -HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *iface) -{ - IMediaEventSink* pEventSink; - IFilterGraph *graph; - HRESULT hr = S_OK; - - TRACE("(%p)\n", iface); - - graph = iface->filter.filterInfo.pGraph; - if (graph) - { hr = IFilterGraph_QueryInterface(iface->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); - if (SUCCEEDED(hr)) - { - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)iface); - IMediaEventSink_Release(pEventSink); - } - } - RendererPosPassThru_EOS(iface->pPosition); - SetEvent(iface->state_event); - - return hr; -} - HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *iface) { if (iface->pMediaSample) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1dbc9ea4d8..b08303f93d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -568,7 +568,6 @@ struct strmbase_renderer_ops }; HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *filter); -HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample); HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer,

1 0

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

28 Nov '19

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

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

28 Nov '19

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 : comctl32/combo: Remove redundant argument from border painting helper.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: a1d7dc23151318d033d5fa803e66a90a0e5d5100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d7dc23151318d033d5fa80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 28 09:06:35 2019 +0300 comctl32/combo: Remove redundant argument from border painting helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 827da37c0c..a82118bc07 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -736,16 +736,13 @@ static void CBPaintText(HEADCOMBO *lphc, HDC hdc_paint) /*********************************************************************** * CBPaintBorder */ -static void CBPaintBorder( - HWND hwnd, - const HEADCOMBO *lphc, - HDC hdc) +static void CBPaintBorder(const HEADCOMBO *lphc, HDC hdc) { RECT clientRect; if (CB_GETTYPE(lphc) != CBS_SIMPLE) { - GetClientRect(hwnd, &clientRect); + GetClientRect(lphc->self, &clientRect); } else { @@ -816,7 +813,7 @@ static LRESULT COMBO_Paint(HEADCOMBO *lphc, HDC hdc) /* * In non 3.1 look, there is a sunken border on the combobox */ - CBPaintBorder(lphc->self, lphc, hdc); + CBPaintBorder(lphc, hdc); CBPaintButton(lphc, hdc);

1 0