August 2007 - Wine-commits - list.winehq.org

Francois Gouget : opengl32/tests: Add missing '\n' to ok() call.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: c7eca6a0271a2d8fdbc7bc8a5362991aa51651ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7eca6a0271a2d8fdbc7bc8a5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:43:45 2007 +0200 opengl32/tests: Add missing '\n' to ok() call. --- dlls/opengl32/tests/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 17ca54a..efb1cd6 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -181,7 +181,7 @@ static void test_setpixelformat(void) /* This should pass even on the main device context */ pf = ChoosePixelFormat(hdc, &pfd); - ok(pf != 0, "ChoosePixelFormat failed on main device context"); + ok(pf != 0, "ChoosePixelFormat failed on main device context\n"); /* SetPixelFormat on the main device context 'X root window' should fail */ res = SetPixelFormat(hdc, pf, &pfd);

1 0

Francois Gouget : winapi_check: FLOAT is a float.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 04a048327371d20ab101a737a2b558bc31c5b3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a048327371d20ab101a737a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:50:39 2007 +0200 winapi_check: FLOAT is a float. --- tools/winapi/win32.api | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index c004da5..88d1d94 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1288,7 +1288,6 @@ REFIID BOOL COLORREF DWORD -FLOAT HANDLE HBITMAP HBRUSH @@ -1316,6 +1315,10 @@ ULONG WORD int +%float + +FLOAT + %ptr ABORTPROC @@ -3269,6 +3272,7 @@ double %float float +FLOAT %long @@ -3277,7 +3281,6 @@ BYTE CALLCONV DISPID DWORD -FLOAT HCURSOR HICON HINSTANCE @@ -3507,11 +3510,14 @@ LPCSTR GLclampd GLdouble +%float + +FLOAT + %long BOOL DWORD -FLOAT GLbitfield GLboolean GLbyte

1 0

Francois Gouget : netapi32: Add missing #include directives to the netapi32 headers.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: d5ce0846862de432c211de5315865d41f0f4610f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ce0846862de432c211de531… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:46:28 2007 +0200 netapi32: Add missing #include directives to the netapi32 headers. --- include/lmerr.h | 2 ++ include/lmserver.h | 1 + include/lmshare.h | 2 ++ 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/lmerr.h b/include/lmerr.h index abf33ee..47b869c 100644 --- a/include/lmerr.h +++ b/include/lmerr.h @@ -21,6 +21,8 @@ #ifndef __WINE_LMERR_H #define __WINE_LMERR_H +#include <winerror.h> + #define NERR_Success 0 #define NERR_BASE 2100 diff --git a/include/lmserver.h b/include/lmserver.h index 1d738fc..94a4844 100644 --- a/include/lmserver.h +++ b/include/lmserver.h @@ -19,6 +19,7 @@ #define _LMSERVER_ #include <winsvc.h> +#include <lmcons.h> #ifdef __cplusplus extern "C" { diff --git a/include/lmshare.h b/include/lmshare.h index 082abf2..8364969 100644 --- a/include/lmshare.h +++ b/include/lmshare.h @@ -22,6 +22,8 @@ extern "C" { #endif +#include <lmcons.h> + typedef struct _SHARE_INFO_0 { LMSTR shi0_netname; } SHARE_INFO_0, *PSHARE_INFO_0, *LPSHARE_INFO_0;

1 0

