wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Francois Gouget : dplayx: Use a proper plural for the repliesExpected field name.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 2539004fe11256cc4368d53439a79fc6a0c1f93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2539004fe11256cc4368d5343… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 01:02:59 2012 +0200 dplayx: Use a proper plural for the repliesExpected field name. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/dplay_global.h | 4 ++-- dlls/dplayx/dplayx_messages.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 87eb185..1bcb386 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -278,7 +278,7 @@ static BOOL DP_CreateDirectPlay2( LPVOID lpDP ) DPQ_INIT(This->dp2->receiveMsgs); DPQ_INIT(This->dp2->sendMsgs); - DPQ_INIT(This->dp2->replysExpected); + DPQ_INIT(This->dp2->repliesExpected); if( !NS_InitializeSessionCache( &This->dp2->lpNameServerData ) ) { diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 2a12389..273f09e 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -67,7 +67,7 @@ typedef struct tagDP_MSG_REPLY_STRUCT typedef struct tagDP_MSG_REPLY_STRUCT_LIST { - DPQ_ENTRY(tagDP_MSG_REPLY_STRUCT_LIST) replysExpected; + DPQ_ENTRY(tagDP_MSG_REPLY_STRUCT_LIST) repliesExpected; DP_MSG_REPLY_STRUCT replyExpected; } DP_MSG_REPLY_STRUCT_LIST, *LPDP_MSG_REPLY_STRUCT_LIST; @@ -193,7 +193,7 @@ typedef struct tagDirectPlay2Data enum SPSTATE connectionInitialized; /* Expected messages queue */ - DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) replysExpected; + DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) repliesExpected; } DirectPlay2Data; typedef struct tagDirectPlay3Data diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 8b9320d..bc888f6 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -172,7 +172,7 @@ HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This, /* Insert into the message queue while locked */ EnterCriticalSection( &This->unk->DP_lock ); - DPQ_INSERT( This->dp2->replysExpected, lpReplyStructList, replysExpected ); + DPQ_INSERT( This->dp2->repliesExpected, lpReplyStructList, repliesExpected ); LeaveCriticalSection( &This->unk->DP_lock ); return lpReplyStructList->replyExpected.hReceipt; @@ -433,7 +433,7 @@ void DP_MSG_ReplyReceived( IDirectPlay2AImpl* This, WORD wCommandId, * avoid problems. */ EnterCriticalSection( &This->unk->DP_lock ); - DPQ_REMOVE_ENTRY( This->dp2->replysExpected, replysExpected, replyExpected.wExpectedReply, + DPQ_REMOVE_ENTRY( This->dp2->repliesExpected, repliesExpected, replyExpected.wExpectedReply, ==, wCommandId, lpReplyList ); LeaveCriticalSection( &This->unk->DP_lock );

1 0

Aric Stewart : quartz: Handle a crash and race condition that occurs on directsound renderer input pin disconnect .
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: a6dbc28bfed6666fc200ec66553a52fed5de379e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dbc28bfed6666fc200ec665… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 11 13:21:07 2012 -0500 quartz: Handle a crash and race condition that occurs on directsound renderer input pin disconnect. --- dlls/quartz/dsoundrender.c | 54 +++++++++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 696f0a2..0b5463e 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -527,7 +527,9 @@ static HRESULT WINAPI DSoundRender_BreakConnect(BaseRenderer* iface) if (This->threadid) { PostThreadMessageW(This->threadid, WM_APP, 0, 0); + LeaveCriticalSection(This->renderer.pInputPin->pin.pCritSec); WaitForSingleObject(This->advisethread, INFINITE); + EnterCriticalSection(This->renderer.pInputPin->pin.pCritSec); CloseHandle(This->advisethread); } if (This->dsbuffer) @@ -931,28 +933,26 @@ static DWORD WINAPI DSoundAdviseThread(LPVOID lpParam) { struct dsoundrender_timer *prev = &head, *cur; hr = IReferenceClock_GetTime(&This->IReferenceClock_iface, &curtime); - if (FAILED(hr)) { - FIXME("Could not get time: %08x\n", hr); - continue; - } - TRACE("Time: %s\n", wine_dbgstr_longlong(curtime)); - while (prev->next) { - cur = prev->next; - if (cur->start > curtime) { - TRACE("Skipping %p\n", cur); - prev = cur; - } else if (cur->periodicity) { - while (cur->start <= curtime) { - cur->start += cur->periodicity; - ReleaseSemaphore(cur->handle, 1, NULL); + if (SUCCEEDED(hr)) { + TRACE("Time: %s\n", wine_dbgstr_longlong(curtime)); + while (prev->next) { + cur = prev->next; + if (cur->start > curtime) { + TRACE("Skipping %p\n", cur); + prev = cur; + } else if (cur->periodicity) { + while (cur->start <= curtime) { + cur->start += cur->periodicity; + ReleaseSemaphore(cur->handle, 1, NULL); + } + prev = cur; + } else { + struct dsoundrender_timer *next = cur->next; + TRACE("Firing %p %s < %s\n", cur, wine_dbgstr_longlong(cur->start), wine_dbgstr_longlong(curtime)); + SetEvent(cur->handle); + HeapFree(GetProcessHeap(), 0, cur); + prev->next = next; } - prev = cur; - } else { - struct dsoundrender_timer *next = cur->next; - TRACE("Firing %p %s < %s\n", cur, wine_dbgstr_longlong(cur->start), wine_dbgstr_longlong(curtime)); - SetEvent(cur->handle); - HeapFree(GetProcessHeap(), 0, cur); - prev->next = next; } } if (!head.next) @@ -1039,9 +1039,17 @@ static HRESULT WINAPI ReferenceClock_GetTime(IReferenceClock *iface, DWORD writepos1, writepos2; EnterCriticalSection(&This->renderer.filter.csFilter); DSoundRender_UpdatePositions(This, &writepos1, &writepos2); - *pTime = This->play_time + time_from_pos(This, This->last_playpos); + if (This->renderer.pInputPin && This->renderer.pInputPin->pin.mtCurrent.pbFormat) + { + *pTime = This->play_time + time_from_pos(This, This->last_playpos); + hr = S_OK; + } + else + { + ERR("pInputPin Disconncted\n"); + hr = E_FAIL; + } LeaveCriticalSection(&This->renderer.filter.csFilter); - hr = S_OK; } if (FAILED(hr)) WARN("Could not get reference time (%x)!\n", hr);

1 0

Aric Stewart : quartz: Reinstate DSoundRender_Pause.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: fb42513a03f97c898386888f65fe872f108788c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb42513a03f97c898386888f6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 11 13:20:47 2012 -0500 quartz: Reinstate DSoundRender_Pause. --- dlls/quartz/dsoundrender.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 71634d3..696f0a2 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -750,6 +750,36 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) return refCount; } +static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) +{ + HRESULT hr = S_OK; + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; + + TRACE("(%p/%p)->()\n", This, iface); + + EnterCriticalSection(&This->renderer.csRenderLock); + if (This->renderer.filter.state != State_Paused) + { + if (This->renderer.filter.state == State_Stopped) + { + if (This->renderer.pInputPin->pin.pConnectedTo) + ResetEvent(This->renderer.evComplete); + This->renderer.pInputPin->end_of_stream = 0; + } + + hr = IDirectSoundBuffer_Stop(This->dsbuffer); + if (SUCCEEDED(hr)) + This->renderer.filter.state = State_Paused; + + ResetEvent(This->blocked); + ResetEvent(This->renderer.RenderEvent); + } + ResetEvent(This->renderer.ThreadSignal); + LeaveCriticalSection(&This->renderer.csRenderLock); + + return hr; +} + static const IBaseFilterVtbl DSoundRender_Vtbl = { DSoundRender_QueryInterface, @@ -757,7 +787,7 @@ static const IBaseFilterVtbl DSoundRender_Vtbl = DSoundRender_Release, BaseFilterImpl_GetClassID, BaseRendererImpl_Stop, - BaseRendererImpl_Pause, + DSoundRender_Pause, BaseRendererImpl_Run, BaseRendererImpl_GetState, BaseRendererImpl_SetSyncSource,

1 0

Aric Stewart : quartz: Some cleanup around evComplete now that DSoundRenderer uses baseRenderer.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 821b8a834c44793d1b62f1f113be8a21fce1021b URL: http://source.winehq.org/git/wine.git/?a=commit;h=821b8a834c44793d1b62f1f11… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 11 13:20:18 2012 -0500 quartz: Some cleanup around evComplete now that DSoundRenderer uses baseRenderer. --- dlls/quartz/dsoundrender.c | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 071d702..71634d3 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -243,9 +243,6 @@ end: static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) { - HRESULT hr; - IMediaEventSink *pEventSink; - while (1) { DWORD pos1, pos2; @@ -260,23 +257,9 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) EnterCriticalSection(&This->renderer.filter.csFilter); EnterCriticalSection(&This->renderer.csRenderLock); This->in_loop = 0; - if (This->renderer.pInputPin->flushing || - This->renderer.filter.state != State_Running) { - SetEvent(This->renderer.evComplete); - return S_FALSE; - } } - if (!This->renderer.filter.filterInfo.pGraph) - return S_OK; - - hr = IFilterGraph_QueryInterface(This->renderer.filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); - if (SUCCEEDED(hr)) - { - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)This); - IMediaEventSink_Release(pEventSink); - } - return hr; + return S_OK; } static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIME tStart, REFERENCE_TIME tStop, const BYTE *data, DWORD size) @@ -300,7 +283,6 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM This->in_loop = 0; if (This->renderer.pInputPin->flushing || This->renderer.filter.state == State_Stopped) { - SetEvent(This->renderer.evComplete); return This->renderer.filter.state == State_Paused ? S_OK : VFW_E_WRONG_STATE; } if (ret != WAIT_TIMEOUT) @@ -478,11 +460,6 @@ static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) /* Unblock our thread, state changing from paused to running doesn't need a reset for state change */ SetEvent(This->blocked); } - else if (This->renderer.filter.state == State_Stopped) - { - ResetEvent(This->renderer.evComplete); - This->renderer.pInputPin->end_of_stream = 0; - } IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); ResetEvent(This->blocked); } @@ -597,16 +574,6 @@ static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) TRACE("\n"); BaseRendererImpl_EndFlush(iface); - if (This->in_loop) { - ResetEvent(This->renderer.evComplete); - LeaveCriticalSection(This->renderer.pInputPin->pin.pCritSec); - LeaveCriticalSection(&This->renderer.filter.csFilter); - LeaveCriticalSection(&This->renderer.csRenderLock); - WaitForSingleObject(This->renderer.evComplete, -1); - EnterCriticalSection(This->renderer.pInputPin->pin.pCritSec); - EnterCriticalSection(&This->renderer.filter.csFilter); - EnterCriticalSection(&This->renderer.csRenderLock); - } if (This->renderer.filter.state != State_Stopped) ResetEvent(This->blocked);

1 0

Aric Stewart : strmbase: do not lock in BaseOutputPinImpl_GetDeliveryBuffer the MemInputPin will lock in the required places .
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: c736af74dc5d5d845822cb1527b28fa4f4ee511b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c736af74dc5d5d845822cb152… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 11 13:19:38 2012 -0500 strmbase: do not lock in BaseOutputPinImpl_GetDeliveryBuffer the MemInputPin will lock in the required places. --- dlls/strmbase/pin.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 50a90c4..936ae0c 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -580,27 +580,23 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa TRACE("(%p, %p, %p, %x)\n", ppSample, tStart, tStop, dwFlags); - EnterCriticalSection(This->pin.pCritSec); + if (!This->pin.pConnectedTo) + hr = VFW_E_NOT_CONNECTED; + else { - if (!This->pin.pConnectedTo) - hr = VFW_E_NOT_CONNECTED; - else - { - IMemAllocator * pAlloc = NULL; + IMemAllocator * pAlloc = NULL; - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); + hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - if (SUCCEEDED(hr)) - hr = IMemAllocator_GetBuffer(pAlloc, ppSample, tStart, tStop, dwFlags); + if (SUCCEEDED(hr)) + hr = IMemAllocator_GetBuffer(pAlloc, ppSample, tStart, tStop, dwFlags); - if (SUCCEEDED(hr)) - hr = IMediaSample_SetTime(*ppSample, tStart, tStop); + if (SUCCEEDED(hr)) + hr = IMediaSample_SetTime(*ppSample, tStart, tStop); - if (pAlloc) - IMemAllocator_Release(pAlloc); - } + if (pAlloc) + IMemAllocator_Release(pAlloc); } - LeaveCriticalSection(This->pin.pCritSec); return hr; }

1 0

Dylan Smith : richedit: Remove some unused structure fields.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 2ebfd01b5171dd2e4995f43e7d922b35f6bc03cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebfd01b5171dd2e4995f43e7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun May 13 23:04:32 2012 -0400 richedit: Remove some unused structure fields. --- dlls/riched20/context.c | 3 --- dlls/riched20/editor.c | 1 - dlls/riched20/editstr.h | 7 ------- dlls/riched20/paint.c | 1 - dlls/riched20/style.c | 1 - 5 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/context.c b/dlls/riched20/context.c index 93d5caa..2cdaeff 100644 --- a/dlls/riched20/context.c +++ b/dlls/riched20/context.c @@ -22,12 +22,10 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) { - c->nSequence = editor->nSequence++; c->hDC = hDC; c->editor = editor; c->pt.x = 0; c->pt.y = 0; - c->hbrMargin = CreateSolidBrush(RGB(224,224,224)); c->rcView = editor->rcFormat; if (hDC) { c->dpi.cx = GetDeviceCaps(hDC, LOGPIXELSX); @@ -44,5 +42,4 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) void ME_DestroyContext(ME_Context *c) { if (c->hDC) ITextHost_TxReleaseDC(c->editor->texthost, c->hDC); - DeleteObject(c->hbrMargin); } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e61aac4..6d5749a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2687,7 +2687,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nLastTotalLength = ed->nTotalLength = 0; ed->nLastTotalWidth = ed->nTotalWidth = 0; ed->nUDArrowX = -1; - ed->nSequence = 0; ed->rgbBackColor = -1; ed->hbrBackground = GetSysColorBrush(COLOR_WINDOW); ed->bCaretAtEnd = FALSE; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 5b5afae..b782ed3 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -67,7 +67,6 @@ typedef struct tagME_Style HFONT hFont; /* cached font for the style */ TEXTMETRICW tm; /* cached font metrics for the style */ int nRefs; /* reference count */ - int nSequence; /* incremented when cache needs to be rebuilt, ie. every screen redraw */ } ME_Style; typedef enum { @@ -186,7 +185,6 @@ typedef struct tagME_Paragraph int nFlags; POINT pt; int nHeight, nWidth; - int nLastPaintYPos, nLastPaintHeight; int nRows; struct tagME_DisplayItem *prev_para, *next_para; } ME_Paragraph; @@ -335,7 +333,6 @@ typedef struct tagME_TextEditor int nTotalWidth, nLastTotalWidth; int nAvailWidth; /* 0 = wrap to client area, else wrap width in twips */ int nUDArrowX; - int nSequence; COLORREF rgbBackColor; HBRUSH hbrBackground; BOOL bCaretAtEnd; @@ -385,16 +382,12 @@ typedef struct tagME_Context { HDC hDC; POINT pt; - POINT ptRowOffset; RECT rcView; - HBRUSH hbrMargin; SIZE dpi; int nAvailWidth; /* those are valid inside ME_WrapTextParagraph and related */ - POINT ptFirstRun; ME_TextEditor *editor; - int nSequence; } ME_Context; typedef struct tagME_WrapContext diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0a2e1a9..662e5ab 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -41,7 +41,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) IntersectClipRect(hDC, rcUpdate->left, rcUpdate->top, rcUpdate->right, rcUpdate->bottom); - editor->nSequence++; ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); ME_MoveCaret(editor); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 605faeb..6cf85da 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -145,7 +145,6 @@ ME_Style *ME_MakeStyle(CHARFORMAT2W *style) assert(style->cbSize == sizeof(CHARFORMAT2W)); s->fmt = *style; - s->nSequence = -2; s->nRefs = 1; s->hFont = NULL; memset(&s->tm, 0, sizeof(s->tm));

