wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Jacek Caban : jscript: Fixed parsing /=/ regexp.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 114a439fed9f4fadc8a5a3ab27af869297f2321c URL: http://source.winehq.org/git/wine.git/?a=commit;h=114a439fed9f4fadc8a5a3ab2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 13:46:11 2012 +0200 jscript: Fixed parsing /=/ regexp. --- dlls/jscript/lex.c | 3 +-- dlls/jscript/tests/regexp.js | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index dcdb3f3..4cf4d41 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -963,8 +963,7 @@ literal_t *parse_regexp(parser_ctx_t *ctx) TRACE("\n"); - while(*ctx->ptr != '/') - ctx->ptr--; + while(*--ctx->ptr != '/'); re = ++ctx->ptr; while(ctx->ptr < ctx->end && *ctx->ptr != '/') { diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index e9f26ef..c7f9363 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -580,4 +580,7 @@ ok(i === 1, "String.prototype.seatch.apply(obj, 'b') = " + i); i = " undefined ".search(); ok(i === null, "' undefined '.search() = " + i); +tmp = "=)".replace(/=/, "?"); +ok(tmp === "?)", "'=)'.replace(/=/, '?') = " + tmp); + reportSuccess();

1 0

Jacek Caban : jscript: Emit undefined statement return for switch without default clausule.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 353553e0aa716e14ed5788fbc4818ffe23b99eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=353553e0aa716e14ed5788fbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 13:45:23 2012 +0200 jscript: Emit undefined statement return for switch without default clausule. --- dlls/jscript/compile.c | 5 ++++- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 1cbe5cb..0a66348 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1515,8 +1515,11 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t return hres; assert(i == case_cnt); - if(!have_default) + if(!have_default) { instr_ptr(ctx, default_jmp)->arg1.uint = ctx->code_off; + if(!push_instr(ctx, OP_undefined)) + return E_OUTOFMEMORY; + } label_set_addr(ctx, stat_ctx.break_label); return S_OK; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 8f5e5d5..41374e2 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -719,6 +719,13 @@ case false: } ok(state === "default", "state = " + state); +switch(1) { +case 2: + ok(false, "unexpected case 2"); +case 3: + ok(false, "unexpected case 3"); +} + tmp = eval("1"); ok(tmp === 1, "eval(\"1\") !== 1"); eval("{ ok(tmp === 1, 'eval: tmp !== 1'); } tmp = 2;");

1 0

