December 2011 - Wine-commits

Rico Schüller : d3dx9/tests: Add effect parameter value GetMatrixTransposeArray() test.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: d0ede16ee4264dc468be54de789ac7c8a77e69b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ede16ee4264dc468be54de7… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 26 11:51:46 2011 +0100 d3dx9/tests: Add effect parameter value GetMatrixTransposeArray() test. --- dlls/d3dx9_36/tests/effect.c | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index d413042..03d0812 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1108,6 +1108,75 @@ static void test_effect_parameter_value_GetMatrixTranspose(const struct test_eff } } +static void test_effect_parameter_value_GetMatrixTransposeArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + UINT l, k, m; + + memset(fvalue, 0xab, sizeof(fvalue)); + hr = effect->lpVtbl->GetMatrixTransposeArray(effect, parameter, (D3DXMATRIX *)&fvalue, res_desc->Elements); + if (!res_desc->Elements) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixTransposeArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixTransposeArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else if (res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixTransposeArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (m = 0; m < res_desc->Elements; ++m) + { + for (k = 0; k < 4; ++k) + { + for (l = 0; l < 4; ++l) + { + if (k < res_desc->Columns && l < res_desc->Rows) + { + ok(compare_float(fvalue[m * 16 + l + k * 4], get_float(res_desc->Type, + &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512), + "%u - %s: GetMatrixTransposeArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l + k * 4, fvalue[m * 16 + l + k * 4], + get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + + l * res_desc->Columns + k])); + } + else + { + ok(fvalue[m * 16 + l + k * 4] == 0.0f, "%u - %s: GetMatrixTransposeArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l + k * 4, fvalue[m * 16 + l + k * 4], 0.0f); + } + } + } + } + + for (l = res_desc->Elements * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixTransposeArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTransposeArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixTransposeArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -1189,6 +1258,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetMatrix(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetMatrixArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetMatrixTranspose(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetMatrixTransposeArray(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Nikolay Sivov : comctl32: Block selection change depending on TCN_SELCHANGING result.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: fade32b515a6b60d224e61e2ffaf0155888a0455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fade32b515a6b60d224e61e2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 26 01:20:54 2011 +0300 comctl32: Block selection change depending on TCN_SELCHANGING result. --- dlls/comctl32/tab.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 374d4ee..ad27b8a 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -684,7 +684,8 @@ TAB_LButtonDown (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) break; } - TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING); + if (TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING)) + return 0; if (pressed) TAB_DeselectAll (infoPtr, FALSE);

1 0

André Hentschel : msvcrt/tests: Fix two test messages.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: 825a25ef96a9952487890dea668673af78a0774e URL: http://source.winehq.org/git/wine.git/?a=commit;h=825a25ef96a9952487890dea6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 23 20:02:54 2011 +0100 msvcrt/tests: Fix two test messages. --- dlls/msvcrt/tests/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c923684..8aa7a81 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1583,7 +1583,7 @@ static void test__strlwr_s(void) ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); ok(!memcmp(buffer, "\0oRrIsTeR", sizeof("\0oRrIsTeR")), - "Expected the output buffer to be \"gorrIsTeR\"\n"); + "Expected the output buffer to be \"\\0oRrIsTeR\"\n"); strcpy(buffer, "GoRrIsTeR"); errno = EBADF; @@ -1591,7 +1591,7 @@ static void test__strlwr_s(void) ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); ok(!memcmp(buffer, "\0oRrIsTeR", sizeof("\0oRrIsTeR")), - "Expected the output buffer to be \"gorrIsTeR\"\n"); + "Expected the output buffer to be \"\\0oRrIsTeR\"\n"); strcpy(buffer, "GoRrIsTeR"); ret = p_strlwr_s(buffer, sizeof("GoRrIsTeR"));

1 0

André Hentschel : dsound: Use if(0) instead of #if 0 to make sure code still compiles.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: 2b981177d323122d5ad47de1fa8a767832834ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b981177d323122d5ad47de1f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 25 19:23:39 2011 +0100 dsound: Use if(0) instead of #if 0 to make sure code still compiles. --- dlls/dsound/sound3d.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index f4c182f..512a254 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -162,9 +162,6 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) D3DVALUE flAngle; D3DVECTOR vLeft; /* doppler shift related stuff */ -#if 0 - D3DVALUE flFreq, flBufferVel, flListenerVel; -#endif TRACE("(%p)\n",dsb); @@ -263,13 +260,17 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) TRACE("panning: Angle = %f rad, lPan = %d\n", flAngle, dsb->volpan.lPan); /* FIXME: Doppler Effect disabled since i have no idea which frequency to change and how to do it */ -#if 0 +if(0) +{ + D3DVALUE flFreq, flBufferVel, flListenerVel; /* doppler shift*/ - if ((VectorMagnitude(&ds3db_ds3db.vVelocity) == 0) && (VectorMagnitude(&dsb->device->ds3dl.vVelocity) == 0)) + if (!VectorMagnitude(&dsb->ds3db_ds3db.vVelocity) && !VectorMagnitude(&dsb->device->ds3dl.vVelocity)) { TRACE("doppler: Buffer and Listener don't have velocities\n"); } - else if (ds3db_ds3db.vVelocity != dsb->device->ds3dl.vVelocity) + else if (!(dsb->ds3db_ds3db.vVelocity.x == dsb->device->ds3dl.vVelocity.x && + dsb->ds3db_ds3db.vVelocity.y == dsb->device->ds3dl.vVelocity.y && + dsb->ds3db_ds3db.vVelocity.z == dsb->device->ds3dl.vVelocity.z)) { /* calculate length of ds3db_ds3db.vVelocity component which causes Doppler Effect NOTE: if buffer moves TOWARDS the listener, it's velocity component is NEGATIVE @@ -282,14 +283,14 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) /* formula taken from Gianicoli D.: Physics, 4th edition: */ /* FIXME: replace dsb->freq with appropriate frequency ! */ flFreq = dsb->freq * ((DEFAULT_VELOCITY + flListenerVel)/(DEFAULT_VELOCITY + flBufferVel)); - TRACE("doppler: Buffer velocity (component) = %lf, Listener velocity (component) = %lf => Doppler shift: %ld Hz -> %lf Hz\n", flBufferVel, flListenerVel, - dsb->freq, flFreq); + TRACE("doppler: Buffer velocity (component) = %f, Listener velocity (component) = %f => Doppler shift: %d Hz -> %f Hz\n", + flBufferVel, flListenerVel, dsb->freq, flFreq); /* FIXME: replace following line with correct frequency setting ! */ dsb->freq = flFreq; DSOUND_RecalcFormat(dsb); - DSOUND_MixToTemporary(dsb, 0, dsb->buflen); + DSOUND_MixToTemporary(dsb, 0, dsb->buflen, FALSE); } -#endif +} /* time for remix */ DSOUND_RecalcVolPan(&dsb->volpan);

1 0

André Hentschel : d3drm: Fix the order of the IDirect3DRM methods.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: a1a1cbcff0df98e398167d7d8952593cedc8a09f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a1cbcff0df98e398167d7d8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 25 19:27:35 2011 +0100 d3drm: Fix the order of the IDirect3DRM methods. --- dlls/d3drm/d3drm.c | 10 +++++----- include/d3drm.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 977c879..d02ec3d 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -239,20 +239,20 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromClipper(IDirect3DRM* iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_CreateShadow(IDirect3DRM* iface, LPDIRECT3DRMVISUAL pVisual, LPDIRECT3DRMLIGHT pLight, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMVISUAL * ppVisual) +static HRESULT WINAPI IDirect3DRMImpl_CreateTextureFromSurface(IDirect3DRM* iface, LPDIRECTDRAWSURFACE pDDS, LPDIRECT3DRMTEXTURE * ppTexture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p,%p,%f,%f,%f,%f,%f,%f,%p): stub\n", iface, This, pVisual, pLight, px, py, pz, nx, ny, nz, ppVisual); + FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, pDDS, ppTexture); return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_CreateTextureFromSurface(IDirect3DRM* iface, LPDIRECTDRAWSURFACE pDDS, LPDIRECT3DRMTEXTURE * ppTexture) +static HRESULT WINAPI IDirect3DRMImpl_CreateShadow(IDirect3DRM* iface, LPDIRECT3DRMVISUAL pVisual, LPDIRECT3DRMLIGHT pLight, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMVISUAL * ppVisual) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, pDDS, ppTexture); + FIXME("(%p/%p)->(%p,%p,%f,%f,%f,%f,%f,%f,%p): stub\n", iface, This, pVisual, pLight, px, py, pz, nx, ny, nz, ppVisual); return E_NOTIMPL; } @@ -412,8 +412,8 @@ static const struct IDirect3DRMVtbl Direct3DRM_Vtbl = IDirect3DRMImpl_CreateDeviceFromSurface, IDirect3DRMImpl_CreateDeviceFromD3D, IDirect3DRMImpl_CreateDeviceFromClipper, - IDirect3DRMImpl_CreateShadow, IDirect3DRMImpl_CreateTextureFromSurface, + IDirect3DRMImpl_CreateShadow, IDirect3DRMImpl_CreateViewport, IDirect3DRMImpl_CreateWrap, IDirect3DRMImpl_CreateUserVisual, diff --git a/include/d3drm.h b/include/d3drm.h index 1a1bcce..4b8f0e7 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -74,9 +74,9 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE *) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, LPDIRECT3DRMDEVICE *) PURE; + STDMETHOD(CreateTextureFromSurface)(THIS_ LPDIRECTDRAWSURFACE pDDS, LPDIRECT3DRMTEXTURE *) PURE; STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMVISUAL *) PURE; - STDMETHOD(CreateTextureFromSurface)(THIS_ LPDIRECTDRAWSURFACE pDDS, LPDIRECT3DRMTEXTURE *) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DRMDEVICE, LPDIRECT3DRMFRAME, DWORD, DWORD, DWORD, DWORD, LPDIRECT3DRMVIEWPORT *) PURE; STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE, LPDIRECT3DRMFRAME, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz,

1 0

Jacek Caban : jscript: Added bytecode version of while statement.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: f5425aeecafa9a811b5262bd359220c4786fd306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5425aeecafa9a811b5262bd3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 27 11:16:02 2011 +0100 jscript: Added bytecode version of while statement. --- dlls/jscript/compile.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/parser.y | 2 +- 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index ceed228..bcec761 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -32,6 +32,8 @@ struct _compiler_ctx_t { unsigned code_off; unsigned code_size; + + BOOL no_fallback; }; static HRESULT compile_expression(compiler_ctx_t*,expression_t*); @@ -425,6 +427,9 @@ static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, statement_t *stat) { unsigned instr; + if(ctx->no_fallback) + return E_NOTIMPL; + instr = push_instr(ctx, OP_tree); if(instr == -1) return E_OUTOFMEMORY; @@ -943,6 +948,67 @@ static HRESULT compile_if_statement(compiler_ctx_t *ctx, if_statement_t *stat) return S_OK; } +/* ECMA-262 3rd Edition 12.6.2 */ +static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *stat) +{ + unsigned off_backup, jmp_off, jmp = -1; + BOOL prev_no_fallback; + HRESULT hres; + + off_backup = ctx->code_off; + + if(!stat->do_while) { + /* FIXME: avoid */ + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + + jmp_off = ctx->code_off; + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + jmp = push_instr(ctx, OP_jmp_z); + if(jmp == -1) + return E_OUTOFMEMORY; + + if(push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + }else { + jmp_off = ctx->code_off; + } + + prev_no_fallback = ctx->no_fallback; + ctx->no_fallback = TRUE; + hres = compile_statement(ctx, stat->statement); + ctx->no_fallback = prev_no_fallback; + if(hres == E_NOTIMPL) { + ctx->code_off = off_backup; + stat->stat.eval = while_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); + } + if(FAILED(hres)) + return hres; + + if(stat->do_while) { + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + jmp = push_instr(ctx, OP_jmp_z); + if(jmp == -1) + return E_OUTOFMEMORY; + + if(push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + } + hres = push_instr_uint(ctx, OP_jmp, jmp_off); + if(FAILED(hres)) + return hres; + + instr_ptr(ctx, jmp)->arg1.uint = ctx->code_off; + return S_OK; +} + static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) { switch(stat->type) { @@ -956,6 +1022,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return compile_if_statement(ctx, (if_statement_t*)stat); case STAT_VAR: return compile_var_statement(ctx, (var_statement_t*)stat); + case STAT_WHILE: + return compile_while_statement(ctx, (while_statement_t*)stat); default: return compile_interp_fallback(ctx, stat); } diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3445476..08a9b83 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -850,7 +850,7 @@ static const statement_eval_t stat_eval_table[] = { throw_statement_eval, try_statement_eval, compiled_statement_eval, - while_statement_eval, + compiled_statement_eval, with_statement_eval };

1 0

Jacek Caban : jscript: Added bytecode version of for loop statement.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: 17fedc448b00512f113e71cf6e616255a9f280f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17fedc448b00512f113e71cf6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 27 11:16:13 2011 +0100 jscript: Added bytecode version of for loop statement. --- dlls/jscript/compile.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/parser.y | 2 +- 2 files changed, 93 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index bcec761..663edf0 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -872,12 +872,12 @@ static HRESULT compile_block_statement(compiler_ctx_t *ctx, statement_t *iter) } /* ECMA-262 3rd Edition 12.2 */ -static HRESULT compile_var_statement(compiler_ctx_t *ctx, var_statement_t *stat) +static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t *list) { variable_declaration_t *iter; HRESULT hres; - for(iter = stat->variable_list; iter; iter = iter->next) { + for(iter = list; iter; iter = iter->next) { if(!iter->expr) continue; @@ -890,6 +890,18 @@ static HRESULT compile_var_statement(compiler_ctx_t *ctx, var_statement_t *stat) return hres; } + return S_OK; +} + +/* ECMA-262 3rd Edition 12.2 */ +static HRESULT compile_var_statement(compiler_ctx_t *ctx, var_statement_t *stat) +{ + HRESULT hres; + + hres = compile_variable_list(ctx, stat->variable_list); + if(FAILED(hres)) + return hres; + return push_instr(ctx, OP_undefined) == -1 ? E_OUTOFMEMORY : S_OK; } @@ -1009,6 +1021,82 @@ static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *s return S_OK; } +/* ECMA-262 3rd Edition 12.6.3 */ +static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) +{ + unsigned off_backup, jmp, expr_off; + BOOL prev_no_fallback; + HRESULT hres; + + off_backup = ctx->code_off; + + if(stat->variable_list) { + hres = compile_variable_list(ctx, stat->variable_list); + if(FAILED(hres)) + return hres; + }else if(stat->begin_expr) { + BOOL no_ret = FALSE; + + hres = compile_expression_noret(ctx, stat->begin_expr, &no_ret); + if(FAILED(hres)) + return hres; + if(!no_ret && push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + } + + /* FIXME: avoid */ + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + + expr_off = ctx->code_off; + + if(stat->expr) { + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + jmp = push_instr(ctx, OP_jmp_z); + if(jmp == -1) + return E_OUTOFMEMORY; + }else { + jmp = -1; + } + + if(push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + + prev_no_fallback = ctx->no_fallback; + ctx->no_fallback = TRUE; + hres = compile_statement(ctx, stat->statement); + ctx->no_fallback = prev_no_fallback; + if(hres == E_NOTIMPL) { + ctx->code_off = off_backup; + stat->stat.eval = for_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); + } + if(FAILED(hres)) + return hres; + + if(stat->end_expr) { + BOOL no_ret = FALSE; + + hres = compile_expression_noret(ctx, stat->end_expr, &no_ret); + if(FAILED(hres)) + return hres; + + if(!no_ret && push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + } + + hres = push_instr_uint(ctx, OP_jmp, expr_off); + if(FAILED(hres)) + return hres; + + if(jmp != -1) + instr_ptr(ctx, jmp)->arg1.uint = ctx->code_off; + return S_OK; +} + static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) { switch(stat->type) { @@ -1018,6 +1106,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return push_instr(ctx, OP_undefined) == -1 ? E_OUTOFMEMORY : S_OK; /* FIXME */ case STAT_EXPR: return compile_expression_statement(ctx, (expression_statement_t*)stat); + case STAT_FOR: + return compile_for_statement(ctx, (for_statement_t*)stat); case STAT_IF: return compile_if_statement(ctx, (if_statement_t*)stat); case STAT_VAR: diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 08a9b83..008ada2 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -841,7 +841,7 @@ static const statement_eval_t stat_eval_table[] = { continue_statement_eval, compiled_statement_eval, compiled_statement_eval, - for_statement_eval, + compiled_statement_eval, forin_statement_eval, compiled_statement_eval, labelled_statement_eval,

1 0

Piotr Caban : msvcp90: Added numpunct<wchar_t> class stub.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: b053c305fa085c872325ded17ca75a582ca841b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b053c305fa085c872325ded17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 23 15:29:05 2011 +0100 msvcp90: Added numpunct<wchar_t> class stub. --- dlls/msvcp90/locale.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 152 ++++++++++++------------ 2 files changed, 377 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b053c305fa085c872325d…

1 0

Piotr Caban : msvcp90: Correctly initialize vtable pointer in Getcat functions.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 5b93bb9800c87d1cab247d57b6bc794bd4f28615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b93bb9800c87d1cab247d57b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 23 15:29:31 2011 +0100 msvcp90: Correctly initialize vtable pointer in Getcat functions. --- dlls/msvcp90/locale.c | 28 ++++++++++++++++++++++++---- dlls/msvcp90/msvcp90.spec | 8 ++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ad44aad..8ed46ea 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -996,8 +996,6 @@ collate* __thiscall collate_short_ctor(collate *this) /* ?_Getcat@?$collate(a)_W@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$collate(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -/* ?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ -/* ?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -1016,6 +1014,18 @@ MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const loc return LC_COLLATE; } +/* ?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ +/* ?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ +MSVCP_size_t __cdecl collate_short__Getcat(const locale_facet **facet, const locale *loc) +{ + if(facet && !*facet) { + collate_wchar__Getcat(facet, loc); + (*(locale_facet**)facet)->vtable = &MSVCP_collate_short_vtable; + } + + return LC_COLLATE; +} + /* _Wcscoll */ int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, const wchar_t *last2, const _Collvec *coll) @@ -2142,8 +2152,6 @@ const char* __thiscall ctype_wchar__Widen_s(const ctype_wchar *this, /* ?_Getcat@?$ctype(a)_W@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$ctype(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -/* ?_Getcat@?$ctype(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ -/* ?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl ctype_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -2166,6 +2174,18 @@ MSVCP_size_t __cdecl ctype_wchar__Getcat(const locale_facet **facet, const local return LC_CTYPE; } +/* ?_Getcat@?$ctype(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ +/* ?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ +MSVCP_size_t __cdecl ctype_short__Getcat(const locale_facet **facet, const locale *loc) +{ + if(facet && !*facet) { + ctype_wchar__Getcat(facet, loc); + (*(locale_facet**)facet)->vtable = &MSVCP_ctype_short_vtable; + } + + return LC_CTYPE; +} + /* _Towlower */ wchar_t __cdecl _Towlower(wchar_t ch, const _Ctypevec *ctype) { diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 750e279..292e91c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2229,14 +2229,14 @@ @ stub -arch=win64 ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z @ cdecl -arch=win32 ?_Getcat@?$collate(a)D@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) collate_char__Getcat @ cdecl -arch=win64 ?_Getcat@?$collate(a)D@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z(ptr ptr) collate_char__Getcat -@ cdecl -arch=win32 ?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) collate_wchar__Getcat -@ cdecl -arch=win64 ?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z(ptr ptr) collate_wchar__Getcat +@ cdecl -arch=win32 ?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) collate_short__Getcat +@ cdecl -arch=win64 ?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z(ptr ptr) collate_short__Getcat @ cdecl -arch=win32 ?_Getcat@?$collate(a)_W@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) collate_wchar__Getcat @ cdecl -arch=win64 ?_Getcat@?$collate(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z(ptr ptr) collate_wchar__Getcat @ cdecl -arch=win32 ?_Getcat@?$ctype(a)D@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) ctype_char__Getcat @ cdecl -arch=win64 ?_Getcat@?$ctype(a)D@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z(ptr ptr) ctype_char__Getcat -@ cdecl -arch=win32 ?_Getcat@?$ctype(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) ctype_wchar__Getcat -@ cdecl -arch=win64 ?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z(ptr ptr) ctype_wchar__Getcat +@ cdecl -arch=win32 ?_Getcat@?$ctype(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) ctype_short__Getcat +@ cdecl -arch=win64 ?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z(ptr ptr) ctype_short__Getcat @ cdecl -arch=win32 ?_Getcat@?$ctype(a)_W@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) ctype_wchar__Getcat @ cdecl -arch=win64 ?_Getcat@?$ctype(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z(ptr ptr) ctype_wchar__Getcat @ stub -arch=win32 ?_Getcat@?$messages(a)D@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z

1 0

Hans Leidekker : msi: Fix handling of single quoted column names in SELECT queries.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: ca49aae61ec31b8f26ce8b3e0b9317a312819940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca49aae61ec31b8f26ce8b3e0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 23 13:54:26 2011 +0100 msi: Fix handling of single quoted column names in SELECT queries. --- dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 2 + dlls/msi/select.c | 39 ++++++-- dlls/msi/sql.y | 59 ++++++++++-- dlls/msi/tests/db.c | 250 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 331 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca49aae61ec31b8f26ce8…

1 0