December 2006 - Wine-commits

Francois Gouget : shlwapi/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: c1e7d16f4026b230b01fe4b026cde01974b764c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1e7d16f4026b230b01fe4b02… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 14 18:10:39 2006 +0100 shlwapi/tests: Replace some '#if 0's with 'if (0)'s. --- dlls/shlwapi/tests/clist.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index a4a55a1..e6e4b05 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -369,9 +369,10 @@ static void test_CList(void) /* The call succeeds but the item is not inserted, except on some early * versions which return failure. Wine behaves like later versions. */ -#if 0 + if (0) + { ok(hRet == S_OK, "failed bad element size\n"); -#endif + } inserted = pSHLWAPI_22(list, 33); ok(inserted == NULL, "inserted bad element size\n"); @@ -380,9 +381,10 @@ static void test_CList(void) inserted->ulId = ~0U; hRet = pSHLWAPI_20(&list, inserted); /* See comment above, some early versions fail this call */ -#if 0 + if (0) + { ok(hRet == S_OK, "failed adding a container\n"); -#endif + } item = SHLWAPI_CLIST_items; /* Look for nonexistent item in populated list */

1 0

Francois Gouget : version/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 65921ad1af9ef460ced5ba8588fc8450cd8f6141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65921ad1af9ef460ced5ba858… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 14 18:10:59 2006 +0100 version/tests: Replace some '#if 0's with 'if (0)'s. Fix the code so it compiles without warnings. --- dlls/version/tests/info.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index c71ecc6..5eafa49 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -199,17 +199,18 @@ static void test_info(void) if (pVersionInfo == 0) return; -#if 0 + if (0) + { /* this test crashes on WinNT4 */ boolret = GetFileVersionInfoA( "kernel32.dll", 0, retval, 0); - ok (!boolret, "GetFileVersionInfoA should have failed: GetLastError = 0x%08lx\n", GetLastError()); + ok (!boolret, "GetFileVersionInfoA should have failed: GetLastError = %d\n", GetLastError()); ok ((GetLastError() == ERROR_INVALID_DATA) || (GetLastError() == ERROR_BAD_PATHNAME) || (GetLastError() == NO_ERROR), "Last error wrong! ERROR_INVALID_DATA/ERROR_BAD_PATHNAME (ME)/" - "NO_ERROR (95) expected, got 0x%08lx\n", + "NO_ERROR (95) expected, got 0x%08x\n", GetLastError()); -#endif + } boolret = GetFileVersionInfoA( "kernel32.dll", 0, retval, pVersionInfo ); ok (boolret, "GetFileVersionInfoA failed: GetLastError = 0x%08x\n", GetLastError()); @@ -228,12 +229,13 @@ static void test_info(void) trace("kernel32.dll version: %s\n", VersionString); -#if 0 + if (0) + { /* this test crashes on WinNT4 */ boolret = VerQueryValueA( pVersionInfo, "\\", (LPVOID *)&pFixedVersionInfo, 0); - ok (boolret, "VerQueryValue failed: GetLastError = 0x%08lx\n", GetLastError()); -#endif + ok (boolret, "VerQueryValue failed: GetLastError = 0x%08x\n", GetLastError()); + } cleanup: HeapFree( GetProcessHeap(), 0, pVersionInfo);

1 0

Francois Gouget : user32/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 1d4aeae7aacdd190354898b90b68fbec8428c9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4aeae7aacdd190354898b90… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 14 18:10:47 2006 +0100 user32/tests: Replace some '#if 0's with 'if (0)'s. Fix the code so it compiles without warnings. --- dlls/user32/tests/class.c | 5 ++- dlls/user32/tests/clipboard.c | 5 ++- dlls/user32/tests/msg.c | 28 ++++++++++++++++---------- dlls/user32/tests/sysparams.c | 12 +++++++--- dlls/user32/tests/win.c | 42 +++++++++++++++++++++++++--------------- 5 files changed, 57 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d4aeae7aacdd19035489…

