September 2011 - Wine-Commits

Alexandre Julliard : winex11: Make sure the cursor bitmaps are owned by x11drv.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: dc1056284fa1fc4c50c707987761c05834747e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1056284fa1fc4c50c707987… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 14:53:59 2011 +0200 winex11: Make sure the cursor bitmaps are owned by x11drv. --- dlls/winex11.drv/mouse.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d70f152..0ba57d1 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1081,6 +1081,11 @@ static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, i if (has_alpha) { + /* make sure the bitmaps are owned by x11drv */ + HBITMAP orig = SelectObject( hdc, icon->hbmMask ); + SelectObject( hdc, xor_bitmap ); + SelectObject( hdc, orig ); + memset( mask_bits, 0, width_bytes * height ); for (y = 0, ptr = color_bits; y < height; y++) for (x = 0; x < width; x++, ptr++)

1 0

Alexandre Julliard : gdi32: Add a null driver fallback for AlphaBlend, using a new BlendImage driver entry point.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: c819e4bdea373406521e7e8a5361a0f40efec173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c819e4bdea373406521e7e8a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 11:57:45 2011 +0200 gdi32: Add a null driver fallback for AlphaBlend, using a new BlendImage driver entry point. --- dlls/gdi32/bitblt.c | 45 +++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/driver.c | 9 ++++--- dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/mfdrv/init.c | 1 + dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 +- 10 files changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 999f5ba..98ced52 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -196,7 +196,10 @@ static DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src return err; } -/* nulldrv fallback implementation using StretchDIBits */ +/*********************************************************************** + * null driver fallback implementations + */ + BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) { @@ -267,6 +270,46 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, return !err; } + +BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func ) +{ + DC *dc_src, *dc_dst = get_nulldrv_dc( dst_dev ); + char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; + BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; + DWORD err; + struct gdi_image_bits bits; + + if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; + src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); + err = src_dev->funcs->pGetImage( src_dev, 0, src_info, &bits, src ); + release_dc_ptr( dc_src ); + if (err) return FALSE; + + dst_dev = GET_DC_PHYSDEV( dc_dst, pBlendImage ); + memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); + if (err == ERROR_BAD_FORMAT) + { + err = convert_bits( src_info, src, dst_info, &bits ); + if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); + } + + if (err == ERROR_TRANSFORM_NOT_SUPPORTED && + ((src->width != dst->width) || (src->height != dst->height))) + { + memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + err = stretch_bits( src_info, src, dst_info, dst, &bits, COLORONCOLOR ); + if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); + } + + if (bits.free) bits.free( &bits ); + return !err; +} + + /*********************************************************************** * PatBlt (GDI32.@) */ diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 99b441c..b02ae8a 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -506,6 +506,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pArc */ NULL, /* pArcTo */ NULL, /* pBeginPath */ + NULL, /* pBlendImage */ NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 51e241f..4f111c3 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -190,14 +190,14 @@ static INT nulldrv_AbortDoc( PHYSDEV dev ) return 0; } -static BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func) +static BOOL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return TRUE; } -static BOOL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) { return TRUE; } @@ -666,6 +666,7 @@ const DC_FUNCTIONS null_driver = nulldrv_Arc, /* pArc */ nulldrv_ArcTo, /* pArcTo */ nulldrv_BeginPath, /* pBeginPath */ + nulldrv_BlendImage, /* pBlendImage */ nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */ nulldrv_Chord, /* pChord */ nulldrv_CloseFigure, /* pCloseFigure */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 8ccb050..292f505 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -43,6 +43,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_Arc, /* pArc */ NULL, /* pArcTo */ EMFDRV_BeginPath, /* pBeginPath */ + NULL, /* pBlendImage */ NULL, /* pChoosePixelFormat */ EMFDRV_Chord, /* pChord */ EMFDRV_CloseFigure, /* pCloseFigure */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4fe2e59..6cb8693 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -383,6 +383,8 @@ static inline void release_wine_region(HRGN rgn) /* null driver entry points */ extern BOOL nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func) DECLSPEC_HIDDEN; extern BOOL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL nulldrv_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 2139b98..0c93571 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -88,6 +88,7 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_Arc, /* pArc */ NULL, /* pArcTo */ MFDRV_BeginPath, /* pBeginPath */ + NULL, /* pBlendImage */ NULL, /* pChoosePixelFormat */ MFDRV_Chord, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e7e545e..3a6f89f 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -825,6 +825,7 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_Arc, /* pArc */ NULL, /* pArcTo */ NULL, /* pBeginPath */ + NULL, /* pBlendImage */ NULL, /* pChoosePixelFormat */ PSDRV_Chord, /* pChord */ NULL, /* pCloseFigure */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index df6084a..96b6a7a 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -472,6 +472,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_Arc, /* pArc */ NULL, /* pArcTo */ NULL, /* pBeginPath */ + NULL, /* pBlendImage */ X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */ X11DRV_Chord, /* pChord */ NULL, /* pCloseFigure */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 2e7aca3..e525d5f 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2598,6 +2598,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pArc */ NULL, /* pArcTo */ NULL, /* pBeginPath */ + NULL, /* pBlendImage */ NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 1e7ebdb..b15dbd1 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -61,6 +61,7 @@ struct gdi_dc_funcs BOOL (*pArc)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (*pArcTo)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (*pBeginPath)(PHYSDEV); + DWORD (*pBlendImage)(PHYSDEV,BITMAPINFO*,const struct gdi_image_bits*,struct bitblt_coords*,struct bitblt_coords*,BLENDFUNCTION); INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *); BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (*pCloseFigure)(PHYSDEV); @@ -189,7 +190,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 13 +#define WINE_GDI_DRIVER_VERSION 14 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Francois Gouget : wineconsole: Use a more standard syntax for multi-line RC file strings.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

