November 2011 - Wine-Commits

Alexandre Julliard : gdi32: Don' t set the bitmap owner when selecting a pattern brush.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 5e1599d8c0a7549a7807e63c20652e896f9f50e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1599d8c0a7549a7807e63c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 22:21:37 2011 +0100 gdi32: Don't set the bitmap owner when selecting a pattern brush. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/brush.c | 10 ---------- dlls/gdi32/gdi_private.h | 4 +--- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 282e22b..45c3011 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -530,7 +530,7 @@ static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) * bitmap is selected into a device to initialize the bitmap function * table. */ -BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) +static BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) { BITMAPOBJ *bitmap; BOOL ret = TRUE; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 579e9fd..a360a1d 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -488,16 +488,6 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) if (bmp && bmp->funcs != physdev->funcs) store_bitmap_bits( brush, bmp ); GDI_ReleaseObj( bitmap ); } - if (brush->logbrush.lbStyle == BS_PATTERN) - { - PHYSDEV pattern_dev = physdev; - /* FIXME: This will go away once the dib driver implements - pattern brushes */ - if(pattern_dev == dc->dibdrv) - pattern_dev = GET_NEXT_PHYSDEV( physdev, pSelectBrush ); - - BITMAP_SetOwnerDC( bitmap, pattern_dev ); - } info = brush->info; bits = brush->bits.ptr; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3b3022a..c23a5cc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -228,9 +228,7 @@ extern 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 ) DECLSPEC_HIDDEN; -/* bitmap.c */ -extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN; - +/* brush.c */ extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; /* clipping.c */

1 0

Alexandre Julliard : gdi32: Grab the bits directly for DIB pattern brushes instead of duplicating the bitmap .
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: cc673f44c7696fd38c6bd23266fda1b76065849e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc673f44c7696fd38c6bd2326… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 21:14:42 2011 +0100 gdi32: Grab the bits directly for DIB pattern brushes instead of duplicating the bitmap. --- dlls/gdi32/brush.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 5cbae61..ccd1369 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -90,6 +90,44 @@ static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) return TRUE; } +static BOOL copy_bitmap( BRUSHOBJ *brush, HBITMAP bitmap ) +{ + BITMAPINFO *info; + BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); + + if (!bmp) return FALSE; + + if (!bmp->dib) + { + GDI_ReleaseObj( bitmap ); + brush->bitmap = BITMAP_CopyBitmap( bitmap ); + return brush->bitmap != 0; + } + + info = HeapAlloc( GetProcessHeap(), 0, + bitmap_info_size( (BITMAPINFO *)&bmp->dib->dsBmih, DIB_RGB_COLORS )); + if (!info) goto done; + info->bmiHeader = bmp->dib->dsBmih; + if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS) + memcpy( &info->bmiHeader + 1, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); + else if (bmp->nb_colors) + memcpy( &info->bmiHeader + 1, bmp->color_table, bmp->nb_colors * sizeof(RGBQUAD) ); + if (!(brush->bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( info )))) + { + HeapFree( GetProcessHeap(), 0, info ); + goto done; + } + memcpy( brush->bits.ptr, bmp->dib->dsBm.bmBits, get_dib_image_size( info )); + brush->bits.is_copy = TRUE; + brush->bits.free = free_heap_bits; + brush->info = info; + brush->usage = DIB_RGB_COLORS; + +done: + GDI_ReleaseObj( bitmap ); + return brush->info != NULL; +} + BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) { BRUSHOBJ *brush; @@ -159,8 +197,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) ptr->logbrush.lbStyle = BS_PATTERN; /* fall through */ case BS_PATTERN: - ptr->bitmap = BITMAP_CopyBitmap( (HBITMAP)ptr->logbrush.lbHatch ); - if (!ptr->bitmap) goto error; + if (!copy_bitmap( ptr, (HBITMAP)ptr->logbrush.lbHatch )) goto error; ptr->logbrush.lbColor = 0; break;

1 0