1 0

Francois Gouget : advapi32/tests: Replace an '#if 0' with an 'if (0)'.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: cbec9337e610e0ebeb30024ca97d2ca7f7b5c0e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbec9337e610e0ebeb30024ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 14 18:10:15 2006 +0100 advapi32/tests: Replace an '#if 0' with an 'if (0)'. --- dlls/advapi32/tests/crypt_md4.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/crypt_md4.c b/dlls/advapi32/tests/crypt_md4.c index f41a778..a114089 100644 --- a/dlls/advapi32/tests/crypt_md4.c +++ b/dlls/advapi32/tests/crypt_md4.c @@ -110,11 +110,12 @@ static void test_SystemFunction007(void) 0x56, 0xeb, 0x6b, 0x96, 0x55, 0xec, 0xcf, 0x0a }; WCHAR szFoo[] = {'f','o','o',0 }; -#if 0 - /* crashes */ + if (0) + { + /* crashes on Windows */ r = pSystemFunction007(NULL, NULL); ok( r == STATUS_UNSUCCESSFUL, "wrong error code\n"); -#endif + } str.Buffer = szFoo; str.Length = 4*sizeof(WCHAR);

1 0

Francois Gouget : localspl/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 94c88f1cfa7b1ad2d8e3110e214a5269a79fa2b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c88f1cfa7b1ad2d8e3110e2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 14 18:09:46 2006 +0100 localspl/tests: Replace some '#if 0's with 'if (0)'s. --- dlls/localspl/tests/localmon.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 00978e7..682d6f2 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -82,10 +82,11 @@ static void test_AddPort(void) /* moved to localui.dll since w2k */ if (!pAddPort) return; -#if 0 + if (0) + { /* NT4 crash on this test */ res = pAddPort(NULL, 0, NULL); -#endif + } /* Testing-Results (localmon.dll from NT4.0): - The Servername is ignored @@ -111,10 +112,11 @@ static void test_ConfigurePort(void) /* moved to localui.dll since w2k */ if (!pConfigurePort) return; -#if 0 + if (0) + { /* NT4 crash on this test */ res = pConfigurePort(NULL, 0, NULL); -#endif + } /* Testing-Results (localmon.dll from NT4.0): - Case of Portname is ignored @@ -151,10 +153,11 @@ static void test_DeletePort(void) /* moved to localui.dll since w2k */ if (!pDeletePort) return; -#if 0 + if (0) + { /* NT4 crash on this test */ res = pDeletePort(NULL, 0, NULL); -#endif + } /* Testing-Results (localmon.dll from NT4.0): - Case of Portname is ignored (returned '1' on Success) @@ -237,12 +240,13 @@ static void test_EnumPorts(void) "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError(), cbBuf, pcReturned); -#if 0 + if (0) + { /* The following tests crash this app with native localmon/localspl */ res = pEnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); res = pEnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); res = pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); -#endif + } /* The Servername is ignored */ pcbNeeded = 0xdeadbeef; @@ -300,11 +304,12 @@ static void test_XcvClosePort(void) if ((pXcvOpenPort == NULL) || (pXcvClosePort == NULL)) return; -#if 0 + if (0) + { /* crash with native localspl.dll (w2k+xp) */ res = pXcvClosePort(NULL); res = pXcvClosePort(INVALID_HANDLE_VALUE); -#endif + } SetLastError(0xdeadbeef); @@ -317,10 +322,11 @@ static void test_XcvClosePort(void) res = pXcvClosePort(hXcv); ok( res, "returned %d with 0x%x(expected '!= 0')\n", res, GetLastError()); -#if 0 + if (0) + { /* test for "Double Free": crash with native localspl.dll (w2k+xp) */ res = pXcvClosePort(hXcv); -#endif + } } } @@ -333,11 +339,12 @@ static void test_XcvOpenPort(void) if ((pXcvOpenPort == NULL) || (pXcvClosePort == NULL)) return; -#if 0 + if (0) + { /* crash with native localspl.dll (w2k+xp) */ res = pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv); res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL); -#endif + } /* The returned handle is the result from a previous "spoolss.dll,DllAllocSplMem" */