1 0

Francois Gouget : po: Remove English strings from the Romanian translation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: fe6cfb25c0cd99bb3d892fafed4dac6d4b7261a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6cfb25c0cd99bb3d892fafe… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 14 00:31:14 2011 +0200 po: Remove English strings from the Romanian translation. --- po/ro.po | 61 ++++++++----------------------------------------------------- 1 files changed, 8 insertions(+), 53 deletions(-) diff --git a/po/ro.po b/po/ro.po index 67977c7..8b36e9a 100644 --- a/po/ro.po +++ b/po/ro.po @@ -563,7 +563,7 @@ msgstr "Fără toner; " #: comdlg32.rc:113 msgid "Page punt; " -msgstr "Page punt; " +msgstr "" #: comdlg32.rc:114 msgid "Interrupted by user; " @@ -4492,9 +4492,8 @@ msgid "Security DB commit failure\n" msgstr "" #: winerror.mc:2256 -#, fuzzy msgid "Account is built-in\n" -msgstr "native, builtin" +msgstr "" #: winerror.mc:2261 msgid "Group is built-in\n" @@ -5868,7 +5867,6 @@ msgid "insert disk %s" msgstr "inserați discul %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5900,35 +5898,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -6829,9 +6798,8 @@ msgid "E&xit" msgstr "Înc&hide" #: shell32.rc:127 -#, fuzzy msgid "&About Control Panel" -msgstr "&About Control Panel..." +msgstr "" #: shell32.rc:135 shell32.rc:139 winefile.rc:111 #, fuzzy @@ -7271,19 +7239,6 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine 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.\n" -"\n" -"Wine 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.\n" -"\n" -"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." #: shell32.rc:266 msgid "Wine License" @@ -11041,19 +10996,19 @@ msgstr "Avertizare: librărie de sistem" #: winecfg.rc:53 msgid "native" -msgstr "native" +msgstr "" #: winecfg.rc:54 msgid "builtin" -msgstr "builtin" +msgstr "" #: winecfg.rc:55 msgid "native, builtin" -msgstr "native, builtin" +msgstr "" #: winecfg.rc:56 msgid "builtin, native" -msgstr "builtin, native" +msgstr "" #: winecfg.rc:57 msgid "disabled" @@ -11822,7 +11777,7 @@ msgstr "&Despre Wine Wordpad" #: wordpad.rc:130 msgid "Automatic" -msgstr "Automatic" +msgstr "" #: wordpad.rc:136 msgid "All documents (*.*)"

1 0

