November 2011 - Wine-Commits

Alexandre Julliard : Release 1.3.32.
by Alexandre Julliard Nov. 4, 2011

Nov. 4, 2011

Module: wine Branch: master Commit: 08a4ca7b531e9fdf2d6868f57adc11a6982293ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a4ca7b531e9fdf2d6868f57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 20:02:31 2011 +0100 Release 1.3.32. --- ANNOUNCE | 1079 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 541 insertions(+), 558 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08a4ca7b531e9fdf2d686…

1 0

Tag wine-1.3.32 : Alexandre Julliard : Release 1.3.32
by Alexandre Julliard Nov. 4, 2011

Nov. 4, 2011

Module: wine Branch: refs/tags/wine-1.3.32 Tag: 02b65a21fd4cb51c4655938b1855e90ded03fdcf URL: http://source.winehq.org/git/wine.git/?a=tag;h=02b65a21fd4cb51c4655938b1855… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 20:02:31 2011 +0100 Release 1.3.32

1 0

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

Nov. 4, 2011

Module: wine Branch: master Commit: f9c42a7d0a493bcf76d1ea3f503d5f7d443a8a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c42a7d0a493bcf76d1ea3f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 3 23:56:46 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (msacm.h). --- dlls/msacm32/driver.c | 2 +- include/msacm.h | 140 ++++++++++++++++++++++++------------------------ 2 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c42a7d0a493bcf76d1e…

1 0

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

Nov. 4, 2011

