May 2007 - Wine-Commits - list.winehq.org

Francois Gouget : shell32/tests: We need NTDDI_VERSION >= NTDDI_WINXPSP1 to get SEE_MASK_NOZONECHECKS with the PSDK.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 29a4a9c84948daae486271832559e05c939e2e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a4a9c84948daae486271832… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:23:37 2007 +0200 shell32/tests: We need NTDDI_VERSION >= NTDDI_WINXPSP1 to get SEE_MASK_NOZONECHECKS with the PSDK. --- dlls/shell32/tests/shlexec.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index a226667..97f43b6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -35,6 +35,10 @@ #include <stdio.h> #include <assert.h> +/* Needed to get SEE_MASK_NOZONECHECKS with the PSDK */ +#define NTDDI_WINXPSP1 0x05010100 +#define NTDDI_VERSION NTDDI_WINXPSP1 + #include "wtypes.h" #include "winbase.h" #include "windef.h"

1 0

Andrew Talbot : wininet: Exclude unused headers.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 8ee390f6f540e479a477e49a4e41c938523b080d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee390f6f540e479a477e49a4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri May 25 15:38:21 2007 +0100 wininet: Exclude unused headers. --- dlls/wininet/dialogs.c | 1 - dlls/wininet/http.c | 1 - dlls/wininet/internet.c | 1 - dlls/wininet/urlcache.c | 1 - dlls/wininet/utility.c | 1 - 5 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index fc473be..dd5aa31 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -29,7 +29,6 @@ #include "winreg.h" #include "wininet.h" #include "winnetwk.h" -#include "winnls.h" #include "wine/debug.h" #include "winerror.h" #define NO_SHLWAPI_STREAM diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 54f6410..ad73e41 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -48,7 +48,6 @@ #include "windef.h" #include "winbase.h" #include "wininet.h" -#include "winreg.h" #include "winerror.h" #define NO_SHLWAPI_STREAM #define NO_SHLWAPI_REG diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b507312..06611c8 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -60,7 +60,6 @@ #include "shlwapi.h" #include "wine/exception.h" -#include "excpt.h" #include "internet.h" #include "resource.h" diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ca38141..42f3ba9 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -42,7 +42,6 @@ #include "internet.h" #include "winreg.h" #include "shlwapi.h" -#include "wingdi.h" #include "shlobj.h" #include "wine/unicode.h" diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 34e72d0..3d779a8 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -33,7 +33,6 @@ #include "windef.h" #include "winbase.h" #include "wininet.h" -#include "winerror.h" #include "winnls.h" #include "wine/debug.h"

1 0

