October 2009 - Wine-Commits

Jacek Caban : jscript: Create regexp object when evaluating regexp literal.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: e52115d67329c60187c273de22fc47d38e4850bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52115d67329c60187c273de2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 14:43:01 2009 +0200 jscript: Create regexp object when evaluating regexp literal. --- dlls/jscript/engine.c | 29 +++++++++++++++++++++-------- dlls/jscript/engine.h | 15 +++++++-------- dlls/jscript/lex.c | 22 ++++------------------ dlls/jscript/parser.y | 5 ----- dlls/jscript/tests/lang.js | 5 +++++ 5 files changed, 37 insertions(+), 39 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index fa14fd9..0cb7851 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -347,7 +347,7 @@ static HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) return S_OK; } -static HRESULT literal_to_var(literal_t *literal, VARIANT *v) +static HRESULT literal_to_var(script_ctx_t *ctx, literal_t *literal, VARIANT *v) { switch(literal->type) { case LT_UNDEFINED: @@ -364,18 +364,31 @@ static HRESULT literal_to_var(literal_t *literal, VARIANT *v) V_VT(v) = VT_R8; V_R8(v) = literal->u.dval; break; - case LT_STRING: + case LT_STRING: { + BSTR str = SysAllocString(literal->u.wstr); + if(!str) + return E_OUTOFMEMORY; + V_VT(v) = VT_BSTR; - V_BSTR(v) = SysAllocString(literal->u.wstr); + V_BSTR(v) = str; break; + } case LT_BOOL: V_VT(v) = VT_BOOL; V_BOOL(v) = literal->u.bval; break; - case LT_DISPATCH: + case LT_REGEXP: { + DispatchEx *regexp; + HRESULT hres; + + hres = create_regexp(ctx, literal->u.regexp.str, literal->u.regexp.str_len, + literal->u.regexp.flags, &regexp); + if(FAILED(hres)) + return hres; + V_VT(v) = VT_DISPATCH; - IDispatch_AddRef(literal->u.disp); - V_DISPATCH(v) = literal->u.disp; + V_DISPATCH(v) = (IDispatch*)_IDispatchEx_(regexp); + } } return S_OK; @@ -1656,7 +1669,7 @@ HRESULT literal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flag TRACE("\n"); - hres = literal_to_var(expr->literal, &var); + hres = literal_to_var(ctx->parser->script, expr->literal, &var); if(FAILED(hres)) return hres; @@ -1735,7 +1748,7 @@ HRESULT property_value_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWO return hres; for(iter = expr->property_list; iter; iter = iter->next) { - hres = literal_to_var(iter->name, &tmp); + hres = literal_to_var(ctx->parser->script, iter->name, &tmp); if(FAILED(hres)) break; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index e1952a9..0cd4c40 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -19,11 +19,6 @@ typedef struct _source_elements_t source_elements_t; typedef struct _function_expression_t function_expression_t; -typedef struct _obj_literal_t { - DispatchEx *obj; - struct _obj_literal_t *next; -} obj_literal_t; - typedef struct _function_declaration_t { function_expression_t *expr; @@ -61,7 +56,6 @@ typedef struct _parser_ctx_t { jsheap_t heap; - obj_literal_t *obj_literals; func_stack_t *func_stack; struct _parser_ctx_t *next; @@ -131,9 +125,9 @@ typedef enum { LT_DOUBLE, LT_STRING, LT_BOOL, - LT_DISPATCH, LT_UNDEFINED, - LT_NULL + LT_NULL, + LT_REGEXP }literal_type_t; typedef struct { @@ -144,6 +138,11 @@ typedef struct { const WCHAR *wstr; VARIANT_BOOL bval; IDispatch *disp; + struct { + const WCHAR *str; + DWORD str_len; + DWORD flags; + } regexp; } u; } literal_t; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index efb1782..4e04dea 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -755,20 +755,10 @@ int parser_lex(void *lval, parser_ctx_t *ctx) return 0; } -static void add_object_literal(parser_ctx_t *ctx, DispatchEx *obj) -{ - obj_literal_t *literal = parser_alloc(ctx, sizeof(obj_literal_t)); - - literal->obj = obj; - literal->next = ctx->obj_literals; - ctx->obj_literals = literal; -} - literal_t *parse_regexp(parser_ctx_t *ctx) { const WCHAR *re, *flags_ptr; DWORD re_len, flags; - DispatchEx *regexp; literal_t *ret; HRESULT hres; @@ -798,14 +788,10 @@ literal_t *parse_regexp(parser_ctx_t *ctx) if(FAILED(hres)) return NULL; - hres = create_regexp(ctx->script, re, re_len, flags, &regexp); - if(FAILED(hres)) - return NULL; - - add_object_literal(ctx, regexp); - ret = parser_alloc(ctx, sizeof(literal_t)); - ret->type = LT_DISPATCH; - ret->u.disp = (IDispatch*)_IDispatchEx_(regexp); + ret->type = LT_REGEXP; + ret->u.regexp.str = re; + ret->u.regexp.str_len = re_len; + ret->u.regexp.flags = flags; return ret; } diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index ee3d100..9cae524 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1591,14 +1591,9 @@ static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) void parser_release(parser_ctx_t *ctx) { - obj_literal_t *iter; - if(--ctx->ref) return; - for(iter = ctx->obj_literals; iter; iter = iter->next) - jsdisp_release(iter->obj); - jsheap_free(&ctx->heap); heap_free(ctx); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 353dcd7..db08b21 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -934,6 +934,11 @@ ok((function (){return 1;})() === 1, "(function (){return 1;})() = " + (function var re = /=(\?|%3F)/g; ok(re.source === "=(\\?|%3F)", "re.source = " + re.source); +tmp = new Array(); +for(var i=0; i<2; i++) + tmp[i] = /b/; +ok(tmp[0] != tmp[1], "tmp[0] == tmp [1]"); + ok(createNullBSTR() === '', "createNullBSTR() !== ''"); ok(getVT(nullDisp) === "VT_DISPATCH", "getVT(nullDisp) = " + getVT(nullDisp));

1 0

Paul Chitescu : netapi32: Add stub for NetFileEnum().
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: b462e34cf80a22b4f140f108e2241cdde9efa6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b462e34cf80a22b4f140f108e… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Oct 14 15:21:14 2009 +0300 netapi32: Add stub for NetFileEnum(). --- dlls/netapi32/netapi32.spec | 2 +- dlls/netapi32/share.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 900d475..eb3b841 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -88,7 +88,7 @@ @ stub NetErrorLogRead @ stub NetErrorLogWrite @ stub NetFileClose -@ stub NetFileEnum +@ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) @ stub NetFileGetInfo @ stub NetGetAnyDCName @ stdcall NetGetDCName(wstr wstr ptr) diff --git a/dlls/netapi32/share.c b/dlls/netapi32/share.c index f19f732..344bf0d 100644 --- a/dlls/netapi32/share.c +++ b/dlls/netapi32/share.c @@ -113,3 +113,16 @@ NET_API_STATUS WINAPI NetShareAdd(LMSTR servername, FIXME("Stub (%s %d %p %p)\n", debugstr_w(servername), level, buf, parm_err); return ERROR_NOT_SUPPORTED; } + +/************************************************************ + * NetFileEnum (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetFileEnum( + LPWSTR ServerName, LPWSTR BasePath, LPWSTR UserName, + DWORD Level, LPBYTE* BufPtr, DWORD PrefMaxLen, + LPDWORD EntriesRead, LPDWORD TotalEntries, PDWORD_PTR ResumeHandle) +{ + FIXME("(%s, %s, %s, %u): stub\n", debugstr_w(ServerName), debugstr_w(BasePath), + debugstr_w(UserName), Level); + return ERROR_NOT_SUPPORTED; +}

1 0

Roderick Colenbrander : winex11: Add X11DRV_XRender_SetDeviceClipping for syncing the clipping region with XRender pictures .
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 14e21d955a1e3562a898cd5a325d3b0c0d025e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e21d955a1e3562a898cd5a3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Oct 14 12:33:40 2009 +0200 winex11: Add X11DRV_XRender_SetDeviceClipping for syncing the clipping region with XRender pictures. --- dlls/winex11.drv/graphics.c | 3 +++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrender.c | 38 +++++++++++++++++++++++++++----------- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index af1e74c..e6cedfb 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -166,6 +166,9 @@ void CDECL X11DRV_SetDeviceClipping( X11DRV_PDEVICE *physDev, HRGN vis_rgn, HRGN XSetClipRectangles( gdi_display, physDev->gc, physDev->dc_rect.left, physDev->dc_rect.top, (XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); wine_tsx11_unlock(); + + if (physDev->xrender) X11DRV_XRender_SetDeviceClipping(physDev, data); + HeapFree( GetProcessHeap(), 0, data ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index eee5849..11f8e0d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -281,6 +281,7 @@ extern int using_client_side_fonts; extern void X11DRV_XRender_Init(void); extern void X11DRV_XRender_Finalize(void); extern BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE*, HFONT); +extern void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data); extern void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE*); extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height); extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index efced85..7d4250c 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -506,13 +506,19 @@ static Picture get_xrender_picture(X11DRV_PDEVICE *physDev) if (!info->pict && info->format) { XRenderPictureAttributes pa; + RGNDATA *clip = X11DRV_GetRegionData( physDev->region, 0 ); wine_tsx11_lock(); pa.subwindow_mode = IncludeInferiors; info->pict = pXRenderCreatePicture(gdi_display, physDev->drawable, info->format->pict_format, CPSubwindowMode, &pa); + if (info->pict && clip) + pXRenderSetPictureClipRectangles( gdi_display, info->pict, + physDev->dc_rect.left, physDev->dc_rect.top, + (XRectangle *)clip->Buffer, clip->rdh.nCount ); wine_tsx11_unlock(); TRACE("Allocing pict=%lx dc=%p drawable=%08lx\n", info->pict, physDev->hdc, physDev->drawable); + HeapFree( GetProcessHeap(), 0, clip ); } return info->pict; @@ -872,6 +878,21 @@ BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont) } /*********************************************************************** +* X11DRV_XRender_SetDeviceClipping +*/ +void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) +{ + if (physDev->xrender->pict) + { + wine_tsx11_lock(); + pXRenderSetPictureClipRectangles( gdi_display, physDev->xrender->pict, + physDev->dc_rect.left, physDev->dc_rect.top, + (XRectangle *)data->Buffer, data->rdh.nCount ); + wine_tsx11_unlock(); + } +} + +/*********************************************************************** * X11DRV_XRender_DeleteDC */ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) @@ -1465,7 +1486,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) { - RGNDATA *data; XGCValues xgcval; gsCacheEntry *entry; gsCacheEntryFormat *formatEntry; @@ -1586,16 +1606,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag int render_op = PictOpOver; Picture pict = get_xrender_picture(physDev); - if ((data = X11DRV_GetRegionData( physDev->region, 0 ))) - { - wine_tsx11_lock(); - pXRenderSetPictureClipRectangles( gdi_display, pict, - physDev->dc_rect.left, physDev->dc_rect.top, - (XRectangle *)data->Buffer, data->rdh.nCount ); - wine_tsx11_unlock(); - HeapFree( GetProcessHeap(), 0, data ); - } - /* There's a bug in XRenderCompositeText that ignores the xDst and yDst parameters. So we pass zeros to the function and move to our starting position using the first element of the elts array. */ @@ -2186,6 +2196,12 @@ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) return; } +void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev) +{ + assert(0); + return; +} + BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx )

