wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 9b5ed14bd8843c124af88ac75283de5f08265427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5ed14bd8843c124af88ac75… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 27 12:30:02 2011 +0200 d3dx9_36/tests: Add a trailing '\n' to an ok() call. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 1ccabb5..f596daf 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -9792,7 +9792,7 @@ static void test_clone_mesh(void) for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++) { ok(memcmp(&tc[i].new_declaration[j], &new_declaration[j], sizeof(*new_declaration)) == 0, - "Test case %d failed. Declaration element %d did not match.", i, j); + "Test case %d failed. Declaration element %d did not match.\n", i, j); } /* Check declaration length */

1 0

Alexandre Julliard : gdi32: Add a helper function to copy BITMAPINFO structures to avoid copying uninitialized data .
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: bb21ac85b33e21971899b1b4a9a0b8cd73daeb5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb21ac85b33e21971899b1b4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 27 14:19:44 2011 +0200 gdi32: Add a helper function to copy BITMAPINFO structures to avoid copying uninitialized data. --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/dib.c | 9 +++++---- dlls/gdi32/gdi_private.h | 7 +++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 486266a..cf5b359 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -245,7 +245,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err) return FALSE; dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + 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) { @@ -288,7 +288,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err == ERROR_TRANSFORM_NOT_SUPPORTED && ((src->width != dst->width) || (src->height != dst->height))) { - memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( src_info, dst_info ); err = stretch_bits( src_info, src, dst_info, dst, &bits, GetStretchBltMode( dst_dev->hdc )); if (!err) err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); } @@ -316,7 +316,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err) goto done; dst_dev = GET_DC_PHYSDEV( dc_dst, pBlendImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); if (err == ERROR_BAD_FORMAT) { @@ -341,7 +341,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err == ERROR_TRANSFORM_NOT_SUPPORTED && ((src->width != dst->width) || (src->height != dst->height))) { - memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( src_info, dst_info ); err = stretch_bits( src_info, src, dst_info, dst, &bits, COLORONCOLOR ); if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 8eba236..7cc24a6 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -184,6 +184,7 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * { /* bitfields are always at bmiColors even in larger structures */ memcpy( dst->bmiColors, info->bmiColors, 3 * sizeof(DWORD) ); + dst->bmiHeader.biClrUsed = 0; } else if (colors) { @@ -497,7 +498,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (clip) OffsetRgn( clip, dst.x - src.x, dst.y - src.y ); dev = GET_DC_PHYSDEV( dc, pPutImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, rop ); if (err == ERROR_BAD_FORMAT) { @@ -523,7 +524,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (err == ERROR_TRANSFORM_NOT_SUPPORTED) { - memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( src_info, dst_info ); err = stretch_bits( src_info, &src, dst_info, &dst, &src_bits, GetStretchBltMode( dev->hdc ) ); if (!err) err = dev->funcs->pPutImage( dev, 0, NULL, dst_info, &src_bits, &src, &dst, rop ); } @@ -678,7 +679,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, dst.width = dst.visrect.right - dst.visrect.left; dst.height = dst.visrect.bottom - dst.visrect.top; - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); if (err == ERROR_BAD_FORMAT) @@ -809,7 +810,7 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR if (clip) OffsetRgn( clip, dst.x - src.x, dst.y - src.y ); dev = GET_DC_PHYSDEV( dc, pPutImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); if (err == ERROR_BAD_FORMAT) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 93842a5..cc8022d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -482,6 +482,13 @@ static inline int get_dib_num_of_colors( const BITMAPINFO *info ) return info->bmiHeader.biBitCount > 8 ? 0 : 1 << info->bmiHeader.biBitCount; } +static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) +{ + unsigned int size = FIELD_OFFSET( BITMAPINFO, bmiColors[get_dib_num_of_colors( src )] ); + if (src->bmiHeader.biCompression == BI_BITFIELDS) size += 3 * sizeof(DWORD); + memcpy( dst, src, size ); +} + static inline const struct gdi_dc_funcs *get_bitmap_funcs( const BITMAPOBJ *bitmap ) { if( bitmap->dib ) return &dib_driver;

1 0

Charles Davis : schannel: Don't use SSLCopyPeerCertificates on Mac OS 10.4.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 65634bca0be94c65e739bb00c7469c9ba27c6840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65634bca0be94c65e739bb00c… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Wed Oct 26 22:57:30 2011 -0600 schannel: Don't use SSLCopyPeerCertificates on Mac OS 10.4. --- configure | 14 ++++++++++++++ configure.ac | 5 +++++ dlls/secur32/schannel_macosx.c | 16 ++++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 38 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 48978ca..07c4ef2 100755 --- a/configure +++ b/configure @@ -6499,6 +6499,20 @@ fi then SECURITYLIB="-framework Security -framework CoreFoundation" + ac_save_LIBS="$LIBS" + LIBS="$LIBS $SECURITYLIB" + for ac_func in SSLCopyPeerCertificates +do : + ac_fn_c_check_func "$LINENO" "SSLCopyPeerCertificates" "ac_cv_func_SSLCopyPeerCertificates" +if test "x$ac_cv_func_SSLCopyPeerCertificates" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SSLCOPYPEERCERTIFICATES 1 +_ACEOF + +fi +done + + LIBS="$ac_save_LIBS" with_gnutls=${with_gnutls:-no} fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" diff --git a/configure.ac b/configure.ac index ad4f36f..c4e44af 100644 --- a/configure.ac +++ b/configure.ac @@ -720,6 +720,11 @@ case $host_os in if test "$ac_cv_header_Security_Security_h" = "yes" then AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation") + dnl Check for the SSLCopyPeerCertificates function + ac_save_LIBS="$LIBS" + LIBS="$LIBS $SECURITYLIB" + AC_CHECK_FUNCS(SSLCopyPeerCertificates) + LIBS="$ac_save_LIBS" with_gnutls=${with_gnutls:-no} fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 1158b14..01493b1 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -670,6 +670,13 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, return SEC_E_OK; } +#ifndef HAVE_SSLCOPYPEERCERTIFICATES +static void schan_imp_cf_release(const void *arg, void *ctx) +{ + CFRelease(arg); +} +#endif + SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, PCCERT_CONTEXT *cert) { @@ -680,7 +687,11 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session TRACE("(%p/%p, %p)\n", s, s->context, cert); +#ifdef HAVE_SSLCOPYPEERCERTIFICATES status = SSLCopyPeerCertificates(s->context, &certs); +#else + status = SSLGetPeerCertificates(s->context, &certs); +#endif if (status == noErr && certs) { SecCertificateRef mac_cert; @@ -702,6 +713,11 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session } else WARN("Couldn't extract certificate data\n"); +#ifndef HAVE_SSLCOPYPEERCERTIFICATES + /* This is why SSLGetPeerCertificates was deprecated */ + CFArrayApplyFunction(certs, CFRangeMake(0, CFArrayGetCount(certs)), + schan_imp_cf_release, NULL); +#endif CFRelease(certs); } else diff --git a/include/config.h.in b/include/config.h.in index f70e354..bb13463 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -746,6 +746,9 @@ /* Define to 1 if the system has the type `ssize_t'. */ #undef HAVE_SSIZE_T +/* Define to 1 if you have the `SSLCopyPeerCertificates' function. */ +#undef HAVE_SSLCOPYPEERCERTIFICATES + /* Define to 1 if you have the `statfs' function. */ #undef HAVE_STATFS

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (sql.h).
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 91c17c8399e48606599d3a23c63a595033c5e717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c17c8399e48606599d3a23c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 27 00:00:35 2011 +0200 include: Make "long" numeric constants LP64/LLP64 proof (sql.h). --- include/sql.h | 56 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/sql.h b/include/sql.h index 6b5218a..3140fcf 100644 --- a/include/sql.h +++ b/include/sql.h @@ -45,7 +45,7 @@ extern "C" { #define SQL_SUCCEEDED(rc) (((rc)&(~1))==0) #define SQL_NTS (-3) -#define SQL_NTSL (-3L) +#define SQL_NTSL (__MSABI_LONG(-3)) #define SQL_MAX_MESSAGE_LENGTH 512 @@ -240,7 +240,7 @@ extern "C" { #endif #if (ODBCVER >= 0x0300) -#define SQL_NULL_HANDLE 0L +#define SQL_NULL_HANDLE __MSABI_LONG(0) #endif #define SQL_SCOPE_CURROW 0 @@ -423,12 +423,12 @@ extern "C" { #endif #if (ODBCVER >= 0x0200) -#define SQL_AT_ADD_COLUMN 0x00000001L -#define SQL_AT_DROP_COLUMN 0x00000002L +#define SQL_AT_ADD_COLUMN __MSABI_LONG(0x00000001) +#define SQL_AT_DROP_COLUMN __MSABI_LONG(0x00000002) #endif #if (ODBCVER >= 0x0300) -#define SQL_AT_ADD_CONSTRAINT 0x00000008L +#define SQL_AT_ADD_CONSTRAINT __MSABI_LONG(0x00000008) #endif /* ODBCVER >= 0x0300 */ @@ -443,15 +443,15 @@ extern "C" { #define SQL_CB_CLOSE 1 #define SQL_CB_PRESERVE 2 -#define SQL_FD_FETCH_NEXT 0x00000001L -#define SQL_FD_FETCH_FIRST 0x00000002L -#define SQL_FD_FETCH_LAST 0x00000004L -#define SQL_FD_FETCH_PRIOR 0x00000008L -#define SQL_FD_FETCH_ABSOLUTE 0x00000010L -#define SQL_FD_FETCH_RELATIVE 0x00000020L +#define SQL_FD_FETCH_NEXT __MSABI_LONG(0x00000001) +#define SQL_FD_FETCH_FIRST __MSABI_LONG(0x00000002) +#define SQL_FD_FETCH_LAST __MSABI_LONG(0x00000004) +#define SQL_FD_FETCH_PRIOR __MSABI_LONG(0x00000008) +#define SQL_FD_FETCH_ABSOLUTE __MSABI_LONG(0x00000010) +#define SQL_FD_FETCH_RELATIVE __MSABI_LONG(0x00000020) -#define SQL_GD_ANY_COLUMN 0x00000001L -#define SQL_GD_ANY_ORDER 0x00000002L +#define SQL_GD_ANY_COLUMN __MSABI_LONG(0x00000001) +#define SQL_GD_ANY_ORDER __MSABI_LONG(0x00000002) #define SQL_IC_UPPER 1 #define SQL_IC_LOWER 2 @@ -459,19 +459,19 @@ extern "C" { #define SQL_IC_MIXED 4 #if (ODBCVER >= 0x0201) -#define SQL_OJ_LEFT 0x00000001L -#define SQL_OJ_RIGHT 0x00000002L -#define SQL_OJ_FULL 0x00000004L -#define SQL_OJ_NESTED 0x00000008L -#define SQL_OJ_NOT_ORDERED 0x00000010L -#define SQL_OJ_INNER 0x00000020L -#define SQL_OJ_ALL_COMPARISON_OPS 0x00000040L +#define SQL_OJ_LEFT __MSABI_LONG(0x00000001) +#define SQL_OJ_RIGHT __MSABI_LONG(0x00000002) +#define SQL_OJ_FULL __MSABI_LONG(0x00000004) +#define SQL_OJ_NESTED __MSABI_LONG(0x00000008) +#define SQL_OJ_NOT_ORDERED __MSABI_LONG(0x00000010) +#define SQL_OJ_INNER __MSABI_LONG(0x00000020) +#define SQL_OJ_ALL_COMPARISON_OPS __MSABI_LONG(0x00000040) #endif -#define SQL_SCCO_READ_ONLY 0x00000001L -#define SQL_SCCO_LOCK 0x00000002L -#define SQL_SCCO_OPT_ROWVER 0x00000004L -#define SQL_SCCO_OPT_VALUES 0x00000008L +#define SQL_SCCO_READ_ONLY __MSABI_LONG(0x00000001) +#define SQL_SCCO_LOCK __MSABI_LONG(0x00000002) +#define SQL_SCCO_OPT_ROWVER __MSABI_LONG(0x00000004) +#define SQL_SCCO_OPT_VALUES __MSABI_LONG(0x00000008) #define SQL_TC_NONE 0 #define SQL_TC_DML 1 @@ -479,13 +479,13 @@ extern "C" { #define SQL_TC_DDL_COMMIT 3 #define SQL_TC_DDL_IGNORE 4 -#define SQL_TXN_READ_UNCOMMITTED 0x00000001L +#define SQL_TXN_READ_UNCOMMITTED __MSABI_LONG(0x00000001) #define SQL_TRANSACTION_READ_UNCOMMITTED SQL_TXN_READ_UNCOMMITTED -#define SQL_TXN_READ_COMMITTED 0x00000002L +#define SQL_TXN_READ_COMMITTED __MSABI_LONG(0x00000002) #define SQL_TRANSACTION_READ_COMMITTED SQL_TXN_READ_COMMITTED -#define SQL_TXN_REPEATABLE_READ 0x00000004L +#define SQL_TXN_REPEATABLE_READ __MSABI_LONG(0x00000004) #define SQL_TRANSACTION_REPEATABLE_READ SQL_TXN_REPEATABLE_READ -#define SQL_TXN_SERIALIZABLE 0x00000008L +#define SQL_TXN_SERIALIZABLE __MSABI_LONG(0x00000008) #define SQL_TRANSACTION_SERIALIZABLE SQL_TXN_SERIALIZABLE #define SQL_NC_HIGH 0

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (sqlext.h).
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: c62f1ffea3fcdccfaf52bfb23f7d034226a0cf31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62f1ffea3fcdccfaf52bfb23… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 26 23:59:00 2011 +0200 include: Make "long" numeric constants LP64/LLP64 proof (sqlext.h). --- include/sqlext.h | 1038 +++++++++++++++++++++++++++--------------------------- 1 files changed, 519 insertions(+), 519 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c62f1ffea3fcdccfaf52b…

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (d3d*.h).
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: da1bef4340c7ed9457f7ef5f0913b1a7c1c10bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1bef4340c7ed9457f7ef5f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 26 23:57:18 2011 +0200 include: Make "long" numeric constants LP64/LLP64 proof (d3d*.h). --- include/d3d.h | 18 +++++++------- include/d3d8.h | 14 ++++++------ include/d3d8types.h | 8 +++--- include/d3dcaps.h | 4 +- include/d3drmdef.h | 24 ++++++++++---------- include/d3dtypes.h | 60 +++++++++++++++++++++++++------------------------- 6 files changed, 64 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da1bef4340c7ed9457f7e…

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (d3d9*.h).
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: bd197aea9285932be2bb5af96e8bc93ac36a4b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd197aea9285932be2bb5af96… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 26 23:52:58 2011 +0200 include: Make "long" numeric constants LP64/LLP64 proof (d3d9*.h). --- include/d3d9.h | 26 ++++++++-------- include/d3d9types.h | 84 +++++++++++++++++++++++++------------------------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index 1311ac0..0ceb23f 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -39,19 +39,19 @@ /***************************************************************************** * Behavior Flags for IDirect3D8::CreateDevice */ -#define D3DCREATE_FPU_PRESERVE 0x00000002L -#define D3DCREATE_MULTITHREADED 0x00000004L -#define D3DCREATE_PUREDEVICE 0x00000010L -#define D3DCREATE_SOFTWARE_VERTEXPROCESSING 0x00000020L -#define D3DCREATE_HARDWARE_VERTEXPROCESSING 0x00000040L -#define D3DCREATE_MIXED_VERTEXPROCESSING 0x00000080L -#define D3DCREATE_DISABLE_DRIVER_MANAGEMENT 0x00000100L -#define D3DCREATE_ADAPTERGROUP_DEVICE 0x00000200L +#define D3DCREATE_FPU_PRESERVE __MSABI_LONG(0x00000002) +#define D3DCREATE_MULTITHREADED __MSABI_LONG(0x00000004) +#define D3DCREATE_PUREDEVICE __MSABI_LONG(0x00000010) +#define D3DCREATE_SOFTWARE_VERTEXPROCESSING __MSABI_LONG(0x00000020) +#define D3DCREATE_HARDWARE_VERTEXPROCESSING __MSABI_LONG(0x00000040) +#define D3DCREATE_MIXED_VERTEXPROCESSING __MSABI_LONG(0x00000080) +#define D3DCREATE_DISABLE_DRIVER_MANAGEMENT __MSABI_LONG(0x00000100) +#define D3DCREATE_ADAPTERGROUP_DEVICE __MSABI_LONG(0x00000200) /***************************************************************************** * Flags for SetPrivateData */ -#define D3DSPD_IUNKNOWN 0x00000001L +#define D3DSPD_IUNKNOWN __MSABI_LONG(0x00000001) /***************************************************************************** @@ -59,10 +59,10 @@ */ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 -#define D3DENUM_NO_WHQL_LEVEL 0x00000002L -#define D3DPRESENT_BACK_BUFFERS_MAX 3L -#define D3DSGR_NO_CALIBRATION 0x00000000L -#define D3DSGR_CALIBRATE 0x00000001L +#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) +#define D3DSGR_NO_CALIBRATION __MSABI_LONG(0x00000000) +#define D3DSGR_CALIBRATE __MSABI_LONG(0x00000001) #define _FACD3D 0x876 #define MAKE_D3DHRESULT( code ) MAKE_HRESULT( 1, _FACD3D, code ) diff --git a/include/d3d9types.h b/include/d3d9types.h index bbb8fbd..8855383 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -24,9 +24,9 @@ /***************************************************************************** * Direct 3D v9 #defines */ -#define D3DCLEAR_TARGET 0x00000001L -#define D3DCLEAR_ZBUFFER 0x00000002L -#define D3DCLEAR_STENCIL 0x00000004L +#define D3DCLEAR_TARGET __MSABI_LONG(0x00000001) +#define D3DCLEAR_ZBUFFER __MSABI_LONG(0x00000002) +#define D3DCLEAR_STENCIL __MSABI_LONG(0x00000004) #define D3DCLIPPLANE0 (1 << 0) #define D3DCLIPPLANE1 (1 << 1) @@ -42,19 +42,19 @@ #define D3DCOLOR_XYUV(y,u,v) D3DCOLOR_ARGB(0xFF,y,u,v) #define D3DCOLOR_AYUV(a,y,u,v) D3DCOLOR_ARGB(a,y,u,v) -#define D3DCS_LEFT 0x001L -#define D3DCS_RIGHT 0x002L -#define D3DCS_TOP 0x004L -#define D3DCS_BOTTOM 0x008L -#define D3DCS_FRONT 0x010L -#define D3DCS_BACK 0x020L -#define D3DCS_PLANE0 0x040L -#define D3DCS_PLANE1 0x080L -#define D3DCS_PLANE2 0x100L -#define D3DCS_PLANE3 0x200L -#define D3DCS_PLANE4 0x400L -#define D3DCS_PLANE5 0x800L -#define D3DCS_ALL 0xFFFL +#define D3DCS_LEFT __MSABI_LONG(0x001) +#define D3DCS_RIGHT __MSABI_LONG(0x002) +#define D3DCS_TOP __MSABI_LONG(0x004) +#define D3DCS_BOTTOM __MSABI_LONG(0x008) +#define D3DCS_FRONT __MSABI_LONG(0x010) +#define D3DCS_BACK __MSABI_LONG(0x020) +#define D3DCS_PLANE0 __MSABI_LONG(0x040) +#define D3DCS_PLANE1 __MSABI_LONG(0x080) +#define D3DCS_PLANE2 __MSABI_LONG(0x100) +#define D3DCS_PLANE3 __MSABI_LONG(0x200) +#define D3DCS_PLANE4 __MSABI_LONG(0x400) +#define D3DCS_PLANE5 __MSABI_LONG(0x800) +#define D3DCS_ALL __MSABI_LONG(0xFFF) #define D3DFVF_TEXTUREFORMAT1 3 #define D3DFVF_TEXTUREFORMAT2 0 @@ -81,7 +81,7 @@ #define D3DCLIPPLANE5 (1 << 5) -#define D3DRENDERSTATE_WRAPBIAS 128UL +#define D3DRENDERSTATE_WRAPBIAS __MSABI_LONG(128U) /* MSDN has this in d3d9caps.h, but it should be here */ #define D3DTSS_TCI_PASSTHRU 0x00000 @@ -97,25 +97,25 @@ #define D3DTS_WORLD3 D3DTS_WORLDMATRIX(3) #define D3DTS_WORLDMATRIX(index) (D3DTRANSFORMSTATETYPE)(index + 256) -#define D3DUSAGE_RENDERTARGET 0x00000001L -#define D3DUSAGE_DEPTHSTENCIL 0x00000002L -#define D3DUSAGE_WRITEONLY 0x00000008L -#define D3DUSAGE_SOFTWAREPROCESSING 0x00000010L -#define D3DUSAGE_DONOTCLIP 0x00000020L -#define D3DUSAGE_POINTS 0x00000040L -#define D3DUSAGE_RTPATCHES 0x00000080L -#define D3DUSAGE_NPATCHES 0x00000100L -#define D3DUSAGE_DYNAMIC 0x00000200L -#define D3DUSAGE_AUTOGENMIPMAP 0x00000400L -#define D3DUSAGE_DMAP 0x00004000L - -#define D3DUSAGE_QUERY_FILTER 0x00020000L -#define D3DUSAGE_QUERY_LEGACYBUMPMAP 0x00008000L -#define D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING 0x00080000L -#define D3DUSAGE_QUERY_SRGBREAD 0x00010000L -#define D3DUSAGE_QUERY_SRGBWRITE 0x00040000L -#define D3DUSAGE_QUERY_VERTEXTEXTURE 0x00100000L -#define D3DUSAGE_QUERY_WRAPANDMIP 0x00200000L +#define D3DUSAGE_RENDERTARGET __MSABI_LONG(0x00000001) +#define D3DUSAGE_DEPTHSTENCIL __MSABI_LONG(0x00000002) +#define D3DUSAGE_WRITEONLY __MSABI_LONG(0x00000008) +#define D3DUSAGE_SOFTWAREPROCESSING __MSABI_LONG(0x00000010) +#define D3DUSAGE_DONOTCLIP __MSABI_LONG(0x00000020) +#define D3DUSAGE_POINTS __MSABI_LONG(0x00000040) +#define D3DUSAGE_RTPATCHES __MSABI_LONG(0x00000080) +#define D3DUSAGE_NPATCHES __MSABI_LONG(0x00000100) +#define D3DUSAGE_DYNAMIC __MSABI_LONG(0x00000200) +#define D3DUSAGE_AUTOGENMIPMAP __MSABI_LONG(0x00000400) +#define D3DUSAGE_DMAP __MSABI_LONG(0x00004000) + +#define D3DUSAGE_QUERY_FILTER __MSABI_LONG(0x00020000) +#define D3DUSAGE_QUERY_LEGACYBUMPMAP __MSABI_LONG(0x00008000) +#define D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING __MSABI_LONG(0x00080000) +#define D3DUSAGE_QUERY_SRGBREAD __MSABI_LONG(0x00010000) +#define D3DUSAGE_QUERY_SRGBWRITE __MSABI_LONG(0x00040000) +#define D3DUSAGE_QUERY_VERTEXTEXTURE __MSABI_LONG(0x00100000) +#define D3DUSAGE_QUERY_WRAPANDMIP __MSABI_LONG(0x00200000) #define D3DWRAP_U 1 #define D3DWRAP_V 2 @@ -167,10 +167,10 @@ #define D3DTA_COMPLEMENT 0x00000010 #define D3DTA_ALPHAREPLICATE 0x00000020 -#define D3DCOLORWRITEENABLE_RED (1L<<0) -#define D3DCOLORWRITEENABLE_GREEN (1L<<1) -#define D3DCOLORWRITEENABLE_BLUE (1L<<2) -#define D3DCOLORWRITEENABLE_ALPHA (1L<<3) +#define D3DCOLORWRITEENABLE_RED (__MSABI_LONG(1)<<0) +#define D3DCOLORWRITEENABLE_GREEN (__MSABI_LONG(1)<<1) +#define D3DCOLORWRITEENABLE_BLUE (__MSABI_LONG(1)<<2) +#define D3DCOLORWRITEENABLE_ALPHA (__MSABI_LONG(1)<<3) #define D3DPV_DONOTCOPYDATA (1 << 0) @@ -206,7 +206,7 @@ #define D3DPRESENTFLAG_NOAUTOROTATE 0x00000020 /* d3d9ex, ignore display rotation */ #define D3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 /* d3d9ex, specify invalid display modes */ -#define D3DPRESENT_BACK_BUFFERS_MAX 3L +#define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) #define D3DPRESENT_RATE_DEFAULT 0x00000000 /**************************** @@ -643,7 +643,7 @@ typedef enum _D3DBACKBUFFER_TYPE { D3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff } D3DBACKBUFFER_TYPE; -#define D3DPRESENT_BACK_BUFFER_MAX 3L +#define D3DPRESENT_BACK_BUFFER_MAX __MSABI_LONG(3) typedef enum _D3DBASISTYPE { D3DBASIS_BEZIER = 0,

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (d3d9caps.h).
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: ee30e087e1d0e233d81b86ec591f52239d1210a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee30e087e1d0e233d81b86ec5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 26 23:47:59 2011 +0200 include: Make "long" numeric constants LP64/LLP64 proof (d3d9caps.h). --- include/d3d9caps.h | 182 ++++++++++++++++++++++++++-------------------------- 1 files changed, 91 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee30e087e1d0e233d81b8…

1 0

Michael Stefaniuc : include: Add a macro to paper over LP64/ LLP64 differences for numeric constants.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 1b2f89e673e7866b1753496f5f7a3126fabdb134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2f89e673e7866b1753496f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 26 23:45:45 2011 +0200 include: Add a macro to paper over LP64/LLP64 differences for numeric constants. Based on an idea by Kai Tietz. --- include/winnt.h | 173 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 91 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b2f89e673e7866b17534…

1 0

Michael Stefaniuc : include: Drop the 'l' modifier from some numeric constants in winnt.h.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: c5441514bc337fa3daf831a8e3cd6f0ad1c95c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5441514bc337fa3daf831a8e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 26 23:43:22 2011 +0200 include: Drop the 'l' modifier from some numeric constants in winnt.h. --- include/winnt.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index f8adbcb..541d2d0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -861,9 +861,9 @@ typedef struct _CONTEXT #define CONTEXT_CONTROL (CONTEXT_i386 | 0x0001) /* SS:SP, CS:IP, FLAGS, BP */ #define CONTEXT_INTEGER (CONTEXT_i386 | 0x0002) /* AX, BX, CX, DX, SI, DI */ #define CONTEXT_SEGMENTS (CONTEXT_i386 | 0x0004) /* DS, ES, FS, GS */ -#define CONTEXT_FLOATING_POINT (CONTEXT_i386 | 0x0008L) /* 387 state */ -#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x0010L) /* DB 0-3,6,7 */ -#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386 | 0x0020L) +#define CONTEXT_FLOATING_POINT (CONTEXT_i386 | 0x0008) /* 387 state */ +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x0010) /* DB 0-3,6,7 */ +#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386 | 0x0020) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | \ CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | CONTEXT_EXTENDED_REGISTERS) @@ -907,8 +907,8 @@ typedef struct _LDT_ENTRY { #define CONTEXT_CONTROL (CONTEXT_AMD64 | 0x0001) #define CONTEXT_INTEGER (CONTEXT_AMD64 | 0x0002) #define CONTEXT_SEGMENTS (CONTEXT_AMD64 | 0x0004) -#define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x0008L) -#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x0010L) +#define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x0008) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x0010) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) @@ -1436,9 +1436,9 @@ ULONGLONG WINAPI RtlVirtualUnwind(ULONGLONG,ULONGLONG,RUNTIME_FUNCTION*,CONTEXT* #define CONTEXT_ALPHA 0x00020000 -#define CONTEXT_CONTROL (CONTEXT_ALPHA | 0x00000001L) -#define CONTEXT_FLOATING_POINT (CONTEXT_ALPHA | 0x00000002L) -#define CONTEXT_INTEGER (CONTEXT_ALPHA | 0x00000004L) +#define CONTEXT_CONTROL (CONTEXT_ALPHA | 0x00000001) +#define CONTEXT_FLOATING_POINT (CONTEXT_ALPHA | 0x00000002) +#define CONTEXT_INTEGER (CONTEXT_ALPHA | 0x00000004) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) #define EXCEPTION_READ_FAULT 0 @@ -1536,8 +1536,8 @@ typedef struct _CONTEXT /* The following flags control the contents of the CONTEXT structure. */ #define CONTEXT_ARM 0x0000040 -#define CONTEXT_CONTROL (CONTEXT_ARM | 0x00000001L) -#define CONTEXT_INTEGER (CONTEXT_ARM | 0x00000002L) +#define CONTEXT_CONTROL (CONTEXT_ARM | 0x00000001) +#define CONTEXT_INTEGER (CONTEXT_ARM | 0x00000002) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) @@ -4738,9 +4738,9 @@ typedef struct _QUOTA_LIMITS_EX { #define DUPLICATE_SAME_ACCESS 0x00000002 /* File attribute flags */ -#define FILE_SHARE_READ 0x00000001L -#define FILE_SHARE_WRITE 0x00000002L -#define FILE_SHARE_DELETE 0x00000004L +#define FILE_SHARE_READ 0x00000001 +#define FILE_SHARE_WRITE 0x00000002 +#define FILE_SHARE_DELETE 0x00000004 #define FILE_ATTRIBUTE_READONLY 0x00000001 #define FILE_ATTRIBUTE_HIDDEN 0x00000002

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
79
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 October 2011