September 2011 - Wine-commits

Michael Stefaniuc : winmm: Remove casts to the type of the casted expression.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: f83c470805b9b7bbc7ce628adef7df93416d12e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83c470805b9b7bbc7ce628ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 22 16:24:21 2011 +0200 winmm: Remove casts to the type of the casted expression. --- dlls/winmm/waveform.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 820d228..1152f61 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -625,7 +625,7 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_OpenInfo *info, WORD channels, if(mr != MMSYSERR_NOERROR) return WAVERR_BADFORMAT; - device = WINMM_GetDeviceFromHWAVE((HWAVE)info->handle); + device = WINMM_GetDeviceFromHWAVE(info->handle); if(!device) return MMSYSERR_INVALHANDLE; @@ -917,7 +917,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, device->cb_info.flags = HIWORD(info->flags & CALLBACK_TYPEMASK); device->cb_info.callback = info->callback; device->cb_info.user = info->cb_user; - device->cb_info.hwave = (HWAVE)device->handle; + device->cb_info.hwave = device->handle; info->handle = device->handle; @@ -1645,7 +1645,7 @@ static HRESULT WINMM_BeginPlaying(WINMM_Device *device) static LRESULT WINMM_Pause(HWAVE hwave) { - WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)hwave); + WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); HRESULT hr; TRACE("(%p)\n", hwave); @@ -1670,7 +1670,7 @@ static LRESULT WINMM_Pause(HWAVE hwave) static LRESULT WINMM_Reset(HWAVE hwave) { WINMM_CBInfo cb_info; - WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)hwave); + WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); WAVEHDR *first; MMRESULT mr; @@ -1752,7 +1752,7 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time) { - WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)hwave); + WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); UINT32 played_frames, sample_rate, bytes_per_frame; TRACE("(%p, %p)\n", hwave, time); @@ -2823,8 +2823,7 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, return WINMM_QueryInstanceIDSize(HandleToULong(hWaveOut), (DWORD_PTR*)dwParam1, TRUE); case DRV_QUERYFUNCTIONINSTANCEID: - return WINMM_QueryInstanceID(HandleToULong(hWaveOut), - (WCHAR*)dwParam1, (DWORD_PTR)dwParam2, TRUE); + return WINMM_QueryInstanceID(HandleToULong(hWaveOut), (WCHAR*)dwParam1, dwParam2, TRUE); /* TODO: Remove after dsound has been rewritten for mmdevapi */ case DRV_QUERYDSOUNDDESC: case DRV_QUERYDSOUNDIFACE: @@ -3203,8 +3202,7 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, return WINMM_QueryInstanceIDSize(HandleToULong(hWaveIn), (DWORD_PTR*)dwParam1, FALSE); case DRV_QUERYFUNCTIONINSTANCEID: - return WINMM_QueryInstanceID(HandleToULong(hWaveIn), - (WCHAR*)dwParam1, (DWORD_PTR)dwParam2, FALSE); + return WINMM_QueryInstanceID(HandleToULong(hWaveIn), (WCHAR*)dwParam1, dwParam2, FALSE); /* TODO: Remove after dsound has been rewritten for mmdevapi */ case DRV_QUERYDSOUNDDESC: case DRV_QUERYDSOUNDIFACE:

1 0

Francois Gouget : comctl32: Not visited links use HotTrackingColor for the text.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 701415f045883dd772f31568fbbc982e9b9728f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701415f045883dd772f31568f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 22 16:53:31 2011 +0200 comctl32: Not visited links use HotTrackingColor for the text. --- dlls/comctl32/syslink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index c13267e..01d638c 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1752,7 +1752,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr->HasFocus = FALSE; infoPtr->MouseDownID = -1; infoPtr->TextColor = comctl32_color.clrWindowText; - infoPtr->LinkColor = comctl32_color.clrHighlight; + infoPtr->LinkColor = comctl32_color.clrHotTrackingColor; infoPtr->VisitedColor = comctl32_color.clrHighlight; infoPtr->BackColor = infoPtr->Style & LWS_TRANSPARENT ? comctl32_color.clrWindow : comctl32_color.clrBtnFace;

1 0