1 0

Eric Pouech : winedbg: Also recognize 'rep ret' as a valid return insn for i386 as we did for x86_64.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 18986ee013d856bbf26aa910128be8425ed7345e URL: http://source.winehq.org/git/wine.git/?a=commit;h=18986ee013d856bbf26aa9101… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 12 18:11:31 2012 +0200 winedbg: Also recognize 'rep ret' as a valid return insn for i386 as we did for x86_64. --- programs/winedbg/be_i386.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index d9fb67c..5dc00ed 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -354,6 +354,11 @@ static unsigned be_i386_is_function_return(const void* insn) BYTE ch; if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; + if (ch == 0xF3) /* REP */ + { + insn = (const char*)insn + 1; + if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; + } return (ch == 0xC2) || (ch == 0xC3); }

1 0

Jacek Caban : jscript: Store double op arg directly instead of by pointer.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 35e663425dff635d3a0baf71ba9c6285cd25b78e URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e663425dff635d3a0baf71b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:22:37 2012 +0200 jscript: Store double op arg directly instead of by pointer. --- dlls/jscript/compile.c | 80 ++++++++++++++++++++++++------------------------ dlls/jscript/engine.c | 10 +++--- dlls/jscript/engine.h | 7 ++-- 3 files changed, 49 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35e663425dff635d3a0ba…