Module: wine Branch: master Commit: cb72e666ba351f894c383e0caeb6b8bb680eefe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb72e666ba351f894c383e0ca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 3 23:58:54 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (winver.h). --- include/winver.h | 124 +++++++++++++++++++++++++++--------------------------- 1 files changed, 62 insertions(+), 62 deletions(-) diff --git a/include/winver.h b/include/winver.h index f7e887b..2de105b 100644 --- a/include/winver.h +++ b/include/winver.h @@ -29,33 +29,33 @@ extern "C" { #define VS_VERSION_INFO 1 #define VS_USER_DEFINED 100 -#define VS_FFI_SIGNATURE 0xfeef04bdL /* FileInfo Magic */ -#define VS_FFI_STRUCVERSION 0x00010000L /* struc version 1.0 */ -#define VS_FFI_FILEFLAGSMASK 0x0000003fL /* valid flags */ +#define VS_FFI_SIGNATURE __MSABI_LONG(0xfeef04bd) /* FileInfo Magic */ +#define VS_FFI_STRUCVERSION __MSABI_LONG(0x00010000) /* struc version 1.0 */ +#define VS_FFI_FILEFLAGSMASK __MSABI_LONG(0x0000003f) /* valid flags */ /* VS_VERSION.dwFileFlags */ -#define VS_FF_DEBUG 0x01L -#define VS_FF_PRERELEASE 0x02L -#define VS_FF_PATCHED 0x04L -#define VS_FF_PRIVATEBUILD 0x08L -#define VS_FF_INFOINFERRED 0x10L -#define VS_FF_SPECIALBUILD 0x20L +#define VS_FF_DEBUG __MSABI_LONG(0x01) +#define VS_FF_PRERELEASE __MSABI_LONG(0x02) +#define VS_FF_PATCHED __MSABI_LONG(0x04) +#define VS_FF_PRIVATEBUILD __MSABI_LONG(0x08) +#define VS_FF_INFOINFERRED __MSABI_LONG(0x10) +#define VS_FF_SPECIALBUILD __MSABI_LONG(0x20) /* VS_VERSION.dwFileOS */ /* major os version */ -#define VOS_UNKNOWN 0x00000000L -#define VOS_DOS 0x00010000L -#define VOS_OS216 0x00020000L -#define VOS_OS232 0x00030000L -#define VOS_NT 0x00040000L +#define VOS_UNKNOWN __MSABI_LONG(0x00000000) +#define VOS_DOS __MSABI_LONG(0x00010000) +#define VOS_OS216 __MSABI_LONG(0x00020000) +#define VOS_OS232 __MSABI_LONG(0x00030000) +#define VOS_NT __MSABI_LONG(0x00040000) /* minor os version */ -#define VOS__BASE 0x00000000L -#define VOS__WINDOWS16 0x00000001L -#define VOS__PM16 0x00000002L -#define VOS__PM32 0x00000003L -#define VOS__WINDOWS32 0x00000004L +#define VOS__BASE __MSABI_LONG(0x00000000) +#define VOS__WINDOWS16 __MSABI_LONG(0x00000001) +#define VOS__PM16 __MSABI_LONG(0x00000002) +#define VOS__PM32 __MSABI_LONG(0x00000003) +#define VOS__WINDOWS32 __MSABI_LONG(0x00000004) /* possible versions */ #define VOS_DOS_WINDOWS16 (VOS_DOS|VOS__WINDOWS16) @@ -65,34 +65,34 @@ extern "C" { #define VOS_NT_WINDOWS32 (VOS_NT|VOS__WINDOWS32) /* VS_VERSION.dwFileType */ -#define VFT_UNKNOWN 0x00000000L -#define VFT_APP 0x00000001L -#define VFT_DLL 0x00000002L -#define VFT_DRV 0x00000003L -#define VFT_FONT 0x00000004L -#define VFT_VXD 0x00000005L -/* ??one type missing?? 0x00000006L -Marcus */ -#define VFT_STATIC_LIB 0x00000007L +#define VFT_UNKNOWN __MSABI_LONG(0x00000000) +#define VFT_APP __MSABI_LONG(0x00000001) +#define VFT_DLL __MSABI_LONG(0x00000002) +#define VFT_DRV __MSABI_LONG(0x00000003) +#define VFT_FONT __MSABI_LONG(0x00000004) +#define VFT_VXD __MSABI_LONG(0x00000005) +/* ??one type missing?? __MSABI_LONG(0x00000006) -Marcus */ +#define VFT_STATIC_LIB __MSABI_LONG(0x00000007) /* VS_VERSION.dwFileSubtype for VFT_DRV */ -#define VFT2_UNKNOWN 0x00000000L -#define VFT2_DRV_PRINTER 0x00000001L -#define VFT2_DRV_KEYBOARD 0x00000002L -#define VFT2_DRV_LANGUAGE 0x00000003L -#define VFT2_DRV_DISPLAY 0x00000004L -#define VFT2_DRV_MOUSE 0x00000005L -#define VFT2_DRV_NETWORK 0x00000006L -#define VFT2_DRV_SYSTEM 0x00000007L -#define VFT2_DRV_INSTALLABLE 0x00000008L -#define VFT2_DRV_SOUND 0x00000009L -#define VFT2_DRV_COMM 0x0000000aL -#define VFT2_DRV_INPUTMETHOD 0x0000000bL -#define VFT2_DRV_VERSIONED_PRINTER 0x0000000cL +#define VFT2_UNKNOWN __MSABI_LONG(0x00000000) +#define VFT2_DRV_PRINTER __MSABI_LONG(0x00000001) +#define VFT2_DRV_KEYBOARD __MSABI_LONG(0x00000002) +#define VFT2_DRV_LANGUAGE __MSABI_LONG(0x00000003) +#define VFT2_DRV_DISPLAY __MSABI_LONG(0x00000004) +#define VFT2_DRV_MOUSE __MSABI_LONG(0x00000005) +#define VFT2_DRV_NETWORK __MSABI_LONG(0x00000006) +#define VFT2_DRV_SYSTEM __MSABI_LONG(0x00000007) +#define VFT2_DRV_INSTALLABLE __MSABI_LONG(0x00000008) +#define VFT2_DRV_SOUND __MSABI_LONG(0x00000009) +#define VFT2_DRV_COMM __MSABI_LONG(0x0000000a) +#define VFT2_DRV_INPUTMETHOD __MSABI_LONG(0x0000000b) +#define VFT2_DRV_VERSIONED_PRINTER __MSABI_LONG(0x0000000c) /* VS_VERSION.dwFileSubtype for VFT_FONT */ -#define VFT2_FONT_RASTER 0x00000001L -#define VFT2_FONT_VECTOR 0x00000002L -#define VFT2_FONT_TRUETYPE 0x00000003L +#define VFT2_FONT_RASTER __MSABI_LONG(0x00000001) +#define VFT2_FONT_VECTOR __MSABI_LONG(0x00000002) +#define VFT2_FONT_TRUETYPE __MSABI_LONG(0x00000003) /* VerFindFile Flags */ /* input */ @@ -109,25 +109,25 @@ extern "C" { #define VIFF_DONTDELETEOLD 0x0002 /* output (return) */ -#define VIF_TEMPFILE 0x00000001L -#define VIF_MISMATCH 0x00000002L -#define VIF_SRCOLD 0x00000004L -#define VIF_DIFFLANG 0x00000008L -#define VIF_DIFFCODEPG 0x00000010L -#define VIF_DIFFTYPE 0x00000020L -#define VIF_WRITEPROT 0x00000040L -#define VIF_FILEINUSE 0x00000080L -#define VIF_OUTOFSPACE 0x00000100L -#define VIF_ACCESSVIOLATION 0x00000200L -#define VIF_SHARINGVIOLATION 0x00000400L -#define VIF_CANNOTCREATE 0x00000800L -#define VIF_CANNOTDELETE 0x00001000L -#define VIF_CANNOTRENAME 0x00002000L -#define VIF_CANNOTDELETECUR 0x00004000L -#define VIF_OUTOFMEMORY 0x00008000L -#define VIF_CANNOTREADSRC 0x00010000L -#define VIF_CANNOTREADDST 0x00020000L -#define VIF_BUFFTOOSMALL 0x00040000L +#define VIF_TEMPFILE __MSABI_LONG(0x00000001) +#define VIF_MISMATCH __MSABI_LONG(0x00000002) +#define VIF_SRCOLD __MSABI_LONG(0x00000004) +#define VIF_DIFFLANG __MSABI_LONG(0x00000008) +#define VIF_DIFFCODEPG __MSABI_LONG(0x00000010) +#define VIF_DIFFTYPE __MSABI_LONG(0x00000020) +#define VIF_WRITEPROT __MSABI_LONG(0x00000040) +#define VIF_FILEINUSE __MSABI_LONG(0x00000080) +#define VIF_OUTOFSPACE __MSABI_LONG(0x00000100) +#define VIF_ACCESSVIOLATION __MSABI_LONG(0x00000200) +#define VIF_SHARINGVIOLATION __MSABI_LONG(0x00000400) +#define VIF_CANNOTCREATE __MSABI_LONG(0x00000800) +#define VIF_CANNOTDELETE __MSABI_LONG(0x00001000) +#define VIF_CANNOTRENAME __MSABI_LONG(0x00002000) +#define VIF_CANNOTDELETECUR __MSABI_LONG(0x00004000) +#define VIF_OUTOFMEMORY __MSABI_LONG(0x00008000) +#define VIF_CANNOTREADSRC __MSABI_LONG(0x00010000) +#define VIF_CANNOTREADDST __MSABI_LONG(0x00020000) +#define VIF_BUFFTOOSMALL __MSABI_LONG(0x00040000) typedef struct tagVS_FIXEDFILEINFO { DWORD dwSignature;

1 0

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

Nov. 4, 2011

Module: wine Branch: master Commit: 232bf4cf318fe417e66fa639c2ea0c990eae136e URL: http://source.winehq.org/git/wine.git/?a=commit;h=232bf4cf318fe417e66fa639c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 3 23:59:47 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (oledlg.h). --- include/oledlg.h | 112 +++++++++++++++++++++++++++--------------------------- 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/include/oledlg.h b/include/oledlg.h index 29fff5a..29f842f 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -197,20 +197,20 @@ DECL_WINELIB_TYPE_AW(OLEUIINSERTOBJECT) DECL_WINELIB_TYPE_AW(POLEUIINSERTOBJECT) DECL_WINELIB_TYPE_AW(LPOLEUIINSERTOBJECT) -#define IOF_SHOWHELP 0x00000001L -#define IOF_SELECTCREATENEW 0x00000002L -#define IOF_SELECTCREATEFROMFILE 0x00000004L -#define IOF_CHECKLINK 0x00000008L -#define IOF_CHECKDISPLAYASICON 0x00000010L -#define IOF_CREATENEWOBJECT 0x00000020L -#define IOF_CREATEFILEOBJECT 0x00000040L -#define IOF_CREATELINKOBJECT 0x00000080L -#define IOF_DISABLELINK 0x00000100L -#define IOF_VERIFYSERVERSEXIST 0x00000200L -#define IOF_DISABLEDISPLAYASICON 0x00000400L -#define IOF_HIDECHANGEICON 0x00000800L -#define IOF_SHOWINSERTCONTROL 0x00001000L -#define IOF_SELECTCREATECONTROL 0x00002000L +#define IOF_SHOWHELP __MSABI_LONG(0x00000001) +#define IOF_SELECTCREATENEW __MSABI_LONG(0x00000002) +#define IOF_SELECTCREATEFROMFILE __MSABI_LONG(0x00000004) +#define IOF_CHECKLINK __MSABI_LONG(0x00000008) +#define IOF_CHECKDISPLAYASICON __MSABI_LONG(0x00000010) +#define IOF_CREATENEWOBJECT __MSABI_LONG(0x00000020) +#define IOF_CREATEFILEOBJECT __MSABI_LONG(0x00000040) +#define IOF_CREATELINKOBJECT __MSABI_LONG(0x00000080) +#define IOF_DISABLELINK __MSABI_LONG(0x00000100) +#define IOF_VERIFYSERVERSEXIST __MSABI_LONG(0x00000200) +#define IOF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000400) +#define IOF_HIDECHANGEICON __MSABI_LONG(0x00000800) +#define IOF_SHOWINSERTCONTROL __MSABI_LONG(0x00001000) +#define IOF_SELECTCREATECONTROL __MSABI_LONG(0x00002000) /***************************************************************************** * CONVERT DIALOG @@ -271,15 +271,15 @@ DECL_WINELIB_TYPE_AW(OLEUICONVERT) DECL_WINELIB_TYPE_AW(POLEUICONVERT) DECL_WINELIB_TYPE_AW(LPOLEUICONVERT) -#define CF_SHOWHELPBUTTON 0x00000001L -#define CF_SETCONVERTDEFAULT 0x00000002L -#define CF_SETACTIVATEDEFAULT 0x00000004L -#define CF_SELECTCONVERTTO 0x00000008L -#define CF_SELECTACTIVATEAS 0x00000010L -#define CF_DISABLEDISPLAYASICON 0x00000020L -#define CF_DISABLEACTIVATEAS 0x00000040L -#define CF_HIDECHANGEICON 0x00000080L -#define CF_CONVERTONLY 0x00000100L +#define CF_SHOWHELPBUTTON __MSABI_LONG(0x00000001) +#define CF_SETCONVERTDEFAULT __MSABI_LONG(0x00000002) +#define CF_SETACTIVATEDEFAULT __MSABI_LONG(0x00000004) +#define CF_SELECTCONVERTTO __MSABI_LONG(0x00000008) +#define CF_SELECTACTIVATEAS __MSABI_LONG(0x00000010) +#define CF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000020) +#define CF_DISABLEACTIVATEAS __MSABI_LONG(0x00000040) +#define CF_HIDECHANGEICON __MSABI_LONG(0x00000080) +#define CF_CONVERTONLY __MSABI_LONG(0x00000100) /***************************************************************************** * CHANGE ICON DIALOG @@ -323,11 +323,11 @@ DECL_WINELIB_TYPE_AW(POLEUICHANGEICON) DECL_WINELIB_TYPE_AW(LPOLEUICHANGEICON) -#define CIF_SHOWHELP 0x00000001L -#define CIF_SELECTCURRENT 0x00000002L -#define CIF_SELECTDEFAULT 0x00000004L -#define CIF_SELECTFROMFILE 0x00000008L -#define CIF_USEICONEXE 0x00000010L +#define CIF_SHOWHELP __MSABI_LONG(0x00000001) +#define CIF_SELECTCURRENT __MSABI_LONG(0x00000002) +#define CIF_SELECTDEFAULT __MSABI_LONG(0x00000004) +#define CIF_SELECTFROMFILE __MSABI_LONG(0x00000008) +#define CIF_USEICONEXE __MSABI_LONG(0x00000010) /***************************************************************************** * PASTE SPECIAL DIALOG @@ -425,15 +425,15 @@ DECL_WINELIB_TYPE_AW(LPOLEUIPASTESPECIAL) #define PS_MAXLINKTYPES 8 -#define PSF_SHOWHELP 0x00000001L -#define PSF_SELECTPASTE 0x00000002L -#define PSF_SELECTPASTELINK 0x00000004L +#define PSF_SHOWHELP __MSABI_LONG(0x00000001) +#define PSF_SELECTPASTE __MSABI_LONG(0x00000002) +#define PSF_SELECTPASTELINK __MSABI_LONG(0x00000004) -#define PSF_CHECKDISPLAYASICON 0x00000008L -#define PSF_DISABLEDISPLAYASICON 0x00000010L -#define PSF_HIDECHANGEICON 0x00000020L -#define PSF_STAYONCLIPBOARDCHANGE 0x00000040L -#define PSF_NOREFRESHDATAOBJECT 0x00000080L +#define PSF_CHECKDISPLAYASICON __MSABI_LONG(0x00000008) +#define PSF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000010) +#define PSF_HIDECHANGEICON __MSABI_LONG(0x00000020) +#define PSF_STAYONCLIPBOARDCHANGE __MSABI_LONG(0x00000040) +#define PSF_NOREFRESHDATAOBJECT __MSABI_LONG(0x00000080) #define OLEUI_IOERR_SRCDATAOBJECTINVALID (OLEUI_ERR_STANDARDMAX+0) #define OLEUI_IOERR_ARRPASTEENTRIESINVALID (OLEUI_ERR_STANDARDMAX+1) @@ -462,11 +462,11 @@ DECL_WINELIB_TYPE_AW(LPOLEUIPASTESPECIAL) * EDIT LINKS DIALOG */ -#define ELF_SHOWHELP 0x00000001L -#define ELF_DISABLEUPDATENOW 0x00000002L -#define ELF_DISABLEOPENSOURCE 0x00000004L -#define ELF_DISABLECHANGESOURCE 0x00000008L -#define ELF_DISABLECANCELLINK 0x00000010L +#define ELF_SHOWHELP __MSABI_LONG(0x00000001) +#define ELF_DISABLEUPDATENOW __MSABI_LONG(0x00000002) +#define ELF_DISABLEOPENSOURCE __MSABI_LONG(0x00000004) +#define ELF_DISABLECHANGESOURCE __MSABI_LONG(0x00000008) +#define ELF_DISABLECANCELLINK __MSABI_LONG(0x00000010) typedef struct tagOLEUIEDITLINKSW { @@ -539,10 +539,10 @@ DECL_WINELIB_TYPE_AW(POLEUIBUSY) DECL_WINELIB_TYPE_AW(LPOLEUIBUSY) -#define BZ_DISABLECANCELBUTTON 0x00000001L -#define BZ_DISABLESWITCHTOBUTTON 0x00000002L -#define BZ_DISABLERETRYBUTTON 0x00000004L -#define BZ_NOTRESPONDINGDIALOG 0x00000008L +#define BZ_DISABLECANCELBUTTON __MSABI_LONG(0x00000001) +#define BZ_DISABLESWITCHTOBUTTON __MSABI_LONG(0x00000002) +#define BZ_DISABLERETRYBUTTON __MSABI_LONG(0x00000004) +#define BZ_NOTRESPONDINGDIALOG __MSABI_LONG(0x00000008) /*********************************************************************************** * OBJECT PROPERTIES DIALOG @@ -609,9 +609,9 @@ DECL_WINELIB_TYPE_AW(POLEUIVIEWPROPS) DECL_WINELIB_TYPE_AW(LPOLEUIVIEWPROPS) -#define VPF_SELECTRELATIVE 0x00000001L -#define VPF_DISABLERELATIVE 0x00000002L -#define VPF_DISABLESCALE 0x00000004L +#define VPF_SELECTRELATIVE __MSABI_LONG(0x00000001) +#define VPF_DISABLERELATIVE __MSABI_LONG(0x00000002) +#define VPF_DISABLESCALE __MSABI_LONG(0x00000004) typedef struct tagOLEUILINKPROPSA { @@ -671,10 +671,10 @@ DECL_WINELIB_TYPE_AW(OLEUIOBJECTPROPS) DECL_WINELIB_TYPE_AW(POLEUIOBJECTPROPS) DECL_WINELIB_TYPE_AW(LPOLEUIOBJECTPROPS) -#define OPF_OBJECTISLINK 0x00000001L -#define OPF_NOFILLDEFAULT 0x00000002L -#define OPF_SHOWHELP 0x00000004L -#define OPF_DISABLECONVERT 0x00000008L +#define OPF_OBJECTISLINK __MSABI_LONG(0x00000001) +#define OPF_NOFILLDEFAULT __MSABI_LONG(0x00000002) +#define OPF_SHOWHELP __MSABI_LONG(0x00000004) +#define OPF_DISABLECONVERT __MSABI_LONG(0x00000008) /************************************************************************************ @@ -731,10 +731,10 @@ DECL_WINELIB_TYPE_AW(POLEUICHANGESOURCE) DECL_WINELIB_TYPE_AW(LPOLEUICHANGESOURCE) /* Change Source Dialog flags */ -#define CSF_SHOWHELP 0x00000001L -#define CSF_VALIDSOURCE 0x00000002L -#define CSF_ONLYGETSOURCE 0x00000004L -#define CSF_EXPLORER 0x00000008L +#define CSF_SHOWHELP __MSABI_LONG(0x00000001) +#define CSF_VALIDSOURCE __MSABI_LONG(0x00000002) +#define CSF_ONLYGETSOURCE __MSABI_LONG(0x00000004) +#define CSF_EXPLORER __MSABI_LONG(0x00000008) /*****************************************************************************

1 0

Alexandre Julliard : gdi32: Return failure when GetPixel is not supported.
by Alexandre Julliard Nov. 4, 2011

Nov. 4, 2011

Module: wine Branch: master Commit: 278899d1e82330af0927a347c2469db94ac9f2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=278899d1e82330af0927a347c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 11:00:57 2011 +0100 gdi32: Return failure when GetPixel is not supported. --- dlls/gdi32/driver.c | 2 +- dlls/gdi32/tests/dc.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e76975a..0986d68 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -402,7 +402,7 @@ static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXT static COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) { - return 0; + return CLR_INVALID; } static INT nulldrv_GetPixelFormat( PHYSDEV dev ) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 19d417b..26b7c61 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -873,6 +873,9 @@ static void test_printer_dc(void) ok( BitBlt( memdc, 10, 10, 20, 20, display_memdc, 0, 0, SRCCOPY ), "BitBlt failed\n" ); ok( BitBlt( display_memdc, 10, 10, 20, 20, memdc, 0, 0, SRCCOPY ), "BitBlt failed\n" ); + ret = GetPixel( hdc, 0, 0 ); + ok( ret == CLR_INVALID, "wrong pixel value %x\n", ret ); + DeleteDC( memdc ); DeleteDC( display_memdc ); DeleteDC( hdc );