Alexandre Julliard : gdi32: Get rid of the get_bitmap_image helper.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: c88f4d452fe56088b317fce165818513a05da4aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88f4d452fe56088b317fce16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 11:06:32 2011 +0100 gdi32: Get rid of the get_bitmap_image helper. --- dlls/gdi32/bitmap.c | 21 --------------------- dlls/gdi32/gdi_private.h | 1 - 2 files changed, 0 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index a158735..7407906 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -297,27 +297,6 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) } -/* convenience wrapper for GetImage to retrieve the full contents of a bitmap */ -BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) -{ - struct bitblt_coords src; - BOOL ret = FALSE; - BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - - if (bmp) - { - const struct gdi_dc_funcs *funcs = get_bitmap_funcs( bmp ); - src.visrect.left = src.x = 0; - src.visrect.top = src.y = 0; - src.visrect.right = src.width = bmp->bitmap.bmWidth; - src.visrect.bottom = src.height = bmp->bitmap.bmHeight; - ret = !funcs->pGetImage( NULL, hbitmap, info, bits, &src ); - GDI_ReleaseObj( hbitmap ); - } - return ret; -} - - /*********************************************************************** * GetBitmapBits [GDI32.@] * diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3dfd9a5..9e40fc5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -229,7 +229,6 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* bitmap.c */ -extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN;

1 0

