Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

01/01: [CRT:STARTUP] Fix a Clang-Cl warning about GS_ExceptionPointers
by Serge Gautherie 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44023cb7d77ed4d7732be… commit 44023cb7d77ed4d7732bece807f255910c8c2c2d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Feb 10 06:39:28 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 10 18:13:12 2018 +0100 [CRT:STARTUP] Fix a Clang-Cl warning about GS_ExceptionPointers "warning: unused variable 'GS_ExceptionPointers' [-Wunused-const-variable]" Missed in CORE-8626 r64704. CORE-14306 --- sdk/lib/crt/startup/gs_support.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/lib/crt/startup/gs_support.c b/sdk/lib/crt/startup/gs_support.c index efdfad4608..1a6d70d38c 100644 --- a/sdk/lib/crt/startup/gs_support.c +++ b/sdk/lib/crt/startup/gs_support.c @@ -37,12 +37,14 @@ typedef union FILETIME ft_struct; } FT; +#ifndef _MSC_VER static EXCEPTION_RECORD GS_ExceptionRecord; static CONTEXT GS_ContextRecord; static const EXCEPTION_POINTERS GS_ExceptionPointers = { &GS_ExceptionRecord,&GS_ContextRecord }; +#endif DECLSPEC_SELECTANY UINT_PTR __security_cookie = DEFAULT_SECURITY_COOKIE; DECLSPEC_SELECTANY UINT_PTR __security_cookie_complement = ~(DEFAULT_SECURITY_COOKIE);

1 0

