November 2011 - Wine-commits

Alexandre Julliard : Release 1.3.32.
by Alexandre Julliard 04 Nov '11

04 Nov '11

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

04 Nov '11

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

Alexandre Julliard : gdi32: Return failure when GetPixel is not supported.
by Alexandre Julliard 04 Nov '11

04 Nov '11

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

04 Nov '11

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

Michael Stefaniuc : include: Drop gratuitous l modifier from numeric constants in corerror.h.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 624079d8518c0fdc53cb10007b70e20dc6477739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=624079d8518c0fdc53cb10007… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 3 23:50:55 2011 +0100 include: Drop gratuitous l modifier from numeric constants in corerror.h. --- include/corerror.h | 146 ++++++++++++++++++++++++++-------------------------- 1 files changed, 73 insertions(+), 73 deletions(-) diff --git a/include/corerror.h b/include/corerror.h index aef7f63..1537f93 100644 --- a/include/corerror.h +++ b/include/corerror.h @@ -44,80 +44,80 @@ #define COR_E_DIRECTORYNOTFOUND HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) #define COR_E_PATHTOOLONG HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) -#define COR_E_AMBIGUOUSMATCH _HRESULT_TYPEDEF_(0x8000211DL) -#define COR_E_TARGETPARAMCOUNT _HRESULT_TYPEDEF_(0x8002000EL) -#define COR_E_DIVIDEBYZERO _HRESULT_TYPEDEF_(0x80020012L) -#define COR_E_BADIMAGEFORMAT _HRESULT_TYPEDEF_(0x8007000BL) +#define COR_E_AMBIGUOUSMATCH _HRESULT_TYPEDEF_(0x8000211D) +#define COR_E_TARGETPARAMCOUNT _HRESULT_TYPEDEF_(0x8002000E) +#define COR_E_DIVIDEBYZERO _HRESULT_TYPEDEF_(0x80020012) +#define COR_E_BADIMAGEFORMAT _HRESULT_TYPEDEF_(0x8007000B) -#define COR_E_ASSEMBLYEXPECTED EMAKEHR(0x1018L) -#define COR_E_TYPEUNLOADED EMAKEHR(0x1013L) -#define COR_E_EXCEPTION EMAKEHR(0x1500L) -#define COR_E_SYSTEM EMAKEHR(0x1501L) -#define COR_E_ARGUMENTOUTOFRANGE EMAKEHR(0x1502L) -#define COR_E_ARRAYTYPEMISMATCH EMAKEHR(0x1503L) -#define COR_E_CONTEXTMARSHAL EMAKEHR(0x1504L) -#define COR_E_TIMEOUT EMAKEHR(0x1505L) -#define COR_E_EXECUTIONENGINE EMAKEHR(0x1506L) -#define COR_E_FIELDACCESS EMAKEHR(0x1507L) -#define COR_E_INDEXOUTOFRANGE EMAKEHR(0x1508L) -#define COR_E_INVALIDOPERATION EMAKEHR(0x1509L) -#define COR_E_SECURITY EMAKEHR(0x150AL) -#define COR_E_REMOTING EMAKEHR(0x150BL) -#define COR_E_SERIALIZATION EMAKEHR(0x150CL) -#define COR_E_VERIFICATION EMAKEHR(0x150DL) -#define COR_E_SERVER EMAKEHR(0x150EL) -#define COR_E_SERVICEDCOMPONENT EMAKEHR(0x150FL) -#define COR_E_METHODACCESS EMAKEHR(0x1510L) -#define COR_E_MISSINGFIELD EMAKEHR(0x1511L) -#define COR_E_MISSINGMEMBER EMAKEHR(0x1512L) -#define COR_E_MISSINGMETHOD EMAKEHR(0x1513L) -#define COR_E_MULTICASTNOTSUPPORTED EMAKEHR(0x1514L) -#define COR_E_NOTSUPPORTED EMAKEHR(0x1515L) -#define COR_E_OVERFLOW EMAKEHR(0x1516L) -#define COR_E_RANK EMAKEHR(0x1517L) -#define COR_E_SYNCHRONIZATIONLOCK EMAKEHR(0x1518L) -#define COR_E_THREADINTERRUPTED EMAKEHR(0x1519L) -#define COR_E_MEMBERACCESS EMAKEHR(0x151AL) -#define COR_E_THREADSTATE EMAKEHR(0x1520L) -#define COR_E_THREADSTOP EMAKEHR(0x1521L) -#define COR_E_TYPELOAD EMAKEHR(0x1522L) -#define COR_E_ENTRYPOINTNOTFOUND EMAKEHR(0x1523L) -#define COR_E_DLLNOTFOUND EMAKEHR(0x1524L) -#define COR_E_THREADSTART EMAKEHR(0x1525L) -#define COR_E_INVALIDCOMOBJECT EMAKEHR(0x1527L) -#define COR_E_NOTFINITENUMBER EMAKEHR(0x1528L) -#define COR_E_DUPLICATEWAITOBJECT EMAKEHR(0x1529L) -#define COR_E_SEMAPHOREFULL EMAKEHR(0x152BL) -#define COR_E_WAITHANDLECANNOTBEOPENED EMAKEHR(0x152CL) -#define COR_E_ABANDONEDMUTEX EMAKEHR(0x152DL) -#define COR_E_INVALIDOLEVARIANTTYPE EMAKEHR(0x1531L) -#define COR_E_MISSINGMANIFESTRESOURCE EMAKEHR(0x1532L) -#define COR_E_SAFEARRAYTYPEMISMATCH EMAKEHR(0x1533L) -#define COR_E_TYPEINITIALIZATION EMAKEHR(0x1534L) -#define COR_E_MARSHALDIRECTIVE EMAKEHR(0x1535L) -#define COR_E_MISSINGSATELLITEASSEMBLY EMAKEHR(0x1536L) -#define COR_E_FORMAT EMAKEHR(0x1537L) -#define COR_E_SAFEARRAYRANKMISMATCH EMAKEHR(0x1538L) -#define COR_E_PLATFORMNOTSUPPORTED EMAKEHR(0x1539L) -#define COR_E_INVALIDPROGRAM EMAKEHR(0x153AL) -#define COR_E_OPERATIONCANCELED EMAKEHR(0x153BL) -#define COR_E_INSUFFICIENTMEMORY EMAKEHR(0x153DL) -#define COR_E_RUNTIMEWRAPPED EMAKEHR(0x153EL) -#define COR_E_DEVICESNOTSUPPORTED EMAKEHR(0x1540L) -#define COR_E_DATAMISALIGNED EMAKEHR(0x1541L) -#define COR_E_KEYNOTFOUND EMAKEHR(0x1577L) -#define COR_E_APPLICATION EMAKEHR(0x1600L) -#define COR_E_INVALIDFILTERCRITERIA EMAKEHR(0x1601L) -#define COR_E_REFLECTIONTYPELOAD EMAKEHR(0x1602L) -#define COR_E_TARGET EMAKEHR(0x1603L) -#define COR_E_TARGETINVOCATION EMAKEHR(0x1604L) -#define COR_E_CUSTOMATTRIBUTEFORMAT EMAKEHR(0x1605L) -#define COR_E_IO EMAKEHR(0x1620L) -#define COR_E_FILELOAD EMAKEHR(0x1621L) -#define COR_E_OBJECTDISPOSED EMAKEHR(0x1622L) -#define COR_E_FAILFAST EMAKEHR(0x1623L) -#define COR_E_HOSTPROTECTION EMAKEHR(0x1640L) -#define COR_E_ILLEGAL_REENTRANCY EMAKEHR(0x1641L) +#define COR_E_ASSEMBLYEXPECTED EMAKEHR(0x1018) +#define COR_E_TYPEUNLOADED EMAKEHR(0x1013) +#define COR_E_EXCEPTION EMAKEHR(0x1500) +#define COR_E_SYSTEM EMAKEHR(0x1501) +#define COR_E_ARGUMENTOUTOFRANGE EMAKEHR(0x1502) +#define COR_E_ARRAYTYPEMISMATCH EMAKEHR(0x1503) +#define COR_E_CONTEXTMARSHAL EMAKEHR(0x1504) +#define COR_E_TIMEOUT EMAKEHR(0x1505) +#define COR_E_EXECUTIONENGINE EMAKEHR(0x1506) +#define COR_E_FIELDACCESS EMAKEHR(0x1507) +#define COR_E_INDEXOUTOFRANGE EMAKEHR(0x1508) +#define COR_E_INVALIDOPERATION EMAKEHR(0x1509) +#define COR_E_SECURITY EMAKEHR(0x150A) +#define COR_E_REMOTING EMAKEHR(0x150B) +#define COR_E_SERIALIZATION EMAKEHR(0x150C) +#define COR_E_VERIFICATION EMAKEHR(0x150D) +#define COR_E_SERVER EMAKEHR(0x150E) +#define COR_E_SERVICEDCOMPONENT EMAKEHR(0x150F) +#define COR_E_METHODACCESS EMAKEHR(0x1510) +#define COR_E_MISSINGFIELD EMAKEHR(0x1511) +#define COR_E_MISSINGMEMBER EMAKEHR(0x1512) +#define COR_E_MISSINGMETHOD EMAKEHR(0x1513) +#define COR_E_MULTICASTNOTSUPPORTED EMAKEHR(0x1514) +#define COR_E_NOTSUPPORTED EMAKEHR(0x1515) +#define COR_E_OVERFLOW EMAKEHR(0x1516) +#define COR_E_RANK EMAKEHR(0x1517) +#define COR_E_SYNCHRONIZATIONLOCK EMAKEHR(0x1518) +#define COR_E_THREADINTERRUPTED EMAKEHR(0x1519) +#define COR_E_MEMBERACCESS EMAKEHR(0x151A) +#define COR_E_THREADSTATE EMAKEHR(0x1520) +#define COR_E_THREADSTOP EMAKEHR(0x1521) +#define COR_E_TYPELOAD EMAKEHR(0x1522) +#define COR_E_ENTRYPOINTNOTFOUND EMAKEHR(0x1523) +#define COR_E_DLLNOTFOUND EMAKEHR(0x1524) +#define COR_E_THREADSTART EMAKEHR(0x1525) +#define COR_E_INVALIDCOMOBJECT EMAKEHR(0x1527) +#define COR_E_NOTFINITENUMBER EMAKEHR(0x1528) +#define COR_E_DUPLICATEWAITOBJECT EMAKEHR(0x1529) +#define COR_E_SEMAPHOREFULL EMAKEHR(0x152B) +#define COR_E_WAITHANDLECANNOTBEOPENED EMAKEHR(0x152C) +#define COR_E_ABANDONEDMUTEX EMAKEHR(0x152D) +#define COR_E_INVALIDOLEVARIANTTYPE EMAKEHR(0x1531) +#define COR_E_MISSINGMANIFESTRESOURCE EMAKEHR(0x1532) +#define COR_E_SAFEARRAYTYPEMISMATCH EMAKEHR(0x1533) +#define COR_E_TYPEINITIALIZATION EMAKEHR(0x1534) +#define COR_E_MARSHALDIRECTIVE EMAKEHR(0x1535) +#define COR_E_MISSINGSATELLITEASSEMBLY EMAKEHR(0x1536) +#define COR_E_FORMAT EMAKEHR(0x1537) +#define COR_E_SAFEARRAYRANKMISMATCH EMAKEHR(0x1538) +#define COR_E_PLATFORMNOTSUPPORTED EMAKEHR(0x1539) +#define COR_E_INVALIDPROGRAM EMAKEHR(0x153A) +#define COR_E_OPERATIONCANCELED EMAKEHR(0x153B) +#define COR_E_INSUFFICIENTMEMORY EMAKEHR(0x153D) +#define COR_E_RUNTIMEWRAPPED EMAKEHR(0x153E) +#define COR_E_DEVICESNOTSUPPORTED EMAKEHR(0x1540) +#define COR_E_DATAMISALIGNED EMAKEHR(0x1541) +#define COR_E_KEYNOTFOUND EMAKEHR(0x1577) +#define COR_E_APPLICATION EMAKEHR(0x1600) +#define COR_E_INVALIDFILTERCRITERIA EMAKEHR(0x1601) +#define COR_E_REFLECTIONTYPELOAD EMAKEHR(0x1602) +#define COR_E_TARGET EMAKEHR(0x1603) +#define COR_E_TARGETINVOCATION EMAKEHR(0x1604) +#define COR_E_CUSTOMATTRIBUTEFORMAT EMAKEHR(0x1605) +#define COR_E_IO EMAKEHR(0x1620) +#define COR_E_FILELOAD EMAKEHR(0x1621) +#define COR_E_OBJECTDISPOSED EMAKEHR(0x1622) +#define COR_E_FAILFAST EMAKEHR(0x1623) +#define COR_E_HOSTPROTECTION EMAKEHR(0x1640) +#define COR_E_ILLEGAL_REENTRANCY EMAKEHR(0x1641) #define FUSION_E_INVALID_NAME EMAKEHR(0x1047)

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (wingdi.h).
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 7ec013cbfe1e546573c5bc748f450d017d136e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ec013cbfe1e546573c5bc748… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 3 23:52:42 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (wingdi.h). --- include/wingdi.h | 138 +++++++++++++++++++++++++++--------------------------- 1 files changed, 69 insertions(+), 69 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index dc3f8f7..ab91409 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -154,13 +154,13 @@ typedef LONG LCSGAMUTMATCH; #define LCS_sRGB 0x73524742 /* 'sRGB' */ #define LCS_WINDOWS_COLOR_SPACE 0x57696e20 /* 'Win ' */ -#define LCS_CALIBRATED_RGB 0x00000000L -#define LCS_DEVICE_RGB 0x00000001L -#define LCS_DEVICE_CMYK 0x00000002L +#define LCS_CALIBRATED_RGB __MSABI_LONG(0x00000000) +#define LCS_DEVICE_RGB __MSABI_LONG(0x00000001) +#define LCS_DEVICE_CMYK __MSABI_LONG(0x00000002) -#define LCS_GM_BUSINESS 0x00000001L -#define LCS_GM_GRAPHICS 0x00000002L -#define LCS_GM_IMAGES 0x00000004L +#define LCS_GM_BUSINESS __MSABI_LONG(0x00000001) +#define LCS_GM_GRAPHICS __MSABI_LONG(0x00000002) +#define LCS_GM_IMAGES __MSABI_LONG(0x00000004) #define CM_OUT_OF_GAMUT 255 #define CM_IN_GAMUT 0 @@ -246,10 +246,10 @@ DECL_WINELIB_TYPE_AW(LOGCOLORSPACE) #define DC_MEDIATYPENAMES 34 #define DC_MEDIATYPES 35 -#define DCTT_BITMAP 0x00000001L -#define DCTT_DOWNLOAD 0x00000002L -#define DCTT_SUBDEV 0x00000004L -#define DCTT_DOWNLOAD_OUTLINE 0x00000008L +#define DCTT_BITMAP __MSABI_LONG(0x00000001) +#define DCTT_DOWNLOAD __MSABI_LONG(0x00000002) +#define DCTT_SUBDEV __MSABI_LONG(0x00000004) +#define DCTT_DOWNLOAD_OUTLINE __MSABI_LONG(0x00000008) #define DCBA_FACEUPNONE 0x0000 #define DCBA_FACEUPCENTER 0x0001 @@ -757,22 +757,22 @@ typedef struct tagXFORM #define ISO10_CHARSET (BYTE)245 /* iso8859-10 */ #define CELTIC_CHARSET (BYTE)246 /* iso8859-14 */ -#define FS_LATIN1 0x00000001L -#define FS_LATIN2 0x00000002L -#define FS_CYRILLIC 0x00000004L -#define FS_GREEK 0x00000008L -#define FS_TURKISH 0x00000010L -#define FS_HEBREW 0x00000020L -#define FS_ARABIC 0x00000040L -#define FS_BALTIC 0x00000080L -#define FS_VIETNAMESE 0x00000100L -#define FS_THAI 0x00010000L -#define FS_JISJAPAN 0x00020000L -#define FS_CHINESESIMP 0x00040000L -#define FS_WANSUNG 0x00080000L -#define FS_CHINESETRAD 0x00100000L -#define FS_JOHAB 0x00200000L -#define FS_SYMBOL 0x80000000L +#define FS_LATIN1 __MSABI_LONG(0x00000001) +#define FS_LATIN2 __MSABI_LONG(0x00000002) +#define FS_CYRILLIC __MSABI_LONG(0x00000004) +#define FS_GREEK __MSABI_LONG(0x00000008) +#define FS_TURKISH __MSABI_LONG(0x00000010) +#define FS_HEBREW __MSABI_LONG(0x00000020) +#define FS_ARABIC __MSABI_LONG(0x00000040) +#define FS_BALTIC __MSABI_LONG(0x00000080) +#define FS_VIETNAMESE __MSABI_LONG(0x00000100) +#define FS_THAI __MSABI_LONG(0x00010000) +#define FS_JISJAPAN __MSABI_LONG(0x00020000) +#define FS_CHINESESIMP __MSABI_LONG(0x00040000) +#define FS_WANSUNG __MSABI_LONG(0x00080000) +#define FS_CHINESETRAD __MSABI_LONG(0x00100000) +#define FS_JOHAB __MSABI_LONG(0x00200000) +#define FS_SYMBOL __MSABI_LONG(0x80000000) /* lfOutPrecision values */ #define OUT_DEFAULT_PRECIS 0 @@ -1148,9 +1148,9 @@ DECL_WINELIB_TYPE_AW(LPPOLYTEXT) /* ntmFlags field flags */ -#define NTM_REGULAR 0x00000040L -#define NTM_BOLD 0x00000020L -#define NTM_ITALIC 0x00000001L +#define NTM_REGULAR __MSABI_LONG(0x00000040) +#define NTM_BOLD __MSABI_LONG(0x00000020) +#define NTM_ITALIC __MSABI_LONG(0x00000001) #define NTM_NONNEGATIVE_AC 0x00010000 #define NTM_PS_OPENTYPE 0x00020000 @@ -1389,17 +1389,17 @@ typedef struct #define GCP_KASHIDA 0x0200 #define GCP_ERROR 0x8000 #define FLI_MASK 0x103b -#define GCP_JUSTIFY 0x00010000L -#define FLI_GLYPHS 0x00040000L -#define GCP_CLASSIN 0x00080000L -#define GCP_MAXEXTENT 0x00100000L -#define GCP_JUSTIFYIN 0x00200000L -#define GCP_DISPLAYZWG 0x00400000L -#define GCP_SYMSWAPOFF 0x00800000L -#define GCP_NUMERICOVERRIDE 0x01000000L -#define GCP_NEUTRALOVERRIDE 0x02000000L -#define GCP_NUMERICSLATIN 0x04000000L -#define GCP_NUMERICSLOCAL 0x08000000L +#define GCP_JUSTIFY __MSABI_LONG(0x00010000) +#define FLI_GLYPHS __MSABI_LONG(0x00040000) +#define GCP_CLASSIN __MSABI_LONG(0x00080000) +#define GCP_MAXEXTENT __MSABI_LONG(0x00100000) +#define GCP_JUSTIFYIN __MSABI_LONG(0x00200000) +#define GCP_DISPLAYZWG __MSABI_LONG(0x00400000) +#define GCP_SYMSWAPOFF __MSABI_LONG(0x00800000) +#define GCP_NUMERICOVERRIDE __MSABI_LONG(0x01000000) +#define GCP_NEUTRALOVERRIDE __MSABI_LONG(0x02000000) +#define GCP_NUMERICSLATIN __MSABI_LONG(0x04000000) +#define GCP_NUMERICSLOCAL __MSABI_LONG(0x08000000) #define GCPCLASS_LATIN 1 #define GCPCLASS_HEBREW 2 @@ -3002,35 +3002,35 @@ DECL_WINELIB_TYPE_AW(LPDEVMODE) #define DM_OUT_BUFFER DM_COPY #define DM_OUT_DEFAULT DM_UPDATE -#define DM_ORIENTATION 0x00000001L -#define DM_PAPERSIZE 0x00000002L -#define DM_PAPERLENGTH 0x00000004L -#define DM_PAPERWIDTH 0x00000008L -#define DM_SCALE 0x00000010L -#define DM_POSITION 0x00000020L -#define DM_NUP 0x00000040L -#define DM_DISPLAYORIENTATION 0x00000080L -#define DM_COPIES 0x00000100L -#define DM_DEFAULTSOURCE 0x00000200L -#define DM_PRINTQUALITY 0x00000400L -#define DM_COLOR 0x00000800L -#define DM_DUPLEX 0x00001000L -#define DM_YRESOLUTION 0x00002000L -#define DM_TTOPTION 0x00004000L -#define DM_COLLATE 0x00008000L -#define DM_FORMNAME 0x00010000L -#define DM_LOGPIXELS 0x00020000L -#define DM_BITSPERPEL 0x00040000L -#define DM_PELSWIDTH 0x00080000L -#define DM_PELSHEIGHT 0x00100000L -#define DM_DISPLAYFLAGS 0x00200000L -#define DM_DISPLAYFREQUENCY 0x00400000L -#define DM_ICMMETHOD 0x00800000L -#define DM_ICMINTENT 0x01000000L -#define DM_MEDIATYPE 0x02000000L -#define DM_DITHERTYPE 0x04000000L -#define DM_PANNINGWIDTH 0x08000000L -#define DM_PANNINGHEIGHT 0x10000000L +#define DM_ORIENTATION __MSABI_LONG(0x00000001) +#define DM_PAPERSIZE __MSABI_LONG(0x00000002) +#define DM_PAPERLENGTH __MSABI_LONG(0x00000004) +#define DM_PAPERWIDTH __MSABI_LONG(0x00000008) +#define DM_SCALE __MSABI_LONG(0x00000010) +#define DM_POSITION __MSABI_LONG(0x00000020) +#define DM_NUP __MSABI_LONG(0x00000040) +#define DM_DISPLAYORIENTATION __MSABI_LONG(0x00000080) +#define DM_COPIES __MSABI_LONG(0x00000100) +#define DM_DEFAULTSOURCE __MSABI_LONG(0x00000200) +#define DM_PRINTQUALITY __MSABI_LONG(0x00000400) +#define DM_COLOR __MSABI_LONG(0x00000800) +#define DM_DUPLEX __MSABI_LONG(0x00001000) +#define DM_YRESOLUTION __MSABI_LONG(0x00002000) +#define DM_TTOPTION __MSABI_LONG(0x00004000) +#define DM_COLLATE __MSABI_LONG(0x00008000) +#define DM_FORMNAME __MSABI_LONG(0x00010000) +#define DM_LOGPIXELS __MSABI_LONG(0x00020000) +#define DM_BITSPERPEL __MSABI_LONG(0x00040000) +#define DM_PELSWIDTH __MSABI_LONG(0x00080000) +#define DM_PELSHEIGHT __MSABI_LONG(0x00100000) +#define DM_DISPLAYFLAGS __MSABI_LONG(0x00200000) +#define DM_DISPLAYFREQUENCY __MSABI_LONG(0x00400000) +#define DM_ICMMETHOD __MSABI_LONG(0x00800000) +#define DM_ICMINTENT __MSABI_LONG(0x01000000) +#define DM_MEDIATYPE __MSABI_LONG(0x02000000) +#define DM_DITHERTYPE __MSABI_LONG(0x04000000) +#define DM_PANNINGWIDTH __MSABI_LONG(0x08000000) +#define DM_PANNINGHEIGHT __MSABI_LONG(0x10000000) #define DMORIENT_PORTRAIT 1 #define DMORIENT_LANDSCAPE 2

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (msacm.h).
by Alexandre Julliard 04 Nov '11

04 Nov '11

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

04 Nov '11

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

04 Nov '11

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

Andrew Talbot : wined3d: Remove unneeded address-of operators from array names.
by Alexandre Julliard 04 Nov '11

04 Nov '11

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