Vincent Povirk : include: Add definition of IWICComponentFactory and its dependencies.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 5d3328d511b389d6fb6cec03e1bb1c64160d001a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d3328d511b389d6fb6cec03e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 8 13:33:49 2011 -0600 include: Add definition of IWICComponentFactory and its dependencies. --- .gitignore | 1 + include/Makefile.in | 1 + include/wincodec.idl | 23 +++++ include/wincodecsdk.idl | 213 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 238 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index dd8e290..97c1f18 100644 --- a/.gitignore +++ b/.gitignore @@ -231,6 +231,7 @@ include/wbemcli.h include/wia_lh.h include/wia_xp.h include/wincodec.h +include/wincodecsdk.h include/wine/itss.h include/wine/svcctl.h include/wine/winedxgi.h diff --git a/include/Makefile.in b/include/Makefile.in index 6313fa8..ddc07ba 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -100,6 +100,7 @@ PUBLIC_IDL_H_SRCS = \ wia_lh.idl \ wia_xp.idl \ wincodec.idl \ + wincodecsdk.idl \ wine/itss.idl \ wine/svcctl.idl \ winsxs.idl \ diff --git a/include/wincodec.idl b/include/wincodec.idl index 6a24f5e..8228bd8 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -900,6 +900,29 @@ interface IWICImagingFactory : IUnknown [out] IWICMetadataQueryWriter **ppIQueryWriter); } +[ + local, + object, + uuid(dc2bb46d-3f07-481e-8625-220c4aedbb33) +] +interface IWICEnumMetadataItem : IUnknown +{ + HRESULT Next( + [in] ULONG celt, + [in, out, unique, size_is(celt)] PROPVARIANT *rgeltSchema, + [in, out, size_is(celt)] PROPVARIANT *rgeltId, + [in, out, optional, size_is(celt)] PROPVARIANT *rgeltValue, + [out, optional] ULONG *pceltFetched); + + HRESULT Skip( + [in] ULONG celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IWICEnumMetadataItem **ppIEnumMetadataItem); +} + cpp_quote("HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst);") cpp_quote("DEFINE_GUID(CLSID_WICBmpDecoder, 0x6b462062,0x7cbf,0x400d,0x9f,0xdb,0x81,0x3d,0xd1,0x0f,0x27,0x78);") diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl new file mode 100644 index 0000000..d83349c --- /dev/null +++ b/include/wincodecsdk.idl @@ -0,0 +1,213 @@ +/* + * Copyright 2011 Vincent Povirk for CodeWeavers + * + * 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 + */ + +import "wincodec.idl"; + +typedef enum WICPersistOptions { + WICPersistOptionsDefault = 0x00000000, + WICPersistOptionsLittleEndian = 0x00000001, + WICPersistOptionsBigEndian = 0x00000002, + WICPersistOptionsStrictFormat = 0x00000004, + WICPersistOptionsNoCacheStream = 0x00000008, + WICPersistOptionsMask = 0x0000FFFF +} WICPersistOptions; + +typedef enum WICMetadataCreationOptions { + WICMetadataCreationDefault = 0x00000000, + WICMetadataCreationAllowUnknown = WICMetadataCreationDefault, + WICMetadataCreationFailUnknown = 0x00010000, + WICMetadataCreationMask = 0xFFFF0000 +} WICMetadataCreationOptions; + +[ + object, + uuid(aba958bf-c672-44d1-8d61-ce6df2e682c2) +] +interface IWICMetadataHandlerInfo : IWICComponentInfo +{ + HRESULT GetMetadataFormat( + [out] GUID *pguidMetadataFormat); + + HRESULT GetContainerFormats( + [in] UINT cContainerFormats, + [in, out, unique, size_is(cContainerFormats)] GUID *pguidContainerFormats, + [out] UINT *pcchActual); + + HRESULT GetDeviceManufacturer( + [in] UINT cchDeviceManufacturer, + [in, out, unique, size_is(cchDeviceManufacturer)] WCHAR *wzDeviceManufacturer, + [out] UINT *pcchActual); + + HRESULT GetDeviceModels( + [in] UINT cchDeviceModels, + [in, out, unique, size_is(cchDeviceModels)] WCHAR *wzDeviceModels, + [out] UINT *pcchActual); + + HRESULT DoesRequireFullStream( + [out] BOOL *pfRequiresFullStream); + + HRESULT DoesSupportPadding( + [out] BOOL *pfSupportsPadding); + + HRESULT DoesRequireFixedSize( + [out] BOOL *pfFixedSize); +} + +[ + object, + uuid(9204fe99-d8fc-4fd5-a001-9536b067a899) +] +interface IWICMetadataReader : IUnknown +{ + HRESULT GetMetadataFormat( + [out] GUID *pguidMetadataFormat); + + HRESULT GetMetadataHandlerInfo( + [out] IWICMetadataHandlerInfo **ppIHandler); + + HRESULT GetCount( + [out] UINT *pcCount); + + HRESULT GetValueByIndex( + [in] UINT nIndex, + [in, out, unique] PROPVARIANT *pvarSchema, + [in, out, unique] PROPVARIANT *pvarId, + [in, out, unique] PROPVARIANT *pvarValue); + + HRESULT GetValue( + [in] const PROPVARIANT *pvarSchema, + [in] const PROPVARIANT *pvarId, + [in, out, unique] const PROPVARIANT *pvarValue); + + HRESULT GetEnumerator( + [out] IWICEnumMetadataItem **ppIEnumMetadata); +} + +[ + object, + uuid(f7836e16-3be0-470b-86bb-160d0aecd7de) +] +interface IWICMetadataWriter : IWICMetadataReader +{ + HRESULT SetValue( + [in, unique] const PROPVARIANT *pvarSchema, + [in] const PROPVARIANT *pvarId, + [in] const PROPVARIANT *pvarValue); + + HRESULT SetValueByIndex( + [in] UINT nIndex, + [in, unique] const PROPVARIANT *pvarSchema, + [in] const PROPVARIANT *pvarId, + [in] const PROPVARIANT *pvarValue); + + HRESULT RemoveValue( + [in, unique] const PROPVARIANT *pvarSchema, + [in] const PROPVARIANT *pvarId); + + HRESULT RemoveValueByIndex( + [in] UINT nIndex); +} + +[ + object, + uuid(feaa2a8d-b3f3-43e4-b25c-d1de990a1ae1) +] +interface IWICMetadataBlockReader : IUnknown +{ + HRESULT GetContainerFormat( + [out] GUID *pguidContainerFormat); + + HRESULT GetCount( + [out] UINT *pcCount); + + HRESULT GetReaderByIndex( + [in] UINT nIndex, + [out] IWICMetadataReader **ppIMetadataReader); + + HRESULT GetEnumerator( + [out] IEnumUnknown **ppIEnumMetadata); +} + +[ + object, + uuid(08fb9676-b444-41e8-8dbe-6a53a542bff1) +] +interface IWICMetadataBlockWriter : IWICMetadataBlockReader +{ + HRESULT InitializeFromBlockReader( + [in] IWICMetadataBlockReader *pIMDBlockReader); + + HRESULT GetWriterByIndex( + [in] UINT nIndex, + [out] IWICMetadataWriter **ppIMetadataWriter); + + HRESULT AddWriter( + [in] IWICMetadataWriter *pIMetadataWriter); + + HRESULT SetWriterByIndex( + [in] UINT nIndex, + [in] IWICMetadataWriter *pIMetadataWriter); + + HRESULT RemoveWriterByIndex( + [in] UINT nIndex); +} + +[ + object, + uuid(412d0c3a-9650-44fa-af5b-dd2a06c8e8fb) +] +interface IWICComponentFactory : IWICImagingFactory +{ + HRESULT CreateMetadataReader( + [in] REFGUID guidMetadataFormat, + [in, unique] const GUID *pguidVendor, + [in] DWORD dwOptions, + [in] IStream *pIStream, + [out] IWICMetadataReader **ppIReader); + + HRESULT CreateMetadataReaderFromContainer( + [in] REFGUID guidMetadataFormat, + [in, unique] const GUID *pguidVendor, + [in] DWORD dwOptions, + [in] IStream *pIStream, + [out] IWICMetadataReader **ppIReader); + + HRESULT CreateMetadataWriter( + [in] REFGUID guidMetadataFormat, + [in, unique] const GUID *pguidVendor, + [in] DWORD dwMetadataOptions, + [out] IWICMetadataWriter **ppIWriter); + + HRESULT CreateMetadataWriterFromReader( + [in] IWICMetadataReader *pIReader, + [in, unique] const GUID *pguidVendor, + [out] IWICMetadataWriter **ppIWriter); + + HRESULT CreateQueryReaderFromBlockReader( + [in] IWICMetadataBlockReader *pIBlockReader, + [out] IWICMetadataQueryReader **ppIQueryReader); + + HRESULT CreateQueryWriterFromBlockWriter( + [in] IWICMetadataBlockWriter *pIBlockWriter, + [out] IWICMetadataQueryWriter **ppIQueryWriter); + + HRESULT CreateEncoderPropertyBag( + [in, unique, size_is(cCount)] PROPBAG2 *ppropOptions, + [in] UINT cCount, + [out] IPropertyBag2 **ppIPropertyBag); +}

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (mmddk.h).
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: eefcb584834ce47ad7292ade978a7b41832aaecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eefcb584834ce47ad7292ade9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 8 23:28:01 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (mmddk.h). --- include/mmddk.h | 72 +++++++++++++++++++++++++++--------------------------- 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/include/mmddk.h b/include/mmddk.h index 17366db..d6359ef 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -67,8 +67,8 @@ typedef struct { * - codes from 0 to 0x7FFFFFFF are user defined * - codes from 0x80000000 to 0xFFFFFFFF are reserved for future definition by microsoft */ -#define DRVM_IOCTL_CMD_USER 0x00000000L -#define DRVM_IOCTL_CMD_SYSTEM 0x80000000L +#define DRVM_IOCTL_CMD_USER __MSABI_LONG(0x00000000) +#define DRVM_IOCTL_CMD_SYSTEM __MSABI_LONG(0x80000000) #define DRVM_MAPPER 0x2000 #define DRVM_USER 0x4000 @@ -207,12 +207,12 @@ typedef struct { #define JOY_HW_LASTENTRY 12 /* calibration flags */ -#define JOY_ISCAL_XY 0x00000001l /* XY are calibrated */ -#define JOY_ISCAL_Z 0x00000002l /* Z is calibrated */ -#define JOY_ISCAL_R 0x00000004l /* R is calibrated */ -#define JOY_ISCAL_U 0x00000008l /* U is calibrated */ -#define JOY_ISCAL_V 0x00000010l /* V is calibrated */ -#define JOY_ISCAL_POV 0x00000020l /* POV is calibrated */ +#define JOY_ISCAL_XY __MSABI_LONG(0x00000001) /* XY are calibrated */ +#define JOY_ISCAL_Z __MSABI_LONG(0x00000002) /* Z is calibrated */ +#define JOY_ISCAL_R __MSABI_LONG(0x00000004) /* R is calibrated */ +#define JOY_ISCAL_U __MSABI_LONG(0x00000008) /* U is calibrated */ +#define JOY_ISCAL_V __MSABI_LONG(0x00000010) /* V is calibrated */ +#define JOY_ISCAL_POV __MSABI_LONG(0x00000020) /* POV is calibrated */ /* point of view constants */ #define JOY_POV_NUMDIRS 4 @@ -222,42 +222,42 @@ typedef struct { #define JOY_POVVAL_RIGHT 3 /* Specific settings for joystick hardware */ -#define JOY_HWS_HASZ 0x00000001l /* has Z info? */ -#define JOY_HWS_HASPOV 0x00000002l /* point of view hat present */ -#define JOY_HWS_POVISBUTTONCOMBOS 0x00000004l /* pov done through combo of buttons */ -#define JOY_HWS_POVISPOLL 0x00000008l /* pov done through polling */ -#define JOY_HWS_ISYOKE 0x00000010l /* joystick is a flight yoke */ -#define JOY_HWS_ISGAMEPAD 0x00000020l /* joystick is a game pad */ -#define JOY_HWS_ISCARCTRL 0x00000040l /* joystick is a car controller */ +#define JOY_HWS_HASZ __MSABI_LONG(0x00000001) /* has Z info? */ +#define JOY_HWS_HASPOV __MSABI_LONG(0x00000002) /* point of view hat present */ +#define JOY_HWS_POVISBUTTONCOMBOS __MSABI_LONG(0x00000004) /* pov done through combo of buttons */ +#define JOY_HWS_POVISPOLL __MSABI_LONG(0x00000008) /* pov done through polling */ +#define JOY_HWS_ISYOKE __MSABI_LONG(0x00000010) /* joystick is a flight yoke */ +#define JOY_HWS_ISGAMEPAD __MSABI_LONG(0x00000020) /* joystick is a game pad */ +#define JOY_HWS_ISCARCTRL __MSABI_LONG(0x00000040) /* joystick is a car controller */ /* X defaults to J1 X axis */ -#define JOY_HWS_XISJ1Y 0x00000080l /* X is on J1 Y axis */ -#define JOY_HWS_XISJ2X 0x00000100l /* X is on J2 X axis */ -#define JOY_HWS_XISJ2Y 0x00000200l /* X is on J2 Y axis */ +#define JOY_HWS_XISJ1Y __MSABI_LONG(0x00000080) /* X is on J1 Y axis */ +#define JOY_HWS_XISJ2X __MSABI_LONG(0x00000100) /* X is on J2 X axis */ +#define JOY_HWS_XISJ2Y __MSABI_LONG(0x00000200) /* X is on J2 Y axis */ /* Y defaults to J1 Y axis */ -#define JOY_HWS_YISJ1X 0x00000400l /* Y is on J1 X axis */ -#define JOY_HWS_YISJ2X 0x00000800l /* Y is on J2 X axis */ -#define JOY_HWS_YISJ2Y 0x00001000l /* Y is on J2 Y axis */ +#define JOY_HWS_YISJ1X __MSABI_LONG(0x00000400) /* Y is on J1 X axis */ +#define JOY_HWS_YISJ2X __MSABI_LONG(0x00000800) /* Y is on J2 X axis */ +#define JOY_HWS_YISJ2Y __MSABI_LONG(0x00001000) /* Y is on J2 Y axis */ /* Z defaults to J2 Y axis */ -#define JOY_HWS_ZISJ1X 0x00002000l /* Z is on J1 X axis */ -#define JOY_HWS_ZISJ1Y 0x00004000l /* Z is on J1 Y axis */ -#define JOY_HWS_ZISJ2X 0x00008000l /* Z is on J2 X axis */ +#define JOY_HWS_ZISJ1X __MSABI_LONG(0x00002000) /* Z is on J1 X axis */ +#define JOY_HWS_ZISJ1Y __MSABI_LONG(0x00004000) /* Z is on J1 Y axis */ +#define JOY_HWS_ZISJ2X __MSABI_LONG(0x00008000) /* Z is on J2 X axis */ /* POV defaults to J2 Y axis, if it is not button based */ -#define JOY_HWS_POVISJ1X 0x00010000l /* pov done through J1 X axis */ -#define JOY_HWS_POVISJ1Y 0x00020000l /* pov done through J1 Y axis */ -#define JOY_HWS_POVISJ2X 0x00040000l /* pov done through J2 X axis */ +#define JOY_HWS_POVISJ1X __MSABI_LONG(0x00010000) /* pov done through J1 X axis */ +#define JOY_HWS_POVISJ1Y __MSABI_LONG(0x00020000) /* pov done through J1 Y axis */ +#define JOY_HWS_POVISJ2X __MSABI_LONG(0x00040000) /* pov done through J2 X axis */ /* R defaults to J2 X axis */ -#define JOY_HWS_HASR 0x00080000l /* has R (4th axis) info */ -#define JOY_HWS_RISJ1X 0x00100000l /* R done through J1 X axis */ -#define JOY_HWS_RISJ1Y 0x00200000l /* R done through J1 Y axis */ -#define JOY_HWS_RISJ2Y 0x00400000l /* R done through J2 X axis */ +#define JOY_HWS_HASR __MSABI_LONG(0x00080000) /* has R (4th axis) info */ +#define JOY_HWS_RISJ1X __MSABI_LONG(0x00100000) /* R done through J1 X axis */ +#define JOY_HWS_RISJ1Y __MSABI_LONG(0x00200000) /* R done through J1 Y axis */ +#define JOY_HWS_RISJ2Y __MSABI_LONG(0x00400000) /* R done through J2 X axis */ /* U & V for future hardware */ -#define JOY_HWS_HASU 0x00800000l /* has U (5th axis) info */ -#define JOY_HWS_HASV 0x01000000l /* has V (6th axis) info */ +#define JOY_HWS_HASU __MSABI_LONG(0x00800000) /* has U (5th axis) info */ +#define JOY_HWS_HASV __MSABI_LONG(0x01000000) /* has V (6th axis) info */ /* Usage settings */ -#define JOY_US_HASRUDDER 0x00000001l /* joystick configured with rudder */ -#define JOY_US_PRESENT 0x00000002l /* is joystick actually present? */ -#define JOY_US_ISOEM 0x00000004l /* joystick is an OEM defined type */ +#define JOY_US_HASRUDDER __MSABI_LONG(0x00000001) /* joystick configured with rudder */ +#define JOY_US_PRESENT __MSABI_LONG(0x00000002) /* is joystick actually present? */ +#define JOY_US_ISOEM __MSABI_LONG(0x00000004) /* joystick is an OEM defined type */ /* struct for storing x,y, z, and rudder values */

1 0

Alexandre Julliard : gdi32: Implement the CopyBitmap entry point in the null driver.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 26f5e2c6e74832bcbdcf9fc0e0718b73be204201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f5e2c6e74832bcbdcf9fc0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 22:14:50 2011 +0100 gdi32: Implement the CopyBitmap entry point in the null driver. --- dlls/gdi32/bitmap.c | 21 +++++++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 10 +++++++++- dlls/gdi32/driver.c | 5 ----- dlls/gdi32/gdi_private.h | 1 + 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 7407906..9042b88 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -65,6 +65,27 @@ DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *inf return dib_driver.pPutImage( NULL, hbitmap, clip, info, bits, src, dst, rop ); } +BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + BOOL ret = TRUE; + BITMAPOBJ *src_bmp = GDI_GetObjPtr( src, OBJ_BITMAP ); + + if (!src_bmp) return FALSE; + if (src_bmp->bitmap.bmBits) + { + BITMAPOBJ *dst_bmp = GDI_GetObjPtr( dst, OBJ_BITMAP ); + int stride = get_dib_stride( dst_bmp->bitmap.bmWidth, dst_bmp->bitmap.bmBitsPixel ); + dst_bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), 0, dst_bmp->bitmap.bmHeight * stride ); + if (dst_bmp->bitmap.bmBits) + memcpy( dst_bmp->bitmap.bmBits, src_bmp->bitmap.bmBits, dst_bmp->bitmap.bmHeight * stride ); + else + ret = FALSE; + GDI_ReleaseObj( dst ); + } + GDI_ReleaseObj( src ); + return ret; +} + /****************************************************************************** * CreateBitmap [GDI32.@] diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 3adf246..a91de78 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -391,6 +391,14 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev ) } /*********************************************************************** + * dibdrv_CopyBitmap + */ +static BOOL dibdrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + return nulldrv_CopyBitmap( src, dst ); +} + +/*********************************************************************** * dibdrv_DeleteBitmap */ static BOOL dibdrv_DeleteBitmap( HBITMAP bitmap ) @@ -523,7 +531,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ - NULL, /* pCopyBitmap */ + dibdrv_CopyBitmap, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ dibdrv_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index b72d6d7..9b951d0 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -209,11 +209,6 @@ static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom return TRUE; } -static BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) -{ - return TRUE; -} - static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap ) { return TRUE; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9e40fc5..ab5cf25 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -357,6 +357,7 @@ extern BOOL nulldrv_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN; extern BOOL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) DECLSPEC_HIDDEN; extern BOOL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Don't print FIXMEs for misaligned surface maps.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: b6c7a3dbc88a02ac0e430624fe8008875e43ed2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c7a3dbc88a02ac0e430624f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 8 20:48:55 2011 +0100 wined3d: Don't print FIXMEs for misaligned surface maps. --- dlls/wined3d/surface.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5d32512..06a36b3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3719,15 +3719,11 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, if ((rect->left & width_mask) || (rect->right & width_mask) || (rect->top & height_mask) || (rect->bottom & height_mask)) { - switch (surface->resource.pool) - { - case WINED3DPOOL_DEFAULT: - WARN("Partial block lock with WINED3DPOOL_DEFAULT\n"); - return WINED3DERR_INVALIDCALL; + WARN("Map rect %s is misaligned for %ux%u blocks.\n", + wine_dbgstr_rect(rect), format->block_width, format->block_height); - default: - FIXME("Partial block lock with %s\n", debug_d3dpool(surface->resource.pool)); - } + if (surface->resource.pool == WINED3DPOOL_DEFAULT) + return WINED3DERR_INVALIDCALL; } }