Aric Stewart : strmbase: More additions to BaseRenderer for video renderers .
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: e1a72011e52d6a76ee3824adb61066da89475940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a72011e52d6a76ee3824adb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:08:25 2012 -0500 strmbase: More additions to BaseRenderer for video renderers. --- dlls/strmbase/renderer.c | 39 +++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 4 ++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1d3f3b5..3f665f7 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -82,6 +82,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_Disconnect(IPin * iface) if (renderer->pFuncsTable->pfnBreakConnect) hr = renderer->pFuncsTable->pfnBreakConnect(renderer); } + BaseRendererImpl_ClearPendingSample(renderer); LeaveCriticalSection(This->pin.pCritSec); return hr; @@ -254,6 +255,9 @@ HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtb InitializeCriticalSection(&This->csRenderLock); This->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); This->evComplete = CreateEventW(NULL, TRUE, TRUE, NULL); + This->ThreadSignal = CreateEventW(NULL, TRUE, TRUE, NULL); + This->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + This->pMediaSample = NULL; } return hr; @@ -291,7 +295,11 @@ ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) This->csRenderLock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csRenderLock); + + BaseRendererImpl_ClearPendingSample(This); CloseHandle(This->evComplete); + CloseHandle(This->ThreadSignal); + CloseHandle(This->RenderEvent); } return refCount; } @@ -318,6 +326,9 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp } } + This->pMediaSample = pSample; + IMediaSample_AddRef(pSample); + if (This->pFuncsTable->pfnPrepareReceive) hr = This->pFuncsTable->pfnPrepareReceive(This, pSample); if (FAILED(hr)) @@ -368,6 +379,8 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp if (SUCCEEDED(hr)) hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); + + BaseRendererImpl_ClearPendingSample(This); LeaveCriticalSection(&This->csRenderLock); return hr; @@ -405,6 +418,8 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) This->pFuncsTable->pfnOnStopStreaming(This); This->filter.state = State_Stopped; SetEvent(This->evComplete); + SetEvent(This->ThreadSignal); + SetEvent(This->RenderEvent); } LeaveCriticalSection(&This->csRenderLock); @@ -423,6 +438,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) goto out; SetEvent(This->evComplete); + ResetEvent(This->ThreadSignal); if (This->pInputPin->pin.pConnectedTo) { @@ -443,6 +459,9 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { if (This->pFuncsTable->pfnOnStartStreaming) This->pFuncsTable->pfnOnStartStreaming(This); + if (This->filter.state == State_Stopped) + BaseRendererImpl_ClearPendingSample(This); + SetEvent(This->RenderEvent); This->filter.state = State_Running; } out: @@ -469,9 +488,14 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) } else if (This->pFuncsTable->pfnOnStopStreaming) This->pFuncsTable->pfnOnStopStreaming(This); + + if (This->filter.state == State_Stopped) + BaseRendererImpl_ClearPendingSample(This); + ResetEvent(This->RenderEvent); This->filter.state = State_Paused; } } + ResetEvent(This->ThreadSignal); LeaveCriticalSection(&This->csRenderLock); return S_OK; @@ -520,6 +544,9 @@ HRESULT WINAPI BaseRendererImpl_EndOfStream(BaseRenderer* iface) HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); + BaseRendererImpl_ClearPendingSample(iface); + SetEvent(iface->ThreadSignal); + SetEvent(iface->RenderEvent); return S_OK; } @@ -527,5 +554,17 @@ HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); RendererPosPassThru_ResetMediaTime(iface->pPosition); + ResetEvent(iface->ThreadSignal); + ResetEvent(iface->RenderEvent); + return S_OK; +} + +HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface) +{ + if (iface->pMediaSample) + { + IMediaSample_Release(iface->pMediaSample); + iface->pMediaSample = NULL; + } return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 46544ba..7e25c04 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -583,6 +583,9 @@ typedef struct BaseRendererTag IUnknown *pPosition; CRITICAL_SECTION csRenderLock; HANDLE evComplete; + HANDLE ThreadSignal; + HANDLE RenderEvent; + IMediaSample *pMediaSample; const struct BaseRendererFuncTable * pFuncsTable; } BaseRenderer; @@ -639,6 +642,7 @@ HRESULT WINAPI BaseRendererImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsT HRESULT WINAPI BaseRendererImpl_EndOfStream(BaseRenderer* iface); HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface); HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface); +HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface); HRESULT WINAPI BaseRenderer_Init(BaseRenderer *This, const IBaseFilterVtbl *Vtbl, IUnknown *pUnkOuter, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseRendererFuncTable* pBaseFuncsTable);

1 0

Aric Stewart : quartz: Convert DsoundRenderer to use strmbase BaseRenderer.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 821ead201d38ebca8f3e92e71bf7b6c8641b5ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=821ead201d38ebca8f3e92e71… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:08:16 2012 -0500 quartz: Convert DsoundRenderer to use strmbase BaseRenderer. --- dlls/quartz/dsoundrender.c | 773 ++++++++++++++++---------------------------- 1 files changed, 280 insertions(+), 493 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=821ead201d38ebca8f3e9…

1 0

Aric Stewart : strmbase: Expand BaseRenderer implementation.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 662220f77fd219107f525503c4656f8d78d6f021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=662220f77fd219107f525503c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:08:07 2012 -0500 strmbase: Expand BaseRenderer implementation. --- dlls/quartz/nullrenderer.c | 7 ++- dlls/strmbase/renderer.c | 126 ++++++++++++++++++++++++++++++++++++++++++-- include/wine/strmbase.h | 9 +++ 3 files changed, 136 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=662220f77fd219107f525…

1 0

