October 2010 - Wine-Commits

Alexandre Julliard : advapi32/tests: Make function pointers static and remove redundant typedefs.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 53d810c9ad3425267a61ab6748318a0b0ea30805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d810c9ad3425267a61ab674… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:33:37 2010 +0200 advapi32/tests: Make function pointers static and remove redundant typedefs. --- dlls/advapi32/tests/crypt_lmhash.c | 84 +++++++++++++------------------ dlls/advapi32/tests/crypt_md4.c | 24 ++++----- dlls/advapi32/tests/crypt_md5.c | 16 ++---- dlls/advapi32/tests/security.c | 96 +++++++++++++----------------------- 4 files changed, 87 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53d810c9ad3425267a61a…

1 0

Alexandre Julliard : d3d9/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: c1b1b6f184facf00eae2570d6814f3fad8c45097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b1b6f184facf00eae2570d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:36:20 2010 +0200 d3d9/tests: Make some variables static. --- dlls/d3d9/tests/device.c | 8 ++++---- dlls/d3d9/tests/visual.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ba25760..41718f8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2069,7 +2069,7 @@ struct formats { BOOL shouldPass; }; -struct formats r5g6b5_format_list[] = +static const struct formats r5g6b5_format_list[] = { { D3DFMT_R5G6B5, D3DFMT_R5G6B5, TRUE }, { D3DFMT_R5G6B5, D3DFMT_X1R5G5B5, FALSE }, @@ -2079,7 +2079,7 @@ struct formats r5g6b5_format_list[] = { 0, 0, 0} }; -struct formats x1r5g5b5_format_list[] = +static const struct formats x1r5g5b5_format_list[] = { { D3DFMT_X1R5G5B5, D3DFMT_R5G6B5, FALSE }, { D3DFMT_X1R5G5B5, D3DFMT_X1R5G5B5, TRUE }, @@ -2096,7 +2096,7 @@ struct formats x1r5g5b5_format_list[] = { 0, 0, 0} }; -struct formats x8r8g8b8_format_list[] = +static const struct formats x8r8g8b8_format_list[] = { { D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, FALSE }, { D3DFMT_X8R8G8B8, D3DFMT_X1R5G5B5, FALSE }, @@ -2347,7 +2347,7 @@ fail: } static HWND filter_messages; -struct +static struct { HWND window; UINT message; diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 32d73fd..e25fc34 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8819,7 +8819,7 @@ struct formats { DWORD resultColorNoBlending; }; -const struct formats test_formats[] = { +static const struct formats test_formats[] = { { "D3DFMT_G16R16", D3DFMT_G16R16, 0x001818ff, 0x002010ff}, { "D3DFMT_R16F", D3DFMT_R16F, 0x0018ffff, 0x0020ffff }, { "D3DFMT_G16R16F", D3DFMT_G16R16F, 0x001818ff, 0x002010ff },

1 0

Alexandre Julliard : comctl32/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 55676e84ed26d68e1ed5c59764e0f21e10983795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55676e84ed26d68e1ed5c5976… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:35:49 2010 +0200 comctl32/tests: Make some variables static. --- dlls/comctl32/tests/rebar.c | 10 +++++----- dlls/comctl32/tests/trackbar.c | 2 +- dlls/comctl32/tests/treeview.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index d5f27b9..98fd4e5 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -30,7 +30,7 @@ #include "wine/test.h" -RECT height_change_notify_rect; +static RECT height_change_notify_rect; static HWND hMainWnd; @@ -182,7 +182,7 @@ typedef struct { rbband_result_t bands[50]; } rbsize_result_t; -rbsize_result_t rbsize_results[] = { +static const rbsize_result_t rbsize_results[] = { { {0, 0, 672, 0}, 0, 0, {0, }, 0, {{{0, 0, 0, 0}, 0, 0}, }, }, { {0, 0, 672, 4}, 4, 1, {4, }, 1, { @@ -299,7 +299,7 @@ static int rbsize_numtests = 0; RECT rc; \ REBARBANDINFO rbi; \ int count, i/*, mask=(todomask)*/; \ - rbsize_result_t *res = &rbsize_results[rbsize_numtests]; \ + const rbsize_result_t *res = &rbsize_results[rbsize_numtests]; \ assert(rbsize_numtests < sizeof(rbsize_results)/sizeof(rbsize_results[0])); \ GetClientRect(hRebar, &rc); \ check_rect("client", rc, res->rcClient); \ @@ -547,7 +547,7 @@ typedef struct { BOOL heightNotify; } rbresize_test_result_t; -rbresize_test_result_t resize_results[] = { +static const rbresize_test_result_t resize_results[] = { /* style 00000001 */ {{0, 2, 672, 2}, 0, FALSE}, {{0, 2, 672, 22}, 1, TRUE}, @@ -673,7 +673,7 @@ static int resize_numtests = 0; #define comment(fmt, arg1) #define check_client() { \ RECT r; \ - rbresize_test_result_t *res = &resize_results[resize_numtests++]; \ + const rbresize_test_result_t *res = &resize_results[resize_numtests++]; \ assert(resize_numtests <= sizeof(resize_results)/sizeof(resize_results[0])); \ GetWindowRect(hRebar, &r); \ MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); \ diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 68261d8..ac67d50 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -30,7 +30,7 @@ #define PARENT_SEQ_INDEX 0 #define TRACKBAR_SEQ_INDEX 1 -HWND hWndParent; +static HWND hWndParent; static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 572ec9b..906a12d 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -33,7 +33,7 @@ #include "v6util.h" #include "msg.h" -const char *TEST_CALLBACK_TEXT = "callback_text"; +static const char *TEST_CALLBACK_TEXT = "callback_text"; #define NUM_MSG_SEQUENCES 2 #define TREEVIEW_SEQ_INDEX 0

1 0

Alexandre Julliard : crypt32/tests: Make some variables static.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: d7bd274eed6cf0b4e11ff82296032166878983bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7bd274eed6cf0b4e11ff8229… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 13:36:03 2010 +0200 crypt32/tests: Make some variables static. --- dlls/crypt32/tests/base64.c | 19 +++++++------------ dlls/crypt32/tests/encode.c | 4 ++-- dlls/crypt32/tests/main.c | 2 +- dlls/crypt32/tests/str.c | 8 ++++---- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 5a260ed..dd85be4 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -40,15 +40,12 @@ #define X509_HEADER_NOCR "-----BEGIN X509 CRL-----\n" #define X509_TRAILER_NOCR "-----END X509 CRL-----\n" -typedef BOOL (WINAPI *CryptBinaryToStringAFunc)(const BYTE *pbBinary, +static BOOL (WINAPI *pCryptBinaryToStringA)(const BYTE *pbBinary, DWORD cbBinary, DWORD dwFlags, LPSTR pszString, DWORD *pcchString); -typedef BOOL (WINAPI *CryptStringToBinaryAFunc)(LPCSTR pszString, +static BOOL (WINAPI *pCryptStringToBinaryA)(LPCSTR pszString, DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags); -CryptBinaryToStringAFunc pCryptBinaryToStringA; -CryptStringToBinaryAFunc pCryptStringToBinaryA; - struct BinTests { const BYTE *toEncode; @@ -64,7 +61,7 @@ static const BYTE toEncode4[] = "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890" "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890"; -struct BinTests tests[] = { +static const struct BinTests tests[] = { { toEncode1, sizeof(toEncode1), "AA==\r\n", }, { toEncode2, sizeof(toEncode2), "AQI=\r\n", }, /* { toEncode3, sizeof(toEncode3), "AQID\r\n", }, This test fails on Vista. */ @@ -76,7 +73,7 @@ struct BinTests tests[] = { "SElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0NTY3ODkwAA==\r\n" }, }; -struct BinTests testsNoCR[] = { +static const struct BinTests testsNoCR[] = { { toEncode1, sizeof(toEncode1), "AA==\n", }, { toEncode2, sizeof(toEncode2), "AQI=\n", }, /* { toEncode3, sizeof(toEncode3), "AQID\n", }, This test fails on Vista. */ @@ -306,7 +303,7 @@ struct BadString DWORD format; }; -struct BadString badStrings[] = { +static const struct BadString badStrings[] = { { "A\r\nA\r\n=\r\n=\r\n", CRYPT_STRING_BASE64 }, { "AA\r\n=\r\n=\r\n", CRYPT_STRING_BASE64 }, { "AA=\r\n=\r\n", CRYPT_STRING_BASE64 }, @@ -441,10 +438,8 @@ START_TEST(base64) { HMODULE lib = GetModuleHandleA("crypt32"); - pCryptBinaryToStringA = (CryptBinaryToStringAFunc)GetProcAddress(lib, - "CryptBinaryToStringA"); - pCryptStringToBinaryA = (CryptStringToBinaryAFunc)GetProcAddress(lib, - "CryptStringToBinaryA"); + pCryptBinaryToStringA = (void *)GetProcAddress(lib, "CryptBinaryToStringA"); + pCryptStringToBinaryA = (void *)GetProcAddress(lib, "CryptStringToBinaryA"); if (pCryptBinaryToStringA) testBinaryToStringA(); diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index cc59a59..214e170 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2356,7 +2356,7 @@ struct EncodedRSAPubKey size_t decodedModulusLen; }; -struct EncodedRSAPubKey rsaPubKeys[] = { +static const struct EncodedRSAPubKey rsaPubKeys[] = { { modulus1, sizeof(modulus1), mod1_encoded, sizeof(modulus1) }, { modulus2, sizeof(modulus2), mod2_encoded, 5 }, { modulus3, sizeof(modulus3), mod3_encoded, 5 }, @@ -7137,7 +7137,7 @@ static CERT_GENERAL_SUBTREE IPAddressWithMinSubtree = { static CERT_GENERAL_SUBTREE IPAddressWithMinMaxSubtree = { { CERT_ALT_NAME_IP_ADDRESS, { 0 } }, 5, TRUE, 3 }; -struct EncodedNameConstraints encodedNameConstraints[] = { +static const struct EncodedNameConstraints encodedNameConstraints[] = { { { sizeof(emptySequence), (LPBYTE)emptySequence }, { 0 } }, { { sizeof(emptyDNSPermittedConstraints), emptyDNSPermittedConstraints }, { 1, &emptyDNSSubtree, 0, NULL } }, diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 7c11e8e..410f9a9 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -28,7 +28,7 @@ #include "wine/test.h" -HMODULE hCrypt; +static HMODULE hCrypt; static void test_findAttribute(void) { diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index ebc3342..afc8544 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -191,7 +191,7 @@ typedef BOOL (WINAPI *CertStrToNameWFunc)(DWORD dwCertEncodingType, LPCWSTR pszX500, DWORD dwStrType, void *pvReserved, BYTE *pbEncoded, DWORD *pcbEncoded, LPCWSTR *ppszError); -HMODULE dll; +static HMODULE dll; static CertNameToStrAFunc pCertNameToStrA; static CertNameToStrWFunc pCertNameToStrW; static CryptDecodeObjectFunc pCryptDecodeObject; @@ -470,7 +470,7 @@ struct StrToNameA const BYTE *encoded; }; -const BYTE encodedSimpleCN[] = { +static const BYTE encodedSimpleCN[] = { 0x30,0x0c,0x31,0x0a,0x30,0x08,0x06,0x03,0x55,0x04,0x03,0x13,0x01,0x31 }; static const BYTE encodedSingleQuotedCN[] = { 0x30,0x0e,0x31,0x0c,0x30,0x0a, 0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x27,0x31,0x27 }; @@ -481,7 +481,7 @@ static const BYTE encodedQuotedCN[] = { 0x30,0x11,0x31,0x0f,0x30,0x0d,0x06,0x03, static const BYTE encodedMultipleAttrCN[] = { 0x30,0x0e,0x31,0x0c,0x30,0x0a, 0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x31,0x2b,0x32 }; -struct StrToNameA namesA[] = { +static const struct StrToNameA namesA[] = { { "CN=1", sizeof(encodedSimpleCN), encodedSimpleCN }, { "CN=\"1\"", sizeof(encodedSimpleCN), encodedSimpleCN }, { "CN = \"1\"", sizeof(encodedSimpleCN), encodedSimpleCN }, @@ -562,7 +562,7 @@ static const WCHAR japaneseCN_W[] = { 'C','N','=',0x226f,0x575b,0 }; static const BYTE encodedJapaneseCN[] = { 0x30,0x0f,0x31,0x0d,0x30,0x0b,0x06, 0x03,0x55,0x04,0x03,0x1e,0x04,0x22,0x6f,0x57,0x5b }; -struct StrToNameW namesW[] = { +static const struct StrToNameW namesW[] = { { simpleCN_W, sizeof(encodedSimpleCN), encodedSimpleCN }, { simpleCN2_W, sizeof(encodedSimpleCN), encodedSimpleCN }, { simpleCN3_W, sizeof(encodedSimpleCN), encodedSimpleCN },

1 0