1 0

Henri Verbeet : wined3d: Get rid of RTL_DISABLE.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 0ba5f7dd983986f40e702f5f775611fbfd6ad088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba5f7dd983986f40e702f5f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 8 20:48:56 2011 +0100 wined3d: Get rid of RTL_DISABLE. --- dlls/wined3d/surface.c | 26 +------------------------- dlls/wined3d/wined3d_main.c | 7 +------ dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 06a36b3..f354c11 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -868,11 +868,7 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD && rect->right == surface->resource.width && rect->bottom == surface->resource.height) pass_rect = NULL; - - if (!(wined3d_settings.rendertargetlock_mode == RTL_DISABLE - && ((surface->container.type == WINED3D_CONTAINER_SWAPCHAIN) - || surface == device->fb.render_targets[0]))) - surface_load_location(surface, SFLAG_INSYSMEM, pass_rect); + surface_load_location(surface, SFLAG_INSYSMEM, pass_rect); } if (surface->flags & SFLAG_PBO) @@ -964,17 +960,6 @@ static void surface_unmap(struct wined3d_surface *surface) if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN || (device->fb.render_targets && surface == device->fb.render_targets[0])) { - if (wined3d_settings.rendertargetlock_mode == RTL_DISABLE) - { - static BOOL warned = FALSE; - if (!warned) - { - ERR("The application tries to write to the render target, but render target locking is disabled.\n"); - warned = TRUE; - } - goto done; - } - if (!surface->dirtyRect.left && !surface->dirtyRect.top && surface->dirtyRect.right == surface->resource.width && surface->dirtyRect.bottom == surface->resource.height) @@ -4013,15 +3998,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r GLint skipPix = 0; GLint skipRow = 0; - if(wined3d_settings.rendertargetlock_mode == RTL_DISABLE) { - static BOOL warned = FALSE; - if(!warned) { - ERR("The application tries to lock the render target, but render target locking is disabled\n"); - warned = TRUE; - } - return; - } - context = context_acquire(device, surface); context_apply_blit_state(context, device); gl_info = context->gl_info; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 282f52d..0533595 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -260,12 +260,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } if ( !get_config_key( hkey, appkey, "RenderTargetLockMode", buffer, size) ) { - if (!strcmp(buffer,"disabled")) - { - TRACE("Disabling render target locking\n"); - wined3d_settings.rendertargetlock_mode = RTL_DISABLE; - } - else if (!strcmp(buffer,"readdraw")) + if (!strcmp(buffer,"readdraw")) { TRACE("Using glReadPixels for render target reading and glDrawPixels for writing\n"); wined3d_settings.rendertargetlock_mode = RTL_READDRAW; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 14fbd2b..48a302a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -246,7 +246,6 @@ static inline float float_24_to_32(DWORD in) #define SHADER_ATI 3 #define SHADER_NONE 4 -#define RTL_DISABLE -1 #define RTL_READDRAW 1 #define RTL_READTEX 2

1 0

Andrew Talbot : shlwapi: Suppress sign-extension through integer promotion.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 0bed0f4ce6c7f0a646bf756ed5d9abc16aaf775b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bed0f4ce6c7f0a646bf756ed… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 8 22:23:45 2011 +0000 shlwapi: Suppress sign-extension through integer promotion. --- dlls/shlwapi/wsprintf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c index 1093393..56eea41 100644 --- a/dlls/shlwapi/wsprintf.c +++ b/dlls/shlwapi/wsprintf.c @@ -488,7 +488,7 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar case WPR_STRING: { LPCSTR ptr = argData.lpcstr_view; - for (i = 0; i < len; i++) *p++ = (WCHAR)*ptr++; + for (i = 0; i < len; i++) *p++ = (BYTE)*ptr++; } break; case WPR_WSTRING: @@ -514,7 +514,7 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar /* fall through */ case WPR_UNSIGNED: for (i = len; i < format.precision; i++, maxlen--) *p++ = '0'; - for (i = sign; i < len; i++) *p++ = (WCHAR)number[i]; + for (i = sign; i < len; i++) *p++ = (BYTE)number[i]; break; case WPR_UNKNOWN: continue;

1 0

Michael Stefaniuc : include: Fixup "long" numeric constants in commctrl.h.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 43a95a9b03feed8ea57f46974997289d9d78692d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a95a9b03feed8ea57f46974… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 8 23:25:00 2011 +0100 include: Fixup "long" numeric constants in commctrl.h. --- dlls/comctl32/rebar.c | 2 +- include/commctrl.h | 112 ++++++++++++++++++++++++------------------------ 2 files changed, 57 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43a95a9b03feed8ea57f4…

1 0