Francois Gouget : msvcrt/tests: Fix a signed/unsigned int mismatch.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: a50dfc174ed0cd0c63f452bfb97712e9ebfe86ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50dfc174ed0cd0c63f452bfb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:19:10 2007 +0200 msvcrt/tests: Fix a signed/unsigned int mismatch. --- dlls/msvcrt/tests/file.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9444b73..46ccad6 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -144,7 +144,8 @@ static void test_readmode( BOOL ascii_mode ) int fd; FILE *file; const int *ip; - int i, j, m, fp, ao, pl; + int i, j, m, ao, pl; + unsigned int fp; long l; fd = open ("fdopen.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); @@ -307,7 +308,8 @@ static void test_fgetwc( void ) WCHAR wtextW[BUFSIZ+LLEN+1]; WCHAR *mytextW = NULL, *aptr, *wptr; BOOL diff_found = FALSE; - int i, j; + int j; + unsigned int i; long l; tempf=_tempnam(".","wne");

1 0

Francois Gouget : msi/tests: Fix a signed/unsigned int mismatch.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: dbf7b7b398ea56a8a9435903b152e36bae587ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf7b7b398ea56a8a9435903b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:18:49 2007 +0200 msi/tests: Fix a signed/unsigned int mismatch. --- dlls/msi/tests/automation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 8bf2913..6369939 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -589,7 +589,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA OLECHAR *name = NULL; DISPID dispid; HRESULT hr; - int i; + UINT i; UINT len; memset(pVarResult, 0, sizeof(VARIANT));

1 0

Francois Gouget : kernel32/tests: Fix a signed/unsigned int mismatch.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: e5b1ca4cf538cbe0418df23748253b2f018d7afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b1ca4cf538cbe0418df2374… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:18:36 2007 +0200 kernel32/tests: Fix a signed/unsigned int mismatch. --- dlls/kernel32/tests/toolhelp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 628626a..ab067d1 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -227,7 +227,8 @@ static void test_module(DWORD pid, const char* expected[], unsigned num_expected THREADENTRY32 te; MODULEENTRY32 me; unsigned found[32]; - int i, num = 0; + unsigned i; + int num = 0; ok(NUM_OF(found) >= num_expected, "Internal: bump found[] size\n");

1 0

Francois Gouget : usp10/tests: Fix a signed/unsigned int mismatch.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 149ac3fcdcfcc4fd5694478c1de25ff57a971992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=149ac3fcdcfcc4fd5694478c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 27 13:17:56 2007 +0200 usp10/tests: Fix a signed/unsigned int mismatch. --- dlls/usp10/tests/usp10.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 40840c3..54d826f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -622,7 +622,8 @@ static void test_ScriptString(HDC hdc) int MaxSel = 0; BOOL Disabled = FALSE; const int *clip_len; - UINT *order, i; + int i; + UINT *order; Charset = -1; /* this flag indicates unicode input */

1 0

Andrew Talbot : winex11.drv: Exclude unused headers.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 080635bdeb7fc3673a81dd3dfe1ba32386c854e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=080635bdeb7fc3673a81dd3df… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri May 25 15:38:17 2007 +0100 winex11.drv: Exclude unused headers. --- dlls/winex11.drv/bitblt.c | 1 - dlls/winex11.drv/clipboard.c | 1 - dlls/winex11.drv/event.c | 1 - dlls/winex11.drv/palette.c | 1 - dlls/winex11.drv/text.c | 1 - dlls/winex11.drv/window.c | 1 - dlls/winex11.drv/winpos.c | 1 - dlls/winex11.drv/xdnd.c | 1 - dlls/winex11.drv/xrender.c | 1 - 9 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 00bf375..06c6ba1 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -29,7 +29,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winreg.h" #include "winuser.h" #include "x11drv.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 57c52f6..7731ae0 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -77,7 +77,6 @@ #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "wine/wingdi16.h" #include "x11drv.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 59fee3d..e3047fd 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -40,7 +40,6 @@ #include "shlobj.h" /* DROPFILES */ #include "win.h" -#include "winreg.h" #include "x11drv.h" #include "shellapi.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 7ccfed7..bb6d493 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "x11drv.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index 57e5cd8..a8032cf 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "x11font.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a74c095..be5d114 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -36,7 +36,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winreg.h" #include "winuser.h" #include "wine/unicode.h" diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index e89625b..5e0e604 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -33,7 +33,6 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" -#include "wownt32.h" #include "wine/wingdi16.h" #include "x11drv.h" diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index af04d75..f1d6d24 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -31,7 +31,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winerror.h" #include "x11drv.h" #include "shlobj.h" /* DROPFILES */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b11ed14..612c048 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -30,7 +30,6 @@ #include "windef.h" #include "winbase.h" -#include "wownt32.h" #include "x11drv.h" #include "winternl.h" #include "wine/library.h"

1 0

Andrew Talbot : wineps.drv: Exclude unused headers.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 9ff4c29d8673e776d9410097ba4da684536cd929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff4c29d8673e776d9410097b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri May 25 15:38:14 2007 +0100 wineps.drv: Exclude unused headers. --- dlls/wineps.drv/bitblt.c | 1 - dlls/wineps.drv/builtin.c | 1 - dlls/wineps.drv/download.c | 2 -- dlls/wineps.drv/driver.c | 1 - dlls/wineps.drv/graphics.c | 1 - dlls/wineps.drv/ppd.c | 1 - dlls/wineps.drv/ps.c | 1 - dlls/wineps.drv/text.c | 2 -- dlls/wineps.drv/type1.c | 2 -- dlls/wineps.drv/type42.c | 2 -- 10 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/wineps.drv/bitblt.c b/dlls/wineps.drv/bitblt.c index 375dc89..023133f 100644 --- a/dlls/wineps.drv/bitblt.c +++ b/dlls/wineps.drv/bitblt.c @@ -20,7 +20,6 @@ #include "psdrv.h" #include "wine/debug.h" -#include "winbase.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index e156433..01547db 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -27,7 +27,6 @@ #include "winbase.h" #include "winerror.h" #include "wingdi.h" -#include "winspool.h" #include "psdrv.h" #include "wine/debug.h" diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index fdc8a7c..78bdce9 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -25,9 +25,7 @@ #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "wingdi.h" -#include "winspool.h" #include "psdrv.h" #include "wine/debug.h" diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 0bc1537..4981b14 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -35,7 +35,6 @@ #include "winuser.h" #include "wownt32.h" -#include "winspool.h" #include "prsht.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 3fde02e..2d98abd 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -31,7 +31,6 @@ #endif #include "psdrv.h" #include "wine/debug.h" -#include "winspool.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index d52f6f9..e29bbc9 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -31,7 +31,6 @@ #include "winbase.h" #include "wine/debug.h" #include "psdrv.h" -#include "winspool.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 9f80693..a856bd4 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -30,7 +30,6 @@ #include "winbase.h" #include "wingdi.h" #include "psdrv.h" -#include "winspool.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index 59ac7c7..4422da4 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -23,10 +23,8 @@ #include <math.h> #include "windef.h" -#include "winbase.h" #include "wingdi.h" #include "psdrv.h" -#include "winspool.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index bc161f1..95534f8 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -29,9 +29,7 @@ #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "wingdi.h" -#include "winspool.h" #include "psdrv.h" #include "wine/debug.h" diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index 8c6b9b7..454d9b3 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -30,9 +30,7 @@ #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "wingdi.h" -#include "winspool.h" #include "psdrv.h" #include "wine/debug.h"

1 0

Alexandre Julliard : msxml3: Fixed compilation without libxml.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: e269fa378b6c9feb030bda4a695b806716bb3b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e269fa378b6c9feb030bda4a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 12:05:20 2007 +0200 msxml3: Fixed compilation without libxml. --- dlls/msxml3/msxml_private.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 3c6badb..2d574ff 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -57,6 +57,10 @@ extern BSTR bstr_from_xmlChar( const xmlChar *buf ); extern LONG xmldoc_add_ref( xmlDocPtr doc ); extern LONG xmldoc_release( xmlDocPtr doc ); + +extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); +extern HRESULT XMLElementCollection_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); + #endif extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, @@ -64,7 +68,5 @@ extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, B extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT SchemaCache_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); -extern HRESULT XMLElementCollection_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); #endif /* __MSXML_PRIVATE__ */

1 0

Andrew Talbot : msg711.acm: Constify some variables.
by Alexandre Julliard May 29, 2007

May 29, 2007

Module: wine Branch: master Commit: 231fa341353d0f4e19c057e845dbd12bb85aae1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=231fa341353d0f4e19c057e84… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 28 18:11:40 2007 +0100 msg711.acm: Constify some variables. --- dlls/msg711.acm/msg711.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index b53524f..c540b05 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -94,7 +94,7 @@ static const Format ULaw_Formats[] = /*********************************************************************** * G711_GetFormatIndex */ -static DWORD G711_GetFormatIndex(LPWAVEFORMATEX wfx) +static DWORD G711_GetFormatIndex(const WAVEFORMATEX *wfx) { int i, hi; const Format* fmts; @@ -983,7 +983,7 @@ static LRESULT G711_StreamClose(PACMDRVSTREAMINSTANCE adsi) * G711_StreamSize * */ -static LRESULT G711_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE adss) +static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSIZE adss) { switch (adss->fdwSize) {

1 0