1 0

Alexandre Julliard : gdi32: Set the mono color map in BitBlt also for the initial PutImage attempt.
by Alexandre Julliard Nov. 4, 2011

Nov. 4, 2011

Module: wine Branch: master Commit: bfb41db3a2d6307513536cd0551f91912f226e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb41db3a2d6307513536cd05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 13:24:03 2011 +0100 gdi32: Set the mono color map in BitBlt also for the initial PutImage attempt. --- dlls/gdi32/bitblt.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index cf5b359..3851bed 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -244,27 +244,27 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, release_dc_ptr( dc_src ); if (err) return FALSE; + /* 1-bpp source without a color table uses the destination DC colors */ + if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) + { + COLORREF color = GetTextColor( dst_dev->hdc ); + src_info->bmiColors[0].rgbRed = GetRValue( color ); + src_info->bmiColors[0].rgbGreen = GetGValue( color ); + src_info->bmiColors[0].rgbBlue = GetBValue( color ); + src_info->bmiColors[0].rgbReserved = 0; + color = GetBkColor( dst_dev->hdc ); + src_info->bmiColors[1].rgbRed = GetRValue( color ); + src_info->bmiColors[1].rgbGreen = GetGValue( color ); + src_info->bmiColors[1].rgbBlue = GetBValue( color ); + src_info->bmiColors[1].rgbReserved = 0; + src_info->bmiHeader.biClrUsed = 2; + } + dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage ); copy_bitmapinfo( dst_info, src_info ); err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); if (err == ERROR_BAD_FORMAT) { - /* 1-bpp source without a color table uses the destination DC colors */ - if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) - { - COLORREF color = GetTextColor( dst_dev->hdc ); - src_info->bmiColors[0].rgbRed = GetRValue( color ); - src_info->bmiColors[0].rgbGreen = GetGValue( color ); - src_info->bmiColors[0].rgbBlue = GetBValue( color ); - src_info->bmiColors[0].rgbReserved = 0; - color = GetBkColor( dst_dev->hdc ); - src_info->bmiColors[1].rgbRed = GetRValue( color ); - src_info->bmiColors[1].rgbGreen = GetGValue( color ); - src_info->bmiColors[1].rgbBlue = GetBValue( color ); - src_info->bmiColors[1].rgbReserved = 0; - src_info->bmiHeader.biClrUsed = 2; - } - /* 1-bpp destination without a color table requires a fake 1-entry table * that contains only the background color */ if (dst_info->bmiHeader.biBitCount == 1 && !dst_info->bmiHeader.biClrUsed)