02/02: [DXG] Fix a Clang-Cl warning about DDHAL_CB32_CANCREATESURFACE
by Serge Gautherie 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b78916119963e4368adf0… commit b78916119963e4368adf0481ee98ba61e54174fe Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Feb 8 00:31:13 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 10 18:04:05 2018 +0100 [DXG] Fix a Clang-Cl warning about DDHAL_CB32_CANCREATESURFACE "warning: use of logical '&&' with constant operand [-Wconstant-logical-operand]" CORE-14306 --- win32ss/reactx/dxg/dd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/reactx/dxg/dd.c b/win32ss/reactx/dxg/dd.c index 38e634a336..97e38d52e4 100644 --- a/win32ss/reactx/dxg/dd.c +++ b/win32ss/reactx/dxg/dd.c @@ -28,7 +28,7 @@ DxDdCanCreateSurface( // assign out DirectDrawGlobal to SurfaceData SurfaceData->lpDD = (PDD_DIRECTDRAW_GLOBAL)peDdGl; - if (peDdGl->ddCallbacks.dwFlags && DDHAL_CB32_CANCREATESURFACE) + if (peDdGl->ddCallbacks.dwFlags & DDHAL_CB32_CANCREATESURFACE) { RetVal = peDdGl->ddCallbacks.CanCreateSurface(SurfaceData); }

1 0

01/02: [OPENGLCFG] Fix a Clang-Cl warning about IDC_DEBUG_OUTPUT
by Serge Gautherie 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71ebfd8717bf3ff4469b7… commit 71ebfd8717bf3ff4469b758f39ea853ec3c78d6a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Feb 8 00:27:27 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 10 18:04:03 2018 +0100 [OPENGLCFG] Fix a Clang-Cl warning about IDC_DEBUG_OUTPUT "warning: use of logical '||' with constant operand [-Wconstant-logical-operand]" CORE-14306 --- dll/cpl/openglcfg/general.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/cpl/openglcfg/general.c b/dll/cpl/openglcfg/general.c index dcf53f55bf..0b9db4ca21 100644 --- a/dll/cpl/openglcfg/general.c +++ b/dll/cpl/openglcfg/general.c @@ -170,8 +170,11 @@ INT_PTR CALLBACK GeneralPageProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM return TRUE; case WM_COMMAND: - if (LOWORD(wParam) == IDC_RENDERER || IDC_DEBUG_OUTPUT) + if (LOWORD(wParam) == IDC_RENDERER || + LOWORD(wParam) == IDC_DEBUG_OUTPUT) + { PropSheet_Changed(GetParent(hWndDlg), hWndDlg); + } break; case WM_NOTIFY:

1 0

01/01: [STRMBASE] Sync with Wine 3.0. CORE-14225
by Thomas Faber 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7ef5747b51d323ecbae5… commit a7ef5747b51d323ecbae5712e9ea97b13844693d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Feb 5 18:47:10 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 10 17:53:05 2018 +0100 [STRMBASE] Sync with Wine 3.0. CORE-14225 --- media/doc/README.WINE | 2 +- sdk/include/reactos/wine/strmbase.h | 4 +- sdk/lib/3rdparty/strmbase/mediatype.c | 13 ++- sdk/lib/3rdparty/strmbase/outputqueue.c | 33 ++---- sdk/lib/3rdparty/strmbase/pin.c | 10 +- sdk/lib/3rdparty/strmbase/pospass.c | 26 ++--- sdk/lib/3rdparty/strmbase/renderer.c | 6 +- sdk/lib/3rdparty/strmbase/transform.c | 10 +- sdk/lib/3rdparty/strmbase/video.c | 196 +++++++++++++++++++++++++------- sdk/lib/3rdparty/strmbase/window.c | 2 +- 10 files changed, 205 insertions(+), 97 deletions(-) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 5cafdae121..7f2e9e6af6 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -250,7 +250,7 @@ In addition the following libs, dlls and source files are mostly based on code p from Winehq CVS. If you are looking to update something in these files check Wine current sources first as it may already be fixed. -reactos/sdk/lib/3rdparty/strmbase # Synced to WineStaging-1.9.16 +reactos/sdk/lib/3rdparty/strmbase # Synced to Wine-3.0 reactos/sdk/lib/rtl/actctx.c # Partly synced with WineStaging-1.9.16 reactos/sdk/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55 diff --git a/sdk/include/reactos/wine/strmbase.h b/sdk/include/reactos/wine/strmbase.h index 841359d445..abe92aea86 100644 --- a/sdk/include/reactos/wine/strmbase.h +++ b/sdk/include/reactos/wine/strmbase.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/list.h" + HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType); AM_MEDIA_TYPE * WINAPI CreateMediaType(AM_MEDIA_TYPE const * pSrc); @@ -351,7 +353,7 @@ typedef struct tagOutputQueue { BOOL bTerminate; BOOL bSendAnyway; - struct list *SampleList; + struct list SampleList; const struct OutputQueueFuncTable* pFuncsTable; } OutputQueue; diff --git a/sdk/lib/3rdparty/strmbase/mediatype.c b/sdk/lib/3rdparty/strmbase/mediatype.c index 0a53357c03..71e29b9430 100644 --- a/sdk/lib/3rdparty/strmbase/mediatype.c +++ b/sdk/lib/3rdparty/strmbase/mediatype.c @@ -118,18 +118,23 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e pEnumMediaTypes->basePin = basePin; i = 0; - while (enumFunc(basePin, i, &amt) == S_OK) i++; + while (enumFunc(basePin, i, &amt) == S_OK) + { + FreeMediaType(&amt); + i++; + } pEnumMediaTypes->enumMediaDetails.cMediaTypes = i; pEnumMediaTypes->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); memset(pEnumMediaTypes->enumMediaDetails.pMediaTypes, 0, sizeof(AM_MEDIA_TYPE) * i); for (i = 0; i < pEnumMediaTypes->enumMediaDetails.cMediaTypes; i++) { - enumFunc(basePin,i,&amt); - if (FAILED(CopyMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i], &amt))) + HRESULT hr; + + if (FAILED(hr = enumFunc(basePin, i, &pEnumMediaTypes->enumMediaDetails.pMediaTypes[i]))) { IEnumMediaTypes_Release(&pEnumMediaTypes->IEnumMediaTypes_iface); - return E_OUTOFMEMORY; + return hr; } } *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface; diff --git a/sdk/lib/3rdparty/strmbase/outputqueue.c b/sdk/lib/3rdparty/strmbase/outputqueue.c index 0e2cb5833b..c071599b45 100644 --- a/sdk/lib/3rdparty/strmbase/outputqueue.c +++ b/sdk/lib/3rdparty/strmbase/outputqueue.c @@ -40,7 +40,7 @@ static DWORD WINAPI OutputQueue_InitialThreadProc(LPVOID data) static void OutputQueue_FreeSamples(OutputQueue *pOutputQueue) { struct list *cursor, *cursor2; - LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + LIST_FOR_EACH_SAFE(cursor, cursor2, &pOutputQueue->SampleList) { QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); list_remove(cursor); @@ -77,14 +77,7 @@ HRESULT WINAPI OutputQueue_Construct( This->bBatchExact = bBatchExact; InitializeCriticalSection(&This->csQueue); This->csQueue.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": OutputQueue.csQueue"); - This->SampleList = HeapAlloc(GetProcessHeap(),0,sizeof(struct list)); - if (!This->SampleList) - { - OutputQueue_Destroy(This); - *ppOutputQueue = NULL; - return E_OUTOFMEMORY; - } - list_init(This->SampleList); + list_init(&This->SampleList); This->pInputPin = pInputPin; IPin_AddRef(&pInputPin->pin.IPin_iface); @@ -121,8 +114,6 @@ HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue) DeleteCriticalSection(&pOutputQueue->csQueue); CloseHandle(pOutputQueue->hProcessQueue); - HeapFree(GetProcessHeap(),0,pOutputQueue->SampleList); - IPin_Release(&pOutputQueue->pInputPin->pin.IPin_iface); HeapFree(GetProcessHeap(),0,pOutputQueue); return S_OK; @@ -159,11 +150,11 @@ HRESULT WINAPI OutputQueue_ReceiveMultiple(OutputQueue *pOutputQueue, IMediaSamp qev->type = SAMPLE_PACKET; qev->pSample = ppSamples[i]; IMediaSample_AddRef(ppSamples[i]); - list_add_tail(pOutputQueue->SampleList, &qev->entry); + list_add_tail(&pOutputQueue->SampleList, &qev->entry); (*nSamplesProcessed)++; } - if (!pOutputQueue->bBatchExact || list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize) + if (!pOutputQueue->bBatchExact || list_count(&pOutputQueue->SampleList) >= pOutputQueue->lBatchSize) SetEvent(pOutputQueue->hProcessQueue); LeaveCriticalSection(&pOutputQueue->csQueue); } @@ -181,7 +172,7 @@ VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue) if (pOutputQueue->hThread) { EnterCriticalSection(&pOutputQueue->csQueue); - if (!list_empty(pOutputQueue->SampleList)) + if (!list_empty(&pOutputQueue->SampleList)) { pOutputQueue->bSendAnyway = TRUE; SetEvent(pOutputQueue->hProcessQueue); @@ -204,7 +195,7 @@ VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue) } qev->type = EOS_PACKET; qev->pSample = NULL; - list_add_tail(pOutputQueue->SampleList, &qev->entry); + list_add_tail(&pOutputQueue->SampleList, &qev->entry); } else { @@ -226,14 +217,14 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) do { EnterCriticalSection(&pOutputQueue->csQueue); - if (!list_empty(pOutputQueue->SampleList) && + if (!list_empty(&pOutputQueue->SampleList) && (!pOutputQueue->bBatchExact || - list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize || + list_count(&pOutputQueue->SampleList) >= pOutputQueue->lBatchSize || pOutputQueue->bSendAnyway ) ) { - while (!list_empty(pOutputQueue->SampleList)) + while (!list_empty(&pOutputQueue->SampleList)) { IMediaSample **ppSamples; LONG nSamples; @@ -242,10 +233,10 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) int i = 0; /* First Pass Process Samples */ - i = list_count(pOutputQueue->SampleList); + i = list_count(&pOutputQueue->SampleList); ppSamples = HeapAlloc(GetProcessHeap(),0,sizeof(IMediaSample*) * i); nSamples = 0; - LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + LIST_FOR_EACH_SAFE(cursor, cursor2, &pOutputQueue->SampleList) { QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); if (qev->type == SAMPLE_PACKET) @@ -269,7 +260,7 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) HeapFree(GetProcessHeap(),0,ppSamples); /* Process Non-Samples */ - LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + LIST_FOR_EACH_SAFE(cursor, cursor2, &pOutputQueue->SampleList) { QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); if (qev->type == EOS_PACKET) diff --git a/sdk/lib/3rdparty/strmbase/pin.c b/sdk/lib/3rdparty/strmbase/pin.c index 835214b564..447d6f7467 100644 --- a/sdk/lib/3rdparty/strmbase/pin.c +++ b/sdk/lib/3rdparty/strmbase/pin.c @@ -329,7 +329,7 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER { BasePin *This = impl_from_IPin(iface); - TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); + TRACE("(%s, %s, %e)\n", wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); This->tStart = tStart; This->tStop = tStop; @@ -387,10 +387,8 @@ ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface) TRACE("(%p)->() Release from %d\n", iface, refCount + 1); if (!refCount) - { BaseOutputPin_Destroy(This); - return 0; - } + return refCount; } @@ -1009,7 +1007,7 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args; - TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); + TRACE("(%s, %s, %e)\n", wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); args.tStart = This->pin.tStart = tStart; args.tStop = This->pin.tStop = tStop; @@ -1202,7 +1200,7 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size if (SUCCEEDED(InputPin_Init(InputPin_Vtbl, pPinInfo, vtbl, pCritSec, allocator, pPinImpl))) { - *ppPin = (IPin *)pPinImpl; + *ppPin = &pPinImpl->pin.IPin_iface; return S_OK; } diff --git a/sdk/lib/3rdparty/strmbase/pospass.c b/sdk/lib/3rdparty/strmbase/pospass.c index 91af649a9f..9e33d7639b 100644 --- a/sdk/lib/3rdparty/strmbase/pospass.c +++ b/sdk/lib/3rdparty/strmbase/pospass.c @@ -67,7 +67,7 @@ static HRESULT WINAPI SeekInner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID *ppvObj) { PassThruImpl *This = impl_from_IUnknown_inner(iface); - TRACE("(%p)->(%s (%p), %p)\n", This, debugstr_guid(riid), riid, ppvObj); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObj); if (This->bAggregatable) This->bUnkOuterValid = TRUE; @@ -142,9 +142,9 @@ static HRESULT SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid, LPVOID { HRESULT hr; - IUnknown_AddRef((IUnknown *)&(This->IUnknown_inner)); - hr = IUnknown_QueryInterface((IUnknown *)&(This->IUnknown_inner), riid, ppv); - IUnknown_Release((IUnknown *)&(This->IUnknown_inner)); + IUnknown_AddRef(&This->IUnknown_inner); + hr = IUnknown_QueryInterface(&This->IUnknown_inner, riid, ppv); + IUnknown_Release(&This->IUnknown_inner); This->bAggregatable = TRUE; return hr; } @@ -153,28 +153,28 @@ static HRESULT SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid, LPVOID return E_NOINTERFACE; } - return IUnknown_QueryInterface((IUnknown *)&(This->IUnknown_inner), riid, ppv); + return IUnknown_QueryInterface(&This->IUnknown_inner, riid, ppv); } static ULONG SeekOuter_AddRef(PassThruImpl *This) { if (This->outer_unk && This->bUnkOuterValid) return IUnknown_AddRef(This->outer_unk); - return IUnknown_AddRef((IUnknown *)&(This->IUnknown_inner)); + return IUnknown_AddRef(&This->IUnknown_inner); } static ULONG SeekOuter_Release(PassThruImpl *This) { if (This->outer_unk && This->bUnkOuterValid) return IUnknown_Release(This->outer_unk); - return IUnknown_Release((IUnknown *)&(This->IUnknown_inner)); + return IUnknown_Release(&This->IUnknown_inner); } static HRESULT WINAPI SeekingPassThru_QueryInterface(ISeekingPassThru *iface, REFIID riid, LPVOID *ppvObj) { PassThruImpl *This = impl_from_ISeekingPassThru(iface); - TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); return SeekOuter_QueryInterface(This, riid, ppvObj); } @@ -266,7 +266,7 @@ static HRESULT WINAPI MediaSeekingPassThru_QueryInterface(IMediaSeeking *iface, { PassThruImpl *This = impl_from_IMediaSeeking(iface); - TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); return SeekOuter_QueryInterface(This, riid, ppvObj); } @@ -516,11 +516,9 @@ static HRESULT WINAPI MediaSeekingPassThru_GetPositions(IMediaSeeking * iface, L if (SUCCEEDED(hr)) { hr = IMediaSeeking_GetPositions(seek, pCurrent, pStop); IMediaSeeking_Release(seek); - } else if (hr == VFW_E_NOT_CONNECTED) { - *pCurrent = 0; - *pStop = 0; - hr = S_OK; } + else + return E_NOTIMPL; return hr; } @@ -651,7 +649,7 @@ static HRESULT WINAPI MediaPositionPassThru_QueryInterface(IMediaPosition *iface { PassThruImpl *This = impl_from_IMediaPosition(iface); - TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); return SeekOuter_QueryInterface(This, riid, ppvObj); } diff --git a/sdk/lib/3rdparty/strmbase/renderer.c b/sdk/lib/3rdparty/strmbase/renderer.c index a89ba5f1bb..2da801ce43 100644 --- a/sdk/lib/3rdparty/strmbase/renderer.c +++ b/sdk/lib/3rdparty/strmbase/renderer.c @@ -228,7 +228,8 @@ static const BaseInputPinFuncTable input_BaseInputFuncTable = { }; -HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtbl, IUnknown *pUnkOuter, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseRendererFuncTable* pBaseFuncsTable) +HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtbl, IUnknown *pUnkOuter, const CLSID *pClsid, + DWORD_PTR DebugInfo, const BaseRendererFuncTable* pBaseFuncsTable) { PIN_INFO piInput; HRESULT hr; @@ -247,7 +248,8 @@ HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtb if (SUCCEEDED(hr)) { - hr = CreatePosPassThru(pUnkOuter ? pUnkOuter: (IUnknown*)This, TRUE, &This->pInputPin->pin.IPin_iface, &This->pPosition); + hr = CreatePosPassThru(pUnkOuter ? pUnkOuter: (IUnknown *)&This->filter.IBaseFilter_iface, TRUE, + &This->pInputPin->pin.IPin_iface, &This->pPosition); if (FAILED(hr)) return hr; diff --git a/sdk/lib/3rdparty/strmbase/transform.c b/sdk/lib/3rdparty/strmbase/transform.c index acb16938d0..fd7534b4af 100644 --- a/sdk/lib/3rdparty/strmbase/transform.c +++ b/sdk/lib/3rdparty/strmbase/transform.c @@ -223,7 +223,8 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p { ISeekingPassThru *passthru; pTransformFilter->seekthru_unk = NULL; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)pTransformFilter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&pTransformFilter->seekthru_unk); + hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown *)&pTransformFilter->filter.IBaseFilter_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&pTransformFilter->seekthru_unk); if (SUCCEEDED(hr)) { IUnknown_QueryInterface(pTransformFilter->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); @@ -326,11 +327,8 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) IUnknown_Release(This->seekthru_unk); BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); - - return 0; } - else - return refCount; + return refCount; } /** IMediaFilter methods **/ @@ -530,7 +528,7 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC TransformFilter* pTransform; HRESULT hr = S_OK; - TRACE("(%p)->()\n", iface); + TRACE("(%p)->(%s %s %e)\n", iface, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); pTransform = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); EnterCriticalSection(&pTransform->filter.csFilter); diff --git a/sdk/lib/3rdparty/strmbase/video.c b/sdk/lib/3rdparty/strmbase/video.c index ba147d7abb..dd6426d11e 100644 --- a/sdk/lib/3rdparty/strmbase/video.c +++ b/sdk/lib/3rdparty/strmbase/video.c @@ -43,6 +43,33 @@ HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) return BaseDispatch_Destroy(&pControlVideo->baseDispatch); } +static HRESULT BaseControlVideoImpl_CheckSourceRect(BaseControlVideo *This, RECT *pSourceRect) +{ + LONG VideoWidth, VideoHeight; + HRESULT hr; + + if (IsRectEmpty(pSourceRect)) + return E_INVALIDARG; + + hr = BaseControlVideoImpl_GetVideoSize((IBasicVideo *)This, &VideoWidth, &VideoHeight); + if (FAILED(hr)) + return hr; + + if (pSourceRect->top < 0 || pSourceRect->left < 0 || + pSourceRect->bottom > VideoHeight || pSourceRect->right > VideoWidth) + return E_INVALIDARG; + + return S_OK; +} + +static HRESULT BaseControlVideoImpl_CheckTargetRect(BaseControlVideo *This, RECT *pTargetRect) +{ + if (IsRectEmpty(pTargetRect)) + return E_INVALIDARG; + + return S_OK; +} + HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *pctinfo) { BaseControlVideo *This = impl_from_IBasicVideo(iface); @@ -85,6 +112,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_AvgTimePerFrame(IBasicVideo *iface, REFT VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); + if (!pAvgTimePerFrame) + return E_POINTER; if (!This->pPin->pConnectedTo) return VFW_E_NOT_CONNECTED; @@ -102,6 +131,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_BitRate(IBasicVideo *iface, LONG *pBitRa TRACE("(%p/%p)->(%p)\n", This, iface, pBitRate); + if (!pBitRate) + return E_POINTER; if (!This->pPin->pConnectedTo) return VFW_E_NOT_CONNECTED; @@ -117,6 +148,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_BitErrorRate(IBasicVideo *iface, LONG *p TRACE("(%p/%p)->(%p)\n", This, iface, pBitErrorRate); + if (!pBitErrorRate) + return E_POINTER; if (!This->pPin->pConnectedTo) return VFW_E_NOT_CONNECTED; @@ -131,6 +164,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_VideoWidth(IBasicVideo *iface, LONG *pVi BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoWidth); + if (!pVideoWidth) + return E_POINTER; vih = This->pFuncsTable->pfnGetVideoFormat(This); *pVideoWidth = vih->bmiHeader.biWidth; @@ -144,6 +179,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_VideoHeight(IBasicVideo *iface, LONG *pV BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoHeight); + if (!pVideoHeight) + return E_POINTER; vih = This->pFuncsTable->pfnGetVideoFormat(This); *pVideoHeight = abs(vih->bmiHeader.biHeight); @@ -155,13 +192,20 @@ HRESULT WINAPI BaseControlVideoImpl_put_SourceLeft(IBasicVideo *iface, LONG Sour { RECT SourceRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, SourceLeft); - This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); - SourceRect.left = SourceLeft; - This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); + hr = This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); + if (SUCCEEDED(hr)) + { + SourceRect.right = (SourceRect.right - SourceRect.left) + SourceLeft; + SourceRect.left = SourceLeft; + hr = BaseControlVideoImpl_CheckSourceRect(This, &SourceRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_SourceLeft(IBasicVideo *iface, LONG *pSourceLeft) @@ -170,6 +214,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceLeft(IBasicVideo *iface, LONG *pSo BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceLeft); + if (!pSourceLeft) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceLeft = SourceRect.left; @@ -180,13 +226,19 @@ HRESULT WINAPI BaseControlVideoImpl_put_SourceWidth(IBasicVideo *iface, LONG Sou { RECT SourceRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, SourceWidth); - This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); - SourceRect.right = SourceRect.left + SourceWidth; - This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); + hr = This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); + if (SUCCEEDED(hr)) + { + SourceRect.right = SourceRect.left + SourceWidth; + hr = BaseControlVideoImpl_CheckSourceRect(This, &SourceRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_SourceWidth(IBasicVideo *iface, LONG *pSourceWidth) @@ -195,6 +247,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceWidth(IBasicVideo *iface, LONG *pS BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceWidth); + if (!pSourceWidth) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceWidth = SourceRect.right - SourceRect.left; @@ -205,13 +259,20 @@ HRESULT WINAPI BaseControlVideoImpl_put_SourceTop(IBasicVideo *iface, LONG Sourc { RECT SourceRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, SourceTop); - This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); - SourceRect.top = SourceTop; - This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); + hr = This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); + if (SUCCEEDED(hr)) + { + SourceRect.bottom = (SourceRect.bottom - SourceRect.top) + SourceTop; + SourceRect.top = SourceTop; + hr = BaseControlVideoImpl_CheckSourceRect(This, &SourceRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_SourceTop(IBasicVideo *iface, LONG *pSourceTop) @@ -220,6 +281,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceTop(IBasicVideo *iface, LONG *pSou BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceTop); + if (!pSourceTop) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceTop = SourceRect.top; @@ -230,13 +293,19 @@ HRESULT WINAPI BaseControlVideoImpl_put_SourceHeight(IBasicVideo *iface, LONG So { RECT SourceRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, SourceHeight); - This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); - SourceRect.bottom = SourceRect.top + SourceHeight; - This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); + hr = This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); + if (SUCCEEDED(hr)) + { + SourceRect.bottom = SourceRect.top + SourceHeight; + hr = BaseControlVideoImpl_CheckSourceRect(This, &SourceRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_SourceHeight(IBasicVideo *iface, LONG *pSourceHeight) @@ -245,6 +314,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceHeight(IBasicVideo *iface, LONG *p BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceHeight); + if (!pSourceHeight) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceHeight = SourceRect.bottom - SourceRect.top; @@ -256,13 +327,20 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationLeft(IBasicVideo *iface, LONG { RECT DestRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, DestinationLeft); - This->pFuncsTable->pfnGetTargetRect(This, &DestRect); - DestRect.left = DestinationLeft; - This->pFuncsTable->pfnSetTargetRect(This, &DestRect); + hr = This->pFuncsTable->pfnGetTargetRect(This, &DestRect); + if (SUCCEEDED(hr)) + { + DestRect.right = (DestRect.right - DestRect.left) + DestinationLeft; + DestRect.left = DestinationLeft; + hr = BaseControlVideoImpl_CheckTargetRect(This, &DestRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetTargetRect(This, &DestRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_DestinationLeft(IBasicVideo *iface, LONG *pDestinationLeft) @@ -271,6 +349,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationLeft(IBasicVideo *iface, LONG BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationLeft); + if (!pDestinationLeft) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pDestinationLeft = DestRect.left; @@ -281,13 +361,19 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationWidth(IBasicVideo *iface, LON { RECT DestRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, DestinationWidth); - This->pFuncsTable->pfnGetTargetRect(This, &DestRect); - DestRect.right = DestRect.left + DestinationWidth; - This->pFuncsTable->pfnSetTargetRect(This, &DestRect); + hr = This->pFuncsTable->pfnGetTargetRect(This, &DestRect); + if (SUCCEEDED(hr)) + { + DestRect.right = DestRect.left + DestinationWidth; + hr = BaseControlVideoImpl_CheckTargetRect(This, &DestRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetTargetRect(This, &DestRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_DestinationWidth(IBasicVideo *iface, LONG *pDestinationWidth) @@ -296,6 +382,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationWidth(IBasicVideo *iface, LON BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationWidth); + if (!pDestinationWidth) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pDestinationWidth = DestRect.right - DestRect.left; @@ -306,13 +394,20 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationTop(IBasicVideo *iface, LONG { RECT DestRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, DestinationTop); - This->pFuncsTable->pfnGetTargetRect(This, &DestRect); - DestRect.top = DestinationTop; - This->pFuncsTable->pfnSetTargetRect(This, &DestRect); + hr = This->pFuncsTable->pfnGetTargetRect(This, &DestRect); + if (SUCCEEDED(hr)) + { + DestRect.bottom = (DestRect.bottom - DestRect.top) + DestinationTop; + DestRect.top = DestinationTop; + hr = BaseControlVideoImpl_CheckTargetRect(This, &DestRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetTargetRect(This, &DestRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_DestinationTop(IBasicVideo *iface, LONG *pDestinationTop) @@ -321,6 +416,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationTop(IBasicVideo *iface, LONG BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationTop); + if (!pDestinationTop) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pDestinationTop = DestRect.top; @@ -331,13 +428,19 @@ HRESULT WINAPI BaseControlVideoImpl_put_DestinationHeight(IBasicVideo *iface, LO { RECT DestRect; BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr; TRACE("(%p/%p)->(%d)\n", This, iface, DestinationHeight); - This->pFuncsTable->pfnGetTargetRect(This, &DestRect); - DestRect.right = DestRect.left + DestinationHeight; - This->pFuncsTable->pfnSetTargetRect(This, &DestRect); + hr = This->pFuncsTable->pfnGetTargetRect(This, &DestRect); + if (SUCCEEDED(hr)) + { + DestRect.bottom = DestRect.top + DestinationHeight; + hr = BaseControlVideoImpl_CheckTargetRect(This, &DestRect); + } + if (SUCCEEDED(hr)) + hr = This->pFuncsTable->pfnSetTargetRect(This, &DestRect); - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_DestinationHeight(IBasicVideo *iface, LONG *pDestinationHeight) @@ -346,8 +449,10 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationHeight(IBasicVideo *iface, LO BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationHeight); + if (!pDestinationHeight) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); - *pDestinationHeight = DestRect.right - DestRect.left; + *pDestinationHeight = DestRect.bottom - DestRect.top; return S_OK; } @@ -360,9 +465,9 @@ HRESULT WINAPI BaseControlVideoImpl_SetSourcePosition(IBasicVideo *iface, LONG L TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); SetRect(&SourceRect, Left, Top, Left + Width, Top + Height); - This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); - - return S_OK; + if (FAILED(BaseControlVideoImpl_CheckSourceRect(This, &SourceRect))) + return E_INVALIDARG; + return This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); } HRESULT WINAPI BaseControlVideoImpl_GetSourcePosition(IBasicVideo *iface, LONG *pLeft, LONG *pTop, LONG *pWidth, LONG *pHeight) @@ -371,6 +476,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetSourcePosition(IBasicVideo *iface, LONG * BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p, %p, %p, %p)\n", This, iface, pLeft, pTop, pWidth, pHeight); + if (!pLeft || !pTop || !pWidth || !pHeight) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pLeft = SourceRect.left; @@ -397,9 +504,9 @@ HRESULT WINAPI BaseControlVideoImpl_SetDestinationPosition(IBasicVideo *iface, L TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); SetRect(&DestRect, Left, Top, Left + Width, Top + Height); - This->pFuncsTable->pfnSetTargetRect(This, &DestRect); - - return S_OK; + if (FAILED(BaseControlVideoImpl_CheckTargetRect(This, &DestRect))) + return E_INVALIDARG; + return This->pFuncsTable->pfnSetTargetRect(This, &DestRect); } HRESULT WINAPI BaseControlVideoImpl_GetDestinationPosition(IBasicVideo *iface, LONG *pLeft, LONG *pTop, LONG *pWidth, LONG *pHeight) @@ -408,6 +515,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetDestinationPosition(IBasicVideo *iface, L BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p, %p, %p, %p)\n", This, iface, pLeft, pTop, pWidth, pHeight); + if (!pLeft || !pTop || !pWidth || !pHeight) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pLeft = DestRect.left; @@ -432,6 +541,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetVideoSize(IBasicVideo *iface, LONG *pWidt BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p, %p)\n", This, iface, pWidth, pHeight); + if (!pWidth || !pHeight) + return E_POINTER; vih = This->pFuncsTable->pfnGetVideoFormat(This); *pHeight = vih->bmiHeader.biHeight; @@ -445,15 +556,18 @@ HRESULT WINAPI BaseControlVideoImpl_GetVideoPaletteEntries(IBasicVideo *iface, L BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%d, %d, %p, %p)\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); + if (!pRetrieved || !pPalette) + return E_POINTER; - if (pRetrieved) - *pRetrieved = 0; + *pRetrieved = 0; return VFW_E_NO_PALETTE_AVAILABLE; } HRESULT WINAPI BaseControlVideoImpl_GetCurrentImage(IBasicVideo *iface, LONG *pBufferSize, LONG *pDIBImage) { BaseControlVideo *This = impl_from_IBasicVideo(iface); + if (!pBufferSize || !pDIBImage) + return E_POINTER; return This->pFuncsTable->pfnGetStaticImage(This, pBufferSize, pDIBImage); } diff --git a/sdk/lib/3rdparty/strmbase/window.c b/sdk/lib/3rdparty/strmbase/window.c index 91606dee97..e35dc138fc 100644 --- a/sdk/lib/3rdparty/strmbase/window.c +++ b/sdk/lib/3rdparty/strmbase/window.c @@ -285,7 +285,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W TRACE("(%p/%p)->(%x -> %x)\n", This, iface, old, WindowStyle); - if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) + if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) return E_INVALIDARG; SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, WindowStyle);

1 0

01/01: [SERVICES] Update the service status after unloading a driver
by Eric Kohl 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85b71880fa000b24f2b2b… commit 85b71880fa000b24f2b2bc88b15d36cb039f00db Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 10 17:02:23 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 10 17:02:23 2018 +0100 [SERVICES] Update the service status after unloading a driver Update the service status after unloading the driver and pass the new status to the caller. CORE-14269 --- base/system/services/driver.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/base/system/services/driver.c b/base/system/services/driver.c index 4248ac95c9..de8bfc1aa3 100644 --- a/base/system/services/driver.c +++ b/base/system/services/driver.c @@ -306,8 +306,16 @@ ScmControlDriver(PSERVICE lpService, dwError = ScmUnloadDriver(lpService); if (dwError == ERROR_SUCCESS) { - lpService->Status.dwControlsAccepted = 0; lpService->Status.dwCurrentState = SERVICE_STOPPED; + lpService->Status.dwControlsAccepted = 0; + lpService->Status.dwWin32ExitCode = ERROR_SUCCESS; + + if (lpServiceStatus != NULL) + { + RtlCopyMemory(lpServiceStatus, + &lpService->Status, + sizeof(SERVICE_STATUS)); + } } break;

1 0

01/01: [EXPLORER] Send balloon notifications to the callback message. TODO: Send NIN_BALLOONUSERCLICK when the user clicks on the balloon content (not the X button).
by David Quintana 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3003471e64d09e838f242… commit 3003471e64d09e838f24263e0d71e4ac4b2b391c Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Sat Feb 10 15:47:49 2018 +0100 Commit: David Quintana <gigaherz(a)gmail.com> CommitDate: Sat Feb 10 16:31:26 2018 +0100 [EXPLORER] Send balloon notifications to the callback message. TODO: Send NIN_BALLOONUSERCLICK when the user clicks on the balloon content (not the X button). --- base/shell/explorer/syspager.cpp | 97 +++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 41 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 32d4b45c6c..0fa8eae4e3 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -78,6 +78,8 @@ private: static UINT WINAPI WatcherThread(_In_opt_ LPVOID lpParam); }; +class CNotifyToolbar; + class CBalloonQueue { public: @@ -114,7 +116,7 @@ private: CAtlList<Info> m_queue; - CToolbar<InternalIconData> * m_toolbar; + CNotifyToolbar * m_toolbar; InternalIconData * m_current; bool m_currentClosed; @@ -124,7 +126,7 @@ private: public: CBalloonQueue(); - void Init(HWND hwndParent, CToolbar<InternalIconData> * toolbar, CTooltips * balloons); + void Init(HWND hwndParent, CNotifyToolbar * toolbar, CTooltips * balloons); void Deinit(); bool OnTimer(int timerId); @@ -137,7 +139,7 @@ private: int IndexOf(InternalIconData * pdata); void SetTimer(int length); void Show(Info& info); - void Close(IN OUT InternalIconData * notifyItem); + void Close(IN OUT InternalIconData * notifyItem, IN UINT uReason); }; class CNotifyToolbar : @@ -160,6 +162,7 @@ public: BOOL UpdateButton(IN CONST NOTIFYICONDATA *iconData); BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData); VOID ResizeImagelist(); + bool SendNotifyCallback(InternalIconData* notifyItem, UINT uMsg); private: VOID SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wParam); @@ -495,7 +498,7 @@ CBalloonQueue::CBalloonQueue() : { } -void CBalloonQueue::Init(HWND hwndParent, CToolbar<InternalIconData> * toolbar, CTooltips * balloons) +void CBalloonQueue::Init(HWND hwndParent, CNotifyToolbar * toolbar, CTooltips * balloons) { m_hwndParent = hwndParent; m_toolbar = toolbar; @@ -520,7 +523,7 @@ bool CBalloonQueue::OnTimer(int timerId) if (m_current && !m_currentClosed) { - Close(m_current); + Close(m_current, NIN_BALLOONTIMEOUT); } else { @@ -556,13 +559,13 @@ void CBalloonQueue::UpdateInfo(InternalIconData * notifyItem) } else { - Close(notifyItem); + Close(notifyItem, NIN_BALLOONHIDE); } } void CBalloonQueue::RemoveInfo(InternalIconData * notifyItem) { - Close(notifyItem); + Close(notifyItem, NIN_BALLOONHIDE); POSITION position = m_queue.GetHeadPosition(); while(position != NULL) @@ -578,7 +581,9 @@ void CBalloonQueue::RemoveInfo(InternalIconData * notifyItem) void CBalloonQueue::CloseCurrent() { if (m_current != NULL) - Close(m_current); + { + Close(m_current, NIN_BALLOONTIMEOUT); + } } int CBalloonQueue::IndexOf(InternalIconData * pdata) @@ -621,14 +626,18 @@ void CBalloonQueue::Show(Info& info) if (timeout > MaxTimeout) timeout = MaxTimeout; SetTimer(timeout); + + m_toolbar->SendNotifyCallback(m_current, NIN_BALLOONSHOW); } -void CBalloonQueue::Close(IN OUT InternalIconData * notifyItem) +void CBalloonQueue::Close(IN OUT InternalIconData * notifyItem, IN UINT uReason) { TRACE("HideBalloonTip called\n"); if (m_current == notifyItem && !m_currentClosed) { + m_toolbar->SendNotifyCallback(m_current, uReason); + // Prevent Re-entry m_currentClosed = true; m_tooltips->TrackDeactivate(); @@ -695,7 +704,7 @@ int CNotifyToolbar::FindExistingSharedIcon(HICON handle) BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData) { - TBBUTTON tbBtn; + TBBUTTON tbBtn = { 0 }; InternalIconData * notifyItem; WCHAR text[] = L""; @@ -1006,27 +1015,8 @@ VOID CNotifyToolbar::ResizeImagelist() SetButtonSize(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)); } -VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wParam) +bool CNotifyToolbar::SendNotifyCallback(InternalIconData* notifyItem, UINT uMsg) { - static LPCWSTR eventNames [] = { - L"WM_MOUSEMOVE", - L"WM_LBUTTONDOWN", - L"WM_LBUTTONUP", - L"WM_LBUTTONDBLCLK", - L"WM_RBUTTONDOWN", - L"WM_RBUTTONUP", - L"WM_RBUTTONDBLCLK", - L"WM_MBUTTONDOWN", - L"WM_MBUTTONUP", - L"WM_MBUTTONDBLCLK", - L"WM_MOUSEWHEEL", - L"WM_XBUTTONDOWN", - L"WM_XBUTTONUP", - L"WM_XBUTTONDBLCLK" - }; - - InternalIconData * notifyItem = GetItemData(wIndex); - if (!::IsWindow(notifyItem->hWnd)) { // We detect and destroy icons with invalid handles only on mouse move over systray, same as MS does. @@ -1039,14 +1029,7 @@ VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wPar NMHDR nmh = {GetParent(), 0, NTNWM_REALIGN}; GetParent().SendMessage(WM_NOTIFY, 0, (LPARAM) &nmh); - return; - } - - if (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST) - { - TRACE("Sending message %S from button %d to %p (msg=%x, w=%x, l=%x)...\n", - eventNames[uMsg - WM_MOUSEFIRST], wIndex, - notifyItem->hWnd, notifyItem->uCallbackMessage, notifyItem->uID, uMsg); + return true; } DWORD pid; @@ -1056,9 +1039,9 @@ VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wPar (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST)) { ::PostMessage(notifyItem->hWnd, - notifyItem->uCallbackMessage, - notifyItem->uID, - uMsg); + notifyItem->uCallbackMessage, + notifyItem->uID, + uMsg); } else { @@ -1067,6 +1050,38 @@ VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wPar notifyItem->uID, uMsg); } + return false; +} + +VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wParam) +{ + static LPCWSTR eventNames [] = { + L"WM_MOUSEMOVE", + L"WM_LBUTTONDOWN", + L"WM_LBUTTONUP", + L"WM_LBUTTONDBLCLK", + L"WM_RBUTTONDOWN", + L"WM_RBUTTONUP", + L"WM_RBUTTONDBLCLK", + L"WM_MBUTTONDOWN", + L"WM_MBUTTONUP", + L"WM_MBUTTONDBLCLK", + L"WM_MOUSEWHEEL", + L"WM_XBUTTONDOWN", + L"WM_XBUTTONUP", + L"WM_XBUTTONDBLCLK" + }; + + InternalIconData * notifyItem = GetItemData(wIndex); + + if (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST) + { + TRACE("Sending message %S from button %d to %p (msg=%x, w=%x, l=%x)...\n", + eventNames[uMsg - WM_MOUSEFIRST], wIndex, + notifyItem->hWnd, notifyItem->uCallbackMessage, notifyItem->uID, uMsg); + } + + SendNotifyCallback(notifyItem, uMsg); } LRESULT CNotifyToolbar::OnMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

1 0

01/01: [PSDK] Add missing shell notification message flags.
by Hermès Bélusca-Maïto 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b78b0ff984aff5de66c0… commit 8b78b0ff984aff5de66c0aebadc54a5b93c14f60 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 10 15:41:21 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 10 15:43:24 2018 +0100 [PSDK] Add missing shell notification message flags. --- sdk/include/psdk/shellapi.h | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h index ee35759c19..41623a08c8 100644 --- a/sdk/include/psdk/shellapi.h +++ b/sdk/include/psdk/shellapi.h @@ -70,13 +70,34 @@ extern "C" { #define ABN_POSCHANGED 1 #define ABN_FULLSCREENAPP 2 #define ABN_WINDOWARRANGE 3 + +#if (_WIN32_IE >= 0x0500) +#define NIN_SELECT (WM_USER + 0) +#define NINF_KEY 1 +#define NIN_KEYSELECT (NIN_SELECT | NINF_KEY) +#endif + +#if (_WIN32_IE >= 0x0501) +#define NIN_BALLOONSHOW (WM_USER + 2) +#define NIN_BALLOONHIDE (WM_USER + 3) +#define NIN_BALLOONTIMEOUT (WM_USER + 4) +#define NIN_BALLOONUSERCLICK (WM_USER + 5) +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define NIN_POPUPOPEN (WM_USER + 6) +#define NIN_POPUPCLOSE (WM_USER + 7) +#endif + #define NIM_ADD 0 #define NIM_MODIFY 1 #define NIM_DELETE 2 #if _WIN32_IE >= 0x0500 -#define NOTIFYICON_VERSION 3 #define NIM_SETFOCUS 3 #define NIM_SETVERSION 4 +#define NOTIFYICON_VERSION 3 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define NOTIFYICON_VERSION_4 4 +#endif #endif #define NIF_MESSAGE 1 #define NIF_ICON 2 @@ -97,6 +118,7 @@ extern "C" { #define NIIF_NOSOUND 0x10 #endif /* _WIN32_IE >= 0x0600 */ #endif /* _WIN32_IE >= 0x0500 */ + #define SE_ERR_FNF 2 #define SE_ERR_PNF 3 #define SE_ERR_ACCESSDENIED 5

1 0

01/01: [SERVICES] Support the NoInteractiveServices registry value
by Eric Kohl 10 Feb '18

10 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=905d65b75b6f00be642ad… commit 905d65b75b6f00be642ada60af4a937071c817dc Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 10 14:23:11 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 10 14:23:11 2018 +0100 [SERVICES] Support the NoInteractiveServices registry value --- base/system/services/database.c | 44 +++++++++++++++++++++++++++++++++-------- boot/bootdata/hivesys.inf | 1 + 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 9822d6048e..19c4e05724 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -27,6 +27,7 @@ LIST_ENTRY ServiceListHead; static RTL_RESOURCE DatabaseLock; static DWORD ResumeCount = 1; +static DWORD NoInteractiveServices = 0; /* The critical section synchronizes service control requests */ static CRITICAL_SECTION ControlServiceCriticalSection; @@ -832,6 +833,33 @@ ScmDeleteMarkedServices(VOID) } +static +VOID +ScmGetNoInteractiveServicesValue(VOID) +{ + HKEY hKey; + DWORD dwKeySize; + LONG lError; + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\Windows", + 0, + KEY_READ, + &hKey); + if (lError == ERROR_SUCCESS) + { + dwKeySize = sizeof(NoInteractiveServices); + lError = RegQueryValueExW(hKey, + L"NoInteractiveServices", + 0, + NULL, + (LPBYTE)&NoInteractiveServices, + &dwKeySize); + RegCloseKey(hKey); + } +} + + DWORD ScmCreateServiceDatabase(VOID) { @@ -845,11 +873,15 @@ ScmCreateServiceDatabase(VOID) DPRINT("ScmCreateServiceDatabase() called\n"); + /* Retrieve the NoInteractiveServies value */ + ScmGetNoInteractiveServicesValue(); + + /* Create the service group list */ dwError = ScmCreateGroupList(); if (dwError != ERROR_SUCCESS) return dwError; - /* Initialize basic variables */ + /* Initialize image and service lists */ InitializeListHead(&ImageListHead); InitializeListHead(&ServiceListHead); @@ -1637,10 +1669,8 @@ ScmStartUserModeService(PSERVICE Service, ZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); /* Use the interactive desktop if the service is interactive */ - // TODO: We should also check the value "NoInteractiveServices ": - // See https://msdn.microsoft.com/en-us/library/windows/desktop/ms683502(v=vs.85).… - // for more details. - if (Service->Status.dwServiceType & SERVICE_INTERACTIVE_PROCESS) + if ((NoInteractiveServices == 0) && + (Service->Status.dwServiceType & SERVICE_INTERACTIVE_PROCESS)) StartupInfo.lpDesktop = L"WinSta0\\Default"; if (Service->lpImage->hToken) @@ -1920,9 +1950,7 @@ ScmAutoStartServices(VOID) */ ASSERT(ScmInitialize); - /* - * Retrieve the SafeBoot parameter. - */ + /* Retrieve the SafeBoot parameter */ dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\SafeBoot\\Option", 0, diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 07e98be494..bb0b3b8257 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1308,6 +1308,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkst ; Some installers check for SP2 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDReleaseType",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000200 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","NoInteractiveServices",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x00000012

1 0

01/01: [NTOSKRNL] Avoid private cache map allocation for the first handle Standard shared cache map provides space for a private cache map, do the same and make it available for the first handle. It avoids two allocations in a row.
by Pierre Schweitzer 09 Feb '18

09 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6e080bd3db21d64f1b43… commit a6e080bd3db21d64f1b43222377bb9c70e805857 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Feb 9 21:52:41 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Feb 9 21:52:41 2018 +0100 [NTOSKRNL] Avoid private cache map allocation for the first handle Standard shared cache map provides space for a private cache map, do the same and make it available for the first handle. It avoids two allocations in a row. --- ntoskrnl/cc/view.c | 19 +++++++++++++++++-- ntoskrnl/include/internal/cc.h | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index d69b195c10..cf2d2c5cb7 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1194,7 +1194,14 @@ CcRosReleaseFileCache ( KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); /* And free it. */ - ExFreePoolWithTag(PrivateMap, TAG_PRIVATE_CACHE_MAP); + if (PrivateMap != &SharedCacheMap->PrivateCacheMap) + { + ExFreePoolWithTag(PrivateMap, TAG_PRIVATE_CACHE_MAP); + } + else + { + PrivateMap->NodeTypeCode = 0; + } if (SharedCacheMap->OpenCount > 0) { @@ -1271,7 +1278,15 @@ CcRosInitializeFileCache ( PPRIVATE_CACHE_MAP PrivateMap; /* Allocate the private cache map for this handle */ - PrivateMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(PRIVATE_CACHE_MAP), TAG_PRIVATE_CACHE_MAP); + if (SharedCacheMap->PrivateCacheMap.NodeTypeCode != 0) + { + PrivateMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(PRIVATE_CACHE_MAP), TAG_PRIVATE_CACHE_MAP); + } + else + { + PrivateMap = &SharedCacheMap->PrivateCacheMap; + } + if (PrivateMap == NULL) { /* If we also allocated the shared cache map for this file, kill it */ diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index d34360a7e3..5751ab665e 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -169,6 +169,7 @@ typedef struct _ROS_SHARED_CACHE_MAP PVOID LazyWriteContext; LIST_ENTRY PrivateList; ULONG DirtyPageThreshold; + PRIVATE_CACHE_MAP PrivateCacheMap; /* ROS specific */ LIST_ENTRY CacheMapVacbListHead;

1 0

03/03: [NTOSKRNL] Modified CcCanIWrite to handle Mm throttling limits
by Pierre Schweitzer 09 Feb '18

09 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d93941d31c714579ff3b… commit 5d93941d31c714579ff3b3bedb766c6448aeaccb Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Feb 9 14:22:00 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Feb 9 14:22:00 2018 +0100 [NTOSKRNL] Modified CcCanIWrite to handle Mm throttling limits --- ntoskrnl/cc/copy.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 40897028fc..a3b1f887aa 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -697,10 +697,16 @@ CcCanIWrite ( /* So, now allow write if: * - Not the first try or we have no throttling yet * AND: - * - We don't execeed threshold! + * - We don't exceed threshold! + * - We don't exceed what Mm can allow us to use + * + If we're above top, that's fine + * + If we're above bottom with limited modified pages, that's fine + * + Otherwise, throttle! */ if ((TryContext != FirstTry || IsListEmpty(&CcDeferredWrites)) && CcTotalDirtyPages + Pages < CcDirtyPageThreshold && + (MmAvailablePages > MmThrottleTop || + (MmModifiedPageListHead.Total < 1000 && MmAvailablePages > MmThrottleBottom)) && !PerFileDefer) { return TRUE;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
24
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

Ros-diffs February 2018