1 0

Alexandre Julliard : winex11: The xrender tile picture must be used only inside the critical section.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: af683e711c4441d7e95dd0bf58271e3fc6d94caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=af683e711c4441d7e95dd0bf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 14 14:24:17 2009 +0200 winex11: The xrender tile picture must be used only inside the critical section. --- dlls/winex11.drv/xrender.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index d83c53d..aac0411 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2170,6 +2170,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE mask_pict = get_xrender_picture_source(physDevSrc); /* Use backgroundPixel as the foreground color */ + EnterCriticalSection( &xrender_cs ); src_pict = get_tile_pict(dst_format, physDevDst->backgroundPixel); /* Create a destination picture and fill it with textPixel color as the background color */ @@ -2181,6 +2182,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); wine_tsx11_unlock(); + LeaveCriticalSection( &xrender_cs ); } else /* color -> color but with different depths */ {

1 0

Paul Vriens : kernel32/tests: Fix some test failures on Win9x/WinMe.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: d11df5126d5fb0fd641da2d43d71ed4ae627a946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11df5126d5fb0fd641da2d43… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 14 13:34:06 2009 +0200 kernel32/tests: Fix some test failures on Win9x/WinMe. --- dlls/kernel32/tests/console.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c3fa57c..33eab26 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -270,6 +270,7 @@ static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) const int mylen = strlen(mytest); const int mylen2 = strchr(mytest, '\n') - mytest; int p; + WORD attr; ok(GetConsoleMode(hCon, &mode) && SetConsoleMode(hCon, (mode | ENABLE_PROCESSED_OUTPUT) & ~ENABLE_WRAP_AT_EOL_OUTPUT), "clearing wrap at EOL & setting processed output\n"); @@ -284,6 +285,15 @@ static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) { okCHAR(hCon, c, mytest[c.X - sbSize.X + 5], TEST_ATTRIB); } + + ReadConsoleOutputAttribute(hCon, &attr, 1, c, &len); + /* Win9x and WinMe change the attribs for '\n' up to 'f' */ + if (attr == TEST_ATTRIB) + { + win_skip("Win9x/WinMe don't respect ~ENABLE_WRAP_AT_EOL_OUTPUT\n"); + return; + } + okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); c.X = 0; c.Y++; @@ -381,6 +391,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) const char* mytest = "abcd\nf\tg"; const int mylen = strlen(mytest); int p; + WORD attr; ok(GetConsoleMode(hCon, &mode) && SetConsoleMode(hCon, mode | (ENABLE_WRAP_AT_EOL_OUTPUT|ENABLE_PROCESSED_OUTPUT)), "setting wrap at EOL & processed output\n"); @@ -396,7 +407,11 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) okCHAR(hCon, c, mytest[p], TEST_ATTRIB); } c.X = sbSize.X - 9 + p; - okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); + ReadConsoleOutputAttribute(hCon, &attr, 1, c, &len); + if (attr == TEST_ATTRIB) + win_skip("Win9x/WinMe changes attribs for '\\n' up to 'f'\n"); + else + okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); c.X = 0; c.Y++; okCHAR(hCon, c, mytest[5], TEST_ATTRIB); for (c.X = 1; c.X < 8; c.X++) @@ -419,7 +434,11 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = 0; c.Y++; okCHAR(hCon, c, mytest[3], TEST_ATTRIB); c.X++; - okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); + ReadConsoleOutputAttribute(hCon, &attr, 1, c, &len); + if (attr == TEST_ATTRIB) + win_skip("Win9x/WinMe changes attribs for '\\n' up to 'f'\n"); + else + okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); c.X = 0; c.Y++; okCHAR(hCon, c, mytest[5], TEST_ATTRIB);