1 0

Francois Gouget : shell32: Replace numeric literals with the proper constant.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: df299b73059991c5a734835a78c77e0894028740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df299b73059991c5a734835a7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 14 18:00:12 2006 +0100 shell32: Replace numeric literals with the proper constant. --- dlls/shell32/shlexec.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index f49382a..0c3b5a4 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -342,7 +342,7 @@ static UINT_PTR SHELL_ExecuteW(const WCH { STARTUPINFOW startup; PROCESS_INFORMATION info; - UINT_PTR retval = 31; + UINT_PTR retval = SE_ERR_NOASSOC; UINT gcdret = 0; WCHAR curdir[MAX_PATH]; @@ -497,9 +497,9 @@ static UINT SHELL_FindExecutableByOperat WCHAR verb[MAX_PATH]; if (RegOpenKeyExW(HKEY_CLASSES_ROOT, filetype, 0, 0x02000000, &hkeyClass)) - return 31; /* default - 'No association was found' */ + return SE_ERR_NOASSOC; if (!HCR_GetDefaultVerbW(hkeyClass, lpOperation, verb, sizeof(verb))) - return 31; /* default - 'No association was found' */ + return SE_ERR_NOASSOC; RegCloseKey(hkeyClass); /* Looking for ...buffer\shell\<verb>\command */ @@ -543,7 +543,7 @@ static UINT SHELL_FindExecutableByOperat return 33; /* FIXME see SHELL_FindExecutable() */ } - return 31; /* default - 'No association was found' */ + return SE_ERR_NOASSOC; } /************************************************************************* @@ -571,7 +571,7 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath LONG filetypelen = sizeof(filetype); /* length of above */ WCHAR command[1024]; /* command from registry */ WCHAR wBuffer[256]; /* Used to GetProfileString */ - UINT retval = 31; /* default - 'No association was found' */ + UINT retval = SE_ERR_NOASSOC; WCHAR *tok; /* token pointer */ WCHAR xlpFile[256]; /* result of SearchPath */ DWORD attribs; /* file attributes */ @@ -622,8 +622,8 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath if (extension == NULL || extension[1]==0) { - WARN("Returning 31 - No association\n"); - return 31; /* no association */ + WARN("Returning SE_ERR_NOASSOC\n"); + return SE_ERR_NOASSOC; } /* Three places to check: */ @@ -790,7 +790,7 @@ static unsigned dde_connect(WCHAR* key, HSZ hszApp, hszTopic; HCONV hConv; HDDEDATA hDdeData; - unsigned ret = 31; + unsigned ret = SE_ERR_NOASSOC; BOOL unicode = !(GetVersion() & 0x80000000); strcpyW(endkey, wApplication); @@ -830,7 +830,7 @@ static unsigned dde_connect(WCHAR* key, static const WCHAR wIfexec[] = {'\\','i','f','e','x','e','c',0}; TRACE("Launching '%s'\n", debugstr_w(start)); ret = execfunc(start, env, TRUE, psei, psei_out); - if (ret < 32) + if (ret <= 32) { TRACE("Couldn't launch\n"); goto error; @@ -895,7 +895,7 @@ static UINT_PTR execute_from_key(LPWSTR { WCHAR cmd[256]; LONG cmdlen = sizeof(cmd); - UINT_PTR retval = 31; + UINT_PTR retval = SE_ERR_NOASSOC; TRACE("%s %s %s %s %s\n", debugstr_w(key), debugstr_w(lpFile), debugstr_w(env), debugstr_w(szCommandline), debugstr_w(executable_name)); @@ -1006,7 +1006,7 @@ HINSTANCE WINAPI FindExecutableA(LPCSTR */ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpResult) { - UINT_PTR retval = 31; /* default - 'No association was found' */ + UINT_PTR retval = SE_ERR_NOASSOC; WCHAR old_dir[1024]; TRACE("File %s, Dir %s\n", @@ -1311,7 +1311,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW WCHAR *env; WCHAR lpstrProtocol[256]; LPCWSTR lpFile; - UINT_PTR retval = 31; + UINT_PTR retval = SE_ERR_NOASSOC; WCHAR wcmd[1024]; WCHAR buffer[MAX_PATH]; BOOL done;

1 0

Francois Gouget : comctl32/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 15a7bcb364de19fc45cc51c8e52e320fff65b52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a7bcb364de19fc45cc51c8e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 14 18:09:38 2006 +0100 comctl32/tests: Replace some '#if 0's with 'if (0)'s. Fix the code so it compiles without warnings. --- dlls/comctl32/tests/mru.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index a58f4cc..182f10b 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -165,9 +165,11 @@ static void test_MRUListA(void) if (!pCreateMRUListA || !pFreeMRUList || !pAddMRUStringA) return; -#if 0 /* Create (NULL) - crashes native */ + if (0) + { + /* Create (NULL) - crashes native */ hMRU = pCreateMRUListA(NULL); -#endif + } /* Create (size too small) */ mruA.cbSize = sizeof(mruA) - 2; @@ -224,14 +226,15 @@ static void test_MRUListA(void) iRet, GetLastError()); /* Add (NULL string) */ -#if 0 + if (0) + { /* Some native versions crash when passed NULL or fail to SetLastError() */ SetLastError(0); iRet = pAddMRUStringA(hMRU, NULL); ok(iRet == 0 && GetLastError() == ERROR_INVALID_PARAMETER, - "AddMRUStringA(NULL str) expected 0,ERROR_INVALID_PARAMETER got %d,%ld\n", + "AddMRUStringA(NULL str) expected 0,ERROR_INVALID_PARAMETER got %d,%d\n", iRet, GetLastError()); -#endif + } /* Add 3 strings. Check the registry is correct after each add */ SetLastError(0);

1 0

Dmitry Timoshkov : secur32: Make some data const.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 098e82d81e52c1a36fe97837e8bbf0445e179261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098e82d81e52c1a36fe97837e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:47:50 2006 +0800 secur32: Make some data const. --- dlls/secur32/ntlm.c | 4 ++-- dlls/secur32/schannel.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 86d61cf..853edd1 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1634,7 +1634,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_De return ret; } -static SecurityFunctionTableA ntlmTableA = { +static const SecurityFunctionTableA ntlmTableA = { 1, NULL, /* EnumerateSecurityPackagesA */ ntlm_QueryCredentialsAttributesA, /* QueryCredentialsAttributesA */ @@ -1665,7 +1665,7 @@ static SecurityFunctionTableA ntlmTableA NULL, /* SetContextAttributesA */ }; -static SecurityFunctionTableW ntlmTableW = { +static const SecurityFunctionTableW ntlmTableW = { 1, NULL, /* EnumerateSecurityPackagesW */ ntlm_QueryCredentialsAttributesW, /* QueryCredentialsAttributesW */ diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index b4c1d57..a8f50b6 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -290,7 +290,7 @@ static SECURITY_STATUS SEC_ENTRY schan_I return ret; } -static SecurityFunctionTableA schanTableA = { +static const SecurityFunctionTableA schanTableA = { 1, NULL, /* EnumerateSecurityPackagesA */ schan_QueryCredentialsAttributesA, @@ -321,7 +321,7 @@ static SecurityFunctionTableA schanTable NULL, /* SetContextAttributesA */ }; -static SecurityFunctionTableW schanTableW = { +static const SecurityFunctionTableW schanTableW = { 1, NULL, /* EnumerateSecurityPackagesW */ schan_QueryCredentialsAttributesW,

1 0

Dmitry Timoshkov : rsaenh: Make some data const and static.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: c9842d2ca99023922d2d2c217d4998ccf9b2f883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9842d2ca99023922d2d2c217… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:47:41 2006 +0800 rsaenh: Make some data const and static. --- dlls/rsaenh/mpi.c | 19 ++++++++----------- dlls/rsaenh/rsaenh.c | 4 ++-- dlls/rsaenh/tomcrypt.h | 4 ---- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index b20f0dc..cd7e2f8 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -31,6 +31,14 @@ #include <stdarg.h> #include "tomcrypt.h" +/* Known optimal configurations + CPU /Compiler /MUL CUTOFF/SQR CUTOFF +------------------------------------------------------------- + Intel P4 Northwood /GCC v3.4.1 / 88/ 128/LTM 0.32 ;-) +*/ +static const int KARATSUBA_MUL_CUTOFF = 88, /* Min. number of digits before Karatsuba multiplication is used. */ + KARATSUBA_SQR_CUTOFF = 128; /* Min. number of digits before Karatsuba squaring is used. */ + /* computes the modular inverse via binary extended euclidean algorithm, * that is c = 1/a mod b * @@ -4409,14 +4417,3 @@ s_mp_sub (mp_int * a, mp_int * b, mp_int mp_clamp (c); return MP_OKAY; } - -/* Known optimal configurations - - CPU /Compiler /MUL CUTOFF/SQR CUTOFF -------------------------------------------------------------- - Intel P4 Northwood /GCC v3.4.1 / 88/ 128/LTM 0.32 ;-) - -*/ - -int KARATSUBA_MUL_CUTOFF = 88, /* Min. number of digits before Karatsuba multiplication is used. */ - KARATSUBA_SQR_CUTOFF = 128; /* Min. number of digits before Karatsuba squaring is used. */ diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index a87cb83..b78adc8 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -156,7 +156,7 @@ typedef struct tagKEYCONTAINER */ #define RSAENH_MAX_ENUMALGS 20 #define RSAENH_PCT1_SSL2_SSL3_TLS1 (CRYPT_FLAG_PCT1|CRYPT_FLAG_SSL2|CRYPT_FLAG_SSL3|CRYPT_FLAG_TLS1) -PROV_ENUMALGS_EX aProvEnumAlgsEx[4][RSAENH_MAX_ENUMALGS+1] = +static const PROV_ENUMALGS_EX aProvEnumAlgsEx[4][RSAENH_MAX_ENUMALGS+1] = { { {CALG_RC2, 40, 40, 56,0, 4,"RC2", 24,"RSA Data Security's RC2"}, @@ -395,7 +395,7 @@ static inline BOOL copy_param( * Failure: NULL (algid not supported) */ static inline const PROV_ENUMALGS_EX* get_algid_info(HCRYPTPROV hProv, ALG_ID algid) { - PROV_ENUMALGS_EX *iterator; + const PROV_ENUMALGS_EX *iterator; KEYCONTAINER *pKeyContainer; if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) { diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index efddd90..b2a2067 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -204,10 +204,6 @@ typedef ulong64 mp_word; typedef int mp_err; -/* you'll have to tune these... */ -extern int KARATSUBA_MUL_CUTOFF, - KARATSUBA_SQR_CUTOFF; - /* define this to use lower memory usage routines (exptmods mostly) */ /* #define MP_LOW_MEM */

1 0

Dmitry Timoshkov : wined3d: Make some data const.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 47ffd7ae956d2cd04d3d0558861e61157f79a36f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ffd7ae956d2cd04d3d05588… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:47:59 2006 +0800 wined3d: Make some data const. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/vertexdeclaration.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 75c22f5..b4aa371 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -187,7 +187,7 @@ void shader_generate_arb_declarations( max_constantsF, max_constantsF - 1); } -static const char* shift_tab[] = { +static const char * const shift_tab[] = { "dummy", /* 0 (none) */ "coefmul.x", /* 1 (x2) */ "coefmul.y", /* 2 (x4) */ @@ -361,7 +361,7 @@ static void vshader_program_add_param(SH IWineD3DVertexShaderImpl* This = (IWineD3DVertexShaderImpl*) arg->shader; /* oPos, oFog and oPts in D3D */ - static const char* hwrastout_reg_names[] = { "TMP_OUT", "TMP_FOG", "result.pointsize" }; + static const char * const hwrastout_reg_names[] = { "TMP_OUT", "TMP_FOG", "result.pointsize" }; DWORD reg = param & WINED3DSP_REGNUM_MASK; DWORD regtype = shader_get_regtype(param); diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index c1c162b..f87716a 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -502,7 +502,7 @@ void shader_dump_param( int input) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; - static const char* rastout_reg_names[] = { "oPos", "oFog", "oPts" }; + static const char * const rastout_reg_names[] = { "oPos", "oFog", "oPts" }; char swizzle_reg_chars[4]; DWORD reg = param & WINED3DSP_REGNUM_MASK; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 7dc33e0..a560084 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -149,7 +149,7 @@ static void init_materials(IWineD3DDevic } -static GLfloat invymat[16] = { +static const GLfloat invymat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b290f2f..dffc1aa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -481,7 +481,7 @@ static void shader_glsl_add_param( char *out_str); /** Used for opcode modifiers - They multiply the result by the specified amount */ -static const char* shift_glsl_tab[] = { +static const char * const shift_glsl_tab[] = { "", /* 0 (none) */ "2.0 * ", /* 1 (x2) */ "4.0 * ", /* 2 (x4) */ @@ -596,7 +596,7 @@ static void shader_glsl_get_register_nam SHADER_OPCODE_ARG* arg) { /* oPos, oFog and oPts in D3D */ - const char* hwrastout_reg_names[] = { "gl_Position", "gl_FogFragCoord", "gl_PointSize" }; + static const char * const hwrastout_reg_names[] = { "gl_Position", "gl_FogFragCoord", "gl_PointSize" }; DWORD reg = param & WINED3DSP_REGNUM_MASK; DWORD regtype = shader_get_regtype(param); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 865703d..1eb787a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -564,7 +564,7 @@ static HRESULT WINAPI IWineD3DSwapChainI } -IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = +const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = { /* IUnknown */ IWineD3DSwapChainImpl_QueryInterface, diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index a512e81..1789646 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -61,7 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); /** Vertex Shader Declaration 8 data types tokens */ #define MAX_VSHADER_DECL_TYPES 8 -static CONST char* VertexDecl8_DataTypes[] = { +static const char * const VertexDecl8_DataTypes[] = { "D3DVSDT_FLOAT1", "D3DVSDT_FLOAT2", "D3DVSDT_FLOAT3", @@ -73,7 +73,7 @@ static CONST char* VertexDecl8_DataTypes NULL }; -static CONST char* VertexDecl8_Registers[] = { +static const char * const VertexDecl8_Registers[] = { "D3DVSDE_POSITION", "D3DVSDE_BLENDWEIGHT", "D3DVSDE_BLENDINDICES", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aaa7de7..2f5e887 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1242,7 +1242,7 @@ typedef struct WineQueryOcclusionData { typedef struct IWineD3DSwapChainImpl { /*IUnknown part*/ - IWineD3DSwapChainVtbl *lpVtbl; + const IWineD3DSwapChainVtbl *lpVtbl; LONG ref; /* Note: Ref counting not required */ IUnknown *parent; @@ -1271,7 +1271,7 @@ typedef struct IWineD3DSwapChainImpl Drawable drawable; } IWineD3DSwapChainImpl; -extern IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl; +extern const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl; /***************************************************************************** * Utility function prototypes

1 0