1 0

Jacek Caban : jscript: Added get_op_str and get_op_double helpers.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 1acb30a52297e500244f2afd4698f817cf2ca854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acb30a52297e500244f2afd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:21:56 2012 +0200 jscript: Added get_op_str and get_op_double helpers. --- dlls/jscript/engine.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bb42899..fb5c39b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -566,6 +566,14 @@ static inline unsigned get_op_int(exec_ctx_t *ctx, int i){ return i ? ctx->code->instrs[ctx->ip].arg2.lng : ctx->code->instrs[ctx->ip].arg1.lng; } +static inline const WCHAR *get_op_str(exec_ctx_t *ctx, int i){ + return i ? ctx->code->instrs[ctx->ip].arg2.str : ctx->code->instrs[ctx->ip].arg1.str; +} + +static inline double get_op_double(exec_ctx_t *ctx){ + return *ctx->code->instrs[ctx->ip].arg1.dbl; +} + /* ECMA-262 3rd Edition 12.2 */ static HRESULT interp_var_set(exec_ctx_t *ctx) { @@ -731,7 +739,7 @@ static HRESULT interp_throw_ref(exec_ctx_t *ctx) static HRESULT interp_throw_type(exec_ctx_t *ctx) { const HRESULT hres = get_op_uint(ctx, 0); - const WCHAR *str = ctx->code->instrs[ctx->ip].arg2.str; + const WCHAR *str = get_op_str(ctx, 1); TRACE("%08x %s\n", hres, debugstr_w(str)); @@ -1176,7 +1184,7 @@ static HRESULT interp_int(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 7.8.3 */ static HRESULT interp_double(exec_ctx_t *ctx) { - const double arg = *ctx->code->instrs[ctx->ip].arg1.dbl; + const double arg = get_op_double(ctx); VARIANT v; TRACE("%lf\n", arg); @@ -1189,7 +1197,7 @@ static HRESULT interp_double(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 7.8.4 */ static HRESULT interp_str(exec_ctx_t *ctx) { - const WCHAR *str = ctx->code->instrs[ctx->ip].arg1.str; + const WCHAR *str = get_op_str(ctx, 0); VARIANT v; TRACE("%s\n", debugstr_w(str)); @@ -1205,7 +1213,7 @@ static HRESULT interp_str(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 7.8 */ static HRESULT interp_regexp(exec_ctx_t *ctx) { - const WCHAR *source = ctx->code->instrs[ctx->ip].arg1.str; + const WCHAR *source = get_op_str(ctx, 0); const unsigned flags = get_op_uint(ctx, 1); jsdisp_t *regexp; VARIANT v;

1 0

Jacek Caban : jscript: Make flags parameter of OP_regexp unsigned.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: e273636d4d362986878c399886c8013952c471fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e273636d4d362986878c39988… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:21:44 2012 +0200 jscript: Make flags parameter of OP_regexp unsigned. --- dlls/jscript/compile.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f965948..bd11621 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -733,7 +733,7 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.str = str; - instr_ptr(ctx, instr)->arg2.lng = literal->u.regexp.flags; + instr_ptr(ctx, instr)->arg2.uint = literal->u.regexp.flags; return S_OK; } default: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7d9b37a..bb42899 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1206,7 +1206,7 @@ static HRESULT interp_str(exec_ctx_t *ctx) static HRESULT interp_regexp(exec_ctx_t *ctx) { const WCHAR *source = ctx->code->instrs[ctx->ip].arg1.str; - const LONG flags = get_op_int(ctx, 1); + const unsigned flags = get_op_uint(ctx, 1); jsdisp_t *regexp; VARIANT v; HRESULT hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8c70783..4a2c89e 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -90,7 +90,7 @@ typedef struct { X(preinc, 1, ARG_INT, 0) \ X(push_except,1, ARG_ADDR, ARG_BSTR) \ X(push_scope, 1, 0,0) \ - X(regexp, 1, ARG_STR, ARG_INT) \ + X(regexp, 1, ARG_STR, ARG_UINT) \ X(rshift, 1, 0,0) \ X(rshift2, 1, 0,0) \ X(str, 1, ARG_STR, 0) \

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
74
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 May 2012