wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Alexandre Julliard : user32: Use the correct alpha for the title bar gradient and simplify the mesh.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 174d2f6d72681c3acec0f8b0c6e41c1e4ca19e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=174d2f6d72681c3acec0f8b0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 30 14:26:25 2011 +0100 user32: Use the correct alpha for the title bar gradient and simplify the mesh. --- dlls/user32/nonclient.c | 55 +++++++++++++++++++--------------------------- 1 files changed, 23 insertions(+), 32 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index d2bcdcb..6bef9ff 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -182,55 +182,46 @@ static void NC_DrawCaptionBar (HDC hdc, const RECT *rect, DWORD dwStyle, { if (gradient) { - TRIVERTEX vertices[6]; + TRIVERTEX vertices[4]; DWORD colLeft = GetSysColor (active ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); DWORD colRight = GetSysColor (active ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); - int v; int buttonsAreaSize = GetSystemMetrics(SM_CYCAPTION) - 1; - static GRADIENT_RECT mesh[] = {{0, 1}, {2, 3}, {4, 5}}; - - for (v = 0; v < 3; v++) - { - vertices[v].Red = GetRValue (colLeft) << 8; - vertices[v].Green = GetGValue (colLeft) << 8; - vertices[v].Blue = GetBValue (colLeft) << 8; - vertices[v].Alpha = 0x8000; - vertices[v+3].Red = GetRValue (colRight) << 8; - vertices[v+3].Green = GetGValue (colRight) << 8; - vertices[v+3].Blue = GetBValue (colRight) << 8; - vertices[v+3].Alpha = 0x8000; - } - - if ((dwStyle & WS_SYSMENU) + static GRADIENT_RECT mesh[] = {{0, 1}, {1, 2}, {2, 3}}; + + vertices[0].Red = vertices[1].Red = GetRValue (colLeft) << 8; + vertices[0].Green = vertices[1].Green = GetGValue (colLeft) << 8; + vertices[0].Blue = vertices[1].Blue = GetBValue (colLeft) << 8; + vertices[0].Alpha = vertices[1].Alpha = 0xff00; + vertices[2].Red = vertices[3].Red = GetRValue (colRight) << 8; + vertices[2].Green = vertices[3].Green = GetGValue (colRight) << 8; + vertices[2].Blue = vertices[3].Blue = GetBValue (colRight) << 8; + vertices[2].Alpha = vertices[3].Alpha = 0xff00; + + if ((dwStyle & WS_SYSMENU) && ((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX))) buttonsAreaSize += 2 * (GetSystemMetrics(SM_CXSIZE) + 1); - + /* area behind icon; solid filled with left color */ vertices[0].x = rect->left; vertices[0].y = rect->top; - if (dwStyle & WS_SYSMENU) - vertices[1].x = - min (rect->left + GetSystemMetrics(SM_CXSMICON), rect->right); + if (dwStyle & WS_SYSMENU) + vertices[1].x = min (rect->left + GetSystemMetrics(SM_CXSMICON), rect->right); else vertices[1].x = vertices[0].x; vertices[1].y = rect->bottom; - + /* area behind text; gradient */ - vertices[2].x = vertices[1].x; + vertices[2].x = max (vertices[1].x, rect->right - buttonsAreaSize); vertices[2].y = rect->top; - vertices[3].x = max (vertices[2].x, rect->right - buttonsAreaSize); - vertices[3].y = rect->bottom; - + /* area behind buttons; solid filled with right color */ - vertices[4].x = vertices[3].x; - vertices[4].y = rect->top; - vertices[5].x = rect->right; - vertices[5].y = rect->bottom; - - GdiGradientFill (hdc, vertices, 6, mesh, 3, GRADIENT_FILL_RECT_H); + vertices[3].x = rect->right; + vertices[3].y = rect->bottom; + + GdiGradientFill (hdc, vertices, 4, mesh, 3, GRADIENT_FILL_RECT_H); } else FillRect (hdc, rect, GetSysColorBrush (active ?

1 0

Alexandre Julliard : winex11: Implement rectangular gradients using XRender if supported.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 76358216f4e203d029afc1a1d5c4df6faf06a519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76358216f4e203d029afc1a1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 30 13:22:21 2011 +0100 winex11: Implement rectangular gradients using XRender if supported. --- configure | 42 ++++++++++++++++ configure.ac | 7 ++- dlls/winex11.drv/xrender.c | 118 ++++++++++++++++++++++++++++++++++++++++++-- include/config.h.in | 3 + 4 files changed, 164 insertions(+), 6 deletions(-) diff --git a/configure b/configure index f573540..cba043f 100755 --- a/configure +++ b/configure @@ -8477,6 +8477,48 @@ $as_echo "#define HAVE_XRENDERSETPICTURETRANSFORM 1" >>confdefs.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderCreateLinearGradient in -lXrender" >&5 +$as_echo_n "checking for XRenderCreateLinearGradient in -lXrender... " >&6; } +if ${ac_cv_lib_Xrender_XRenderCreateLinearGradient+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXrender $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XRenderCreateLinearGradient (); +int +main () +{ +return XRenderCreateLinearGradient (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xrender_XRenderCreateLinearGradient=yes +else + ac_cv_lib_Xrender_XRenderCreateLinearGradient=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderCreateLinearGradient" >&5 +$as_echo "$ac_cv_lib_Xrender_XRenderCreateLinearGradient" >&6; } +if test "x$ac_cv_lib_Xrender_XRenderCreateLinearGradient" = xyes; then : + +$as_echo "#define HAVE_XRENDERCREATELINEARGRADIENT 1" >>confdefs.h + +fi + fi fi diff --git a/configure.ac b/configure.ac index d6f5e6a..82f7c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -1021,8 +1021,11 @@ then WINE_CHECK_SONAME(Xrender,XRenderQueryExtension, [AC_CHECK_LIB(Xrender,XRenderSetPictureTransform, [AC_DEFINE(HAVE_XRENDERSETPICTURETRANSFORM, 1, - [Define if Xrender has the XRenderSetPictureTransform function])],, - [$X_LIBS $XLIB $X_EXTRA_LIBS])],,[$X_LIBS $XLIB $X_EXTRA_LIBS]) + [Define if Xrender has the XRenderSetPictureTransform function])],,[$X_LIBS $XLIB $X_EXTRA_LIBS]) + AC_CHECK_LIB(Xrender,XRenderCreateLinearGradient, + [AC_DEFINE(HAVE_XRENDERCREATELINEARGRADIENT, 1, + [Define if Xrender has the XRenderCreateLinearGradient function])],,[$X_LIBS $XLIB $X_EXTRA_LIBS])],, + [$X_LIBS $XLIB $X_EXTRA_LIBS]) fi WINE_WARNING_WITH(xrender,[test "x$ac_cv_lib_soname_Xrender" = "x"], diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ebbf9fc..f7fd11e 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -198,6 +198,9 @@ MAKE_FUNCPTR(XRenderFindVisualFormat) MAKE_FUNCPTR(XRenderFreeGlyphSet) MAKE_FUNCPTR(XRenderFreePicture) MAKE_FUNCPTR(XRenderSetPictureClipRectangles) +#ifdef HAVE_XRENDERCREATELINEARGRADIENT +MAKE_FUNCPTR(XRenderCreateLinearGradient) +#endif #ifdef HAVE_XRENDERSETPICTURETRANSFORM MAKE_FUNCPTR(XRenderSetPictureTransform) #endif @@ -367,6 +370,7 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) if (!(xrender_handle = wine_dlopen(SONAME_LIBXRENDER, RTLD_NOW, NULL, 0))) return NULL; #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xrender_handle, #f, NULL, 0)) == NULL) return NULL +#define LOAD_OPTIONAL_FUNCPTR(f) p##f = wine_dlsym(xrender_handle, #f, NULL, 0) LOAD_FUNCPTR(XRenderAddGlyphs); LOAD_FUNCPTR(XRenderComposite); LOAD_FUNCPTR(XRenderCompositeText16); @@ -379,12 +383,14 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) LOAD_FUNCPTR(XRenderFreePicture); LOAD_FUNCPTR(XRenderSetPictureClipRectangles); LOAD_FUNCPTR(XRenderQueryExtension); -#undef LOAD_FUNCPTR +#ifdef HAVE_XRENDERCREATELINEARGRADIENT + LOAD_OPTIONAL_FUNCPTR(XRenderCreateLinearGradient); +#endif #ifdef HAVE_XRENDERSETPICTURETRANSFORM -#define LOAD_OPTIONAL_FUNCPTR(f) p##f = wine_dlsym(xrender_handle, #f, NULL, 0) LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform); -#undef LOAD_OPTIONAL_FUNCPTR #endif +#undef LOAD_OPTIONAL_FUNCPTR +#undef LOAD_FUNCPTR wine_tsx11_lock(); X11DRV_XRender_Installed = pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base); @@ -2519,6 +2525,110 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, } /*********************************************************************** + * xrenderdrv_GradientFill + */ +static BOOL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void * grad_array, ULONG ngrad, ULONG mode ) +{ +#ifdef HAVE_XRENDERCREATELINEARGRADIENT + static const XFixed stops[2] = { 0, 1 << 16 }; + struct xrender_physdev *physdev = get_xrender_dev( dev ); + XLinearGradient gradient; + XRenderColor colors[2]; + Picture src_pict, dst_pict; + unsigned int i; + const GRADIENT_RECT *rect = grad_array; + POINT pt[2]; + + if (!X11DRV_XRender_Installed) goto fallback; + if (!pXRenderCreateLinearGradient) goto fallback; + + /* 16-bpp uses dithering */ + if (!physdev->pict_format || physdev->pict_format->depth == 16) goto fallback; + + switch (mode) + { + case GRADIENT_FILL_RECT_H: + case GRADIENT_FILL_RECT_V: + X11DRV_LockDIBSection( physdev->x11dev, DIB_Status_GdiMod ); + for (i = 0; i < ngrad; i++, rect++) + { + const TRIVERTEX *v1 = vert_array + rect->UpperLeft; + const TRIVERTEX *v2 = vert_array + rect->LowerRight; + + colors[0].red = v1->Red * 257 / 256; + colors[0].green = v1->Green * 257 / 256; + colors[0].blue = v1->Blue * 257 / 256; + colors[1].red = v2->Red * 257 / 256; + colors[1].green = v2->Green * 257 / 256; + colors[1].blue = v2->Blue * 257 / 256; + if (has_alpha( physdev->format )) + { + colors[0].alpha = v1->Alpha * 257 / 256; + colors[1].alpha = v2->Alpha * 257 / 256; + } + else colors[0].alpha = colors[1].alpha = 65535; + + pt[0].x = v1->x; + pt[0].y = v1->y; + pt[1].x = v2->x; + pt[1].y = v2->y; + LPtoDP( dev->hdc, pt, 2 ); + if (mode == GRADIENT_FILL_RECT_H) + { + gradient.p1.y = gradient.p2.y = 0; + if (pt[1].x > pt[0].x) + { + gradient.p1.x = 0; + gradient.p2.x = (pt[1].x - pt[0].x) << 16; + } + else + { + gradient.p1.x = (pt[0].x - pt[1].x) << 16; + gradient.p2.x = 0; + } + } + else + { + gradient.p1.x = gradient.p2.x = 0; + if (pt[1].y > pt[0].y) + { + gradient.p1.y = 0; + gradient.p2.y = (pt[1].y - pt[0].y) << 16; + } + else + { + gradient.p1.y = (pt[0].y - pt[1].y) << 16; + gradient.p2.y = 0; + } + } + + TRACE( "%u gradient %d,%d - %d,%d colors %04x,%04x,%04x,%04x -> %04x,%04x,%04x,%04x\n", + mode, pt[0].x, pt[0].y, pt[1].x, pt[1].y, + colors[0].red, colors[0].green, colors[0].blue, colors[0].alpha, + colors[1].red, colors[1].green, colors[1].blue, colors[1].alpha ); + + wine_tsx11_lock(); + src_pict = pXRenderCreateLinearGradient( gdi_display, &gradient, stops, colors, 2 ); + dst_pict = get_xrender_picture( physdev, 0, NULL ); + xrender_blit( PictOpSrc, src_pict, 0, dst_pict, 0, 0, + physdev->x11dev->dc_rect.left + min( pt[0].x, pt[1].x ), + physdev->x11dev->dc_rect.top + min( pt[0].y, pt[1].y ), + 1, 1, abs(pt[1].x - pt[0].x), abs(pt[1].y - pt[0].y) ); + pXRenderFreePicture( gdi_display, src_pict ); + wine_tsx11_unlock(); + } + X11DRV_UnlockDIBSection( physdev->x11dev, TRUE ); + return TRUE; + } + +fallback: +#endif + dev = GET_NEXT_PHYSDEV( dev, pGradientFill ); + return dev->funcs->pGradientFill( dev, vert_array, nvert, grad_array, ngrad, mode ); +} + +/*********************************************************************** * xrenderdrv_SelectBrush */ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, @@ -2644,7 +2754,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ NULL, /* pGetTextMetrics */ - NULL, /* pGradientFill */ + xrenderdrv_GradientFill, /* pGradientFill */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ NULL, /* pLineTo */ diff --git a/include/config.h.in b/include/config.h.in index bb13463..60179db 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1133,6 +1133,9 @@ /* Define if libxml2 has the xmlSchemaSetValidStructuredErrors function */ #undef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS +/* Define if Xrender has the XRenderCreateLinearGradient function */ +#undef HAVE_XRENDERCREATELINEARGRADIENT + /* Define if Xrender has the XRenderSetPictureTransform function */ #undef HAVE_XRENDERSETPICTURETRANSFORM

1 0

Alexandre Julliard : winex11: Implement rectangular gradients using straight X11 calls.
by Alexandre Julliard 30 Nov '11

30 Nov '11

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

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

30 Nov '11

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 30 Nov '11

30 Nov '11

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

Alex Henrie : shell32: Update Catalan translation.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 4bda215f2b0c6e746471dc4cdfa061400ab93f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bda215f2b0c6e746471dc4cd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:49 2011 -0700 shell32: Update Catalan translation. --- dlls/shell32/shell32_Ca.rc | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shell32_Ca.rc b/dlls/shell32/shell32_Ca.rc index a617770..cc34ba7 100644 --- a/dlls/shell32/shell32_Ca.rc +++ b/dlls/shell32/shell32_Ca.rc @@ -20,13 +20,15 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT +#pragma code_page(65001) /* UTF-8 */ + SHBRSFORFOLDER_MSGBOX DIALOG 15, 40, 188, 192 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK CAPTION "Navegar per Carpeta" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "D'acord", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancella", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel·la", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP LTEXT "", IDD_TITLE, 4, 4, 180, 12 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", @@ -50,7 +52,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Fer Una Nova Carpeta", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "D'acord", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancella", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel·la", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP } SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 @@ -58,27 +60,27 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Missatge" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "&S", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "S a &tots", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Sí", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Sí a &tots", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancella", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancel·la", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ICON "", IDD_ICON, 10, 10, 16, 16 LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } SHELL_ABOUT_MSGBOX DIALOG 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Quant a %s" +CAPTION "Quant al %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "D'acord", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "&Llicencia de Wine", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "&Llicència de Wine", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 LTEXT "Executant en %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 - LTEXT "Wine ha estat construit per:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 + LTEXT "El Wine ha estat construit per:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG 0, 0, 227, 95 @@ -87,10 +89,10 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Introdueix el nom d'un programa, carpeta, document, o recurs de web, i Wine el obrir per vs.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 - LTEXT "&Open:", IDC_RUNDLG_LABEL, 7, 39, 24, 10 + LTEXT "Introdueix el nom d'un programa, carpeta, document, o recurs de web, i el Wine el obrirà per vostè.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 + LTEXT "&Obrir:", IDC_RUNDLG_LABEL, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "D'acord", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancella", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancel·la", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Navega...", IDC_RUNDLG_BROWSE, 170, 63, 50, 14, WS_TABSTOP }

1 0

Alex Henrie : comctl32: Update Catalan translation.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: d8906da528dfa65f3f826b3a05de038b1eafc500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8906da528dfa65f3f826b3a0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:39 2011 -0700 comctl32: Update Catalan translation. --- dlls/comctl32/comctl_Ca.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comctl_Ca.rc b/dlls/comctl32/comctl_Ca.rc index b95263b..d3533e1 100644 --- a/dlls/comctl32/comctl_Ca.rc +++ b/dlls/comctl32/comctl_Ca.rc @@ -18,13 +18,15 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT +#pragma code_page(65001) /* UTF-8 */ + IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Propietats de %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "D'acord", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Cancella", IDCANCEL,58,122,50,14 + PUSHBUTTON "Cancel·la", IDCANCEL,58,122,50,14 PUSHBUTTON "&Aplica", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 @@ -39,7 +41,7 @@ BEGIN PUSHBUTTON "< &Enrere", IDC_BACK_BUTTON,71,138,50,14 DEFPUSHBUTTON "&Proper >", IDC_NEXT_BUTTON,121,138,50,14 DEFPUSHBUTTON "Finalitza", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Cancella", IDCANCEL,178,138,50,14 + PUSHBUTTON "Cancel·la", IDCANCEL,178,138,50,14 PUSHBUTTON "Ajuda", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5

1 0

Alex Henrie : appwiz.cpl: Add Catalan translation.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: ffa8777883fac10ebc11a62a03b51af4d9217025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa8777883fac10ebc11a62a0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:32 2011 -0700 appwiz.cpl: Add Catalan translation. --- dlls/appwiz.cpl/Ca.rc | 85 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Makefile.in | 1 + 2 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Ca.rc b/dlls/appwiz.cpl/Ca.rc new file mode 100644 index 0000000..e411bf0 --- /dev/null +++ b/dlls/appwiz.cpl/Ca.rc @@ -0,0 +1,85 @@ +/* +* Add/Remove Programs English resources +* +* Copyright 2001-2002, 2008 Owen Rudge +* Copyright 2005-2006 Jacek Caban +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +* +*/ + +#include "res.h" + +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT + +#pragma code_page(65001) /* UTF-8 */ + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instal·lar/Desinstal·lar" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Per instal·lar un nou programa des de un disquet, disc compact, o el vostre disc dur, feu clic en Instal·la.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Instal·la...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "El següent programari es pot eliminar automàticament. Per treure un programa o modificar els seus components instal·lats, seleccioneu-lo de la llista i feu clic en Canvia/Treu.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Info. de suport", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Modifica...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Treu", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Informació de Suport" +FONT 8, "MS Shell Dlg" +{ + CONTROL "D'acord", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "La següent informació es pot utilitzar per obtenir suport tècnic per a %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Editor:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versió:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contacte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Informació de Suport:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Telèfon de Suport:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Llegiu-me:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Actualitzacions de Producte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Comentaris:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instal·lador del Wine Gecko" +FONT 8, "MS Shell Dlg" +{ + LTEXT "El Wine no ha pogut trobar un paquet del Gecko que es necessita perquè les " \ + "aplicacions que inclouen HTML funcionin correctament. El Wine el pot descarregar i " \ + "instal·lar automàticament per vostè.\n\n" \ + "Nota: es recomana utilitzar els paquets de la vostra distribució en compte." \ + "Vegeu http://wiki.winehq.org/Gecko pels detalls.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Progrés", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Instal·la", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancel·la", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 4d67b57..b28b61e 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ RC_SRCS = \ Bg.rc \ + Ca.rc \ Da.rc \ De.rc \ En.rc \

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 30 Nov '11

30 Nov '11

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: Get rid of no longer needed EXPRVAL_NAMEREF.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 82368f5cfea6dc4ebf91d13bab523aaebc190226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82368f5cfea6dc4ebf91d13ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 10:14:48 2011 +0100 jscript: Get rid of no longer needed EXPRVAL_NAMEREF. --- dlls/jscript/engine.c | 39 +++++---------------------------------- dlls/jscript/engine.h | 5 ----- 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6567d68..62efc44 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -31,7 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define EXPR_NOVAL 0x0001 #define EXPR_NEWREF 0x0002 -#define EXPR_STRREF 0x0004 struct _return_type_t { enum{ @@ -154,11 +153,6 @@ static void exprval_release(exprval_t *val) if(val->u.idref.disp) IDispatch_Release(val->u.idref.disp); return; - case EXPRVAL_NAMEREF: - if(val->u.nameref.disp) - IDispatch_Release(val->u.nameref.disp); - SysFreeString(val->u.nameref.name); - return; case EXPRVAL_INVALID: SysFreeString(val->u.identifier); } @@ -179,8 +173,6 @@ static HRESULT exprval_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei, } return disp_propget(ctx, val->u.idref.disp, val->u.idref.id, ret, ei, NULL/*FIXME*/); - case EXPRVAL_NAMEREF: - break; case EXPRVAL_INVALID: return throw_type_error(ctx, ei, JS_E_UNDEFINED_VARIABLE, val->u.identifier); } @@ -1494,13 +1486,6 @@ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag hres = to_string(ctx, &val, ei, &str); VariantClear(&val); if(SUCCEEDED(hres)) { - if(flags & EXPR_STRREF) { - ret->type = EXPRVAL_NAMEREF; - ret->u.nameref.disp = obj; - ret->u.nameref.name = str; - return S_OK; - } - hres = disp_get_id(ctx, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); SysFreeString(str); } @@ -1546,11 +1531,9 @@ HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla return hres; str = SysAllocString(expr->identifier); - if(flags & EXPR_STRREF) { - ret->type = EXPRVAL_NAMEREF; - ret->u.nameref.disp = obj; - ret->u.nameref.name = str; - return S_OK; + if(!str) { + IDispatch_Release(obj); + return E_OUTOFMEMORY; } hres = disp_get_id(ctx, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); @@ -2457,7 +2440,7 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla TRACE("\n"); - hres = expr_eval(ctx, expr->expression, EXPR_STRREF, ei, &exprval); + hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); if(FAILED(hres)) return hres; @@ -2465,7 +2448,7 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla case EXPRVAL_IDREF: { IDispatchEx *dispex; - hres = IDispatch_QueryInterface(exprval.u.nameref.disp, &IID_IDispatchEx, (void**)&dispex); + hres = IDispatch_QueryInterface(exprval.u.idref.disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { hres = IDispatchEx_DeleteMemberByDispID(dispex, exprval.u.idref.id); b = VARIANT_TRUE; @@ -2473,18 +2456,6 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } break; } - case EXPRVAL_NAMEREF: { - IDispatchEx *dispex; - - hres = IDispatch_QueryInterface(exprval.u.nameref.disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_DeleteMemberByName(dispex, exprval.u.nameref.name, - make_grfdex(ctx, fdexNameCaseSensitive)); - b = VARIANT_TRUE; - IDispatchEx_Release(dispex); - } - break; - } default: FIXME("unsupported type %d\n", exprval.type); hres = E_NOTIMPL; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f2af36f..362e9d1 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -364,7 +364,6 @@ typedef struct { enum { EXPRVAL_VARIANT, EXPRVAL_IDREF, - EXPRVAL_NAMEREF, EXPRVAL_INVALID } type; union { @@ -373,10 +372,6 @@ typedef struct { IDispatch *disp; DISPID id; } idref; - struct { - IDispatch *disp; - BSTR name; - } nameref; BSTR identifier; } u; } exprval_t;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2011