wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

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 (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: 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

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

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

Matteo Bruni : wined3d: Recognize Northern Islands cards with AMD binary drivers.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: cc221b285bb748658cb9a454a69715ae01b048aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc221b285bb748658cb9a454a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 3 15:26:37 2011 +0100 wined3d: Recognize Northern Islands cards with AMD binary drivers. --- dlls/wined3d/directx.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index becfd1e..44fd88d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1186,6 +1186,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6410D, "AMD Radeon HD 6410D", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6550D, "AMD Radeon HD 6550D", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600M, "AMD Radeon HD 6600M Series", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, /* Intel cards */ @@ -1708,6 +1709,17 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in } cards[] = { + /* Northern Islands */ + {"HD 6900", CARD_AMD_RADEON_HD6900}, + {"HD 6800", CARD_AMD_RADEON_HD6800}, + {"HD 6630M",CARD_AMD_RADEON_HD6600M}, + {"HD 6600M",CARD_AMD_RADEON_HD6600M}, + {"HD 6600", CARD_AMD_RADEON_HD6600}, + {"HD 6500M",CARD_AMD_RADEON_HD6600M}, + {"HD 6500", CARD_AMD_RADEON_HD6600}, + {"HD 6400", CARD_AMD_RADEON_HD6400}, + {"HD 6300", CARD_AMD_RADEON_HD6300}, + {"HD 6200", CARD_AMD_RADEON_HD6300}, /* Evergreen */ {"HD 5870", CARD_AMD_RADEON_HD5800}, /* Radeon EG CYPRESS PRO */ {"HD 5850", CARD_AMD_RADEON_HD5800}, /* Radeon EG CYPRESS XT */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c15d879..c4784b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1347,6 +1347,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6410D = 0x9644, CARD_AMD_RADEON_HD6550D = 0x9640, CARD_AMD_RADEON_HD6600 = 0x6758, + CARD_AMD_RADEON_HD6600M = 0x6741, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719,

1 0

Matteo Bruni : wined3d: Test more thoroughly for post-pixelshader blending support, try on more texture formats.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 7b0ba5153f3e42f31b922e5eb997d5e1d0cb44d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0ba5153f3e42f31b922e5eb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 3 15:26:36 2011 +0100 wined3d: Test more thoroughly for post-pixelshader blending support, try on more texture formats. --- dlls/wined3d/utils.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f374967..981ed2c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1053,9 +1053,13 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined } } - if (status == GL_FRAMEBUFFER_COMPLETE && format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) + if (status == GL_FRAMEBUFFER_COMPLETE && ((format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) + || !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING))) { - GLuint rb; + GLuint rb, tex2; + DWORD readback[16 * 16], color; + BYTE r, a; + BOOL match = TRUE; if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) @@ -1069,6 +1073,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined } glEnable(GL_BLEND); + glClearColor(0, 0, 0, 1); glClear(GL_COLOR_BUFFER_BIT); if (glGetError() == GL_INVALID_FRAMEBUFFER_OPERATION) { @@ -1077,6 +1082,65 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined format->flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; } + glViewport(0, 0, 16, 16); + glDisable(GL_LIGHTING); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + /* Draw a full-black quad */ + glBegin(GL_TRIANGLE_STRIP); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(-1.0f, -1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(1.0f, -1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(-1.0f, 1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(1.0f, 1.0f, 0.0f); + glEnd(); + + /* Draw a half-transparent red quad */ + glBegin(GL_TRIANGLE_STRIP); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(-1.0f, -1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(1.0f, -1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(-1.0f, 1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(1.0f, 1.0f, 0.0f); + glEnd(); + + glGenTextures(1, &tex2); + glBindTexture(GL_TEXTURE_2D, tex2); + + glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, 16, 16, 0); + glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); + checkGLcall("Post-pixelshader blending check"); + + color = readback[7 * 16 + 7]; + a = color >> 24; + r = (color & 0x00ff0000) >> 16; + + if (format->red_mask && (r < 0x7b || r > 0x84)) + match = FALSE; + /* If the alpha component is more than 1 bit */ + else if ((format->alpha_mask & (format->alpha_mask - 1)) && (a < 0x9f || a > 0xdf)) + match = FALSE; + if (!match) + { + TRACE("Format doesn't support post-pixelshader blending.\n"); + TRACE("Color output: %#x\n", color); + format->flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; + } + + glBindTexture(GL_TEXTURE_2D, tex); + glDeleteTextures(1, &tex2); + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) { @@ -1125,6 +1189,8 @@ static void init_format_fbo_compat_info(struct wined3d_gl_info *gl_info) gl_info->fbo_ops.glGenFramebuffers(1, &fbo); gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo); + glDrawBuffer(GL_COLOR_ATTACHMENT0); + glReadBuffer(GL_COLOR_ATTACHMENT0); LEAVE_GL(); }

1 0

Matteo Bruni : wined3d: Add filtering flag to more texture formats.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 307579156fa9e6a925b5d35700d57cf084424b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307579156fa9e6a925b5d3570… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 3 15:26:35 2011 +0100 wined3d: Add filtering flag to more texture formats. --- dlls/wined3d/directx.c | 37 ++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2e63a1a..becfd1e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -607,6 +607,12 @@ static BOOL match_dx10_capable(const struct wined3d_gl_info *gl_info, const char return gl_info->limits.glsl_varyings > 44; } +static BOOL match_not_dx10_capable(const struct wined3d_gl_info *gl_info, const char *gl_renderer, + enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) +{ + return !match_dx10_capable(gl_info, gl_renderer, gl_vendor, card_vendor, device); +} + /* A GL context is provided by the caller */ static BOOL match_allows_spec_alpha(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) @@ -780,16 +786,6 @@ static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_re return gl_vendor == GL_VENDOR_FGLRX; } -static BOOL match_limited_vtf(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - /* Nvidia GeForce 6xxx and 7xxx support accelerated VTF only on a few - selected texture formats. As they are apparently the only DX9 class GPUs - supporting VTF, the check can be very simple. */ - return gl_info->limits.vertex_samplers && - !match_dx10_capable(gl_info, gl_renderer, gl_vendor, card_vendor, device); -} - static void quirk_arb_constants(struct wined3d_gl_info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->limits.arb_vs_native_constants); @@ -912,9 +908,14 @@ static void quirk_infolog_spam(struct wined3d_gl_info *gl_info) gl_info->quirks |= WINED3D_QUIRK_INFO_LOG_SPAM; } -static void quirk_limited_vtf(struct wined3d_gl_info *gl_info) +static void quirk_limited_tex_filtering(struct wined3d_gl_info *gl_info) { - gl_info->quirks |= WINED3D_QUIRK_LIMITED_VTF; + /* Nvidia GeForce 6xxx and 7xxx support accelerated VTF only on a few + selected texture formats. They are apparently the only DX9 class GPUs + supporting VTF. + Also, DX9-era GPUs are somewhat limited with float textures + filtering and blending. */ + gl_info->quirks |= WINED3D_QUIRK_LIMITED_TEX_FILTERING; } struct driver_quirk @@ -1007,9 +1008,9 @@ static const struct driver_quirk quirk_table[] = "Not printing GLSL infolog" }, { - match_limited_vtf, - quirk_limited_vtf, - "Vertex textures support is limited" + match_not_dx10_capable, + quirk_limited_tex_filtering, + "Texture filtering, blending and VTF support is limited" }, }; @@ -3281,7 +3282,9 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, static BOOL CheckFilterCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { /* The flags entry of a format contains the filtering capability */ - if (format->flags & WINED3DFMT_FLAG_FILTERING) return TRUE; + if ((format->flags & WINED3DFMT_FLAG_FILTERING) + || !(adapter->gl_info.quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) + return TRUE; return FALSE; } @@ -3720,7 +3723,7 @@ static BOOL CheckVertexTextureCapability(const struct wined3d_adapter *adapter, case WINED3DFMT_R32_FLOAT: return TRUE; default: - return !(gl_info->quirks & WINED3D_QUIRK_LIMITED_VTF); + return !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 098d03a..c15d879 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -53,7 +53,7 @@ #define WINED3D_QUIRK_FBO_TEX_UPDATE 0x00000020 #define WINED3D_QUIRK_BROKEN_RGBA16 0x00000040 #define WINED3D_QUIRK_INFO_LOG_SPAM 0x00000080 -#define WINED3D_QUIRK_LIMITED_VTF 0x00000100 +#define WINED3D_QUIRK_LIMITED_TEX_FILTERING 0x00000100 /* Texture format fixups */

1 0

Henri Verbeet : wined3d: Make the shader parameter to shader_arb_generate_pshader() const.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: 55d8063e67eeef0c7ed2e869190cbea4e9d24b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d8063e67eeef0c7ed2e8691… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:30 2011 +0100 wined3d: Make the shader parameter to shader_arb_generate_pshader() const. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1330438..ffcc2a8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3517,7 +3517,7 @@ static void init_ps_input(const struct wined3d_shader *shader, } /* GL locking is done by the caller */ -static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, +static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, struct wined3d_shader_buffer *buffer, const struct arb_ps_compile_args *args, struct arb_ps_compiled_shader *compiled) {

1 0

Henri Verbeet : wined3d: Make the shader parameter to shader_arb_generate_vshader() const.
by Alexandre Julliard 04 Nov '11

04 Nov '11

Module: wine Branch: master Commit: e3a105a6266c31edcfcb0e46b0f95726666a26da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a105a6266c31edcfcb0e46b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 3 19:37:29 2011 +0100 wined3d: Make the shader parameter to shader_arb_generate_vshader() const. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ea404cb..1330438 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4103,7 +4103,7 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig } /* GL locking is done by the caller */ -static GLuint shader_arb_generate_vshader(struct wined3d_shader *shader, +static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, struct wined3d_shader_buffer *buffer, const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled) {

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2011