October 2011 - Wine-commits

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

Alexandre Julliard : gdi32: Avoid directly modifying the cursor position in the DC structure in PolyDraw .
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 97a261d573fec67d891bd763c660e7f2ec092636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a261d573fec67d891bd763c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 19:47:27 2011 +0200 gdi32: Avoid directly modifying the cursor position in the DC structure in PolyDraw. --- dlls/gdi32/path.c | 91 +++++++++++++++++++++++++---------------------------- 1 files changed, 43 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index e8c7eaa..9f44944 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1199,63 +1199,58 @@ BOOL PATH_PolyBezier(DC *dc, const POINT *pts, DWORD cbPoints) BOOL PATH_PolyDraw(DC *dc, const POINT *pts, const BYTE *types, DWORD cbPoints) { - GdiPath *pPath = &dc->path; - POINT lastmove, orig_pos; - INT i; - - lastmove.x = orig_pos.x = dc->CursPosX; - lastmove.y = orig_pos.y = dc->CursPosY; - - for(i = pPath->numEntriesUsed - 1; i >= 0; i--){ - if(pPath->pFlags[i] == PT_MOVETO){ - lastmove.x = pPath->pPoints[i].x; - lastmove.y = pPath->pPoints[i].y; - if(!DPtoLP(dc->hSelf, &lastmove, 1)) - return FALSE; - break; - } + GdiPath *pPath = &dc->path; + POINT lastmove, orig_pos; + INT i; + + GetCurrentPositionEx( dc->hSelf, &orig_pos ); + lastmove = orig_pos; + + for(i = pPath->numEntriesUsed - 1; i >= 0; i--){ + if(pPath->pFlags[i] == PT_MOVETO){ + lastmove = pPath->pPoints[i]; + DPtoLP(dc->hSelf, &lastmove, 1); + break; } + } - for(i = 0; i < cbPoints; i++){ - if(types[i] == PT_MOVETO){ - pPath->newStroke = TRUE; - lastmove.x = pts[i].x; - lastmove.y = pts[i].y; - } - else if((types[i] & ~PT_CLOSEFIGURE) == PT_LINETO){ - PATH_LineTo(dc, pts[i].x, pts[i].y); - } - else if(types[i] == PT_BEZIERTO){ - if(!((i + 2 < cbPoints) && (types[i + 1] == PT_BEZIERTO) - && ((types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO))) - goto err; - PATH_PolyBezierTo(dc, &(pts[i]), 3); + for(i = 0; i < cbPoints; i++) + { + switch (types[i]) + { + case PT_MOVETO: + MoveToEx( dc->hSelf, pts[i].x, pts[i].y, NULL ); + break; + case PT_LINETO: + case PT_LINETO | PT_CLOSEFIGURE: + LineTo( dc->hSelf, pts[i].x, pts[i].y ); + break; + case PT_BEZIERTO: + if ((i + 2 < cbPoints) && (types[i + 1] == PT_BEZIERTO) && + (types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO) + { + PolyBezierTo( dc->hSelf, &pts[i], 3 ); i += 2; + break; } - else - goto err; - - dc->CursPosX = pts[i].x; - dc->CursPosY = pts[i].y; - - if(types[i] & PT_CLOSEFIGURE){ - pPath->pFlags[pPath->numEntriesUsed-1] |= PT_CLOSEFIGURE; - pPath->newStroke = TRUE; - dc->CursPosX = lastmove.x; - dc->CursPosY = lastmove.y; + /* fall through */ + default: + if (i) /* restore original position */ + { + if (!(types[i - 1] & PT_CLOSEFIGURE)) lastmove = pts[i - 1]; + if (lastmove.x != orig_pos.x || lastmove.y != orig_pos.y) + MoveToEx( dc->hSelf, orig_pos.x, orig_pos.y, NULL ); } + return FALSE; } - return TRUE; - -err: - if((dc->CursPosX != orig_pos.x) || (dc->CursPosY != orig_pos.y)){ - pPath->newStroke = TRUE; - dc->CursPosX = orig_pos.x; - dc->CursPosY = orig_pos.y; + if(types[i] & PT_CLOSEFIGURE){ + pPath->pFlags[pPath->numEntriesUsed-1] |= PT_CLOSEFIGURE; + MoveToEx( dc->hSelf, lastmove.x, lastmove.y, NULL ); } + } - return FALSE; + return TRUE; } BOOL PATH_Polyline(DC *dc, const POINT *pts, DWORD cbPoints)

1 0

Alexandre Julliard : gdi32: Push a path driver on the DC stack when a path is opened.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 8a7bf0a2abe85b7ae1199b84610e85b1da811519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7bf0a2abe85b7ae1199b846… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 18:13:21 2011 +0200 gdi32: Push a path driver on the DC stack when a path is opened. --- dlls/gdi32/bitmap.c | 5 +- dlls/gdi32/dc.c | 7 +- dlls/gdi32/gdi_private.h | 4 +- dlls/gdi32/path.c | 309 +++++++++++++++++++++++++++++++++++++++------- 4 files changed, 274 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a7bf0a2abe85b7ae1199…

1 0

Alexandre Julliard : gdi32: Implement the MoveTo entry point in the path driver.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 2c1ec7fc3b99c7ce38b777e010f480ce06b41ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1ec7fc3b99c7ce38b777e01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 19:57:28 2011 +0200 gdi32: Implement the MoveTo entry point in the path driver. --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/painting.c | 11 ++++------- dlls/gdi32/path.c | 26 ++++++++------------------ 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index db5ec43..e0b3b76 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -325,7 +325,6 @@ extern void PATH_DestroyGdiPath(GdiPath *pPath) DECLSPEC_HIDDEN; extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; -extern BOOL PATH_MoveTo(DC *dc) DECLSPEC_HIDDEN; extern BOOL PATH_LineTo(DC *dc, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL PATH_Rectangle(DC *dc, INT x1, INT y1, INT x2, INT y2) DECLSPEC_HIDDEN; extern BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 60b2898..5eb5654 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -258,7 +258,8 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) */ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) { - BOOL ret = TRUE; + BOOL ret; + PHYSDEV physdev; DC * dc = get_dc_ptr( hdc ); if(!dc) return FALSE; @@ -270,12 +271,8 @@ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) dc->CursPosX = x; dc->CursPosY = y; - if(PATH_IsPathOpen(dc->path)) ret = PATH_MoveTo(dc); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pMoveTo ); - ret = physdev->funcs->pMoveTo( physdev, x, y ); - } + physdev = GET_DC_PHYSDEV( dc, pMoveTo ); + ret = physdev->funcs->pMoveTo( physdev, x, y ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index ba67952..25e1d52 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -884,25 +884,15 @@ BOOL PATH_RestorePath( DC *dst, DC *src ) return ret; } -/* PATH_MoveTo - * - * Should be called when a MoveTo is performed on a DC that has an - * open path. This starts a new stroke. Returns TRUE if successful, else - * FALSE. + +/************************************************************* + * pathdrv_MoveTo */ -BOOL PATH_MoveTo(DC *dc) +static BOOL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) { - GdiPath *pPath = &dc->path; - - /* Check that path is open */ - if(pPath->state!=PATH_Open) - /* FIXME: Do we have to call SetLastError? */ - return FALSE; - - /* Start a new stroke */ - pPath->newStroke=TRUE; - - return TRUE; + struct path_physdev *physdev = get_path_physdev( dev ); + physdev->path->newStroke = TRUE; + return TRUE; } /* PATH_LineTo @@ -2372,7 +2362,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pInvertRgn */ NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ - NULL, /* pMoveTo */ + pathdrv_MoveTo, /* pMoveTo */ NULL, /* pOffsetClipRgn */ NULL, /* pOffsetViewportOrg */ NULL, /* pOffsetWindowOrg */

1 0

Alexandre Julliard : winegcc: Avoid including Windows headers in the Mingw unicode stub.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 5adfd065bbcd56f1c177f85d955b0d50d7ccc90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5adfd065bbcd56f1c177f85d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 17:38:19 2011 +0200 winegcc: Avoid including Windows headers in the Mingw unicode stub. --- tools/winegcc/winegcc.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index adb1873..7d03119 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -648,16 +648,17 @@ static const char *mingw_unicode_hack( struct options *opts ) char *main_stub = get_temp_file( opts->output_name, ".c" ); create_file( main_stub, 0644, - "#include <stdarg.h>\n" - "#include <windef.h>\n" - "#include <winbase.h>\n" + "typedef unsigned short wchar_t;\n" + "extern void * __stdcall LoadLibraryA(const char *);\n" + "extern void * __stdcall GetProcAddress(void *,const char *);\n" + "extern int wmain( int argc, wchar_t *argv[] );\n\n" "int main( int argc, char *argv[] )\n{\n" " int wargc;\n" " wchar_t **wargv, **wenv;\n" - " HMODULE msvcrt = LoadLibraryA( \"msvcrt.dll\" );\n" - " void __cdecl (*__wgetmainargs)(int *argc, wchar_t** *wargv, wchar_t** *wenvp, int expand_wildcards,\n" - " int *new_mode) = (void *)GetProcAddress( msvcrt, \"__wgetmainargs\" );\n" - " __wgetmainargs( &wargc, &wargv, &wenv, 0, NULL );\n" + " void *msvcrt = LoadLibraryA( \"msvcrt.dll\" );\n" + " void (*__wgetmainargs)(int *argc, wchar_t** *wargv, wchar_t** *wenvp, int expand_wildcards,\n" + " int *new_mode) = GetProcAddress( msvcrt, \"__wgetmainargs\" );\n" + " __wgetmainargs( &wargc, &wargv, &wenv, 0, 0 );\n" " return wmain( wargc, wargv );\n}\n" ); return compile_to_object( opts, main_stub, NULL ); }

1 0

Louis Lenders : ntoskrnl.exe: Update version resource.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 066a649a7749d2d267d758ff07f4500bd8494d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=066a649a7749d2d267d758ff0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Oct 22 19:19:04 2011 +0200 ntoskrnl.exe: Update version resource. --- dlls/ntoskrnl.exe/ntoskrnl.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.rc b/dlls/ntoskrnl.exe/ntoskrnl.rc index 322dd75..767196c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.rc +++ b/dlls/ntoskrnl.exe/ntoskrnl.rc @@ -18,10 +18,10 @@ #define WINE_FILENAME_STR "ntoskrnl.exe" -/* Version as of Win XP SP3 */ -#define WINE_FILEVERSION 5,1,2600,5657 -#define WINE_FILEVERSION_STR "5.1.2600.5657" -#define WINE_PRODUCTVERSION 5,1,2600,5657 -#define WINE_PRODUCTVERSION_STR "5.1.2600.5657" +/* Version as of Win 7 SP1 */ +#define WINE_FILEVERSION 6,1,7601,17592 +#define WINE_FILEVERSION_STR "6.1.7601.17592" +#define WINE_PRODUCTVERSION 6,1,7601,17592 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17592" #include "wine/wine_common_ver.rc"

1 0

Michael Mc Donnell : d3dx9: Implemented non-equal declaration support in CloneMesh.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 3b693143ebc806e71126150d9301af9f64db29d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b693143ebc806e71126150d9… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Aug 17 12:50:09 2011 +0200 d3dx9: Implemented non-equal declaration support in CloneMesh. --- dlls/d3dx9_36/mesh.c | 455 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 423 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b693143ebc806e711261…

1 0