Aric Stewart : quartz: COM cleanup in ACMWrapperImpl.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: c6289fecec4afa1355222c29dd525fbc180880c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6289fecec4afa1355222c29d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:10:47 2012 -0500 quartz: COM cleanup in ACMWrapperImpl. --- dlls/quartz/acmwrapper.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 1c840b7..300559e 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -54,9 +54,19 @@ typedef struct ACMWrapperImpl static const IBaseFilterVtbl ACMWrapper_Vtbl; +static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface ) +{ + return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter); +} + +static inline ACMWrapperImpl *impl_from_IBaseFilter( IBaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter.IBaseFilter_iface); +} + static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) { - ACMWrapperImpl* This = (ACMWrapperImpl*)tf; + ACMWrapperImpl* This = impl_from_TransformFilter(tf); AM_MEDIA_TYPE amt; IMediaSample* pOutSample = NULL; DWORD cbDstStream, cbSrcStream; @@ -244,7 +254,7 @@ error: static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) { - ACMWrapperImpl* This = (ACMWrapperImpl *)tf; + ACMWrapperImpl* This = impl_from_TransformFilter(tf); MMRESULT res; TRACE("(%p)->(%i %p)\n", This, dir, pmt); @@ -301,7 +311,7 @@ static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION static HRESULT WINAPI ACMWrapper_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) { - ACMWrapperImpl* This = (ACMWrapperImpl *)tf; + ACMWrapperImpl* This = impl_from_TransformFilter(tf); MMRESULT res; HACMSTREAM drv; @@ -325,7 +335,7 @@ static HRESULT WINAPI ACMWrapper_CompleteConnect(TransformFilter *tf, PIN_DIRECT static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) { - ACMWrapperImpl *This = (ACMWrapperImpl *)tf; + ACMWrapperImpl *This = impl_from_TransformFilter(tf); TRACE("(%p)->(%i)\n", This,dir); @@ -343,7 +353,7 @@ static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION static HRESULT WINAPI ACMWrapper_DecideBufferSize(TransformFilter *tf, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { - ACMWrapperImpl *pACM = (ACMWrapperImpl*)tf; + ACMWrapperImpl *pACM = impl_from_TransformFilter(tf); ALLOCATOR_PROPERTIES actual; if (!ppropInputRequest->cbAlign) @@ -394,7 +404,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) ISeekingPassThru *passthru; hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, (IPin*)This->tf.ppPins[0]); + ISeekingPassThru_Init(passthru, FALSE, This->tf.ppPins[0]); ISeekingPassThru_Release(passthru); } @@ -407,7 +417,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) static HRESULT WINAPI ACMWrapper_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { HRESULT hr; - ACMWrapperImpl *This = (ACMWrapperImpl *)iface; + ACMWrapperImpl *This = impl_from_IBaseFilter(iface); TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IMediaSeeking))

1 0

Aric Stewart : quartz: COM cleanup for AVIDecImpl.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 26d33bb1c1c8236522828395cb072827a7a397cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d33bb1c1c8236522828395c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:10:15 2012 -0500 quartz: COM cleanup for AVIDecImpl. --- dlls/quartz/avidec.c | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 011e5ff..5537db9 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -53,9 +53,19 @@ typedef struct AVIDecImpl static const IBaseFilterVtbl AVIDec_Vtbl; +static inline AVIDecImpl *impl_from_IBaseFilter( IBaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter.IBaseFilter_iface); +} + +static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface ) +{ + return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter); +} + static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter) { - AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; + AVIDecImpl* This = impl_from_TransformFilter(pTransformFilter); DWORD result; TRACE("(%p)->()\n", This); @@ -71,13 +81,13 @@ static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter) } static HRESULT WINAPI AVIDec_EndFlush(TransformFilter *pTransformFilter) { - AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; + AVIDecImpl* This = impl_from_TransformFilter(pTransformFilter); This->late = -1; return S_OK; } static HRESULT WINAPI AVIDec_NotifyDrop(TransformFilter *pTransformFilter, IBaseFilter *sender, Quality qm) { - AVIDecImpl *This = (AVIDecImpl*)pTransformFilter; + AVIDecImpl *This = impl_from_TransformFilter(pTransformFilter); EnterCriticalSection(&This->tf.filter.csFilter); if (qm.Late > 0) @@ -102,7 +112,7 @@ static int AVIDec_DropSample(AVIDecImpl *This, REFERENCE_TIME tStart) { static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) { - AVIDecImpl* This = (AVIDecImpl *)tf; + AVIDecImpl* This = impl_from_TransformFilter(tf); AM_MEDIA_TYPE amt; HRESULT hr; DWORD res; @@ -208,7 +218,7 @@ error: static HRESULT WINAPI AVIDec_StopStreaming(TransformFilter* pTransformFilter) { - AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; + AVIDecImpl* This = impl_from_TransformFilter(pTransformFilter); DWORD result; TRACE("(%p)->()\n", This); @@ -227,7 +237,7 @@ static HRESULT WINAPI AVIDec_StopStreaming(TransformFilter* pTransformFilter) static HRESULT WINAPI AVIDec_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) { - AVIDecImpl* This = (AVIDecImpl*)tf; + AVIDecImpl* This = impl_from_TransformFilter(tf); HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; TRACE("(%p)->(%p)\n", This, pmt); @@ -328,7 +338,7 @@ failed: static HRESULT WINAPI AVIDec_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) { - AVIDecImpl* This = (AVIDecImpl*)tf; + AVIDecImpl* This = impl_from_TransformFilter(tf); TRACE("(%p)\n", This); @@ -337,7 +347,7 @@ static HRESULT WINAPI AVIDec_CompleteConnect(TransformFilter *tf, PIN_DIRECTION static HRESULT WINAPI AVIDec_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) { - AVIDecImpl *This = (AVIDecImpl *)tf; + AVIDecImpl *This = impl_from_TransformFilter(tf); TRACE("(%p)->()\n", This); @@ -360,7 +370,7 @@ static HRESULT WINAPI AVIDec_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir static HRESULT WINAPI AVIDec_DecideBufferSize(TransformFilter *tf, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { - AVIDecImpl *pAVI = (AVIDecImpl*)tf; + AVIDecImpl *pAVI = impl_from_TransformFilter(tf); ALLOCATOR_PROPERTIES actual; if (!ppropInputRequest->cbAlign) @@ -412,7 +422,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) ISeekingPassThru *passthru; hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, (IPin*)This->tf.ppPins[0]); + ISeekingPassThru_Init(passthru, FALSE, This->tf.ppPins[0]); ISeekingPassThru_Release(passthru); } @@ -428,7 +438,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) static HRESULT WINAPI AVIDec_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { HRESULT hr; - AVIDecImpl *This = (AVIDecImpl *)iface; + AVIDecImpl *This = impl_from_IBaseFilter(iface); TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IMediaSeeking))

1 0

Aric Stewart : quartz: COM cleanup for AsyncReader and FileAsyncReader.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: e7d4d9e4f63fd21d26999f915b6694369afc3eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d4d9e4f63fd21d26999f915… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:09:49 2012 -0500 quartz: COM cleanup for AsyncReader and FileAsyncReader. --- dlls/quartz/filesource.c | 119 +++++++++++++++++++++++++++++----------------- 1 files changed, 75 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7d4d9e4f63fd21d26999…

1 0

Hans Leidekker : msi: Suspend the installation if an action sets MSIRUNMODE_REBOOTNOW.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 350449fc4305a99a99385ab699e0f9e9c6b299d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=350449fc4305a99a99385ab69… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 2 13:16:32 2012 +0200 msi: Suspend the installation if an action sets MSIRUNMODE_REBOOTNOW. --- dlls/msi/action.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5ecf8a5..5e9ef35 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -536,6 +536,12 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) if (rc != ERROR_SUCCESS) ERR("Execution halted, action %s returned %i\n", debugstr_w(action), rc); + if (package->need_reboot_now) + { + TRACE("action %s asked for immediate reboot, suspending installation\n", + debugstr_w(action)); + rc = ACTION_ForceReboot( package ); + } return rc; }