1 0

Andrew Talbot : wined3d: Remove unneeded address-of operators from array names.
by Alexandre Julliard Nov. 4, 2011

Nov. 4, 2011

Module: wine Branch: master Commit: a89584415b29be02921bce0f087734022d7e0d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89584415b29be02921bce0f0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 3 23:03:18 2011 +0000 wined3d: Remove unneeded address-of operators from array names. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ffcc2a8..d32b5f1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4485,7 +4485,7 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, int_skip = ~shader->reg_maps.integer_constants | shader->reg_maps.local_int_consts; if (int_skip == 0xffff || gl_info->supported[NV_FRAGMENT_PROGRAM_OPTION]) { - memset(&args->loop_ctrl, 0, sizeof(args->loop_ctrl)); + memset(args->loop_ctrl, 0, sizeof(args->loop_ctrl)); return; } @@ -4561,7 +4561,7 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, /* This is about flow control, not clipping. */ if (int_skip == 0xffff || gl_info->supported[NV_VERTEX_PROGRAM2_OPTION]) { - memset(&args->loop_ctrl, 0, sizeof(args->loop_ctrl)); + memset(args->loop_ctrl, 0, sizeof(args->loop_ctrl)); return; }

1 0

Andrew Talbot : ws2_32: Remove unneeded address-of operator from array name .
by Alexandre Julliard Nov. 4, 2011

