October 2010 - Wine-commits

Dmitry Timoshkov : user32: FindWindow() should treat an empty title same way as NULL.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 2f0b9dd3bfa3820abd89846d45eb78578b627b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0b9dd3bfa3820abd89846d4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 19 14:22:53 2010 +0900 user32: FindWindow() should treat an empty title same way as NULL. --- dlls/user32/tests/win.c | 24 +++++++++++++++++++++--- dlls/user32/win.c | 9 ++++++++- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0acd704..80aad49 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6239,15 +6239,31 @@ static void test_rtl_layout(void) static void test_FindWindowEx(void) { - HWND found; + HWND hwnd, found; CHAR title[1]; + hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + title[0] = 0; found = FindWindowExA( 0, 0, "MainWindowClass", title ); ok( found == NULL, "expected a NULL hwnd\n" ); found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); - ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + + DestroyWindow( hwnd ); + + hwnd = CreateWindowExA( 0, "MainWindowClass", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + + found = FindWindowExA( 0, 0, "MainWindowClass", title ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + + DestroyWindow( hwnd ); + /* test behaviour with a window title that is an empty character */ found = FindWindowExA( 0, 0, "Shell_TrayWnd", title ); todo_wine @@ -6307,6 +6323,9 @@ START_TEST(win) hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); if (!hhook) win_skip( "Cannot set CBT hook, skipping some tests\n" ); + /* make sure that FindWindow tests are executed first */ + test_FindWindowEx(); + hwndMain = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, @@ -6374,7 +6393,6 @@ START_TEST(win) test_Expose(); test_layered_window(); - test_FindWindowEx(); test_SetForegroundWindow(hwndMain); test_shell_window(); test_handles( hwndMain ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 1b67329..f9b6be2 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1767,7 +1767,14 @@ HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR t { while (list[i]) { - if (GetWindowTextW( list[i], buffer, len + 1 ) && !strcmpiW( buffer, title )) break; + if (GetWindowTextW( list[i], buffer, len + 1 )) + { + if (!strcmpiW( buffer, title )) break; + } + else + { + if (!title[0]) break; + } i++; } }

1 0

Jacek Caban : wininet: Skip more tests on IE older than 6.0.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: fa5839399fdb2313e40ea3b7f022d69453782b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5839399fdb2313e40ea3b7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 19 10:44:03 2010 +0200 wininet: Skip more tests on IE older than 6.0. --- dlls/wininet/tests/ftp.c | 12 ++++++------ dlls/wininet/tests/http.c | 29 +++++++++++++++-------------- dlls/wininet/tests/internet.c | 6 ++++++ dlls/wininet/tests/url.c | 5 +++++ dlls/wininet/tests/urlcache.c | 6 ++++++ 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index df9c347..a483dc9 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -943,12 +943,6 @@ static void test_status_callbacks(HINTERNET hInternet) HINTERNET hFtp; BOOL ret; - if (!pInternetSetStatusCallbackA) - { - win_skip("InternetSetStatusCallbackA() is not available, skipping test\n"); - return; - } - cb = pInternetSetStatusCallbackA(hInternet, status_callback); ok(cb == NULL, "expected NULL got %p\n", cb); @@ -973,6 +967,12 @@ START_TEST(ftp) HANDLE hInternet, hFtp, hHttp; hWininet = GetModuleHandleA("wininet.dll"); + + if(!GetProcAddress(hWininet, "InternetGetCookieExW")) { + win_skip("Too old IE (older than 6.0)\n"); + return; + } + pFtpCommandA = (void*)GetProcAddress(hWininet, "FtpCommandA"); pInternetSetStatusCallbackA = (void*)GetProcAddress(hWininet, "InternetSetStatusCallbackA"); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d942ca4..7872297 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3151,22 +3151,23 @@ START_TEST(http) { HMODULE hdll; hdll = GetModuleHandleA("wininet.dll"); - pInternetSetStatusCallbackA = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackA"); - if (!pInternetSetStatusCallbackA) - skip("skipping the InternetReadFile tests\n"); - else - { - init_status_tests(); - InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]); - InternetReadFile_test(0, &test_data[0]); - first_connection_to_test_url = TRUE; - InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[1]); - InternetReadFile_test(0, &test_data[1]); - InternetReadFileExA_test(INTERNET_FLAG_ASYNC); - test_open_url_async(); - test_async_HttpSendRequestEx(); + if(!GetProcAddress(hdll, "InternetGetCookieExW")) { + win_skip("Too old IE (older than 6.0)\n"); + return; } + + pInternetSetStatusCallbackA = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackA"); + + init_status_tests(); + InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]); + InternetReadFile_test(0, &test_data[0]); + first_connection_to_test_url = TRUE; + InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[1]); + InternetReadFile_test(0, &test_data[1]); + InternetReadFileExA_test(INTERNET_FLAG_ASYNC); + test_open_url_async(); + test_async_HttpSendRequestEx(); InternetOpenRequest_test(); test_http_cache(); InternetOpenUrlA_test(); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 54fd229..a38e196 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1129,6 +1129,12 @@ START_TEST(internet) { HMODULE hdll; hdll = GetModuleHandleA("wininet.dll"); + + if(!GetProcAddress(hdll, "InternetGetCookieExW")) { + win_skip("Too old IE (older than 6.0)\n"); + return; + } + pCreateUrlCacheContainerA = (void*)GetProcAddress(hdll, "CreateUrlCacheContainerA"); pCreateUrlCacheContainerW = (void*)GetProcAddress(hdll, "CreateUrlCacheContainerW"); pInternetTimeFromSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeA"); diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 5e055ff..0a2079d 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -1103,6 +1103,11 @@ START_TEST(url) { int i; + if(!GetProcAddress(GetModuleHandleA("wininet.dll"), "InternetGetCookieExW")) { + win_skip("Too old IE (older than 6.0)\n"); + return; + } + for(i=0; i < sizeof(crack_url_tests)/sizeof(*crack_url_tests); i++) test_crack_url(crack_url_tests+i); diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 65e433c..630b5cc 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -311,6 +311,12 @@ START_TEST(urlcache) { HMODULE hdll; hdll = GetModuleHandleA("wininet.dll"); + + if(!GetProcAddress(hdll, "InternetGetCookieExW")) { + win_skip("Too old IE (older than 6.0)\n"); + return; + } + pDeleteUrlCacheEntryA = (void*)GetProcAddress(hdll, "DeleteUrlCacheEntryA"); pUnlockUrlCacheEntryFileA = (void*)GetProcAddress(hdll, "UnlockUrlCacheEntryFileA"); test_urlcacheA();

1 0

Hans Leidekker : msi: Compare strings without depending on thread locale.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: eaa57c5b7bdcc0fb5a2004a7e388ac5a1ed03ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa57c5b7bdcc0fb5a2004a7e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 19 11:27:44 2010 +0200 msi: Compare strings without depending on thread locale. --- dlls/msi/action.c | 54 ++++++++----- dlls/msi/appsearch.c | 8 +- dlls/msi/classes.c | 12 ++-- dlls/msi/cond.y | 54 ++++++++------ dlls/msi/create.c | 3 +- dlls/msi/custom.c | 2 +- dlls/msi/database.c | 14 ++-- dlls/msi/dialog.c | 38 +++++----- dlls/msi/events.c | 37 ++++----- dlls/msi/files.c | 2 +- dlls/msi/helpers.c | 20 +++--- dlls/msi/insert.c | 5 +- dlls/msi/install.c | 4 +- dlls/msi/media.c | 6 +- dlls/msi/msi.c | 138 +++++++++++++++++----------------- dlls/msi/msipriv.h | 2 + dlls/msi/msiquery.c | 4 +- dlls/msi/package.c | 2 +- dlls/msi/record.c | 3 +- dlls/msi/registry.c | 2 +- dlls/msi/source.c | 26 +++--- dlls/msi/sql.y | 2 +- dlls/msi/string.c | 4 +- dlls/msi/table.c | 72 +++++++++--------- dlls/msi/tests/db.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/package.c | 20 +++++ dlls/msi/where.c | 3 +- 27 files changed, 474 insertions(+), 248 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaa57c5b7bdcc0fb5a200…

1 0

Juan Lang : crypt32: Trace certificate chain verification parameters.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: ca7512d296754c2bb7630f7ad9aa4a38dcf806a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7512d296754c2bb7630f7ad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 7 05:52:57 2010 -0700 crypt32: Trace certificate chain verification parameters. --- dlls/crypt32/chain.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a813b64..af8f386 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2989,13 +2989,30 @@ static BYTE msTestPubKey2[] = { 0x71,0x9e,0x06,0xd9,0xbf,0xbb,0x31,0x69,0xa3,0xf6,0x30,0xa0,0x78,0x7b,0x18, 0xdd,0x50,0x4d,0x79,0x1e,0xeb,0x61,0xc1,0x02,0x03,0x01,0x00,0x01 }; +static void dump_authenticode_extra_chain_policy_para( + AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA *extraPara) +{ + if (extraPara) + { + TRACE_(chain)("cbSize = %d\n", extraPara->cbSize); + TRACE_(chain)("dwRegPolicySettings = %08x\n", + extraPara->dwRegPolicySettings); + TRACE_(chain)("pSignerInfo = %p\n", extraPara->pSignerInfo); + } +} + static BOOL WINAPI verify_authenticode_policy(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus) { BOOL ret = verify_base_policy(szPolicyOID, pChainContext, pPolicyPara, pPolicyStatus); + AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA *extraPara = NULL; + if (pPolicyPara) + extraPara = pPolicyPara->pvExtraPolicyPara; + if (TRACE_ON(chain)) + dump_authenticode_extra_chain_policy_para(extraPara); if (ret && pPolicyStatus->dwError == CERT_E_UNTRUSTEDROOT) { CERT_PUBLIC_KEY_INFO msPubKey = { { 0 } }; @@ -3323,6 +3340,18 @@ static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) return matches; } +static void dump_ssl_extra_chain_policy_para(HTTPSPolicyCallbackData *sslPara) +{ + if (sslPara) + { + TRACE_(chain)("cbSize = %d\n", sslPara->u.cbSize); + TRACE_(chain)("dwAuthType = %d\n", sslPara->dwAuthType); + TRACE_(chain)("fdwChecks = %08x\n", sslPara->fdwChecks); + TRACE_(chain)("pwszServerName = %s\n", + debugstr_w(sslPara->pwszServerName)); + } +} + static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus) @@ -3332,6 +3361,8 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, if (pPolicyPara) sslPara = pPolicyPara->pvExtraPolicyPara; + if (TRACE_ON(chain)) + dump_ssl_extra_chain_policy_para(sslPara); if (sslPara && sslPara->u.cbSize >= sizeof(HTTPSPolicyCallbackData)) checks = sslPara->fdwChecks; pPolicyStatus->lChainIndex = pPolicyStatus->lElementIndex = -1; @@ -3570,6 +3601,16 @@ typedef BOOL (WINAPI *CertVerifyCertificateChainPolicyFunc)(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus); +static void dump_policy_para(PCERT_CHAIN_POLICY_PARA para) +{ + if (para) + { + TRACE_(chain)("cbSize = %d\n", para->cbSize); + TRACE_(chain)("dwFlags = %08x\n", para->dwFlags); + TRACE_(chain)("pvExtraPolicyPara = %p\n", para->pvExtraPolicyPara); + } +} + BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus) @@ -3581,6 +3622,8 @@ BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, TRACE("(%s, %p, %p, %p)\n", debugstr_a(szPolicyOID), pChainContext, pPolicyPara, pPolicyStatus); + if (TRACE_ON(chain)) + dump_policy_para(pPolicyPara); if (IS_INTOID(szPolicyOID)) {

1 0

Juan Lang : crypt32/tests: Add more tests of the authenticode policy.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: c4ae9e9c5a4942f53ed8eff6fca688d24a12dd2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ae9e9c5a4942f53ed8eff6f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 7 09:08:11 2010 -0700 crypt32/tests: Add more tests of the authenticode policy. --- dlls/crypt32/tests/chain.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 2e453e1..c172fe5 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4278,6 +4278,28 @@ static void check_base_policy(void) invalidExtensionPolicyCheck, &oct2007, &policyPara); } +static void check_authenticode_policy(void) +{ + CERT_CHAIN_POLICY_PARA policyPara = { 0 }; + SYSTEMTIME epochStart = { 0 }; + + /* The authenticode policy doesn't seem to check anything beyond the base + * policy. It might check for chains signed by the MS test cert, but none + * of these chains is. + */ + CHECK_CHAIN_POLICY_STATUS_ARRAY(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, + authenticodePolicyCheck, &oct2007, NULL); + policyPara.cbSize = sizeof(policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, + ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, + ignoredUnknownCAPolicyCheck, &epochStart, &policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, + ignoredInvalidDateBasePolicyCheck, &oct2007, &policyPara); +} + static void check_ssl_policy(void) { CERT_CHAIN_POLICY_PARA policyPara = { 0 }; @@ -4516,12 +4538,7 @@ static void testVerifyCertChainPolicy(void) check_base_policy(); check_ssl_policy(); - /* The authenticode policy doesn't seem to check anything beyond the base - * policy. It might check for chains signed by the MS test cert, but none - * of these chains is. - */ - CHECK_CHAIN_POLICY_STATUS_ARRAY(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, - authenticodePolicyCheck, &oct2007, NULL); + check_authenticode_policy(); CHECK_CHAIN_POLICY_STATUS_ARRAY(CERT_CHAIN_POLICY_BASIC_CONSTRAINTS, NULL, basicConstraintsPolicyCheck, &oct2007, NULL); }

