November 2011 - Wine-Commits

Piotr Caban : services: Added support for SERVICE_CONFIG_PRESHUTDOWN_INFO.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: b8704a4929a9325242ad1fa2f5791734d5e84a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8704a4929a9325242ad1fa2f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 30 15:28:26 2011 +0100 services: Added support for SERVICE_CONFIG_PRESHUTDOWN_INFO. --- include/wine/svcctl.idl | 5 +++++ programs/services/rpc.c | 20 ++++++++++++++++++++ programs/services/services.c | 8 +++++++- programs/services/services.h | 1 + 4 files changed, 33 insertions(+), 1 deletions(-) diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 895ee2e..f261702 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -114,6 +114,10 @@ typedef struct _SERVICE_FAILURE_ACTIONSW { [size_is(cActions)] SC_ACTION *lpsaActions; } SERVICE_FAILURE_ACTIONSW,*LPSERVICE_FAILURE_ACTIONSW; +typedef struct _SERVICE_PRESHUTDOWN_INFO { + DWORD dwPreshutdownTimeout; +} SERVICE_PRESHUTDOWN_INFO,*LPSERVICE_PRESHUTDOWN_INFO; + #define SERVICE_CONFIG_DESCRIPTION 1 #define SERVICE_CONFIG_FAILURE_ACTIONS 2 #define SERVICE_CONFIG_DELAYED_AUTO_START_INFO 3 @@ -134,6 +138,7 @@ typedef [switch_type(DWORD)] union { [case (SERVICE_CONFIG_DESCRIPTION)] SERVICE_DESCRIPTIONW descr; [case (SERVICE_CONFIG_FAILURE_ACTIONS)] SERVICE_FAILURE_ACTIONSW actions; + [case (SERVICE_CONFIG_PRESHUTDOWN_INFO)] SERVICE_PRESHUTDOWN_INFO preshutdown; } SERVICE_CONFIG2W; /* Compatible with Windows function 0x00 */ diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 2d853c0..66bd17b 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -737,6 +737,14 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, wine_dbgstr_w(config->actions.lpRebootMsg), wine_dbgstr_w(config->actions.lpCommand) ); break; + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + WINE_TRACE( "changing service %p preshutdown timeout to %d\n", + service, config->preshutdown.dwPreshutdownTimeout ); + service_lock_exclusive( service->service_entry ); + service->service_entry->preshutdown_timeout = config->preshutdown.dwPreshutdownTimeout; + save_service_config( service->service_entry ); + service_unlock( service->service_entry ); + break; default: WINE_FIXME("level %u not implemented\n", level); err = ERROR_INVALID_LEVEL; @@ -781,6 +789,18 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, } break; + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + service_lock_shared(service->service_entry); + + *needed = sizeof(SERVICE_PRESHUTDOWN_INFO); + if (size >= *needed) + ((LPSERVICE_PRESHUTDOWN_INFO)buffer)->dwPreshutdownTimeout = + service->service_entry->preshutdown_timeout; + else err = ERROR_INSUFFICIENT_BUFFER; + + service_unlock(service->service_entry); + break; + default: WINE_FIXME("level %u not implemented\n", level); err = ERROR_INVALID_LEVEL; diff --git a/programs/services/services.c b/programs/services/services.c index 94b4747..ba6b697 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -41,6 +41,7 @@ struct scmdatabase *active_database; DWORD service_pipe_timeout = 10000; DWORD service_kill_timeout = 20000; +static DWORD default_preshutdown_timeout = 180000; static void *env = NULL; static const int is_win64 = (sizeof(void *) > sizeof(int)); @@ -64,6 +65,7 @@ static const WCHAR SZ_DEPEND_ON_GROUP[] = {'D','e','p','e','n','d','O','n','G' static const WCHAR SZ_OBJECT_NAME[] = {'O','b','j','e','c','t','N','a','m','e',0}; static const WCHAR SZ_TAG[] = {'T','a','g',0}; static const WCHAR SZ_DESCRIPTION[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR SZ_PRESHUTDOWN[] = {'P','r','e','s','h','u','t','d','o','w','n','T','i','m','e','o','u','t',0}; DWORD service_create(LPCWSTR name, struct service_entry **entry) @@ -80,6 +82,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) (*entry)->control_pipe = INVALID_HANDLE_VALUE; (*entry)->status.dwCurrentState = SERVICE_STOPPED; (*entry)->status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; + (*entry)->preshutdown_timeout = default_preshutdown_timeout; /* all other fields are zero */ return ERROR_SUCCESS; } @@ -130,6 +133,8 @@ static DWORD load_service_config(HKEY hKey, struct service_entry *entry) return err; if ((err = load_reg_dword(hKey, SZ_TAG, &entry->config.dwTagId)) != 0) return err; + if ((err = load_reg_dword(hKey, SZ_PRESHUTDOWN, &entry->preshutdown_timeout)) != 0) + return err; WINE_TRACE("Image path = %s\n", wine_dbgstr_w(entry->config.lpBinaryPathName) ); WINE_TRACE("Group = %s\n", wine_dbgstr_w(entry->config.lpLoadOrderGroup) ); @@ -206,9 +211,10 @@ DWORD save_service_config(struct service_entry *entry) goto cleanup; if ((err = RegSetValueExW(hKey, SZ_ERROR, 0, REG_DWORD, (LPBYTE)&entry->config.dwErrorControl, sizeof(DWORD))) != 0) goto cleanup; - if ((err = RegSetValueExW(hKey, SZ_TYPE, 0, REG_DWORD, (LPBYTE)&entry->config.dwServiceType, sizeof(DWORD))) != 0) goto cleanup; + if ((err = RegSetValueExW(hKey, SZ_PRESHUTDOWN, 0, REG_DWORD, (LPBYTE)&entry->preshutdown_timeout, sizeof(DWORD))) != 0) + goto cleanup; if (entry->config.dwTagId) err = RegSetValueExW(hKey, SZ_TAG, 0, REG_DWORD, (LPBYTE)&entry->config.dwTagId, sizeof(DWORD)); diff --git a/programs/services/services.h b/programs/services/services.h index 448ddfa..d5fcf77 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -39,6 +39,7 @@ struct service_entry LPWSTR name; SERVICE_STATUS_PROCESS status; QUERY_SERVICE_CONFIGW config; + DWORD preshutdown_timeout; LPWSTR description; LPWSTR dependOnServices; LPWSTR dependOnGroups;