Francois Gouget : user32: Change HotTrackingColor to better differentiate regular links from visited links .
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: dd0f5377edb618a791be6082cb28b609923abe0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0f5377edb618a791be6082c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 22 16:56:42 2011 +0200 user32: Change HotTrackingColor to better differentiate regular links from visited links. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6c5955a..fe910f2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -124,7 +124,7 @@ static const struct {"InfoText", RGB(0, 0, 0)}, /* COLOR_INFOTEXT */ {"InfoWindow", RGB(255, 255, 225)}, /* COLOR_INFOBK */ {"ButtonAlternateFace", RGB(181, 181, 181)}, /* COLOR_ALTERNATEBTNFACE */ - {"HotTrackingColor", RGB(0, 0, 128)}, /* COLOR_HOTLIGHT */ + {"HotTrackingColor", RGB(0, 0, 200)}, /* COLOR_HOTLIGHT */ {"GradientActiveTitle", RGB(166, 202, 240)}, /* COLOR_GRADIENTACTIVECAPTION */ {"GradientInactiveTitle", RGB(192, 192, 192)}, /* COLOR_GRADIENTINACTIVECAPTION */ {"MenuHilight", RGB(10, 36, 106)}, /* COLOR_MENUHILIGHT */

1 0

Jörg Höhle : mmdevapi: Fix stuttering upon start and underrun.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 03ad9366f1ada4fbda6adeb44cc64b0e61413d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ad9366f1ada4fbda6adeb44… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Sep 20 15:03:52 2011 +0200 mmdevapi: Fix stuttering upon start and underrun. --- dlls/winealsa.drv/mmdevdrv.c | 3 ++- dlls/wineoss.drv/mmdevdrv.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c77b54e..15146f5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2107,7 +2107,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( alsa_wrap_buffer(This, This->tmp_buffer + written * This->fmt->nBlockAlign, written_frames - written); - + else + This->lcl_offs_frames += written; This->held_frames = written_frames - written; } } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 629f4f7..562a674 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1740,7 +1740,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( if(This->buf_state == LOCKED_WRAPPED) oss_wrap_buffer(This, This->tmp_buffer + w_bytes, written_frames - w_frames); - + else + This->lcl_offs_frames += w_frames; This->held_frames = written_frames - w_frames; } }

1 0