Nov. 4, 2011

Module: wine Branch: master Commit: a38b3008c5c14f6850c6b9c6c79b1f8d81848d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38b3008c5c14f6850c6b9c6c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 3 23:03:22 2011 +0000 ws2_32: Remove unneeded address-of operator from array name. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 219e954..00a15b6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2784,7 +2784,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, &src->dev[i].daddr, sizeof(dst->Device[i].irdaDeviceID) ) ; memcpy( dst->Device[i].irdaDeviceName, - &src->dev[i].info, + src->dev[i].info, sizeof(dst->Device[i].irdaDeviceName) ) ; memcpy( &dst->Device[i].irdaDeviceHints1, &src->dev[i].hints[0],

1 0

Eric Pouech : icinfo: Compile the IcInfo program as a command-line app.
by Alexandre Julliard Nov. 4, 2011

Nov. 4, 2011

Module: wine Branch: master Commit: 15bcb63bca6ac74c2f4d4dbbc5bb449fd52f4cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bcb63bca6ac74c2f4d4dbbc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Nov 3 21:54:05 2011 +0100 icinfo: Compile the IcInfo program as a command-line app. --- programs/icinfo/Makefile.in | 2 +- programs/icinfo/icinfo.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in index 16a5bb7..cbd49f9 100644 --- a/programs/icinfo/Makefile.in +++ b/programs/icinfo/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = icinfo.exe -APPMODE = -mwindows +APPMODE = -mconsole IMPORTS = msvfw32 C_SRCS = icinfo.c diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 3b882ac..345f813 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -23,15 +23,21 @@ #include "vfw.h" -int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +int main(int argc, char* argv[]) { - int n=0,doabout=0,doconfigure=0; + int i, n=0,doabout=0,doconfigure=0; char buf[128],type[5],handler[5]; - if (strstr(cmdline,"-about")) - doabout = 1; - if (strstr(cmdline,"-configure")) - doconfigure = 1; + for (i = 1; i < argc; i++) { + if (!strcmp(argv[i], "-about")) + doabout = 1; + else if (!strcmp(argv[i], "-configure")) + doconfigure = 1; + else { + printf("Unknown option: %s\n", argv[i]); + return -1; + } + } printf("Currently installed Video Compressors:\n"); while (1) {

1 0