Francois Gouget : po: Remove English strings from the Russian translation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 6eed74088ab103f7556f9157daa321af93940e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eed74088ab103f7556f9157d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 14 00:34:22 2011 +0200 po: Remove English strings from the Russian translation. Also mark a partial translation as fuzzy. --- po/ru.po | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/po/ru.po b/po/ru.po index 0c7e8f8..a849235 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2022,9 +2022,8 @@ msgid "Default MidiOut Device" msgstr "Устройство вывода MIDI по умолчанию" #: dinput.rc:34 -#, fuzzy msgid "Action" -msgstr "Activation" +msgstr "" #: dinput.rc:35 #, fuzzy @@ -6080,55 +6079,55 @@ msgstr "Перемотать" #: shdoclc.rc:196 msgid "Trace Tags" -msgstr "Trace Tags" +msgstr "" #: shdoclc.rc:197 msgid "Resource Failures" -msgstr "Resource Failures" +msgstr "" #: shdoclc.rc:198 msgid "Dump Tracking Info" -msgstr "Dump Tracking Info" +msgstr "" #: shdoclc.rc:199 msgid "Debug Break" -msgstr "Debug Break" +msgstr "" #: shdoclc.rc:200 msgid "Debug View" -msgstr "Debug View" +msgstr "" #: shdoclc.rc:201 msgid "Dump Tree" -msgstr "Dump Tree" +msgstr "" #: shdoclc.rc:202 msgid "Dump Lines" -msgstr "Dump Lines" +msgstr "" #: shdoclc.rc:203 msgid "Dump DisplayTree" -msgstr "Dump DisplayTree" +msgstr "" #: shdoclc.rc:204 msgid "Dump FormatCaches" -msgstr "Dump FormatCaches" +msgstr "" #: shdoclc.rc:205 msgid "Dump LayoutRects" -msgstr "Dump LayoutRects" +msgstr "" #: shdoclc.rc:206 msgid "Memory Monitor" -msgstr "Memory Monitor" +msgstr "" #: shdoclc.rc:207 msgid "Performance Meters" -msgstr "Performance Meters" +msgstr "" #: shdoclc.rc:208 msgid "Save HTML" -msgstr "Save HTML" +msgstr "" #: shdoclc.rc:210 msgid "&Browse View" @@ -8946,7 +8945,7 @@ msgstr "OleView" #: oleview.rc:98 msgid "ITypeLib viewer" -msgstr "ITypeLib viewer" +msgstr "" #: oleview.rc:96 msgid "OleView - OLE/COM Object Viewer" @@ -9050,7 +9049,7 @@ msgstr "ObjectClasses" #: oleview.rc:129 msgid "Grouped by Component Category" -msgstr "Grouped by Component Category" +msgstr "" #: oleview.rc:130 msgid "OLE 1.0 Objects" @@ -9070,7 +9069,7 @@ msgstr "ID приложения" #: oleview.rc:134 msgid "Type Libraries" -msgstr "Type Libraries" +msgstr "" #: oleview.rc:135 msgid "ver." @@ -9086,11 +9085,11 @@ msgstr "Реестр" #: oleview.rc:139 msgid "Implementation" -msgstr "Implementation" +msgstr "" #: oleview.rc:140 msgid "Activation" -msgstr "Activation" +msgstr "" #: oleview.rc:142 msgid "CoGetClassObject failed." @@ -9106,11 +9105,11 @@ msgstr "байт" #: oleview.rc:148 msgid "LoadTypeLib( %s ) failed ($%x)" -msgstr "LoadTypeLib( %s ) failed ($%x)" +msgstr "" #: oleview.rc:149 msgid "Inherited Interfaces" -msgstr "Inherited Interfaces" +msgstr "" #: oleview.rc:124 msgid "Save as an .IDL or .H file" @@ -9122,7 +9121,7 @@ msgstr "Закрыть окно" #: oleview.rc:126 msgid "Group typeinfos by kind" -msgstr "Group typeinfos by kind" +msgstr "" #: progman.rc:30 msgid "&New..." @@ -10863,7 +10862,7 @@ msgstr "Ошибка при выборе нового шрифта." #: winefile.rc:99 msgid "Wine File Manager" -msgstr "Winefile" +msgstr "" #: winefile.rc:101 msgid "root fs" @@ -10895,7 +10894,7 @@ msgstr "Дата последнего изменения" #: winefile.rc:115 msgid "Index/Inode" -msgstr "Index/Inode" +msgstr "" #: winefile.rc:118 msgid "Security" @@ -11350,9 +11349,10 @@ msgstr "" #: xcopy.rc:35 msgid "%s? (Yes|No)\n" -msgstr "%s? (Yes|No)\n" +msgstr "" #: xcopy.rc:36 +#, fuzzy msgid "Overwrite %s? (Yes|No|All)\n" msgstr "Переписать %s? (Yes|No|All)\n"

