January 2012 - Wine-Commits

André Hentschel : setuapi: Add stub for CM_Get_DevNode_Registry_Property_ExA.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 9ea3c46e7180cf8a08cf0fdb01850b7a7447b9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea3c46e7180cf8a08cf0fdb0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 11 20:50:43 2012 +0100 setuapi: Add stub for CM_Get_DevNode_Registry_Property_ExA. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index a34555f..24c4cf3 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -56,7 +56,7 @@ @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA @ stub CM_Get_DevNode_Registry_PropertyW -@ stub CM_Get_DevNode_Registry_Property_ExA +@ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 6ef8f92..eceef49 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,7 +67,7 @@ @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA @ stub CM_Get_DevNode_Registry_PropertyW -@ stub CM_Get_DevNode_Registry_Property_ExA +@ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index abe964f..1617f71 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -359,6 +359,16 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class, } /*********************************************************************** + * CM_Get_DevNode_Registry_Property_ExA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExA(DEVINST dev, ULONG prop, PULONG regdatatype, + PVOID buf, PULONG len, ULONG flags, HMACHINE machine) +{ + FIXME("0x%08x %u %p %p %p 0x%08x %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Get_DevNode_Registry_Property_ExW (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW(DEVINST dev, ULONG prop, PULONG regdatatype,

1 0

Vincent Povirk : include/wincodecsdk.idl: Fix typo.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 8a68deec7a43f0d717f81afc396ff333988e4a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a68deec7a43f0d717f81afc3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 16:03:00 2012 -0600 include/wincodecsdk.idl: Fix typo. --- include/wincodecsdk.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index dec9488..a3af55a 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -101,7 +101,7 @@ interface IWICMetadataReader : IUnknown HRESULT GetValue( [in] const PROPVARIANT *pvarSchema, [in] const PROPVARIANT *pvarId, - [in, out, unique] const PROPVARIANT *pvarValue); + [in, out, unique] PROPVARIANT *pvarValue); HRESULT GetEnumerator( [out] IWICEnumMetadataItem **ppIEnumMetadata);

1 0

Daniel Lehman : msvcp90: Forward uncaught_exception to msvcrt.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: f63bbcf69250697b92a9e0055a6b0de7df28b4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63bbcf69250697b92a9e0055… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Aug 26 20:18:57 2010 -0700 msvcp90: Forward uncaught_exception to msvcrt. --- dlls/msvcp90/msvcp90.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index b3f0857..d6cd97f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5640,7 +5640,7 @@ @ stub -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ @ stub -arch=win32 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ @ stub -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ -@ stub ?uncaught_exception(a)std@@YA_NXZ +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception @ stub -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ @ stub -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ @ stub -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ

1 0

André Hentschel : setuapi: Add stub for CM_Set_Class_Registry_PropertyW.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 33d60e9060daecbe3bd99d4c21c4a3e67569a493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d60e9060daecbe3bd99d4c2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 11 20:50:24 2012 +0100 setuapi: Add stub for CM_Set_Class_Registry_PropertyW. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 9593746..a34555f 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -157,7 +157,7 @@ @ stub CM_Run_Detection @ stub CM_Run_Detection_Ex @ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyA -@ stub CM_Set_Class_Registry_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_Problem @ stub CM_Set_DevNode_Problem_Ex @ stub CM_Set_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index e7bcb19..6ef8f92 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -174,7 +174,7 @@ @ stub CM_Run_Detection @ stub CM_Run_Detection_Ex @ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) -@ stub CM_Set_Class_Registry_PropertyW +@ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) @ stub CM_Set_DevNode_Problem @ stub CM_Set_DevNode_Problem_Ex @ stub CM_Set_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 1f632c1..abe964f 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -388,6 +388,16 @@ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID } /*********************************************************************** + * CM_Set_Class_Registry_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW(LPGUID class, ULONG prop, PVOID buf, ULONG len, + ULONG flags, HMACHINE machine) +{ + FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * SetupLogFileW (SETUPAPI.@) */ BOOL WINAPI SetupLogFileW(

1 0

André Hentschel : setuapi: Add stub for CM_Set_Class_Registry_PropertyA.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: ed4b8cb617096fbb03cbca382e07a35fbeb6432e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4b8cb617096fbb03cbca382… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 11 20:50:07 2012 +0100 setuapi: Add stub for CM_Set_Class_Registry_PropertyA. --- dlls/cfgmgr32/cfgmgr32.spec | 2 ++ dlls/setupapi/setupapi.spec | 2 ++ dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 450ce02..9593746 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -156,6 +156,8 @@ @ stub CM_Reset_Children_Marks_Ex @ stub CM_Run_Detection @ stub CM_Run_Detection_Ex +@ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyA +@ stub CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_Problem @ stub CM_Set_DevNode_Problem_Ex @ stub CM_Set_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 2d5d80a..e7bcb19 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -173,6 +173,8 @@ @ stub CM_Reset_Children_Marks_Ex @ stub CM_Run_Detection @ stub CM_Run_Detection_Ex +@ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) +@ stub CM_Set_Class_Registry_PropertyW @ stub CM_Set_DevNode_Problem @ stub CM_Set_DevNode_Problem_Ex @ stub CM_Set_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index b43a343..1f632c1 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -378,6 +378,16 @@ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) } /*********************************************************************** + * CM_Set_Class_Registry_PropertyA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID buf, ULONG len, + ULONG flags, HMACHINE machine) +{ + FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * SetupLogFileW (SETUPAPI.@) */ BOOL WINAPI SetupLogFileW(

1 0

Austin English : comctl32: Fix a grammar error in comment.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 913fb67a5b2a9c2138c6202976ae548650fb4d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=913fb67a5b2a9c2138c620297… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 11 11:44:11 2012 -0800 comctl32: Fix a grammar error in comment. --- dlls/comctl32/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 41c1017..ccc594f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -775,7 +775,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, if (cGrow > 256) { - /* Windows doesn't limit the size here, but X11 doesn't let use allocate such huge bitmaps */ + /* Windows doesn't limit the size here, but X11 doesn't let us allocate such huge bitmaps */ WARN( "grow %d too large, limiting to 256\n", cGrow ); cGrow = 256; }

1 0

Alexandre Julliard : winex11: Don' t cache text and background pixel values to support PALETTEINDEX properly.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 98dd61e2f3127d60bbcb0ba804bbabdc1f6440de URL: http://source.winehq.org/git/wine.git/?a=commit;h=98dd61e2f3127d60bbcb0ba80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 11 20:55:35 2012 +0100 winex11: Don't cache text and background pixel values to support PALETTEINDEX properly. --- dlls/winex11.drv/bitblt.c | 18 ++++++++++++------ dlls/winex11.drv/graphics.c | 35 ++++++----------------------------- dlls/winex11.drv/init.c | 4 ++-- dlls/winex11.drv/text.c | 7 +++++-- dlls/winex11.drv/x11drv.h | 4 ---- 5 files changed, 25 insertions(+), 43 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index a54ca49..801ea08 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -850,9 +850,12 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } if (physDevSrc->depth == 1) { + int text_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetTextColor(physDevDst->dev.hdc) ); + int bkgnd_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetBkColor(physDevDst->dev.hdc) ); + wine_tsx11_lock(); - XSetBackground( gdi_display, physDevDst->gc, physDevDst->textPixel ); - XSetForeground( gdi_display, physDevDst->gc, physDevDst->backgroundPixel ); + XSetBackground( gdi_display, physDevDst->gc, text_pixel ); + XSetForeground( gdi_display, physDevDst->gc, bkgnd_pixel ); XSetFunction( gdi_display, physDevDst->gc, OP_ROP(*opcode) ); XCopyPlane( gdi_display, physDevSrc->drawable, physDevDst->drawable, physDevDst->gc, @@ -881,15 +884,18 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, to color or vice versa, the foreground and background color of the device context are used. In fact, it also applies to the case when it is converted from mono to mono. */ + int text_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetTextColor(physDevDst->dev.hdc) ); + int bkgnd_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetBkColor(physDevDst->dev.hdc) ); + if (X11DRV_PALETTE_XPixelToPalette && physDevDst->depth != 1) { - XSetBackground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->textPixel] ); - XSetForeground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->backgroundPixel]); + XSetBackground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[text_pixel] ); + XSetForeground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[bkgnd_pixel]); } else { - XSetBackground( gdi_display, gc, physDevDst->textPixel ); - XSetForeground( gdi_display, gc, physDevDst->backgroundPixel ); + XSetBackground( gdi_display, gc, text_pixel ); + XSetForeground( gdi_display, gc, bkgnd_pixel ); } XCopyPlane( gdi_display, physDevSrc->drawable, src_pixmap, gc, physDevSrc->dc_rect.left + src->visrect.left, diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index e317eb9..910dfea 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -274,13 +274,13 @@ BOOL X11DRV_SetupGCForPatBlt( X11DRV_PDEVICE *physDev, GC gc, BOOL fMapColors ) * We need to swap foreground and background because * Windows does it the wrong way... */ - val.foreground = physDev->backgroundPixel; - val.background = physDev->textPixel; + val.foreground = X11DRV_PALETTE_ToPhysical( physDev, GetBkColor(physDev->dev.hdc) ); + val.background = X11DRV_PALETTE_ToPhysical( physDev, GetTextColor(physDev->dev.hdc) ); } else { val.foreground = physDev->brush.pixel; - val.background = physDev->backgroundPixel; + val.background = X11DRV_PALETTE_ToPhysical( physDev, GetBkColor(physDev->dev.hdc) ); } if (fMapColors && X11DRV_PALETTE_XPixelToPalette) { @@ -399,7 +399,7 @@ static BOOL X11DRV_SetupGCForPen( X11DRV_PDEVICE *physDev ) val.foreground = physDev->pen.pixel; val.function = X11DRV_XROPfunction[rop2-1]; } - val.background = physDev->backgroundPixel; + val.background = X11DRV_PALETTE_ToPhysical( physDev, GetBkColor(physDev->dev.hdc) ); val.fill_style = FillSolid; val.line_width = physDev->pen.width; if (val.line_width <= 1) { @@ -463,8 +463,8 @@ BOOL X11DRV_SetupGCForText( X11DRV_PDEVICE *physDev ) XGCValues val; val.function = GXcopy; /* Text is always GXcopy */ - val.foreground = physDev->textPixel; - val.background = physDev->backgroundPixel; + val.foreground = X11DRV_PALETTE_ToPhysical( physDev, GetTextColor(physDev->dev.hdc) ); + val.background = X11DRV_PALETTE_ToPhysical( physDev, GetBkColor(physDev->dev.hdc) ); val.fill_style = FillSolid; val.font = xfs->fid; @@ -1493,29 +1493,6 @@ fallback: return dev->funcs->pGradientFill( dev, vert_array, nvert, grad_array, ngrad, mode ); } -/********************************************************************** - * X11DRV_SetBkColor - */ -COLORREF X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) -{ - X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - - physDev->backgroundPixel = X11DRV_PALETTE_ToPhysical( physDev, color ); - return color; -} - -/********************************************************************** - * X11DRV_SetTextColor - */ -COLORREF X11DRV_SetTextColor( PHYSDEV dev, COLORREF color ) -{ - X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - - physDev->textPixel = X11DRV_PALETTE_ToPhysical( physDev, color ); - return color; -} - - static unsigned char *get_icm_profile( unsigned long *size ) { Atom type; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 0530e31..de0d029 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -550,7 +550,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pSelectPalette */ X11DRV_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */ - X11DRV_SetBkColor, /* pSetBkColor */ + NULL, /* pSetBkColor */ NULL, /* pSetBkMode */ X11DRV_SetDCBrushColor, /* pSetDCBrushColor */ X11DRV_SetDCPenColor, /* pSetDCPenColor */ @@ -568,7 +568,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pSetStretchBltMode */ NULL, /* pSetTextAlign */ NULL, /* pSetTextCharacterExtra */ - X11DRV_SetTextColor, /* pSetTextColor */ + NULL, /* pSetTextColor */ NULL, /* pSetTextJustification */ NULL, /* pSetViewportExt */ NULL, /* pSetViewportOrg */ diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index f0197b6..22a6353 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -43,6 +43,7 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); BOOL restore_region = FALSE; unsigned int i; + int pixel; fontObject* pfo = XFONT_GetFontObject( physDev->font ); XFontStruct* font; BOOL rotated = FALSE; @@ -70,8 +71,9 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, if (flags & ETO_OPAQUE) { + pixel = X11DRV_PALETTE_ToPhysical( physDev, GetBkColor(physDev->dev.hdc) ); wine_tsx11_lock(); - XSetForeground( gdi_display, physDev->gc, physDev->backgroundPixel ); + XSetForeground( gdi_display, physDev->gc, pixel ); XFillRectangle( gdi_display, physDev->drawable, physDev->gc, physDev->dc_rect.left + lprect->left, physDev->dc_rect.top + lprect->top, lprect->right - lprect->left, lprect->bottom - lprect->top ); @@ -97,8 +99,9 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, goto END; } + pixel = X11DRV_PALETTE_ToPhysical( physDev, GetTextColor(physDev->dev.hdc) ); wine_tsx11_lock(); - XSetForeground( gdi_display, physDev->gc, physDev->textPixel ); + XSetForeground( gdi_display, physDev->gc, pixel ); wine_tsx11_unlock(); if(!rotated) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0f155ee..32f51d7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -141,8 +141,6 @@ typedef struct X_PHYSBRUSH brush; X_PHYSBITMAP *bitmap; /* currently selected bitmap for memory DCs */ BOOL has_gdi_font; /* is current font a GDI font? */ - int backgroundPixel; - int textPixel; int depth; /* bit depth of the DC */ ColorShifts *color_shifts; /* color shifts of the DC */ int exposures; /* count of graphics exposures operations */ @@ -210,14 +208,12 @@ extern HBITMAP X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) DECLSPEC_HIDD extern HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern HFONT X11DRV_SelectFont( PHYSDEV dev, HFONT hfont ) DECLSPEC_HIDDEN; extern HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; -extern COLORREF X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetDCBrushColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) DECLSPEC_HIDDEN; -extern COLORREF X11DRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : user32: Don' t access past the file size when loading a cursor/icon.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 8407559167457c0420be40b0577ff43cd20b1eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8407559167457c0420be40b05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 12 12:18:15 2012 +0100 user32: Don't access past the file size when loading a cursor/icon. --- dlls/user32/cursoricon.c | 63 ++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8407559167457c0420be4…