1 0

Jacek Caban : jscript: Don't use VARTYPE as is in literal_t.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: fa3e6917b49075ac7662a3a8517357497e6d278f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3e6917b49075ac7662a3a85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 14:41:50 2009 +0200 jscript: Don't use VARTYPE as is in literal_t. --- dlls/jscript/engine.c | 30 ++++++++++++++++-------------- dlls/jscript/engine.h | 12 +++++++++++- dlls/jscript/lex.c | 6 +++--- dlls/jscript/parser.y | 8 ++++---- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index cecfd62..fa14fd9 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -349,31 +349,33 @@ static HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) static HRESULT literal_to_var(literal_t *literal, VARIANT *v) { - V_VT(v) = literal->vt; - - switch(V_VT(v)) { - case VT_EMPTY: - case VT_NULL: + switch(literal->type) { + case LT_UNDEFINED: + V_VT(v) = VT_EMPTY; break; - case VT_I4: + case LT_NULL: + V_VT(v) = VT_NULL; + break; + case LT_INT: + V_VT(v) = VT_I4; V_I4(v) = literal->u.lval; break; - case VT_R8: + case LT_DOUBLE: + V_VT(v) = VT_R8; V_R8(v) = literal->u.dval; break; - case VT_BSTR: + case LT_STRING: + V_VT(v) = VT_BSTR; V_BSTR(v) = SysAllocString(literal->u.wstr); break; - case VT_BOOL: + case LT_BOOL: + V_VT(v) = VT_BOOL; V_BOOL(v) = literal->u.bval; break; - case VT_DISPATCH: + case LT_DISPATCH: + V_VT(v) = VT_DISPATCH; IDispatch_AddRef(literal->u.disp); V_DISPATCH(v) = literal->u.disp; - break; - default: - ERR("wrong type %d\n", V_VT(v)); - return E_NOTIMPL; } return S_OK; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 386f38b..e1952a9 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -126,8 +126,18 @@ typedef struct _parameter_t parameter_t; HRESULT create_source_function(parser_ctx_t*,parameter_t*,source_elements_t*,scope_chain_t*, const WCHAR*,DWORD,DispatchEx**); +typedef enum { + LT_INT, + LT_DOUBLE, + LT_STRING, + LT_BOOL, + LT_DISPATCH, + LT_UNDEFINED, + LT_NULL +}literal_type_t; + typedef struct { - VARTYPE vt; + literal_type_t type; union { LONG lval; double dval; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 43089d3..cd53bd9 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -369,7 +369,7 @@ static literal_t *alloc_int_literal(parser_ctx_t *ctx, LONG l) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_I4; + ret->type = LT_INT; ret->u.lval = l; return ret; @@ -447,7 +447,7 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li } *literal = parser_alloc(ctx, sizeof(literal_t)); - (*literal)->vt = VT_R8; + (*literal)->type = LT_DOUBLE; (*literal)->u.dval = (double)d*pow(10, exp); return tNumericLiteral; @@ -801,7 +801,7 @@ literal_t *parse_regexp(parser_ctx_t *ctx) add_object_literal(ctx, regexp); ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_DISPATCH; + ret->type = LT_DISPATCH; ret->u.disp = (IDispatch*)_IDispatchEx_(regexp); return ret; } diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index d4b4908..ee3d100 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -841,7 +841,7 @@ static literal_t *new_string_literal(parser_ctx_t *ctx, const WCHAR *str) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_BSTR; + ret->type = LT_STRING; ret->u.wstr = str; return ret; @@ -851,7 +851,7 @@ static literal_t *new_null_literal(parser_ctx_t *ctx) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_NULL; + ret->type = LT_NULL; return ret; } @@ -860,7 +860,7 @@ static literal_t *new_undefined_literal(parser_ctx_t *ctx) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_EMPTY; + ret->type = LT_UNDEFINED; return ret; } @@ -869,7 +869,7 @@ static literal_t *new_boolean_literal(parser_ctx_t *ctx, VARIANT_BOOL bval) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_BOOL; + ret->type = LT_BOOL; ret->u.bval = bval; return ret;