1 0

Piotr Caban : include: Update winsvc.h header.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: eeb5c93ac7975a20ade0b233de9952bce927ac72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb5c93ac7975a20ade0b233d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 30 15:28:15 2011 +0100 include: Update winsvc.h header. --- include/winsvc.h | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/winsvc.h b/include/winsvc.h index 1031f0c..c1af509 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -64,6 +64,7 @@ extern "C" { #define SERVICE_CONTROL_HARDWAREPROFILECHANGE 0x0000000C #define SERVICE_CONTROL_POWEREVENT 0x0000000D #define SERVICE_CONTROL_SESSIONCHANGE 0x0000000E +#define SERVICE_CONTROL_PRESHUTDOWN 0x0000000F /* Service State */ #define SERVICE_STOPPED 0x00000001 @@ -83,6 +84,7 @@ extern "C" { #define SERVICE_ACCEPT_HARDWAREPROFILECHANGE 0x00000020 #define SERVICE_ACCEPT_POWEREVENT 0x00000040 #define SERVICE_ACCEPT_SESSIONCHANGE 0x00000080 +#define SERVICE_ACCEPT_PRESHUTDOWN 0x00000100 /* Service Control Manager Object access types */ #define SC_MANAGER_CONNECT 0x0001 @@ -294,6 +296,33 @@ typedef struct _SERVICE_FAILURE_ACTIONSW { DECL_WINELIB_TYPE_AW(SERVICE_FAILURE_ACTIONS) DECL_WINELIB_TYPE_AW(LPSERVICE_FAILURE_ACTIONS) +typedef struct _SERVICE_DELAYED_AUTO_START_INFO { + BOOL fDelayedAutostart; +} SERVICE_DELAYED_AUTO_START_INFO,*LPSERVICE_DELAYED_AUTO_START_INFO; + +typedef struct _SERVICE_FAILURE_ACTIONS_FLAG { + BOOL fFailureActionsOnNonCrashFailures; +} SERVICE_FAILURE_ACTIONS_FLAG,*LPSERVICE_FAILURE_ACTIONS_FLAG; + +typedef struct _SERVICE_SID_INFO { + DWORD dwServiceSidType; +} SERVICE_SID_INFO,*LPSERVICE_SID_INFO; + +typedef struct _SERVICE_REQUIRED_PRIVILEGES_INFOA { + LPSTR pmszRequiredPrivileges; +} SERVICE_REQUIRED_PRIVILEGES_INFOA,*LPSERVICE_REQUIRED_PRIVILEGES_INFOA; + +typedef struct _SERVICE_REQUIRED_PRIVILEGES_INFOW { + LPWSTR pmszRequiredPrivileges; +} SERVICE_REQUIRED_PRIVILEGES_INFOW,*LPSERVICE_REQUIRED_PRIVILEGES_INFOW; + +DECL_WINELIB_TYPE_AW(SERVICE_REQUIRED_PRIVILEGES_INFO) +DECL_WINELIB_TYPE_AW(LPSERVICE_REQUIRED_PRIVILEGES_INFO) + +typedef struct _SERVICE_PRESHUTDOWN_INFO { + DWORD dwPreshutdownTimeout; +} SERVICE_PRESHUTDOWN_INFO,*LPSERVICE_PRESHUTDOWN_INFO; + typedef struct _QUERY_SERVICE_LOCK_STATUSA { DWORD fIsLocked;

1 0

Alexandre Julliard : winex11: Implement rectangular gradients using straight X11 calls.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 0446707a561e81387157ac68ea9499376ddf400f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0446707a561e81387157ac68e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 30 13:09:08 2011 +0100 winex11: Implement rectangular gradients using straight X11 calls. --- dlls/winex11.drv/graphics.c | 118 +++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 2 + 3 files changed, 121 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 0abd593..88e9b0c 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1494,6 +1494,124 @@ BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillTy } /********************************************************************** + * X11DRV_GradientFill + */ +BOOL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) +{ + X11DRV_PDEVICE *physdev = get_x11drv_dev( dev ); + const GRADIENT_RECT *rect = grad_array; + TRIVERTEX v[2]; + POINT pt[2]; + unsigned int i; + XGCValues val; + + /* 4, 8, and 16-bpp use dithering */ + if (physdev->depth >= 4 && physdev->depth <= 16) goto fallback; + + switch (mode) + { + case GRADIENT_FILL_RECT_H: + val.function = GXcopy; + val.fill_style = FillSolid; + val.line_width = 1; + val.cap_style = CapNotLast; + val.line_style = LineSolid; + wine_tsx11_lock(); + XChangeGC( gdi_display, physdev->gc, + GCFunction | GCLineWidth | GCLineStyle | GCCapStyle | GCFillStyle, &val ); + wine_tsx11_unlock(); + + X11DRV_LockDIBSection( physdev, DIB_Status_GdiMod ); + for (i = 0; i < ngrad; i++, rect++) + { + int pos, x, dx; + + v[0] = vert_array[rect->UpperLeft]; + v[1] = vert_array[rect->LowerRight]; + pt[0].x = v[0].x; + pt[0].y = v[0].y; + pt[1].x = v[1].x; + pt[1].y = v[1].y; + LPtoDP( dev->hdc, pt, 2 ); + dx = pt[1].x - pt[0].x; + if (!dx) continue; + if (dx < 0) /* swap the colors */ + { + v[0] = vert_array[rect->LowerRight]; + v[1] = vert_array[rect->UpperLeft]; + dx = -dx; + } + for (x = 0, pos = min( pt[0].x, pt[1].x ); x < dx; x++, pos++) + { + COLORREF color = RGB( (v[0].Red * (dx - x) + v[1].Red * x) / dx / 256, + (v[0].Green * (dx - x) + v[1].Green * x) / dx / 256, + (v[0].Blue * (dx - x) + v[1].Blue * x) / dx / 256); + wine_tsx11_lock(); + XSetForeground( gdi_display, physdev->gc, X11DRV_PALETTE_ToPhysical( physdev, color )); + XDrawLine( gdi_display, physdev->drawable, physdev->gc, + physdev->dc_rect.left + pos, physdev->dc_rect.top + pt[0].y, + physdev->dc_rect.left + pos, physdev->dc_rect.top + pt[1].y ); + wine_tsx11_unlock(); + } + } + X11DRV_UnlockDIBSection( physdev, TRUE ); + return TRUE; + + case GRADIENT_FILL_RECT_V: + val.function = GXcopy; + val.fill_style = FillSolid; + val.line_width = 1; + val.cap_style = CapNotLast; + val.line_style = LineSolid; + wine_tsx11_lock(); + XChangeGC( gdi_display, physdev->gc, + GCFunction | GCLineWidth | GCLineStyle | GCCapStyle | GCFillStyle, &val ); + wine_tsx11_unlock(); + + X11DRV_LockDIBSection( physdev, DIB_Status_GdiMod ); + for (i = 0; i < ngrad; i++, rect++) + { + int pos, y, dy; + + v[0] = vert_array[rect->UpperLeft]; + v[1] = vert_array[rect->LowerRight]; + pt[0].x = v[0].x; + pt[0].y = v[0].y; + pt[1].x = v[1].x; + pt[1].y = v[1].y; + LPtoDP( dev->hdc, pt, 2 ); + dy = pt[1].y - pt[0].y; + if (!dy) continue; + if (dy < 0) /* swap the colors */ + { + v[0] = vert_array[rect->LowerRight]; + v[1] = vert_array[rect->UpperLeft]; + dy = -dy; + } + for (y = 0, pos = min( pt[0].y, pt[1].y ); y < dy; y++, pos++) + { + COLORREF color = RGB( (v[0].Red * (dy - y) + v[1].Red * y) / dy / 256, + (v[0].Green * (dy - y) + v[1].Green * y) / dy / 256, + (v[0].Blue * (dy - y) + v[1].Blue * y) / dy / 256); + wine_tsx11_lock(); + XSetForeground( gdi_display, physdev->gc, X11DRV_PALETTE_ToPhysical( physdev, color )); + XDrawLine( gdi_display, physdev->drawable, physdev->gc, + physdev->dc_rect.left + pt[0].x, physdev->dc_rect.top + pos, + physdev->dc_rect.left + pt[1].x, physdev->dc_rect.top + pos ); + wine_tsx11_unlock(); + } + } + X11DRV_UnlockDIBSection( physdev, TRUE ); + return TRUE; + } + +fallback: + dev = GET_NEXT_PHYSDEV( dev, pGradientFill ); + return dev->funcs->pGradientFill( dev, vert_array, nvert, grad_array, ngrad, mode ); +} + +/********************************************************************** * X11DRV_SetBkColor */ COLORREF X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 8d61b5b..8b3b951 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -527,7 +527,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ X11DRV_GetTextMetrics, /* pGetTextMetrics */ - NULL, /* pGradientFill */ + X11DRV_GradientFill, /* pGradientFill */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ X11DRV_LineTo, /* pLineTo */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index dbc0629..d90968d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -203,6 +203,8 @@ extern UINT X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, extern BOOL X11DRV_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; +extern BOOL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; extern BOOL X11DRV_LineTo( PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN;

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 361d746fbd26a53eba8e1b2c817b6be91b353a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=361d746fbd26a53eba8e1b2c8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:15 2011 -0700 po: Update Catalan translation. --- po/ca.po | 1039 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 430 insertions(+), 609 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=361d746fbd26a53eba8e1…

1 0

Jacek Caban : jscript: Mark some functions as static.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 6c47177cb1aa52f89aed54c16c8d943556b52b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c47177cb1aa52f89aed54c16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 10:14:04 2011 +0100 jscript: Mark some functions as static. --- dlls/jscript/engine.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2d766e4..48633cf 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1636,7 +1636,7 @@ static void jsstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) } /* ECMA-262 3rd Edition 11.2.2 */ -HRESULT interp_new(exec_ctx_t *ctx) +static HRESULT interp_new(exec_ctx_t *ctx) { const LONG arg = ctx->parser->code->instrs[ctx->ip].arg1.lng; VARIANT *constr, v; @@ -1721,7 +1721,7 @@ HRESULT call_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags } /* ECMA-262 3rd Edition 11.1.1 */ -HRESULT interp_this(exec_ctx_t *ctx) +static HRESULT interp_this(exec_ctx_t *ctx) { VARIANT v; @@ -1775,7 +1775,7 @@ static HRESULT interp_ident(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8.1 */ -HRESULT interp_null(exec_ctx_t *ctx) +static HRESULT interp_null(exec_ctx_t *ctx) { VARIANT v; @@ -1786,7 +1786,7 @@ HRESULT interp_null(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8.2 */ -HRESULT interp_bool(exec_ctx_t *ctx) +static HRESULT interp_bool(exec_ctx_t *ctx) { const LONG arg = ctx->parser->code->instrs[ctx->ip].arg1.lng; @@ -1796,7 +1796,7 @@ HRESULT interp_bool(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8.3 */ -HRESULT interp_int(exec_ctx_t *ctx) +static HRESULT interp_int(exec_ctx_t *ctx) { const LONG arg = ctx->parser->code->instrs[ctx->ip].arg1.lng; VARIANT v; @@ -1809,7 +1809,7 @@ HRESULT interp_int(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8.3 */ -HRESULT interp_double(exec_ctx_t *ctx) +static HRESULT interp_double(exec_ctx_t *ctx) { const double arg = *ctx->parser->code->instrs[ctx->ip].arg1.dbl; VARIANT v; @@ -1822,7 +1822,7 @@ HRESULT interp_double(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8.4 */ -HRESULT interp_str(exec_ctx_t *ctx) +static HRESULT interp_str(exec_ctx_t *ctx) { const WCHAR *str = ctx->parser->code->instrs[ctx->ip].arg1.str; VARIANT v; @@ -1838,7 +1838,7 @@ HRESULT interp_str(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8 */ -HRESULT interp_regexp(exec_ctx_t *ctx) +static HRESULT interp_regexp(exec_ctx_t *ctx) { const WCHAR *source = ctx->parser->code->instrs[ctx->ip].arg1.str; const LONG flags = ctx->parser->code->instrs[ctx->ip].arg2.lng; @@ -1960,7 +1960,7 @@ HRESULT property_value_expression_eval(script_ctx_t *ctx, expression_t *_expr, D } /* ECMA-262 3rd Edition 11.11 */ -HRESULT interp_jmp_nz(exec_ctx_t *ctx) +static HRESULT interp_jmp_nz(exec_ctx_t *ctx) { const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; VARIANT_BOOL b; @@ -1982,7 +1982,7 @@ HRESULT interp_jmp_nz(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.11 */ -HRESULT interp_jmp_z(exec_ctx_t *ctx) +static HRESULT interp_jmp_z(exec_ctx_t *ctx) { const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; VARIANT_BOOL b; @@ -2177,7 +2177,7 @@ HRESULT instanceof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD } /* ECMA-262 3rd Edition 11.8.7 */ -HRESULT interp_in(exec_ctx_t *ctx) +static HRESULT interp_in(exec_ctx_t *ctx) { VARIANT *obj, *v; DISPID id = 0; @@ -2280,7 +2280,7 @@ static HRESULT add_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.6.1 */ -HRESULT interp_add(exec_ctx_t *ctx) +static HRESULT interp_add(exec_ctx_t *ctx) { VARIANT *l, *r, ret; HRESULT hres; @@ -2318,7 +2318,7 @@ static HRESULT sub_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.6.2 */ -HRESULT interp_sub(exec_ctx_t *ctx) +static HRESULT interp_sub(exec_ctx_t *ctx) { VARIANT l, r; HRESULT hres; @@ -2355,7 +2355,7 @@ static HRESULT mul_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.5.1 */ -HRESULT interp_mul(exec_ctx_t *ctx) +static HRESULT interp_mul(exec_ctx_t *ctx) { VARIANT l, r; HRESULT hres; @@ -2498,7 +2498,7 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } /* ECMA-262 3rd Edition 11.4.2 */ -HRESULT interp_void(exec_ctx_t *ctx) +static HRESULT interp_void(exec_ctx_t *ctx) { VARIANT v; @@ -2603,7 +2603,7 @@ HRESULT typeof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } /* ECMA-262 3rd Edition 11.4.7 */ -HRESULT interp_minus(exec_ctx_t *ctx) +static HRESULT interp_minus(exec_ctx_t *ctx) { VARIANT n; HRESULT hres; @@ -2618,7 +2618,7 @@ HRESULT interp_minus(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.4.6 */ -HRESULT interp_tonum(exec_ctx_t *ctx) +static HRESULT interp_tonum(exec_ctx_t *ctx) { VARIANT *v, num; HRESULT hres; @@ -2871,7 +2871,7 @@ static HRESULT equal_values(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jse } /* ECMA-262 3rd Edition 11.9.1 */ -HRESULT interp_eq(exec_ctx_t *ctx) +static HRESULT interp_eq(exec_ctx_t *ctx) { VARIANT *l, *r; BOOL b; @@ -2892,7 +2892,7 @@ HRESULT interp_eq(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.9.2 */ -HRESULT interp_neq(exec_ctx_t *ctx) +static HRESULT interp_neq(exec_ctx_t *ctx) { VARIANT *l, *r; BOOL b; @@ -3090,7 +3090,7 @@ HRESULT greatereq_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD } /* ECMA-262 3rd Edition 11.4.8 */ -HRESULT interp_bneg(exec_ctx_t *ctx) +static HRESULT interp_bneg(exec_ctx_t *ctx) { VARIANT *v, r; INT i; @@ -3110,7 +3110,7 @@ HRESULT interp_bneg(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.4.9 */ -HRESULT interp_neg(exec_ctx_t *ctx) +static HRESULT interp_neg(exec_ctx_t *ctx) { VARIANT *v; VARIANT_BOOL b; @@ -3361,7 +3361,7 @@ HRESULT assign_xor_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD return assign_oper_eval(ctx, expr->expression1, expr->expression2, xor_eval, ei, ret); } -HRESULT interp_jmp(exec_ctx_t *ctx) +static HRESULT interp_jmp(exec_ctx_t *ctx) { const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint;

1 0

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_PIPELINETIMINGS.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 04a7ae43d5dee2de0de6a2b1011f6f8ec15a61ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a7ae43d5dee2de0de6a2b10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 30 06:01:48 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_PIPELINETIMINGS. --- include/wine/wined3d.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fea107f..edab31b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1696,14 +1696,6 @@ struct wined3d_device_creation_parameters DWORD flags; }; -typedef struct _WINED3DDEVINFO_PIPELINETIMINGS -{ - float VertexProcessingTimePercent; - float PixelProcessingTimePercent; - float OtherGPUProcessingTimePercent; - float GPUIdleTimePercent; -} WINED3DDEVINFO_PIPELINETIMINGS; - typedef struct _WINED3DDEVINFO_STAGETIMINGS { float MemoryProcessingPercent;

1 0

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_INTERFACETIMINGS.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 3c75024210a1c2e31c5c8b74724e087ef314cb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c75024210a1c2e31c5c8b747… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 30 06:01:47 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_INTERFACETIMINGS. --- include/wine/wined3d.h | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c79137e..fea107f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1696,15 +1696,6 @@ struct wined3d_device_creation_parameters DWORD flags; }; -typedef struct _WINED3DDEVINFO_INTERFACETIMINGS -{ - float WaitingForGPUToUseApplicationResourceTimePercent; - float WaitingForGPUToAcceptMoreCommandsTimePercent; - float WaitingForGPUToStayWithinLatencyTimePercent; - float WaitingForGPUExclusiveResourceTimePercent; - float WaitingForGPUOtherTimePercent; -} WINED3DDEVINFO_INTERFACETIMINGS; - typedef struct _WINED3DDEVINFO_PIPELINETIMINGS { float VertexProcessingTimePercent;

1 0

Jacek Caban : jscript: Use bytecode for delete member expression.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 962307da6c74685876939dd148bd3d80c3b7a913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=962307da6c74685876939dd14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 10:14:33 2011 +0100 jscript: Use bytecode for delete member expression. --- dlls/jscript/compile.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index adcd749..b0fa861 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -321,6 +321,22 @@ static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t return E_OUTOFMEMORY; break; } + case EXPR_MEMBER: { + member_expression_t *member_expr = (member_expression_t*)expr->expression; + + hres = compile_expression(ctx, member_expr->expression); + if(FAILED(hres)) + return hres; + + /* FIXME: Potential optimization */ + hres = push_instr_str(ctx, OP_str, member_expr->identifier); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_delete) == -1) + return E_OUTOFMEMORY; + break; + } default: expr->expr.eval = delete_expression_eval; return compile_interp_fallback(ctx, &expr->expr);

1 0

Alexandre Julliard : gdi32: Use the DIB engine and PutImage for the null driver rectangular gradient implementation .
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 4c6807199ef5acaa4f8c1a3b3285f30f66d6c582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6807199ef5acaa4f8c1a3b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 30 12:21:35 2011 +0100 gdi32: Use the DIB engine and PutImage for the null driver rectangular gradient implementation. --- dlls/gdi32/bitblt.c | 157 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/bitblt.c | 9 +++ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/painting.c | 143 ---------------------------------------- 4 files changed, 167 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c6807199ef5acaa4f8c1…

1 0

Alex Henrie : wineconsole: Widen label to accomodate translations.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 157be323b7a39e939d46774a8758da53ea6ad001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157be323b7a39e939d46774a8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:55 2011 -0700 wineconsole: Widen label to accomodate translations. --- programs/wineconsole/wineconsole.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole.rc b/programs/wineconsole/wineconsole.rc index 8216da3..d738433 100644 --- a/programs/wineconsole/wineconsole.rc +++ b/programs/wineconsole/wineconsole.rc @@ -81,7 +81,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Font " FONT 8, "MS Shell Dlg" { - LTEXT "&Font", -1, 5, 5, 32, 8 + LTEXT "&Font", -1, 5, 5, 50, 8 LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL LTEXT "&Color", -1, 100, 5, 50, 8 CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16

1 0