Jörg Höhle : wineoss: EAGAIN (OSS buffer full) is a regular situation.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 55efce6c9ca7fd13f4e4362f7fc8fd456d803ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55efce6c9ca7fd13f4e4362f7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 21 10:42:16 2011 +0200 wineoss: EAGAIN (OSS buffer full) is a regular situation. --- dlls/wineoss.drv/mmdevdrv.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 562a674..33438e4 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1224,6 +1224,7 @@ static void oss_write_data(ACImpl *This) written = write(This->fd, buf, to_write * This->fmt->nBlockAlign); if(written < 0){ + /* EAGAIN is OSS buffer full, log that too */ WARN("write failed: %d (%s)\n", errno, strerror(errno)); return; } @@ -1729,9 +1730,12 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( w_bytes = write(This->fd, buffer, written_frames * This->fmt->nBlockAlign); if(w_bytes < 0){ - LeaveCriticalSection(&This->lock); - WARN("write failed: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; + if(errno != EAGAIN){ + LeaveCriticalSection(&This->lock); + WARN("write failed: %d (%s)\n", errno, strerror(errno)); + return E_FAIL; + }else /* OSS buffer full */ + w_bytes = 0; } w_frames = w_bytes / This->fmt->nBlockAlign; This->inbuf_frames += w_frames;

1 0

Jörg Höhle : mmdevapi: Unlock buffer in case of ReleaseBuffer error.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 83796800959794b98bb1dfd4090bbf3a04627605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83796800959794b98bb1dfd40… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Sep 12 07:12:10 2011 +0200 mmdevapi: Unlock buffer in case of ReleaseBuffer error. --- dlls/winealsa.drv/mmdevdrv.c | 3 ++- dlls/wineoss.drv/mmdevdrv.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 15146f5..8118103 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2097,8 +2097,9 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( written = alsa_write_best_effort(This->pcm_handle, buffer, written_frames, This); if(written < 0){ + This->buf_state = NOT_LOCKED; LeaveCriticalSection(&This->lock); - WARN("write failed: %ld (%s)\n", written, snd_strerror(written)); + ERR("write failed: %ld (%s)\n", written, snd_strerror(written)); return E_FAIL; } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 33438e4..b7e3bbf 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1731,8 +1731,9 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( written_frames * This->fmt->nBlockAlign); if(w_bytes < 0){ if(errno != EAGAIN){ + This->buf_state = NOT_LOCKED; LeaveCriticalSection(&This->lock); - WARN("write failed: %d (%s)\n", errno, strerror(errno)); + ERR("write failed: %d (%s)\n", errno, strerror(errno)); return E_FAIL; }else /* OSS buffer full */ w_bytes = 0;

1 0

Alistair Leslie-Hughes : mshtml: Fix test for Windows 7 with IE9.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 05e18862cb5ae825697695a6ac9b6d4772a9a863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e18862cb5ae825697695a6a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 22 20:09:59 2011 +1000 mshtml: Fix test for Windows 7 with IE9. --- dlls/mshtml/tests/dom.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4a2a7ac..45b3a80 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4459,7 +4459,8 @@ static void test_window(IHTMLDocument2 *doc) str = NULL; hres = IHTMLWindow2_toString(window, &str); ok(hres == S_OK, "toString failed: %08x\n", hres); - ok(!strcmp_wa(str, "[object]"), "toString returned %s\n", wine_dbgstr_w(str)); + ok(!strcmp_wa(str, "[object]") || + !strcmp_wa(str, "[object Window]") /* win7 ie9 */, "toString returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); test_window_name(window, NULL);

1 0

Jacek Caban : vbscript: Added for..to statement parser implementation.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: d935c21ccf6bf48cab6ddafd3372106357bcc5b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d935c21ccf6bf48cab6ddafd3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:22:40 2011 +0200 vbscript: Added for..to statement parser implementation. --- dlls/vbscript/lex.c | 6 ++++++ dlls/vbscript/parse.h | 10 ++++++++++ dlls/vbscript/parser.y | 28 ++++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index f42d2fd..ac3d65e 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -44,6 +44,7 @@ static const WCHAR errorW[] = {'e','r','r','o','r',0}; static const WCHAR exitW[] = {'e','x','i','t',0}; static const WCHAR explicitW[] = {'e','x','p','l','i','c','i','t',0}; static const WCHAR falseW[] = {'f','a','l','s','e',0}; +static const WCHAR forW[] = {'f','o','r',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; static const WCHAR getW[] = {'g','e','t',0}; static const WCHAR gotoW[] = {'g','o','t','o',0}; @@ -68,9 +69,11 @@ static const WCHAR publicW[] = {'p','u','b','l','i','c',0}; static const WCHAR remW[] = {'r','e','m',0}; static const WCHAR resumeW[] = {'r','e','s','u','m','e',0}; static const WCHAR setW[] = {'s','e','t',0}; +static const WCHAR stepW[] = {'s','t','e','p',0}; static const WCHAR stopW[] = {'s','t','o','p',0}; static const WCHAR subW[] = {'s','u','b',0}; static const WCHAR thenW[] = {'t','h','e','n',0}; +static const WCHAR toW[] = {'t','o',0}; static const WCHAR trueW[] = {'t','r','u','e',0}; static const WCHAR untilW[] = {'u','n','t','i','l',0}; static const WCHAR wendW[] = {'w','e','n','d',0}; @@ -99,6 +102,7 @@ static const struct { {exitW, tEXIT}, {explicitW, tEXPLICIT}, {falseW, tFALSE}, + {forW, tFOR}, {functionW, tFUNCTION}, {getW, tGET}, {gotoW, tGOTO}, @@ -123,9 +127,11 @@ static const struct { {remW, tREM}, {resumeW, tRESUME}, {setW, tSET}, + {stepW, tSTEP}, {stopW, tSTOP}, {subW, tSUB}, {thenW, tTHEN}, + {toW, tTO}, {trueW, tTRUE}, {untilW, tUNTIL}, {wendW, tWEND}, diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 8e4be57..a5bd505 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -106,6 +106,7 @@ typedef enum { STAT_EXITFUNC, STAT_EXITPROP, STAT_EXITSUB, + STAT_FORTO, STAT_FUNC, STAT_IF, STAT_ONERROR, @@ -198,6 +199,15 @@ typedef struct { typedef struct { statement_t stat; + const WCHAR *identifier; + expression_t *from_expr; + expression_t *to_expr; + expression_t *step_expr; + statement_t *body; +} forto_statement_t; + +typedef struct { + statement_t stat; BOOL resume_next; } onerror_statement_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8435e92..3b30051 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -52,6 +52,7 @@ static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expr static statement_t *new_set_statement(parser_ctx_t*,member_expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); static statement_t *new_while_statement(parser_ctx_t*,statement_type_t,expression_t*,statement_t*); +static statement_t *new_forto_statement(parser_ctx_t*,const WCHAR*,expression_t*,expression_t*,expression_t*,statement_t*); static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*); static statement_t *new_function_statement(parser_ctx_t*,function_decl_t*); static statement_t *new_onerror_statement(parser_ctx_t*,BOOL); @@ -102,7 +103,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token tIS tLTEQ tGTEQ tMOD %token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET tCONST %token tIF tELSE tELSEIF tEND tTHEN tEXIT -%token tWHILE tWEND tDO tLOOP tUNTIL +%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tSTEP %token tBYREF tBYVAL %token tOPTION tEXPLICIT %token tSTOP @@ -118,7 +119,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression %type <member> MemberExpression -%type <expression> Arguments_opt ArgumentList_opt ArgumentList +%type <expression> Arguments_opt ArgumentList_opt ArgumentList Step_opt %type <bool> OptionExplicit_opt DoType %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl @@ -186,6 +187,8 @@ SimpleStatement | tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, TRUE); CHECK_ERROR; } | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, FALSE); CHECK_ERROR; } | tCONST ConstDeclList { $$ = new_const_statement(ctx, $2); CHECK_ERROR; } + | tFOR tIdentifier '=' Expression tTO Expression Step_opt tNL StatementsNl_opt tNEXT + { $$ = new_forto_statement(ctx, $2, $4, $6, $7, $9); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -206,6 +209,10 @@ DoType : tWHILE { $$ = TRUE; } | tUNTIL { $$ = FALSE; } +Step_opt + : /* empty */ { $$ = NULL;} + | tSTEP Expression { $$ = $2; } + IfStatement : tIF Expression tTHEN tNL StatementsNl ElseIfs_opt Else_opt tEND tIF { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } @@ -626,6 +633,23 @@ static statement_t *new_while_statement(parser_ctx_t *ctx, statement_type_t type return &stat->stat; } +static statement_t *new_forto_statement(parser_ctx_t *ctx, const WCHAR *identifier, expression_t *from_expr, + expression_t *to_expr, expression_t *step_expr, statement_t *body) +{ + forto_statement_t *stat; + + stat = new_statement(ctx, STAT_FORTO, sizeof(*stat)); + if(!stat) + return NULL; + + stat->identifier = identifier; + stat->from_expr = from_expr; + stat->to_expr = to_expr; + stat->step_expr = step_expr; + stat->body = body; + return &stat->stat; +} + static statement_t *new_if_statement(parser_ctx_t *ctx, expression_t *expr, statement_t *if_stat, elseif_decl_t *elseif_decl, statement_t *else_stat) {

1 0

Jacek Caban : vbscript: Added for..to statement compiler implementation.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 8244e4c0c7011ef1bf5d06f63ae8b5b94b5ea6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8244e4c0c7011ef1bf5d06f63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:23:10 2011 +0200 vbscript: Added for..to statement compiler implementation. --- dlls/vbscript/compile.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/interp.c | 30 ++++++++++++++++++ dlls/vbscript/vbscript.h | 4 ++ 3 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9cfe45b..1f1f041 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -169,6 +169,18 @@ static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) return S_OK; } +static HRESULT push_instr_uint(compile_ctx_t *ctx, vbsop_t op, unsigned arg) +{ + unsigned ret; + + ret = push_instr(ctx, op); + if(ret == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, ret)->arg1.uint = arg; + return S_OK; +} + static HRESULT push_instr_addr(compile_ctx_t *ctx, vbsop_t op, unsigned arg) { unsigned ret; @@ -603,6 +615,68 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * return S_OK; } +static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *stat) +{ + unsigned step_instr, instr; + BSTR identifier; + HRESULT hres; + + identifier = alloc_bstr_arg(ctx, stat->identifier); + if(!identifier) + return E_OUTOFMEMORY; + + hres = compile_expression(ctx, stat->from_expr); + if(FAILED(hres)) + return hres; + + instr = push_instr(ctx, OP_assign_ident); + if(instr == -1) + return E_OUTOFMEMORY; + instr_ptr(ctx, instr)->arg1.bstr = identifier; + + hres = compile_expression(ctx, stat->to_expr); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_val) == -1) + return E_OUTOFMEMORY; + + if(stat->step_expr) { + hres = compile_expression(ctx, stat->step_expr); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_val) == -1) + return E_OUTOFMEMORY; + }else { + hres = push_instr_int(ctx, OP_short, 1); + if(FAILED(hres)) + return hres; + } + + step_instr = push_instr(ctx, OP_step); + if(step_instr == -1) + return E_OUTOFMEMORY; + instr_ptr(ctx, step_instr)->arg2.bstr = identifier; + + hres = compile_statement(ctx, stat->body); + if(FAILED(hres)) + return hres; + + instr = push_instr(ctx, OP_incc); + if(instr == -1) + return E_OUTOFMEMORY; + instr_ptr(ctx, instr)->arg1.bstr = identifier; + + hres = push_instr_addr(ctx, OP_jmp, step_instr); + if(FAILED(hres)) + return hres; + + instr_ptr(ctx, step_instr)->arg1.uint = ctx->instr_cnt; + + return push_instr_uint(ctx, OP_pop, 2); +} + static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat, BOOL is_set) { HRESULT hres; @@ -799,6 +873,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_EXITSUB: hres = compile_exitsub_statement(ctx); break; + case STAT_FORTO: + hres = compile_forto_statement(ctx, (forto_statement_t*)stat); + break; case STAT_FUNC: hres = compile_function_statement(ctx, (function_statement_t*)stat); break; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index c2ffd98..1327c17 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -682,6 +682,22 @@ static HRESULT interp_const(exec_ctx_t *ctx) return add_dynamic_var(ctx, arg, TRUE, val.v, val.owned); } +static HRESULT interp_val(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_pop(exec_ctx_t *ctx) +{ + const unsigned n = ctx->instr->arg1.uint; + + TRACE("%u\n", n); + + stack_popn(ctx, n); + return S_OK; +} + static HRESULT interp_new(exec_ctx_t *ctx) { const WCHAR *arg = ctx->instr->arg1.bstr; @@ -710,6 +726,13 @@ static HRESULT interp_new(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_step(exec_ctx_t *ctx) +{ + const BSTR ident = ctx->instr->arg2.bstr; + FIXME("%s\n", debugstr_w(ident)); + return E_NOTIMPL; +} + static HRESULT interp_jmp(exec_ctx_t *ctx) { const unsigned arg = ctx->instr->arg1.uint; @@ -1439,6 +1462,13 @@ static HRESULT interp_neg(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_incc(exec_ctx_t *ctx) +{ + const BSTR ident = ctx->instr->arg1.bstr; + FIXME("%s\n", debugstr_w(ident)); + return E_NOTIMPL; +} + static const instr_func_t op_funcs[] = { #define X(x,n,a,b) interp_ ## x, OP_LIST diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index bd55719..4b0a569 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -199,6 +199,7 @@ typedef enum { X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(idiv, 1, 0, 0) \ X(imp, 1, 0, 0) \ + X(incc, 1, ARG_BSTR, 0) \ X(is, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ @@ -218,13 +219,16 @@ typedef enum { X(nothing, 1, 0, 0) \ X(null, 1, 0, 0) \ X(or, 1, 0, 0) \ + X(pop, 1, ARG_UINT, 0) \ X(ret, 0, 0, 0) \ X(set_ident, 1, ARG_BSTR, 0) \ X(set_member, 1, ARG_BSTR, 0) \ X(short, 1, ARG_INT, 0) \ + X(step, 0, ARG_ADDR, ARG_BSTR) \ X(stop, 1, 0, 0) \ X(string, 1, ARG_STR, 0) \ X(sub, 1, 0, 0) \ + X(val, 1, 0, 0) \ X(xor, 1, 0, 0) typedef enum {

1 0

Jacek Caban : vbscript: Added interp_val implementation.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: aad758921c2efc6442fc6dfc3836b3a27658527e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad758921c2efc6442fc6dfc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 14:23:25 2011 +0200 vbscript: Added interp_val implementation. --- dlls/vbscript/interp.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1327c17..5e41845 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -684,8 +684,24 @@ static HRESULT interp_const(exec_ctx_t *ctx) static HRESULT interp_val(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t val; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + if(!val.owned) { + V_VT(&v) = VT_EMPTY; + hres = VariantCopy(&v, val.v); + if(FAILED(hres)) + return hres; + } + + return stack_push(ctx, val.owned ? val.v : &v); } static HRESULT interp_pop(exec_ctx_t *ctx)

1 0