1 0

Hans Leidekker : msi: Implement MsiGet/SetMode(MSIRUNMODE_REBOOTNOW).
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 15ee85dee89e892c2850f4b05c886b9d6b2c6276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ee85dee89e892c2850f4b05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 2 13:15:56 2012 +0200 msi: Implement MsiGet/SetMode(MSIRUNMODE_REBOOTNOW). --- dlls/msi/install.c | 8 ++++++-- dlls/msi/msipriv.h | 1 + dlls/msi/tests/automation.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 709f4dc..a6c832a 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -764,6 +764,10 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) r = package->need_reboot_at_end; break; + case MSIRUNMODE_REBOOTNOW: + r = package->need_reboot_now; + break; + case MSIRUNMODE_LOGENABLED: r = (package->log_file != INVALID_HANDLE_VALUE); break; @@ -819,8 +823,8 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) break; case MSIRUNMODE_REBOOTNOW: - FIXME("unimplemented run mode: %d\n", iRunMode); - r = ERROR_FUNCTION_FAILED; + package->need_reboot_now = (fState != 0); + r = ERROR_SUCCESS; break; default: diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bf15f50..4ed4fd6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -407,6 +407,7 @@ typedef struct tagMSIPACKAGE unsigned char commit_action_running : 1; unsigned char rollback_action_running : 1; unsigned char need_reboot_at_end : 1; + unsigned char need_reboot_now : 1; unsigned char need_rollback : 1; } MSIPACKAGE; diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 8ae18bd..630ff76 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1887,7 +1887,7 @@ static void test_Session(IDispatch *pSession) ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); - todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &bool); @@ -1895,7 +1895,7 @@ static void test_Session(IDispatch *pSession) ok(bool, "Reboot now mode is %d, expected 1\n", bool); hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ - todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE);

1 0

← Newer
1
...
65
66
67
68
69
70
71
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012