1 0

Ray Hinchliffe : kernel32: Correct ullTotalVirtual for GlobalMemoryStatusEx ().
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 2c725de6dee07d2cc3c22c7df6d371c2b78e6ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c725de6dee07d2cc3c22c7df… Author: Ray Hinchliffe <ray(a)rh-software.com> Date: Wed Oct 14 09:23:45 2009 +0100 kernel32: Correct ullTotalVirtual for GlobalMemoryStatusEx(). --- dlls/kernel32/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index e85ccc3..ead0778 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1274,7 +1274,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) /* FIXME: should do something for other systems */ GetSystemInfo(&si); - lpmemex->ullTotalVirtual = (char*)si.lpMaximumApplicationAddress-(char*)si.lpMinimumApplicationAddress; + lpmemex->ullTotalVirtual = (ULONG_PTR)si.lpMaximumApplicationAddress-(ULONG_PTR)si.lpMinimumApplicationAddress; /* FIXME: we should track down all the already allocated VM pages and substract them, for now arbitrarily remove 64KB so that it matches NT */ lpmemex->ullAvailVirtual = lpmemex->ullTotalVirtual-64*1024;

1 0

Erich Hoover : user32: Test for 'F10' key events.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: b74c0cc2fea3568d2bd08e42513212e1cc60ed58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74c0cc2fea3568d2bd08e425… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Oct 12 18:49:57 2009 -0600 user32: Test for 'F10' key events. --- dlls/user32/tests/msg.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 761f3aa..bfc81dc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6870,6 +6870,36 @@ static const struct message WmVkAppsSeq[] = { { WM_CONTEXTMENU, sent|lparam, /*hwnd*/0, (LPARAM)-1 }, { 0 } }; +static const struct message WmVkF10Seq[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ + { WM_SYSKEYDOWN, wparam|lparam, VK_F10, 1 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, VK_F10, 0x00000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ + { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSCOMMAND, sent|defwinproc|wparam, SC_KEYMENU }, + { HCBT_SYSCOMMAND, hook }, + { WM_ENTERMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { WM_INITMENU, sent|defwinproc }, + { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_SYSMENU, 1 }, + + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0x10000001 }, /* XP */ + + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0, }, + { WM_CAPTURECHANGED, sent|defwinproc }, + { WM_MENUSELECT, sent|defwinproc|wparam|optional, MAKEWPARAM(0,0xffff) }, + { EVENT_SYSTEM_MENUEND, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, + { WM_EXITMENULOOP, sent|defwinproc }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ + { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, + { 0 } +}; static void pump_msg_loop(HWND hwnd, HACCEL hAccel) { @@ -7082,6 +7112,14 @@ static void test_accelerators(void) pump_msg_loop(hwnd, 0); ok_sequence(WmVkAppsSeq, "VK_APPS press/release", FALSE); + trace("testing VK_F10 press/release\n"); + keybd_event(VK_F10, 0, 0, 0); + keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_F10, 0, 0, 0); + keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); + pump_msg_loop(hwnd, 0); + ok_sequence(WmVkF10Seq, "VK_F10 press/release", TRUE); + trace("testing Shift+MouseButton press/release\n"); /* first, move mouse pointer inside of the window client area */ GetClientRect(hwnd, &rc);

1 0

Stefan Dösinger : ddraw: Make directdraw create functions hookable.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 64367542d0dfb143ec5076b2f2d6f53d4d040dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=64367542d0dfb143ec5076b2f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:15:31 2009 +0200 ddraw: Make directdraw create functions hookable. --- dlls/ddraw/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 2a0d8f0..24de0a2 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -303,7 +303,7 @@ err_out: * Arguments, return values: See DDRAW_Create * ***********************************************************************/ -HRESULT WINAPI +HRESULT WINAPI DECLSPEC_HOTPATCH DirectDrawCreate(GUID *GUID, LPDIRECTDRAW *DD, IUnknown *UnkOuter) @@ -326,7 +326,7 @@ DirectDrawCreate(GUID *GUID, * Arguments, return values: See DDRAW_Create * ***********************************************************************/ -HRESULT WINAPI +HRESULT WINAPI DECLSPEC_HOTPATCH DirectDrawCreateEx(GUID *GUID, LPVOID *DD, REFIID iid,

1 0

Erich Hoover : winex11: Send WM_SYSKEYDOWN and WM_SYSKEYUP when the 'F10' key is used.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 8c9a6e9f5cafa3306d9c0024a3e9635081678262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9a6e9f5cafa3306d9c0024a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Oct 12 18:51:19 2009 -0600 winex11: Send WM_SYSKEYDOWN and WM_SYSKEYUP when the 'F10' key is used. --- dlls/winex11.drv/keyboard.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 3da7183..1964d5c 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1197,9 +1197,10 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD if (event_flags & KEYEVENTF_KEYUP) { message = WM_KEYUP; - if ((key_state_table[VK_MENU] & 0x80) && - ((wVkStripped == VK_MENU) || (wVkStripped == VK_CONTROL) - || !(key_state_table[VK_CONTROL] & 0x80))) + if (((key_state_table[VK_MENU] & 0x80) && + ((wVkStripped == VK_MENU) || (wVkStripped == VK_CONTROL) + || !(key_state_table[VK_CONTROL] & 0x80))) + || (wVkStripped == VK_F10)) { if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */ (wVkStripped != VK_MENU)) /* <ALT>-down...<something else>-up */ @@ -1211,8 +1212,9 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD else { message = WM_KEYDOWN; - if ((key_state_table[VK_MENU] & 0x80 || wVkStripped == VK_MENU) && - !(key_state_table[VK_CONTROL] & 0x80 || wVkStripped == VK_CONTROL)) + if (((key_state_table[VK_MENU] & 0x80 || wVkStripped == VK_MENU) && + !(key_state_table[VK_CONTROL] & 0x80 || wVkStripped == VK_CONTROL)) || + (wVkStripped == VK_F10)) { message = WM_SYSKEYDOWN; TrackSysKey = wVkStripped;

1 0