1 0

Alexandre Julliard : comctl32/syslink: Fix painting of background color for transparent controls.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: e0cc9a798b0b9be5adca70b86b43382de4b781c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0cc9a798b0b9be5adca70b86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 12 12:20:46 2012 +0100 comctl32/syslink: Fix painting of background color for transparent controls. --- dlls/comctl32/syslink.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 42fb987..a5ba3dd 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -94,7 +94,6 @@ typedef struct COLORREF TextColor; /* Color of the text */ COLORREF LinkColor; /* Color of links */ COLORREF VisitedColor; /* Color of visited links */ - COLORREF BackColor; /* Background color, set on creation */ WCHAR BreakChar; /* Break Character for the current font */ BOOL IgnoreReturn; /* (infoPtr->Style & LWS_IGNORERETURN) on creation */ } SYSLINK_INFO; @@ -819,11 +818,13 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) HFONT hOldFont; COLORREF OldTextColor, OldBkColor; HBRUSH hBrush; + UINT text_flags = ETO_CLIPPED; + UINT mode = GetBkMode( hdc ); hOldFont = SelectObject(hdc, infoPtr->Font); OldTextColor = SetTextColor(hdc, infoPtr->TextColor); - OldBkColor = SetBkColor(hdc, infoPtr->BackColor); - + OldBkColor = SetBkColor(hdc, comctl32_color.clrWindow); + GetClientRect(infoPtr->Self, &rc); rc.right -= SL_RIGHTMARGIN + SL_LEFTMARGIN; rc.bottom -= SL_BOTTOMMARGIN + SL_TOPMARGIN; @@ -832,9 +833,13 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) hBrush = (HBRUSH)SendMessageW(infoPtr->Notify, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)infoPtr->Self); - if (!hBrush) - hBrush = CreateSolidBrush(infoPtr->BackColor); - FillRect(hdc, &rc, hBrush); + if (!(infoPtr->Style & LWS_TRANSPARENT)) + { + FillRect(hdc, &rc, hBrush); + if (GetBkMode( hdc ) == OPAQUE) text_flags |= ETO_OPAQUE; + } + else SetBkMode( hdc, TRANSPARENT ); + DeleteObject(hBrush); for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) @@ -863,7 +868,7 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) while(n > 0) { tx += bl->nSkip; - ExtTextOutW(hdc, bl->rc.left, bl->rc.top, ETO_OPAQUE | ETO_CLIPPED, &bl->rc, tx, bl->nChars, NULL); + ExtTextOutW(hdc, bl->rc.left, bl->rc.top, text_flags, &bl->rc, tx, bl->nChars, NULL); if((Current->Type == slLink) && (Current->u.Link.state & LIS_FOCUSED) && infoPtr->HasFocus) { COLORREF PrevTextColor; @@ -881,7 +886,7 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) SetBkColor(hdc, OldBkColor); SetTextColor(hdc, OldTextColor); SelectObject(hdc, hOldFont); - + SetBkMode(hdc, mode); return 0; } @@ -1549,6 +1554,17 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, return SYSLINK_Paint (infoPtr, (HDC)wParam); case WM_ERASEBKGND: + if (!(infoPtr->Style & LWS_TRANSPARENT)) + { + HDC hdc = (HDC)wParam; + HBRUSH brush = CreateSolidBrush( comctl32_color.clrWindow ); + RECT rect; + + GetClipBox( hdc, &rect ); + FillRect( hdc, &rect, brush ); + DeleteObject( brush ); + return 1; + } return 0; case WM_SETCURSOR: @@ -1731,8 +1747,6 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr->TextColor = comctl32_color.clrWindowText; infoPtr->LinkColor = comctl32_color.clrHighlight; infoPtr->VisitedColor = comctl32_color.clrHighlight; - infoPtr->BackColor = infoPtr->Style & LWS_TRANSPARENT ? - comctl32_color.clrWindow : comctl32_color.clrBtnFace; infoPtr->BreakChar = ' '; infoPtr->IgnoreReturn = infoPtr->Style & LWS_IGNORERETURN; TRACE("SysLink Ctrl creation, hwnd=%p\n", hwnd); @@ -1750,8 +1764,6 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); - if (infoPtr->Style & LWS_TRANSPARENT) - infoPtr->BackColor = comctl32_color.clrWindow; return 0; default:

1 0

Vincent Povirk : gdiplus: Implement GdipDrawImagePoints.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: aba9ddc4a0b895ee7958625ce2a36214414f91ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba9ddc4a0b895ee7958625ce… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 11:23:09 2012 -0600 gdiplus: Implement GdipDrawImagePoints. --- dlls/gdiplus/graphics.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 50d2f7c..65a3815 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2528,15 +2528,38 @@ GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics *graphics, GpImage *image GpStatus WINGDIPAPI GdipDrawImagePoints(GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *dstpoints, INT count) { - FIXME("(%p, %p, %p, %d): stub\n", graphics, image, dstpoints, count); - return NotImplemented; + UINT width, height; + + TRACE("(%p, %p, %p, %d)\n", graphics, image, dstpoints, count); + + if(!image) + return InvalidParameter; + + GdipGetImageWidth(image, &width); + GdipGetImageHeight(image, &height); + + return GdipDrawImagePointsRect(graphics, image, dstpoints, count, 0, 0, + width, height, UnitPixel, NULL, NULL, NULL); } GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics *graphics, GpImage *image, GDIPCONST GpPoint *dstpoints, INT count) { - FIXME("(%p, %p, %p, %d): stub\n", graphics, image, dstpoints, count); - return NotImplemented; + GpPointF ptf[3]; + + TRACE("(%p, %p, %p, %d)\n", graphics, image, dstpoints, count); + + if (count != 3 || !dstpoints) + return InvalidParameter; + + ptf[0].X = (REAL)dstpoints[0].X; + ptf[0].Y = (REAL)dstpoints[0].Y; + ptf[1].X = (REAL)dstpoints[1].X; + ptf[1].Y = (REAL)dstpoints[1].Y; + ptf[2].X = (REAL)dstpoints[2].X; + ptf[2].Y = (REAL)dstpoints[2].Y; + + return GdipDrawImagePoints(graphics, image, ptf, count); } GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image,

1 0