Francois Gouget : oleaut32: Fix a signed/unsigned mismatch.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 3543d51c7f2a37768fb646f6105a29135f66310a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3543d51c7f2a37768fb646f61… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:48:13 2007 +0200 oleaut32: Fix a signed/unsigned mismatch. --- dlls/oleaut32/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a7dc158..ca46d01 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -545,7 +545,7 @@ static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface, return E_POINTER; switch (This->desc.picType) { - case PICTYPE_UNINITIALIZED: + case (UINT)PICTYPE_UNINITIALIZED: case PICTYPE_NONE: *phandle = 0; hres = S_FALSE;

1 0

Francois Gouget : d3d8: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 69958262eb6ff322a46690dd0ffbd1f9d310decd URL: http://source.winehq.org/git/wine.git/?a=commit;h=69958262eb6ff322a46690dd0… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:47:02 2007 +0200 d3d8: Better match the PSDK types and fix the winapi_check warnings. --- dlls/d3d8/d3d8_main.c | 4 ++-- tools/winapi/win32.api | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 4922b10..63cb472 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -78,7 +78,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * bool seems always passed as 0 or 1, but other values work as well.... * toto result? */ -HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, int bool, DWORD* toto) +HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) { HRESULT ret; FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); @@ -108,7 +108,7 @@ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD * PARAMS * toto result? */ -HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, int bool, DWORD* toto) +HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto) { HRESULT ret; FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 2a5fd92..520a432 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -792,8 +792,8 @@ UINT %ptr +DWORD * IDirect3D8 * -LPVOID %void

1 0

Francois Gouget : comctl32: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 623969b76e8f9f099289a6589ad8a0f1f70c2664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=623969b76e8f9f099289a6589… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:44:59 2007 +0200 comctl32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 520a432..a3b4e4d 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -532,6 +532,8 @@ POINT %ptr +CREATEMRULISTA * +CREATEMRULISTW * DLLVERSIONINFO * DPALOADPROC DWORD_PTR * @@ -547,8 +549,7 @@ LPCPROPSHEETHEADERA LPCPROPSHEETHEADERW LPCPROPSHEETPAGEA LPCPROPSHEETPAGEW -LPCREATEMRULISTA -LPCREATEMRULISTW +LPCRECT LPCTBBUTTON LPCVOID LPINT @@ -564,6 +565,7 @@ PFNDPAENUMCALLBACK PFNDPAMERGE PFNDSAENUMCALLBACK POINT * +RECT * RGBQUAD * SMOOTHSCROLLSTRUCT * SUBCLASSPROC

1 0

Francois Gouget : advapi32: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: e434a3ff95843829ef9ab9e69b926e13f36dee66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e434a3ff95843829ef9ab9e69… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:44:44 2007 +0200 advapi32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index a3b4e4d..c004da5 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -65,6 +65,10 @@ WELL_KNOWN_SID_TYPE WORD unsigned int +%long --pointer + +ULONG_PTR + %ptr BYTE *

1 0

Francois Gouget : gdiplus: Use the gdiplus type, REAL, rather than FLOAT.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: d76b19abd994e200872e7e70d0791b56ce3a9ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76b19abd994e200872e7e70d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:53:23 2007 +0200 gdiplus: Use the gdiplus type, REAL, rather than FLOAT. --- dlls/gdiplus/gdiplus.c | 2 +- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/pen.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index edbfb1c..9267b90 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -218,7 +218,7 @@ COLORREF ARGB2COLORREF(ARGB color) } /* Like atan2, but puts angle in correct quadrant if dx is 0. */ -FLOAT gdiplus_atan2(FLOAT dy, FLOAT dx) +REAL gdiplus_atan2(REAL dy, REAL dx) { if((dx == 0.0) && (dy != 0.0)) return dy > 0.0 ? M_PI_2 : -M_PI_2; diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 3ce92a1..ee120d9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -40,7 +40,7 @@ COLORREF ARGB2COLORREF(ARGB color); extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, REAL startAngle, REAL sweepAngle); -extern FLOAT gdiplus_atan2(FLOAT dy, FLOAT dx); +extern REAL gdiplus_atan2(REAL dy, REAL dx); static inline INT roundr(REAL x) { diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 388567a..20a44bc 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -84,7 +84,7 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) return Ok; } -GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, FLOAT width, GpUnit unit, +GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, REAL width, GpUnit unit, GpPen **pen) { GpPen *gp_pen;

1 0

Francois Gouget : imagehlp: Add two missing fields.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 7a70f9f511d2e402a1b6d8772840e02afa263acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a70f9f511d2e402a1b6d8772… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:49:50 2007 +0200 imagehlp: Add two missing fields. --- dlls/imagehlp/access.c | 2 ++ include/dbghelp.h | 4 +++- include/imagehlp.h | 29 ++++++++++++++++------------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 2aeedff..39e7afa 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -48,6 +48,8 @@ static LOADED_IMAGE IMAGEHLP_EmptyLoadedImage = { 1, /* Characteristics */ FALSE, /* fSystemImage */ FALSE, /* fDOSImage */ + FALSE, /* fReadOnly */ + 0, /* Version */ { &IMAGEHLP_EmptyLoadedImage.Links, &IMAGEHLP_EmptyLoadedImage.Links }, /* Links */ 148, /* SizeOfImage; */ }; diff --git a/include/dbghelp.h b/include/dbghelp.h index e818096..d454635 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -27,7 +27,7 @@ extern "C" { typedef struct _LOADED_IMAGE { - LPSTR ModuleName; + PSTR ModuleName; HANDLE hFile; PUCHAR MappedAddress; PIMAGE_NT_HEADERS FileHeader; @@ -37,6 +37,8 @@ typedef struct _LOADED_IMAGE ULONG Characteristics; BOOLEAN fSystemImage; BOOLEAN fDOSImage; + BOOLEAN fReadOnly; + UCHAR Version; LIST_ENTRY Links; ULONG SizeOfImage; } LOADED_IMAGE, *PLOADED_IMAGE; diff --git a/include/imagehlp.h b/include/imagehlp.h index e37d921..89883d9 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -158,19 +158,22 @@ typedef enum { * Structures */ -typedef struct _LOADED_IMAGE { - LPSTR ModuleName; - HANDLE hFile; - PUCHAR MappedAddress; - PIMAGE_NT_HEADERS FileHeader; - PIMAGE_SECTION_HEADER LastRvaSection; - ULONG NumberOfSections; - PIMAGE_SECTION_HEADER Sections; - ULONG Characteristics; - BOOLEAN fSystemImage; - BOOLEAN fDOSImage; - LIST_ENTRY Links; - ULONG SizeOfImage; +typedef struct _LOADED_IMAGE +{ + PSTR ModuleName; + HANDLE hFile; + PUCHAR MappedAddress; + PIMAGE_NT_HEADERS FileHeader; + PIMAGE_SECTION_HEADER LastRvaSection; + ULONG NumberOfSections; + PIMAGE_SECTION_HEADER Sections; + ULONG Characteristics; + BOOLEAN fSystemImage; + BOOLEAN fDOSImage; + BOOLEAN fReadOnly; + UCHAR Version; + LIST_ENTRY Links; + ULONG SizeOfImage; } LOADED_IMAGE, *PLOADED_IMAGE; typedef struct _WIN_CERTIFICATE {

1 0

Francois Gouget : dbghelp: Better match the PSDK types, especially with regards to constness.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 9d2f48dc0f58037774d230d5ee9dc955ec5c2e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d2f48dc0f58037774d230d5e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:51:09 2007 +0200 dbghelp: Better match the PSDK types, especially with regards to constness. Also add a number of missing prototypes, especially 64bit or Unicode versions of existing prototypes, and the related structures. Update win32.api to fix the winapi_check warnings. --- dlls/dbghelp/dbghelp.c | 4 +- dlls/dbghelp/image.c | 4 +- dlls/dbghelp/minidump.c | 8 +- dlls/dbghelp/module.c | 16 ++-- dlls/dbghelp/path.c | 48 +++++++------- dlls/dbghelp/stack.c | 4 +- dlls/dbghelp/symbol.c | 4 +- include/dbghelp.h | 160 ++++++++++++++++++++++++++++++++++++-------- programs/winedbg/info.c | 2 +- programs/winedbg/types.c | 2 +- programs/winedbg/winedbg.c | 2 +- tools/winapi/win32.api | 31 +++++++-- 12 files changed, 203 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d2f48dc0f58037774d23…

1 0