1 0

Francois Gouget : po: Remove English strings from the Slovak translation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: b87134a4e1389f3eaf9dce9e1bfd5f2dcfc2ccc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b87134a4e1389f3eaf9dce9e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 14 00:36:24 2011 +0200 po: Remove English strings from the Slovak translation. --- po/sk.po | 490 ++++++++++++++++++-------------------------------------------- 1 files changed, 143 insertions(+), 347 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b87134a4e1389f3eaf9dc…

1 0

Gerald Pfeifer : vbscript: Add missing error handling in interp_jmp_false.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: d685a07f221e1f5be34c85837d2016cd5b755e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d685a07f221e1f5be34c85837… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 13 23:45:23 2011 +0200 vbscript: Add missing error handling in interp_jmp_false. --- dlls/vbscript/interp.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 593c83e..66c2cf1 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -391,6 +391,9 @@ static HRESULT interp_jmp_false(exec_ctx_t *ctx) TRACE("%u\n", arg); hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + if(V_VT(val.v) != VT_BOOL) { FIXME("unsupported for %s\n", debugstr_variant(val.v)); release_val(&val);

1 0

Alexandre Julliard : gdi32: Add a couple of helper functions for converting and stretching DIBs.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 27516babd6762e32975820c15c6b5dac9c63d128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27516babd6762e32975820c15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 11:25:19 2011 +0200 gdi32: Add a couple of helper functions for converting and stretching DIBs. --- dlls/gdi32/bitblt.c | 74 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 45 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index e023872..999f5ba 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -157,6 +157,45 @@ void free_heap_bits( struct gdi_image_bits *bits ) HeapFree( GetProcessHeap(), 0, bits->ptr ); } +static DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, + BITMAPINFO *dst_info, struct gdi_image_bits *bits ) +{ + void *ptr; + DWORD err; + + dst_info->bmiHeader.biWidth = src->visrect.right - src->visrect.left; + if (!(ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) + return ERROR_OUTOFMEMORY; + + err = convert_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr ); + if (bits->free) bits->free( bits ); + bits->ptr = ptr; + bits->is_copy = TRUE; + bits->free = free_heap_bits; + return err; +} + +static DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, + BITMAPINFO *dst_info, struct bitblt_coords *dst, + struct gdi_image_bits *bits, int mode ) +{ + void *ptr; + DWORD err; + + dst_info->bmiHeader.biWidth = dst->visrect.right - dst->visrect.left; + dst_info->bmiHeader.biHeight = dst->visrect.bottom - dst->visrect.top; + if (src_info->bmiHeader.biHeight < 0) dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; + if (!(ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) + return ERROR_OUTOFMEMORY; + + err = stretch_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr, dst, mode ); + if (bits->free) bits->free( bits ); + bits->ptr = ptr; + bits->is_copy = TRUE; + bits->free = free_heap_bits; + return err; +} + /* nulldrv fallback implementation using StretchDIBits */ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) @@ -168,7 +207,6 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; DWORD err; struct gdi_image_bits bits; - LPVOID ptr; if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); @@ -209,42 +247,20 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, dst_info->bmiHeader.biClrUsed = 1; } - dst_info->bmiHeader.biWidth = src->visrect.right - src->visrect.left; - if ((ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) + if (!(err = convert_bits( src_info, src, dst_info, &bits ))) { - err = convert_bitmapinfo( src_info, bits.ptr, src, dst_info, ptr ); - if (bits.free) bits.free( &bits ); - bits.ptr = ptr; - bits.is_copy = TRUE; - bits.free = free_heap_bits; - if (!err) - { - /* get rid of the fake 1-bpp table */ - if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; - err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); - } + /* get rid of the fake 1-bpp table */ + if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; + err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); } - else err = ERROR_OUTOFMEMORY; } if (err == ERROR_TRANSFORM_NOT_SUPPORTED && ((src->width != dst->width) || (src->height != dst->height))) { memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); - dst_info->bmiHeader.biWidth = dst->visrect.right - dst->visrect.left; - dst_info->bmiHeader.biHeight = dst->visrect.bottom - dst->visrect.top; - if (src_info->bmiHeader.biHeight < 0) dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; - if ((ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) - { - err = stretch_bitmapinfo( src_info, bits.ptr, src, dst_info, ptr, dst, - GetStretchBltMode( dst_dev->hdc ) ); - if (bits.free) bits.free( &bits ); - bits.ptr = ptr; - bits.is_copy = TRUE; - bits.free = free_heap_bits; - if (!err) err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); - } - else err = ERROR_OUTOFMEMORY; + err = stretch_bits( src_info, src, dst_info, dst, &bits, GetStretchBltMode( dst_dev->hdc )); + if (!err) err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); } if (bits.free) bits.free( &bits );

