January 2007 - Wine-Commits

Andrew Talbot : dplayx: Declare some functions static.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: f0763b91ab42d9625a6ff03197af991aada3365a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0763b91ab42d9625a6ff0319… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 6 19:31:56 2007 +0000 dplayx: Declare some functions static. --- dlls/dplayx/dplayx_global.c | 26 ++++++++++++++------------ dlls/dplayx/dplayx_global.h | 3 --- dlls/dplayx/dplobby.c | 8 ++++---- dlls/dplayx/name_server.c | 4 ++-- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 99e0d8e..28b462b 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -199,14 +199,16 @@ static DPSESSIONDESC2* sessionData = NUL /* static DPSESSIONDESC2* sessionData[ numSupportedSessions ]; */ /* Function prototypes */ -DWORD DPLAYX_SizeOfLobbyDataA( LPDPLCONNECTION lpDplData ); -DWORD DPLAYX_SizeOfLobbyDataW( LPDPLCONNECTION lpDplData ); -void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, LPDPLCONNECTION src ); -void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, LPDPLCONNECTION src ); -BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppId, LPDPLAYX_LOBBYDATA* dplData ); -void DPLAYX_InitializeLobbyDataEntry( LPDPLAYX_LOBBYDATA lpData ); -BOOL DPLAYX_CopyIntoSessionDesc2A( LPDPSESSIONDESC2 lpSessionDest, - LPCDPSESSIONDESC2 lpSessionSrc ); +static DWORD DPLAYX_SizeOfLobbyDataA( LPDPLCONNECTION lpDplData ); +static DWORD DPLAYX_SizeOfLobbyDataW( LPDPLCONNECTION lpDplData ); +static void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, LPDPLCONNECTION src ); +static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, LPDPLCONNECTION src ); +static BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppId, LPDPLAYX_LOBBYDATA* dplData ); +static void DPLAYX_InitializeLobbyDataEntry( LPDPLAYX_LOBBYDATA lpData ); +static BOOL DPLAYX_CopyIntoSessionDesc2A( LPDPSESSIONDESC2 lpSessionDest, + LPCDPSESSIONDESC2 lpSessionSrc ); +static BOOL DPLAYX_GetThisLobbyHandles( LPHANDLE lphStart, LPHANDLE lphDeath, + LPHANDLE lphConnRead, BOOL bClearSetHandles ); @@ -527,10 +529,10 @@ BOOL DPLAYX_SetLobbyHandles( DWORD dwApp return TRUE; } -BOOL DPLAYX_GetThisLobbyHandles( LPHANDLE lphStart, - LPHANDLE lphDeath, - LPHANDLE lphConnRead, - BOOL bClearSetHandles ) +static BOOL DPLAYX_GetThisLobbyHandles( LPHANDLE lphStart, + LPHANDLE lphDeath, + LPHANDLE lphConnRead, + BOOL bClearSetHandles ) { LPDPLAYX_LOBBYDATA lpLData; diff --git a/dlls/dplayx/dplayx_global.h b/dlls/dplayx/dplayx_global.h index ddc384b..d7f7e73 100644 --- a/dlls/dplayx/dplayx_global.h +++ b/dlls/dplayx/dplayx_global.h @@ -51,9 +51,6 @@ BOOL DPLAYX_AnyLobbiesWaitingForConnSett BOOL DPLAYX_SetLobbyHandles( DWORD dwAppID, HANDLE hStart, HANDLE hDeath, HANDLE hConnRead ); -BOOL DPLAYX_GetThisLobbyHandles( LPHANDLE lphStart, - LPHANDLE lphDeath, - LPHANDLE lphConnRead, BOOL bClearSetHandles ); LPDPSESSIONDESC2 DPLAYX_CopyAndAllocateLocalSession( UINT* index ); BOOL DPLAYX_CopyLocalSession( UINT* index, LPDPSESSIONDESC2 lpsd ); diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 73e3e6e..6a8cf6b 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -50,7 +50,7 @@ typedef struct IDirectPlayLobby3Impl IDi HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface ); -HRESULT DPL_CreateAddress( REFGUID guidSP, REFGUID guidDataType, LPCVOID lpData, DWORD dwDataSize, +static HRESULT DPL_CreateAddress( REFGUID guidSP, REFGUID guidDataType, LPCVOID lpData, DWORD dwDataSize, LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface ); @@ -62,7 +62,7 @@ static HRESULT WINAPI DPL_ConnectEx( IDi DWORD dwFlags, REFIID riid, LPVOID* lplpDP, IUnknown* pUnk ); -BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess, +static BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess, LPHANDLE lphStart, LPHANDLE lphDeath, LPHANDLE lphRead ); @@ -610,7 +610,7 @@ static HRESULT WINAPI IDirectPlayLobbyWI lpAddress, lpdwAddressSize, FALSE ); } -HRESULT DPL_CreateAddress( +static HRESULT DPL_CreateAddress( REFGUID guidSP, REFGUID guidDataType, LPCVOID lpData, @@ -1143,7 +1143,7 @@ static BOOL CALLBACK RunApplicationA_Enu return TRUE; /* Keep enumerating, haven't found the application yet */ } -BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess, +static BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess, LPHANDLE lphStart, LPHANDLE lphDeath, LPHANDLE lphRead ) { diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 86d333e..c731ea6 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -67,7 +67,7 @@ struct NSCache typedef struct NSCache NSCache, *lpNSCache; /* Function prototypes */ -DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData ); +static DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData ); /* Name Server functions * --------------------- @@ -245,7 +245,7 @@ HRESULT NS_SendSessionRequestBroadcast( } /* Delete a name server node which has been allocated on the heap */ -DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData ) +static DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData ) { /* NOTE: This proc doesn't deal with the walking pointer */

1 0

Andrew Talbot : dmstyle: Declare some functions static.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 482eebab9ab5717815d99fe0859bcc6a5a7de411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=482eebab9ab5717815d99fe08… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 6 19:29:10 2007 +0000 dmstyle: Declare some functions static. --- dlls/dmstyle/dmutils.c | 12 ++++++------ dlls/dmstyle/dmutils.h | 7 ------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 4d8f12f..c732b56 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -256,7 +256,7 @@ const char *debugstr_fourcc (DWORD fourc } /* DMUS_VERSION struct to string conversion for debug messages */ -const char *debugstr_dmversion (LPDMUS_VERSION version) { +static const char *debugstr_dmversion (LPDMUS_VERSION version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", HIWORD(version->dwVersionMS),LOWORD(version->dwVersionMS), @@ -264,7 +264,7 @@ const char *debugstr_dmversion (LPDMUS_V } /* month number into month name (for debugstr_filetime) */ -const char *debugstr_month (DWORD dwMonth) { +static const char *debugstr_month (DWORD dwMonth) { switch (dwMonth) { case 1: return "January"; case 2: return "February"; @@ -283,7 +283,7 @@ const char *debugstr_month (DWORD dwMont } /* FILETIME struct to string conversion for debug messages */ -const char *debugstr_filetime (LPFILETIME time) { +static const char *debugstr_filetime (LPFILETIME time) { SYSTEMTIME sysTime; if (!time) return "'null'"; @@ -646,7 +646,7 @@ const char* debugstr_flags (DWORD flags, } /* dump DMUS_OBJ flags */ -const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { +static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_OBJ_OBJECT), FE(DMUS_OBJ_CLASS), @@ -665,7 +665,7 @@ const char *debugstr_DMUS_OBJ_FLAGS (DWO } /* dump DMUS_CONTAINER flags */ -const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) { +static const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_CONTAINER_NOLOADS) }; @@ -673,7 +673,7 @@ const char *debugstr_DMUS_CONTAINER_FLAG } /* dump DMUS_CONTAINED_OBJF flags */ -const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { +static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_CONTAINED_OBJF_KEEP) }; diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h index 4d3292a..c932fbe 100644 --- a/dlls/dmstyle/dmutils.h +++ b/dlls/dmstyle/dmutils.h @@ -68,10 +68,6 @@ extern BOOL IS_VALID_DMFORM (FOURCC chun extern const char *resolve_STREAM_SEEK (DWORD flag); /* FOURCC to string conversion for debug messages */ extern const char *debugstr_fourcc (DWORD fourcc); -/* DMUS_VERSION struct to string conversion for debug messages */ -extern const char *debugstr_dmversion (LPDMUS_VERSION version); -/* FILETIME struct to string conversion for debug messages */ -extern const char *debugstr_filetime (LPFILETIME time); /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id); /* returns name of given error code */ @@ -79,9 +75,6 @@ extern const char *debugstr_dmreturn (DW /* generic flags-dumping function */ extern const char *debugstr_flags (DWORD flags, const flag_info* names, size_t num_names); -extern const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask); -extern const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask); -extern const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask); /* dump whole DMUS_OBJECTDESC struct */ extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); extern void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc);

1 0

Andrew Talbot : dnsapi: Declare some items static.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 906c0cac177b5f459172eb40cfb6ec2195806a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=906c0cac177b5f459172eb40c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jan 6 19:30:51 2007 +0000 dnsapi: Declare some items static. --- dlls/dnsapi/main.c | 2 +- dlls/dnsapi/ns_name.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 13f5ba6..10e3204 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -HINSTANCE hdnsapi; +static HINSTANCE hdnsapi; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { diff --git a/dlls/dnsapi/ns_name.c b/dlls/dnsapi/ns_name.c index 542ea1b..de5fbdb 100644 --- a/dlls/dnsapi/ns_name.c +++ b/dlls/dnsapi/ns_name.c @@ -54,7 +54,7 @@ static int printable(int); * The root is returned as "." * All other domains are returned in non absolute form */ -int +static int dns_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { const u_char *cp; char *dn, *eom; @@ -275,7 +275,7 @@ dns_ns_name_pton(const char *src, u_char * return: * -1 if it fails, or consumed octets if it succeeds. */ -int +static int dns_ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, u_char *dst, size_t dstsiz) {

1 0

Francois Gouget : mlang/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 7f0b93eabc9977624eb2029a9b56613bae5590b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0b93eabc9977624eb2029a9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:33:10 2007 +0100 mlang/tests: Replace some '#if 0's with 'if (0)'s. --- dlls/mlang/tests/mlang.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 3c871f7..69e8c50 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -399,12 +399,14 @@ static void test_EnumCodePages(IMultiLan "wszWebCharset mismatch"); #endif -#if 0 /* native mlang returns completely messed up encodings in some cases */ + if (0) + { + /* native mlang returns completely messed up encodings in some cases */ ok(mcsi.uiInternetEncoding == cpinfo[i].uiCodePage || mcsi.uiInternetEncoding == cpinfo[i].uiFamilyCodePage, "%u != %u || %u\n", mcsi.uiInternetEncoding, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); ok(mcsi.uiCodePage == cpinfo[i].uiCodePage || mcsi.uiCodePage == cpinfo[i].uiFamilyCodePage, "%u != %u || %u\n", mcsi.uiCodePage, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); -#endif + } } ret = IMultiLanguage2_GetCharsetInfo(iML2, cpinfo[i].wszHeaderCharset, &mcsi); @@ -423,12 +425,14 @@ static void test_EnumCodePages(IMultiLan "wszHeaderCharset mismatch"); #endif -#if 0 /* native mlang returns completely messed up encodings in some cases */ + if (0) + { + /* native mlang returns completely messed up encodings in some cases */ ok(mcsi.uiInternetEncoding == cpinfo[i].uiCodePage || mcsi.uiInternetEncoding == cpinfo[i].uiFamilyCodePage, "%u != %u || %u\n", mcsi.uiInternetEncoding, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); ok(mcsi.uiCodePage == cpinfo[i].uiCodePage || mcsi.uiCodePage == cpinfo[i].uiFamilyCodePage, "%u != %u || %u\n", mcsi.uiCodePage, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); -#endif + } } ret = IMultiLanguage2_GetCharsetInfo(iML2, cpinfo[i].wszBodyCharset, &mcsi); @@ -447,12 +451,14 @@ static void test_EnumCodePages(IMultiLan "wszBodyCharset mismatch"); #endif -#if 0 /* native mlang returns completely messed up encodings in some cases */ + if (0) + { + /* native mlang returns completely messed up encodings in some cases */ ok(mcsi.uiInternetEncoding == cpinfo[i].uiCodePage || mcsi.uiInternetEncoding == cpinfo[i].uiFamilyCodePage, "%u != %u || %u\n", mcsi.uiInternetEncoding, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); ok(mcsi.uiCodePage == cpinfo[i].uiCodePage || mcsi.uiCodePage == cpinfo[i].uiFamilyCodePage, "%u != %u || %u\n", mcsi.uiCodePage, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); -#endif + } } trace("---\n"); @@ -470,13 +476,14 @@ static void test_EnumCodePages(IMultiLan ok(n == 1 && ret == S_OK, "IEnumCodePage_Next: expected 1/S_OK, got %u/%08x\n", n, ret); cpinfo_cmp(&cpinfo[0], &cpinfo2); -#if 0 + if (0) + { /* Due to a bug in MS' implementation of IEnumCodePage_Skip * it's not used here. */ ret = IEnumCodePage_Skip(iEnumCP, 1); ok(ret == S_OK, "IEnumCodePage_Skip: expected S_OK, got %08x\n", ret); -#endif + } for (i = 0; i < total - 1; i++) { n = 0; @@ -589,13 +596,14 @@ static void test_EnumScripts(IMultiLangu ok(n == 1 && ret == S_OK, "IEnumScript_Next: expected 1/S_OK, got %u/%08x\n", n, ret); scriptinfo_cmp(&sinfo[0], &sinfo2); -#if 0 + if (0) + { /* Due to a bug in MS' implementation of IEnumScript_Skip * it's not used here. */ ret = IEnumScript_Skip(iEnumScript, 1); ok(ret == S_OK, "IEnumScript_Skip: expected S_OK, got %08x\n", ret); -#endif + } for (i = 0; i < total - 1; i++) { n = 0;

1 0

Francois Gouget : mshtml/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: ebe52bf5355cd9cc3481b62ac507362087572b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe52bf5355cd9cc3481b62ac… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:33:19 2007 +0100 mshtml/tests: Replace some '#if 0's with 'if (0)'s. Fix the code so it compiles without warnings. --- dlls/mshtml/tests/protocol.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 2cb50d2..a76791d 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -307,27 +307,29 @@ static void test_res_protocol(void) ok(buf[0] == '?', "buf changed\n"); ok(size == sizeof(wrong_url1)/sizeof(WCHAR), "size=%d\n", size); -#if 0 /* Crashes on win9x */ + if (0) + { + /* Crashes on win9x */ size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); - ok(hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); + ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == 1, "size=%ld, ezpected 1\n", size); + ok(size == 1, "size=%u, ezpected 1\n", size); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), NULL, 0); - ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); + ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), NULL, 0); - ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); + ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); -#endif + } buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_UNESCAPE+1, 0, buf, @@ -499,27 +501,29 @@ static void test_about_protocol(void) ok(buf[0] == '?', "buf changed\n"); ok(size == sizeof(blank_url)/sizeof(WCHAR), "size=%d\n", size); -#if 0 /* Crashes on win9x */ + if (0) + { + /* Crashes on win9x */ size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); - ok(hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); + ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == 1, "size=%ld, ezpected 1\n", size); + ok(size == 1, "size=%u, ezpected 1\n", size); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), NULL, 0); - ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); + ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), NULL, 0); - ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); + ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); -#endif + } hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_UNESCAPE+1, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0);

1 0

Francois Gouget : kernel32/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 9299c4985e117084779c7e3e4ee2a3aff1873b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9299c4985e117084779c7e3e4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:32:56 2007 +0100 kernel32/tests: Replace some '#if 0's with 'if (0)'s. Fix the code so it compiles without warnings. --- dlls/kernel32/tests/console.c | 5 ++--- dlls/kernel32/tests/file.c | 14 ++++++++------ dlls/kernel32/tests/path.c | 13 +++++-------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 3bcb872..abd42bd 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -532,9 +532,8 @@ static void testCtrlHandler(void) mch_event = CreateEventA(NULL, TRUE, FALSE, NULL); mch_count = 0; ok(GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0), "Couldn't send ctrl-c event\n"); -#if 0 /* FIXME: it isn't synchronous on wine but it can still happen before we test */ - todo_wine ok(mch_count == 1, "Event isn't synchronous\n"); -#endif + /* FIXME: it isn't synchronous on wine but it can still happen before we test */ + if (0) ok(mch_count == 1, "Event isn't synchronous\n"); ok(WaitForSingleObject(mch_event, 3000) == WAIT_OBJECT_0, "event sending didn't work\n"); CloseHandle(mch_event); diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 5b86d3c..7eecec6 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -693,12 +693,14 @@ static void test_CreateFileW(void) ret = DeleteFileW(filename); ok(ret, "DeleteFileW: error %d\n", GetLastError()); -#if 0 /* this test crashes on NT4.0 */ - hFile = CreateFileW(NULL, GENERIC_READ, 0, NULL, - CREATE_NEW, FILE_FLAG_RANDOM_ACCESS, 0); - ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND, - "CreateFileW(NULL) returned ret=%p error=%ld\n",hFile,GetLastError()); -#endif + if (0) + { + /* this crashes on NT4.0 */ + hFile = CreateFileW(NULL, GENERIC_READ, 0, NULL, + CREATE_NEW, FILE_FLAG_RANDOM_ACCESS, 0); + ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND, + "CreateFileW(NULL) returned ret=%p error=%u\n",hFile,GetLastError()); + } hFile = CreateFileW(emptyW, GENERIC_READ, 0, NULL, CREATE_NEW, FILE_FLAG_RANDOM_ACCESS, 0); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 25f5c1b..9212165 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -964,10 +964,9 @@ static void test_GetSystemDirectory(void ok(res > 0, "returned %d with %d (expected '>0')\n", res, GetLastError()); total = res; -#if 0 - /* this test crash on XP */ - res = GetSystemDirectory(NULL, total); -#endif + + /* this crashes on XP */ + if (0) res = GetSystemDirectory(NULL, total); SetLastError(0xdeadbeef); res = GetSystemDirectory(NULL, total-1); @@ -1024,10 +1023,8 @@ static void test_GetWindowsDirectory(voi ok(res > 0, "returned %d with %d (expected '>0')\n", res, GetLastError()); total = res; -#if 0 - /* this test crash on XP */ - res = GetWindowsDirectory(NULL, total); -#endif + /* this crashes on XP */ + if (0) res = GetWindowsDirectory(NULL, total); SetLastError(0xdeadbeef); res = GetWindowsDirectory(NULL, total-1);

1 0

Francois Gouget : gdi32/tests: Replace an '#if 0' with an 'if (0)'.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 7a76ae1a650cf6ee4c4556e89e3f77a62de1289b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a76ae1a650cf6ee4c4556e89… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:32:23 2007 +0100 gdi32/tests: Replace an '#if 0' with an 'if (0)'. --- dlls/gdi32/tests/font.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cc8325e..e18bffe 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -668,10 +668,9 @@ todo_wine { kd[i].otmMacAscent, otm.otmMacAscent); ok(kd[i].otmMacDescent == otm.otmMacDescent, "expected %d, got %d\n", kd[i].otmMacDescent, otm.otmMacDescent); -#if 0 /* this one succeeds due to expected 0, enable it when removing todo */ - ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", + /* FIXME: this one sometimes succeeds due to expected 0, enable it when removing todo */ + if (0) ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", kd[i].otmMacLineGap, otm.otmMacLineGap); -#endif ok(kd[i].otmusMinimumPPEM == otm.otmusMinimumPPEM, "expected %u, got %u\n", kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM); }

1 0

Francois Gouget : ntdll/tests: Replace an '#if 0' with an 'if (0)'.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 97422b1576acdc041bbfb84dc746e4fca8b3f25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97422b1576acdc041bbfb84dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:31:36 2007 +0100 ntdll/tests: Replace an '#if 0' with an 'if (0)'. Fix the code so it compiles without warnings. --- dlls/ntdll/tests/reg.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 262e33f..e21e68c 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -301,16 +301,18 @@ static void test_NtOpenKey(void) OBJECT_ATTRIBUTES attr; ACCESS_MASK am = KEY_READ; -#if 0 /* Crashes Wine */ + if (0) + { + /* Crashes Wine */ /* All NULL */ status = pNtOpenKey(NULL, 0, NULL); - ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08lx\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status); /* NULL attributes */ status = pNtOpenKey(&key, 0, NULL); ok(status == STATUS_ACCESS_VIOLATION /* W2K3/XP/W2K */ || status == STATUS_INVALID_PARAMETER /* NT4 */, - "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08lx\n", status); -#endif + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08x\n", status); + } InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);

1 0

Francois Gouget : d3d9/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 3ba0e7b01b0d7a6596bc8db667c27448dfcc3656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba0e7b01b0d7a6596bc8db66… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:31:20 2007 +0100 d3d9/tests: Replace some '#if 0's with 'if (0)'s. --- dlls/d3d9/tests/surface.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 84ad723..c76a358 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -135,12 +135,10 @@ static void test_surface_alignment(IDire hr = IDirect3DSurface9_LockRect(surface_ptr, &lockedRect, NULL, 0); ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned %08x\n", hr); ok(!(lockedRect.Pitch & 3), "Surface pitch %d is not 32-bit aligned\n", lockedRect.Pitch); -#if 0 /* Some applications also depend on the exact pitch, rather than just * the alignment. However, this test will fail or succeed depending * on the NP2 mode we're using. */ - ok(lockedRect.Pitch == 12, "Got pitch %d, expected 12\n", lockedRect.Pitch); -#endif + if (0) ok(lockedRect.Pitch == 12, "Got pitch %d, expected 12\n", lockedRect.Pitch); hr = IDirect3DSurface9_UnlockRect(surface_ptr); IDirect3DSurface9_Release(surface_ptr); }

1 0

Francois Gouget : crypt32/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 4bc31a962a37257c5a9ef9b36d10dfda460e3eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc31a962a37257c5a9ef9b36… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:31:10 2007 +0100 crypt32/tests: Replace some '#if 0's with 'if (0)'s. --- dlls/crypt32/tests/encode.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 20c646a..23f0553 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -199,7 +199,7 @@ static void test_decodeInt(DWORD dwEncod static const BYTE bigInt[] = { 2, 5, 0xff, 0xfe, 0xff, 0xfe, 0xff }; static const BYTE testStr[] = { 0x16, 4, 't', 'e', 's', 't' }; static const BYTE longForm[] = { 2, 0x81, 0x01, 0x01 }; - /* static const BYTE bigBogus[] = { 0x02, 0x84, 0x01, 0xff, 0xff, 0xf9 }; */ + static const BYTE bigBogus[] = { 0x02, 0x84, 0x01, 0xff, 0xff, 0xf9 }; BYTE *buf = NULL; DWORD bufSize = 0; int i; @@ -324,12 +324,14 @@ static void test_decodeInt(DWORD dwEncod /* This will try to decode the buffer and overflow it, check that it's * caught. */ -#if 0 /* a large buffer isn't guaranteed to crash, it depends on memory allocation order */ + if (0) + { + /* a large buffer isn't guaranteed to crash, it depends on memory allocation order */ ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, bigBogus, 0x01ffffff, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); -#endif + } } static const BYTE bin18[] = {0x0a,0x01,0x01};

1 0