1 0

Nikolay Sivov : oleaut32: Fix multidimensional SAFEARRAY marshalling.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: b08d3d2656746cfd78be59cea2e06abd178a1ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08d3d2656746cfd78be59cea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 19 02:35:27 2010 +0400 oleaut32: Fix multidimensional SAFEARRAY marshalling. --- dlls/oleaut32/tests/usrmarshal.c | 96 ++++++++++++++++++++++++++++++-------- dlls/oleaut32/usrmarshal.c | 9 +++- 2 files changed, 84 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 9275837..1aae0f5 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -120,9 +120,11 @@ static DWORD elem_wire_size(LPSAFEARRAY lpsa, SF_TYPE sftype) static void check_safearray(void *buffer, LPSAFEARRAY lpsa) { unsigned char *wiresa = buffer; + const SAFEARRAYBOUND *bounds; VARTYPE vt; SF_TYPE sftype; ULONG cell_count; + int i; if(!lpsa) { @@ -163,7 +165,18 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) ok(IsEqualGUID(&guid, wiresa), "guid mismatch\n"); wiresa += sizeof(GUID); } - ok(!memcmp(wiresa, lpsa->rgsabound, sizeof(lpsa->rgsabound[0]) * lpsa->cDims), "bounds mismatch\n"); + + /* bounds are marshaled in natural dimensions order */ + bounds = (SAFEARRAYBOUND*)wiresa; + for(i=0; i<lpsa->cDims; i++) + { + ok(memcmp(bounds, &lpsa->rgsabound[lpsa->cDims-i-1], sizeof(SAFEARRAYBOUND)) == 0, + "bounds mismatch for dimension %d, got (%d,%d), expected (%d,%d)\n", i, + bounds->lLbound, bounds->cElements, lpsa->rgsabound[lpsa->cDims-i-1].lLbound, + lpsa->rgsabound[lpsa->cDims-i-1].cElements); + bounds++; + } + wiresa += sizeof(lpsa->rgsabound[0]) * lpsa->cDims; ok(*(DWORD *)wiresa == cell_count, "wiresa + 0x28 should be %u instead of %u\n", cell_count, *(DWORD*)wiresa); @@ -209,7 +222,7 @@ static void test_marshal_LPSAFEARRAY(void) ULONG size, expected; LPSAFEARRAY lpsa; LPSAFEARRAY lpsa2 = NULL; - SAFEARRAYBOUND sab; + SAFEARRAYBOUND sab[2]; RPC_MESSAGE rpc_msg; MIDL_STUB_MESSAGE stub_msg; USER_MARSHAL_CB umcb; @@ -220,22 +233,66 @@ static void test_marshal_LPSAFEARRAY(void) int i; LONG indices[1]; - sab.lLbound = 5; - sab.cElements = 10; + sab[0].lLbound = 5; + sab[0].cElements = 10; - lpsa = SafeArrayCreate(VT_I2, 1, &sab); + lpsa = SafeArrayCreate(VT_I2, 1, sab); *(DWORD *)lpsa->pvData = 0xcafebabe; lpsa->cLocks = 7; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = LPSAFEARRAY_UserSize(&umcb.Flags, 1, &lpsa); expected = (44 + 1 + sizeof(ULONG) - 1) & ~(sizeof(ULONG) - 1); - expected += sab.cElements * sizeof(USHORT); + expected += sab[0].cElements * sizeof(USHORT); ok(size == expected || size == expected + 12, /* win64 */ "size should be %u bytes, not %u\n", expected, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); - expected = 44 + sab.cElements * sizeof(USHORT); + expected = 44 + sab[0].cElements * sizeof(USHORT); + ok(size == expected || size == expected + 12, /* win64 */ + "size should be %u bytes, not %u\n", expected, size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); + next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); + + check_safearray(buffer, lpsa); + + if (LPSAFEARRAY_UNMARSHAL_WORKS) + { + VARTYPE vt, vt2; + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); + LPSAFEARRAY_UserUnmarshal(&umcb.Flags, buffer, &lpsa2); + ok(lpsa2 != NULL, "LPSAFEARRAY didn't unmarshal\n"); + SafeArrayGetVartype(lpsa, &vt); + SafeArrayGetVartype(lpsa2, &vt2); + ok(vt == vt2, "vts differ %x %x\n", vt, vt2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); + } + HeapFree(GetProcessHeap(), 0, buffer); + lpsa->cLocks = 0; + SafeArrayDestroy(lpsa); + + /* use two dimensions */ + sab[0].lLbound = 5; + sab[0].cElements = 10; + sab[1].lLbound = 1; + sab[1].cElements = 2; + + lpsa = SafeArrayCreate(VT_I2, 2, sab); + *(DWORD *)lpsa->pvData = 0xcafebabe; + + lpsa->cLocks = 7; + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + size = LPSAFEARRAY_UserSize(&umcb.Flags, 1, &lpsa); + expected = (44 + 1 + +sizeof(SAFEARRAYBOUND) + sizeof(ULONG) - 1) & ~(sizeof(ULONG) - 1); + expected += max(sab[0].cElements, sab[1].cElements) * lpsa->cDims * sizeof(USHORT); + ok(size == expected || size == expected + 12, /* win64 */ + "size should be %u bytes, not %u\n", expected, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); + expected = 52 + max(sab[0].cElements, sab[1].cElements) * lpsa->cDims * sizeof(USHORT); ok(size == expected || size == expected + 12, /* win64 */ "size should be %u bytes, not %u\n", expected, size); buffer = HeapAlloc(GetProcessHeap(), 0, size); @@ -284,22 +341,22 @@ static void test_marshal_LPSAFEARRAY(void) } HeapFree(GetProcessHeap(), 0, buffer); - sab.lLbound = 5; - sab.cElements = 10; + sab[0].lLbound = 5; + sab[0].cElements = 10; - lpsa = SafeArrayCreate(VT_R8, 1, &sab); + lpsa = SafeArrayCreate(VT_R8, 1, sab); *(double *)lpsa->pvData = 3.1415; lpsa->cLocks = 7; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = LPSAFEARRAY_UserSize(&umcb.Flags, 1, &lpsa); expected = (44 + 1 + (sizeof(double) - 1)) & ~(sizeof(double) - 1); - expected += sab.cElements * sizeof(double); + expected += sab[0].cElements * sizeof(double); ok(size == expected || size == expected + 16, /* win64 */ "size should be %u bytes, not %u\n", expected, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); expected = (44 + (sizeof(double) - 1)) & ~(sizeof(double) - 1); - expected += sab.cElements * sizeof(double); + expected += sab[0].cElements * sizeof(double); size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); ok(size == expected || size == expected + 8, /* win64 */ "size should be %u bytes, not %u\n", expected, size); @@ -344,19 +401,19 @@ static void test_marshal_LPSAFEARRAY(void) SafeArrayDestroyDescriptor(lpsa); /* Test an array of VT_BSTR */ - sab.lLbound = 3; - sab.cElements = sizeof(values) / sizeof(values[0]); + sab[0].lLbound = 3; + sab[0].cElements = sizeof(values) / sizeof(values[0]); - lpsa = SafeArrayCreate(VT_BSTR, 1, &sab); + lpsa = SafeArrayCreate(VT_BSTR, 1, sab); expected_bstr_size = 0; - for (i = 0; i < sab.cElements; i++) + for (i = 0; i < sab[0].cElements; i++) { int j; WCHAR buf[128]; for (j = 0; j <= i; j++) buf[j] = 'a' + j; buf[j] = 0; - indices[0] = i + sab.lLbound; + indices[0] = i + sab[0].lLbound; values[i] = SysAllocString(buf); hr = SafeArrayPutElement(lpsa, indices, values[i]); ok(hr == S_OK, "Failed to put bstr element hr 0x%x\n", hr); @@ -367,7 +424,7 @@ static void test_marshal_LPSAFEARRAY(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = LPSAFEARRAY_UserSize(&umcb.Flags, 1, &lpsa); - expected = 44 + (sab.cElements * sizeof(DWORD)) + expected_bstr_size; + expected = 44 + (sab[0].cElements * sizeof(DWORD)) + expected_bstr_size; todo_wine ok(size == expected + sizeof(DWORD) || size == (expected + sizeof(DWORD) + 12 /* win64 */), "size should be %u bytes, not %u\n", expected + (ULONG) sizeof(DWORD), size); @@ -401,7 +458,7 @@ static void test_marshal_LPSAFEARRAY(void) if (lpsa2) { - indices[0] = i + sab.lLbound; + indices[0] = i + sab[0].lLbound; hr = SafeArrayGetElement(lpsa2, indices, &gotvalue); ok(hr == S_OK, "Failed to get bstr element at hres 0x%x\n", hr); if (hr == S_OK) @@ -423,7 +480,6 @@ static void test_marshal_LPSAFEARRAY(void) HeapFree(GetProcessHeap(), 0, buffer); SafeArrayDestroy(lpsa); - /* VARTYPE-less arrays with FADF_VARIANT */ hr = SafeArrayAllocDescriptor(1, &lpsa); ok(hr == S_OK, "saad failed %08x\n", hr); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 402794c..4884c66 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -898,8 +898,10 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf VARTYPE vt; SAFEARRAY *psa = *ppsa; ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); + SAFEARRAYBOUND *bound; SF_TYPE sftype; GUID guid; + INT i; sftype = SAFEARRAY_GetUnionType(psa); @@ -932,7 +934,12 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf Buffer += sizeof(guid); } - memcpy(Buffer, psa->rgsabound, sizeof(psa->rgsabound[0]) * psa->cDims); + /* bounds are marshaled in opposite order comparing to storage layout */ + bound = (SAFEARRAYBOUND*)Buffer; + for (i = 0; i < psa->cDims; i++) + { + memcpy(bound++, &psa->rgsabound[psa->cDims-i-1], sizeof(psa->rgsabound[0])); + } Buffer += sizeof(psa->rgsabound[0]) * psa->cDims; *(ULONG *)Buffer = ulCellCount;

1 0

Damjan Jovanovic : msvcrt: Improve wcsncat_s.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: b39c59e75d0cc33ab68ec384d4c4bf63048341f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39c59e75d0cc33ab68ec384d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Oct 19 07:24:52 2010 +0200 msvcrt: Improve wcsncat_s. --- dlls/msvcrt/tests/string.c | 7 ++++++- dlls/msvcrt/wcs.c | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b568345..85e4cf3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1459,8 +1459,13 @@ static void test_wcsncat_s(void) dst[0] = 0; ret = p_wcsncat_s(dst, 2, src, _TRUNCATE); - todo_wine ok(ret == 80, "err = %d\n", ret); + ok(ret == STRUNCATE, "err = %d\n", ret); ok(dst[0] == 'a' && dst[1] == 0, "dst is %s\n", wine_dbgstr_w(dst)); + + memcpy(dst, abcW, sizeof(abcW)); + dst[3] = 'd'; + ret = p_wcsncat_s(dst, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); } START_TEST(string) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 98aa6c5..d7d2fd4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1588,8 +1588,8 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, const MSVCRT_wchar_t *src, MSVCRT_size_t count) { MSVCRT_size_t srclen; - MSVCRT_size_t i; MSVCRT_wchar_t dststart; + INT ret = 0; if (src == NULL && count > 0) return MSVCRT_EINVAL; @@ -1597,34 +1597,33 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, return MSVCRT_EINVAL; if (elem == 0) return MSVCRT_EINVAL; + if (count == 0) + return 0; - for (i = 0; i < elem; i++) + for (dststart = 0; dststart < elem; dststart++) { - dststart = i; - if (dst[i] == '\0') + if (dst[dststart] == '\0') break; } if (dststart == elem) return MSVCRT_EINVAL; if (count == MSVCRT__TRUNCATE) - srclen = elem - dststart - 1; - else - srclen = count; - for (i = 0; i < srclen; i++) { - if (src[i] == '\0') + srclen = strlenW(src); + if (srclen >= (elem - dststart)) { - srclen = i; - break; + srclen = elem - dststart - 1; + ret = MSVCRT_STRUNCATE; } } - + else + srclen = min(strlenW(src), count); if (srclen < (elem - dststart)) { memcpy(&dst[dststart], src, srclen*sizeof(MSVCRT_wchar_t)); dst[srclen] = '\0'; - return 0; + return ret; } dst[0] = '\0'; return MSVCRT_ERANGE;

1 0

Juan Lang : crypt32: Test encoding more quoted strings.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 8b3681e92195b895865055c7984ab16c023173f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3681e92195b895865055c79… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 18 14:04:53 2010 -0700 crypt32: Test encoding more quoted strings. --- dlls/crypt32/tests/str.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index afc8544..614039e 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -480,6 +480,24 @@ static const BYTE encodedQuotedCN[] = { 0x30,0x11,0x31,0x0f,0x30,0x0d,0x06,0x03, 0x55, 0x04,0x03,0x1e,0x06,0x00,0x22,0x00,0x31,0x00,0x22, }; static const BYTE encodedMultipleAttrCN[] = { 0x30,0x0e,0x31,0x0c,0x30,0x0a, 0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x31,0x2b,0x32 }; +static const BYTE encodedCommaCN[] = { +0x30,0x0e,0x31,0x0c,0x30,0x0a,0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x61,0x2c, +0x62 }; +static const BYTE encodedEqualCN[] = { +0x30,0x0e,0x31,0x0c,0x30,0x0a,0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x61,0x3d, +0x62 }; +static const BYTE encodedLessThanCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3c +}; +static const BYTE encodedGreaterThanCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3e +}; +static const BYTE encodedHashCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x23 +}; +static const BYTE encodedSemiCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3b +}; static const struct StrToNameA namesA[] = { { "CN=1", sizeof(encodedSimpleCN), encodedSimpleCN }, @@ -489,6 +507,12 @@ static const struct StrToNameA namesA[] = { { "CN=\" 1 \"", sizeof(encodedSpacedCN), encodedSpacedCN }, { "CN=\"\"\"1\"\"\"", sizeof(encodedQuotedCN), encodedQuotedCN }, { "CN=\"1+2\"", sizeof(encodedMultipleAttrCN), encodedMultipleAttrCN }, + { "CN=\"a,b\"", sizeof(encodedCommaCN), encodedCommaCN }, + { "CN=\"a=b\"", sizeof(encodedEqualCN), encodedEqualCN }, + { "CN=\"<\"", sizeof(encodedLessThanCN), encodedLessThanCN }, + { "CN=\">\"", sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, + { "CN=\"#\"", sizeof(encodedHashCN), encodedHashCN }, + { "CN=\";\"", sizeof(encodedSemiCN), encodedSemiCN }, }; static void test_CertStrToNameA(void) @@ -561,6 +585,12 @@ static const WCHAR multipleAttrCN_W[] = { 'C','N','=','"','1','+','2','"',0 }; 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 }; +static const WCHAR commaCN_W[] = { 'C','N','=','"','a',',','b','"',0 }; +static const WCHAR equalCN_W[] = { 'C','N','=','"','a','=','b','"',0 }; +static const WCHAR lessThanCN_W[] = { 'C','N','=','"','<','"',0 }; +static const WCHAR greaterThanCN_W[] = { 'C','N','=','"','>','"',0 }; +static const WCHAR hashCN_W[] = { 'C','N','=','"','#','"',0 }; +static const WCHAR semiCN_W[] = { 'C','N','=','"',';','"',0 }; static const struct StrToNameW namesW[] = { { simpleCN_W, sizeof(encodedSimpleCN), encodedSimpleCN }, @@ -571,6 +601,12 @@ static const struct StrToNameW namesW[] = { { quotedCN_W, sizeof(encodedQuotedCN), encodedQuotedCN }, { multipleAttrCN_W, sizeof(encodedMultipleAttrCN), encodedMultipleAttrCN }, { japaneseCN_W, sizeof(encodedJapaneseCN), encodedJapaneseCN }, + { commaCN_W, sizeof(encodedCommaCN), encodedCommaCN }, + { equalCN_W, sizeof(encodedEqualCN), encodedEqualCN }, + { lessThanCN_W, sizeof(encodedLessThanCN), encodedLessThanCN }, + { greaterThanCN_W, sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, + { hashCN_W, sizeof(encodedHashCN), encodedHashCN }, + { semiCN_W, sizeof(encodedSemiCN), encodedSemiCN }, }; static void test_CertStrToNameW(void)

1 0

Juan Lang : crypt32: Test more encoded string to string conversions.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 462af2f91be09e869ab9ca92f7515956db7661fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=462af2f91be09e869ab9ca92f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 18 14:19:01 2010 -0700 crypt32: Test more encoded string to string conversions. --- dlls/crypt32/tests/str.c | 138 +++++++++++++++++++++++++++++++-------------- 1 files changed, 95 insertions(+), 43 deletions(-) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 614039e..573219d 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -312,24 +312,70 @@ static void test_CertRDNValueToStrW(void) } static void test_NameToStrConversionA(PCERT_NAME_BLOB pName, DWORD dwStrType, - LPCSTR expected) + LPCSTR expected, BOOL todo) { char buffer[2000] = { 0 }; DWORD i; i = pCertNameToStrA(X509_ASN_ENCODING, pName, dwStrType, NULL, 0); - ok(i == strlen(expected) + 1, "Expected %d chars, got %d\n", - lstrlenA(expected) + 1, i); + if (todo) + todo_wine + ok(i == strlen(expected) + 1, "Expected %d chars, got %d\n", + lstrlenA(expected) + 1, i); + else + ok(i == strlen(expected) + 1, "Expected %d chars, got %d\n", + lstrlenA(expected) + 1, i); i = pCertNameToStrA(X509_ASN_ENCODING,pName, dwStrType, buffer, sizeof(buffer)); - ok(i == strlen(expected) + 1, "Expected %d chars, got %d\n", - lstrlenA(expected) + 1, i); - ok(!strcmp(buffer, expected), "Expected %s, got %s\n", expected, buffer); + if (todo) + todo_wine + ok(i == strlen(expected) + 1, "Expected %d chars, got %d\n", + lstrlenA(expected) + 1, i); + else + ok(i == strlen(expected) + 1, "Expected %d chars, got %d\n", + lstrlenA(expected) + 1, i); + if (todo) + todo_wine + ok(!strcmp(buffer, expected), "Expected %s, got %s\n", expected, + buffer); + else + ok(!strcmp(buffer, expected), "Expected %s, got %s\n", expected, + buffer); } +static BYTE encodedSimpleCN[] = { +0x30,0x0c,0x31,0x0a,0x30,0x08,0x06,0x03,0x55,0x04,0x03,0x13,0x01,0x31 }; +static BYTE encodedSingleQuotedCN[] = { 0x30,0x0e,0x31,0x0c,0x30,0x0a, + 0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x27,0x31,0x27 }; +static BYTE encodedSpacedCN[] = { 0x30,0x0e,0x31,0x0c,0x30,0x0a,0x06,0x03, + 0x55,0x04,0x03,0x13,0x03,0x20,0x31,0x20 }; +static BYTE encodedQuotedCN[] = { 0x30,0x11,0x31,0x0f,0x30,0x0d,0x06,0x03, + 0x55, 0x04,0x03,0x1e,0x06,0x00,0x22,0x00,0x31,0x00,0x22, }; +static BYTE encodedMultipleAttrCN[] = { 0x30,0x0e,0x31,0x0c,0x30,0x0a, + 0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x31,0x2b,0x32 }; +static BYTE encodedCommaCN[] = { +0x30,0x0e,0x31,0x0c,0x30,0x0a,0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x61,0x2c, +0x62 }; +static BYTE encodedEqualCN[] = { +0x30,0x0e,0x31,0x0c,0x30,0x0a,0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x61,0x3d, +0x62 }; +static BYTE encodedLessThanCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3c +}; +static BYTE encodedGreaterThanCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3e +}; +static BYTE encodedHashCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x23 +}; +static BYTE encodedSemiCN[] = { +0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3b +}; + static void test_CertNameToStrA(void) { PCCERT_CONTEXT context; + CERT_NAME_BLOB blob; if (!pCertNameToStrA) { @@ -362,28 +408,63 @@ static void test_CertNameToStrA(void) ret, GetLastError()); test_NameToStrConversionA(&context->pCertInfo->Issuer, - CERT_SIMPLE_NAME_STR, issuerStr); + CERT_SIMPLE_NAME_STR, issuerStr, FALSE); test_NameToStrConversionA(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, - issuerStrSemicolon); + issuerStrSemicolon, FALSE); test_NameToStrConversionA(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_CRLF_FLAG, - issuerStrCRLF); + issuerStrCRLF, FALSE); test_NameToStrConversionA(&context->pCertInfo->Subject, - CERT_OID_NAME_STR, subjectStr); + CERT_OID_NAME_STR, subjectStr, FALSE); test_NameToStrConversionA(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, - subjectStrSemicolon); + subjectStrSemicolon, FALSE); test_NameToStrConversionA(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_CRLF_FLAG, - subjectStrCRLF); + subjectStrCRLF, FALSE); test_NameToStrConversionA(&context->pCertInfo->Subject, - CERT_X500_NAME_STR, x500SubjectStr); + CERT_X500_NAME_STR, x500SubjectStr, FALSE); test_NameToStrConversionA(&context->pCertInfo->Subject, - CERT_X500_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG | CERT_NAME_STR_REVERSE_FLAG, x500SubjectStrSemicolonReverse); + CERT_X500_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG | CERT_NAME_STR_REVERSE_FLAG, + x500SubjectStrSemicolonReverse, FALSE); CertFreeCertificateContext(context); } + blob.pbData = encodedSimpleCN; + blob.cbData = sizeof(encodedSimpleCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=1", FALSE); + blob.pbData = encodedSingleQuotedCN; + blob.cbData = sizeof(encodedSingleQuotedCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN='1'", FALSE); + blob.pbData = encodedSpacedCN; + blob.cbData = sizeof(encodedSpacedCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\" 1 \"", TRUE); + blob.pbData = encodedQuotedCN; + blob.cbData = sizeof(encodedQuotedCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"\"\"1\"\"\"", + TRUE); + blob.pbData = encodedMultipleAttrCN; + blob.cbData = sizeof(encodedMultipleAttrCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"1+2\"", TRUE); + blob.pbData = encodedCommaCN; + blob.cbData = sizeof(encodedCommaCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"a,b\"", TRUE); + blob.pbData = encodedEqualCN; + blob.cbData = sizeof(encodedEqualCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"a=b\"", TRUE); + blob.pbData = encodedLessThanCN; + blob.cbData = sizeof(encodedLessThanCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"<\"", TRUE); + blob.pbData = encodedGreaterThanCN; + blob.cbData = sizeof(encodedGreaterThanCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\">\"", TRUE); + blob.pbData = encodedHashCN; + blob.cbData = sizeof(encodedHashCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"#\"", TRUE); + blob.pbData = encodedSemiCN; + blob.cbData = sizeof(encodedSemiCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\";\"", TRUE); } static void test_NameToStrConversionW(PCERT_NAME_BLOB pName, DWORD dwStrType, @@ -470,35 +551,6 @@ struct StrToNameA const BYTE *encoded; }; -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 }; -static const BYTE encodedSpacedCN[] = { 0x30,0x0e,0x31,0x0c,0x30,0x0a,0x06,0x03, - 0x55,0x04,0x03,0x13,0x03,0x20,0x31,0x20 }; -static const BYTE encodedQuotedCN[] = { 0x30,0x11,0x31,0x0f,0x30,0x0d,0x06,0x03, - 0x55, 0x04,0x03,0x1e,0x06,0x00,0x22,0x00,0x31,0x00,0x22, }; -static const BYTE encodedMultipleAttrCN[] = { 0x30,0x0e,0x31,0x0c,0x30,0x0a, - 0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x31,0x2b,0x32 }; -static const BYTE encodedCommaCN[] = { -0x30,0x0e,0x31,0x0c,0x30,0x0a,0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x61,0x2c, -0x62 }; -static const BYTE encodedEqualCN[] = { -0x30,0x0e,0x31,0x0c,0x30,0x0a,0x06,0x03,0x55,0x04,0x03,0x13,0x03,0x61,0x3d, -0x62 }; -static const BYTE encodedLessThanCN[] = { -0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3c -}; -static const BYTE encodedGreaterThanCN[] = { -0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3e -}; -static const BYTE encodedHashCN[] = { -0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x23 -}; -static const BYTE encodedSemiCN[] = { -0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3b -}; - static const struct StrToNameA namesA[] = { { "CN=1", sizeof(encodedSimpleCN), encodedSimpleCN }, { "CN=\"1\"", sizeof(encodedSimpleCN), encodedSimpleCN },

1 0

Juan Lang : crypt32: Implement quoting of simple string types.
by Alexandre Julliard 19 Oct '10

19 Oct '10

Module: wine Branch: master Commit: 993068038e0958ccb3f866c7faf0ebe012b9fa21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=993068038e0958ccb3f866c7f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 18 17:23:05 2010 -0700 crypt32: Implement quoting of simple string types. --- dlls/crypt32/str.c | 89 +++++++++++++++++++++++++++++++++++++--------- dlls/crypt32/tests/str.c | 8 ++-- 2 files changed, 76 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 914ccaa..d3a1a36 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -29,10 +29,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); +static inline BOOL is_quotable_char(char c) +{ + switch(c) + { + case '+': + case ',': + case '"': + case '=': + case '<': + case '>': + case ';': + case '#': + return TRUE; + default: + return FALSE; + } +} + DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, LPSTR psz, DWORD csz) { - DWORD ret = 0; + DWORD ret = 0, len, i; + BOOL needsQuotes = FALSE; TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz); @@ -48,18 +67,37 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, case CERT_RDN_GRAPHIC_STRING: case CERT_RDN_VISIBLE_STRING: case CERT_RDN_GENERAL_STRING: + len = pValue->cbData; + if (pValue->cbData && isspace(pValue->pbData[0])) + needsQuotes = TRUE; + if (pValue->cbData && isspace(pValue->pbData[pValue->cbData - 1])) + needsQuotes = TRUE; + for (i = 0; i < pValue->cbData; i++) + { + if (is_quotable_char(pValue->pbData[i])) + needsQuotes = TRUE; + if (pValue->pbData[i] == '"') + len += 1; + } + if (needsQuotes) + len += 2; if (!psz || !csz) - ret = pValue->cbData; + ret = len; else { - DWORD chars = min(pValue->cbData, csz - 1); + char *ptr = psz; - if (chars) + if (needsQuotes) + *ptr++ = '"'; + for (i = 0; i < pValue->cbData && ptr - psz < csz; ptr++, i++) { - memcpy(psz, pValue->pbData, chars); - ret += chars; - csz -= chars; + *ptr = pValue->pbData[i]; + if (pValue->pbData[i] == '"' && ptr - psz < csz - 1) + *(++ptr) = '"'; } + if (needsQuotes && ptr - psz < csz) + *ptr++ = '"'; + ret = ptr - psz; } break; case CERT_RDN_UTF8_STRING: @@ -91,7 +129,8 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, LPWSTR psz, DWORD csz) { - DWORD ret = 0; + DWORD ret = 0, len, i; + BOOL needsQuotes = FALSE; TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz); @@ -107,21 +146,37 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, case CERT_RDN_GRAPHIC_STRING: case CERT_RDN_VISIBLE_STRING: case CERT_RDN_GENERAL_STRING: + len = pValue->cbData; + if (pValue->cbData && isspace(pValue->pbData[0])) + needsQuotes = TRUE; + if (pValue->cbData && isspace(pValue->pbData[pValue->cbData - 1])) + needsQuotes = TRUE; + for (i = 0; i < pValue->cbData; i++) + { + if (is_quotable_char(pValue->pbData[i])) + needsQuotes = TRUE; + if (pValue->pbData[i] == '"') + len += 1; + } + if (needsQuotes) + len += 2; if (!psz || !csz) - ret = pValue->cbData; + ret = len; else { - DWORD chars = min(pValue->cbData, csz - 1); + WCHAR *ptr = psz; - if (chars) + if (needsQuotes) + *ptr++ = '"'; + for (i = 0; i < pValue->cbData && ptr - psz < csz; ptr++, i++) { - DWORD i; - - for (i = 0; i < chars; i++) - psz[i] = pValue->pbData[i]; - ret += chars; - csz -= chars; + *ptr = pValue->pbData[i]; + if (pValue->pbData[i] == '"' && ptr - psz < csz - 1) + *(++ptr) = '"'; } + if (needsQuotes && ptr - psz < csz) + *ptr++ = '"'; + ret = ptr - psz; } break; case CERT_RDN_UTF8_STRING: diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 573219d..3032b93 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -439,20 +439,20 @@ static void test_CertNameToStrA(void) test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN='1'", FALSE); blob.pbData = encodedSpacedCN; blob.cbData = sizeof(encodedSpacedCN); - test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\" 1 \"", TRUE); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\" 1 \"", FALSE); blob.pbData = encodedQuotedCN; blob.cbData = sizeof(encodedQuotedCN); test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"\"\"1\"\"\"", TRUE); blob.pbData = encodedMultipleAttrCN; blob.cbData = sizeof(encodedMultipleAttrCN); - test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"1+2\"", TRUE); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"1+2\"", FALSE); blob.pbData = encodedCommaCN; blob.cbData = sizeof(encodedCommaCN); - test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"a,b\"", TRUE); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"a,b\"", FALSE); blob.pbData = encodedEqualCN; blob.cbData = sizeof(encodedEqualCN); - test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"a=b\"", TRUE); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"a=b\"", FALSE); blob.pbData = encodedLessThanCN; blob.cbData = sizeof(encodedLessThanCN); test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"<\"", TRUE);

1 0