1 0

Alexandre Julliard : gdi32: Add a placeholder function for DIB stretching.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 7696168dce19d182191a12e509a8c80d814c85cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7696168dce19d182191a12e50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 11:17:02 2011 +0200 gdi32: Add a placeholder function for DIB stretching. --- dlls/gdi32/bitblt.c | 17 +++++++++++++++-- dlls/gdi32/dibdrv/bitblt.c | 14 ++++++++++++++ dlls/gdi32/gdi_private.h | 3 +++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 9f37ab0..e023872 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -230,8 +230,21 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err == ERROR_TRANSFORM_NOT_SUPPORTED && ((src->width != dst->width) || (src->height != dst->height))) { - FIXME( "should stretch %dx%d -> %dx%d\n", - src->width, src->height, dst->width, dst->height ); + memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + dst_info->bmiHeader.biWidth = dst->visrect.right - dst->visrect.left; + dst_info->bmiHeader.biHeight = dst->visrect.bottom - dst->visrect.top; + if (src_info->bmiHeader.biHeight < 0) dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; + if ((ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) + { + err = stretch_bitmapinfo( src_info, bits.ptr, src, dst_info, ptr, dst, + GetStretchBltMode( dst_dev->hdc ) ); + if (bits.free) bits.free( &bits ); + bits.ptr = ptr; + bits.is_copy = TRUE; + bits.free = free_heap_bits; + if (!err) err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); + } + else err = ERROR_OUTOFMEMORY; } if (bits.free) bits.free( &bits ); diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 0bb37fb..1d41e11 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -793,3 +793,17 @@ done: return ret; } + +DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, + const BITMAPINFO *dst_info, void *dst_bits, const struct bitblt_coords *dst, + INT mode ) +{ + FIXME( "should stretch %dx%d -> %dx%d\n", src->width, src->height, dst->width, dst->height ); + + /* update coordinates, the destination rectangle is always stored at 0,0 */ + *src = *dst; + src->x -= src->visrect.left; + src->y -= src->visrect.top; + offset_rect( &src->visrect, -src->visrect.left, -src->visrect.top ); + return ERROR_SUCCESS; +} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a06a593..4fe2e59 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -254,6 +254,9 @@ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_H extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN; +extern DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, + const BITMAPINFO *dst_info, void *dst_bits, const struct bitblt_coords *dst, + INT mode ) DECLSPEC_HIDDEN; /* driver.c */ extern const DC_FUNCTIONS null_driver DECLSPEC_HIDDEN;

1 0

Henri Verbeet : ddraw: Get rid of the unused "initialized" field in IDirectDrawImpl.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 5de020342cc039819b6fe11ee787d5a9a288f85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5de020342cc039819b6fe11ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 13 20:02:25 2011 +0200 ddraw: Get rid of the unused "initialized" field in IDirectDrawImpl. --- dlls/ddraw/ddraw.c | 13 ++----------- dlls/ddraw/ddraw_private.h | 3 --- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3e3bf60..f981cf5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1674,18 +1674,9 @@ static HRESULT WINAPI ddraw2_GetAvailableVidMem(IDirectDraw2 *iface, *****************************************************************************/ static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *Guid) { - IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); - - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(Guid)); + FIXME("iface %p, guid %s stub!\n", iface, debugstr_guid(Guid)); - if(This->initialized) - { - return DDERR_ALREADYINITIALIZED; - } - else - { - return DD_OK; - } + return DDERR_ALREADYINITIALIZED; } static HRESULT WINAPI ddraw4_Initialize(IDirectDraw4 *iface, GUID *guid) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 80dd53d..e0706fc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -88,9 +88,6 @@ struct IDirectDrawImpl struct wined3d_device *wined3d_device; BOOL d3d_initialized; - /* Misc ddraw fields */ - BOOL initialized; - /* DirectDraw things, which are not handled by WineD3D */ DWORD cooperative_level;

1 0