February 2010 - Wine-Commits

Andrew Nguyen : mapi32/tests: Invoke MAPIInitialize before performing the HexFromBin tests.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: ad2fdafee9fe1f0649b55a56f1c47d1f169bfddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2fdafee9fe1f0649b55a56f… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Jan 30 18:58:43 2010 -0600 mapi32/tests: Invoke MAPIInitialize before performing the HexFromBin tests. This avoids crashes with the native Outlook extended MAPI provider. --- dlls/mapi32/tests/util.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index c116b1f..0d1022a 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -31,6 +31,7 @@ static HMODULE hMapi32 = 0; static SCODE (WINAPI *pScInitMapiUtil)(ULONG); +static void (WINAPI *pDeinitMapiUtil)(void); static void (WINAPI *pSwapPword)(PUSHORT,ULONG); static void (WINAPI *pSwapPlong)(PULONG,ULONG); static void (WINAPI *pHexFromBin)(LPBYTE,int,LPWSTR); @@ -39,12 +40,15 @@ static UINT (WINAPI *pUFromSz)(LPCSTR); static ULONG (WINAPI *pUlFromSzHex)(LPCSTR); static ULONG (WINAPI *pCbOfEncoded)(LPCSTR); static BOOL (WINAPI *pIsBadBoundedStringPtr)(LPCSTR,ULONG); +static SCODE (WINAPI *pMAPIInitialize)(LPVOID); +static void (WINAPI *pMAPIUninitialize)(void); static void init_function_pointers(void) { hMapi32 = LoadLibraryA("mapi32.dll"); pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil(a)4"); + pDeinitMapiUtil = (void*)GetProcAddress(hMapi32, "DeinitMapiUtil(a)0"); pSwapPword = (void*)GetProcAddress(hMapi32, "SwapPword(a)8"); pSwapPlong = (void*)GetProcAddress(hMapi32, "SwapPlong(a)8"); pHexFromBin = (void*)GetProcAddress(hMapi32, "HexFromBin(a)12"); @@ -53,6 +57,8 @@ static void init_function_pointers(void) pUlFromSzHex = (void*)GetProcAddress(hMapi32, "UlFromSzHex(a)4"); pCbOfEncoded = (void*)GetProcAddress(hMapi32, "CbOfEncoded(a)4"); pIsBadBoundedStringPtr = (void*)GetProcAddress(hMapi32, "IsBadBoundedStringPtr(a)8"); + pMAPIInitialize = (void*)GetProcAddress(hMapi32, "MAPIInitialize"); + pMAPIUninitialize = (void*)GetProcAddress(hMapi32, "MAPIUninitialize"); } static void test_SwapPword(void) @@ -209,9 +215,9 @@ START_TEST(util) init_function_pointers(); - if (!pScInitMapiUtil) + if (!pScInitMapiUtil || !pDeinitMapiUtil) { - win_skip("ScInitMapiUtil is not available\n"); + win_skip("MAPI utility initialization functions are not available\n"); FreeLibrary(hMapi32); return; } @@ -233,11 +239,22 @@ START_TEST(util) test_SwapPword(); test_SwapPlong(); + + /* We call MAPIInitialize here for the benefit of native extended MAPI + * providers which crash in the HexFromBin tests when MAPIInitialize has + * not been called. Since MAPIInitialize is irrelevant for HexFfromBin on + * Wine, we do not care whether MAPIInitialize succeeds. */ + if (pMAPIInitialize) + ret = pMAPIInitialize(NULL); test_HexFromBin(); + if (pMAPIUninitialize && ret == S_OK) + pMAPIUninitialize(); + test_UFromSz(); test_UlFromSzHex(); test_CbOfEncoded(); test_IsBadBoundedStringPtr(); + pDeinitMapiUtil(); FreeLibrary(hMapi32); }

1 0

Andrew Nguyen : mapi32/tests: Centralize utility function pointer initialization.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 5ed70a69df77b8e32391628f30c64a6fd237cc5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed70a69df77b8e32391628f3… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Jan 30 18:58:24 2010 -0600 mapi32/tests: Centralize utility function pointer initialization. --- dlls/mapi32/tests/util.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index a638cff..7450efe 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -40,11 +40,25 @@ static ULONG (WINAPI *pUlFromSzHex)(LPCSTR); static ULONG (WINAPI *pCbOfEncoded)(LPCSTR); static BOOL (WINAPI *pIsBadBoundedStringPtr)(LPCSTR,ULONG); +static void init_function_pointers(void) +{ + hMapi32 = LoadLibraryA("mapi32.dll"); + + pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil(a)4"); + pSwapPword = (void*)GetProcAddress(hMapi32, "SwapPword(a)8"); + pSwapPlong = (void*)GetProcAddress(hMapi32, "SwapPlong(a)8"); + pHexFromBin = (void*)GetProcAddress(hMapi32, "HexFromBin(a)12"); + pFBinFromHex = (void*)GetProcAddress(hMapi32, "FBinFromHex(a)8"); + pUFromSz = (void*)GetProcAddress(hMapi32, "UFromSz(a)4"); + pUlFromSzHex = (void*)GetProcAddress(hMapi32, "UlFromSzHex(a)4"); + pCbOfEncoded = (void*)GetProcAddress(hMapi32, "CbOfEncoded(a)4"); + pIsBadBoundedStringPtr = (void*)GetProcAddress(hMapi32, "IsBadBoundedStringPtr(a)8"); +} + static void test_SwapPword(void) { USHORT shorts[3]; - pSwapPword = (void*)GetProcAddress(hMapi32, "SwapPword(a)8"); if (!pSwapPword) { win_skip("SwapPword is not available\n"); @@ -64,7 +78,6 @@ static void test_SwapPlong(void) { ULONG longs[3]; - pSwapPlong = (void*)GetProcAddress(hMapi32, "SwapPlong(a)8"); if (!pSwapPlong) { win_skip("SwapPlong is not available\n"); @@ -95,8 +108,6 @@ static void test_HexFromBin(void) BOOL bOk; int i; - pHexFromBin = (void*)GetProcAddress(hMapi32, "HexFromBin(a)12"); - pFBinFromHex = (void*)GetProcAddress(hMapi32, "FBinFromHex(a)8"); if (!pHexFromBin || !pFBinFromHex) { win_skip("Hexadecimal conversion functions are not available\n"); @@ -121,7 +132,6 @@ static void test_HexFromBin(void) static void test_UFromSz(void) { - pUFromSz = (void*)GetProcAddress(hMapi32, "UFromSz(a)4"); if (!pUFromSz) { win_skip("UFromSz is not available\n"); @@ -137,7 +147,6 @@ static void test_UFromSz(void) static void test_UlFromSzHex(void) { - pUlFromSzHex = (void*)GetProcAddress(hMapi32, "UlFromSzHex(a)4"); if (!pUlFromSzHex) { win_skip("UlFromSzHex is not available\n"); @@ -156,7 +165,6 @@ static void test_CbOfEncoded(void) char buff[129]; unsigned int i; - pCbOfEncoded = (void*)GetProcAddress(hMapi32, "CbOfEncoded(a)4"); if (!pCbOfEncoded) { win_skip("CbOfEncoded is not available\n"); @@ -178,7 +186,6 @@ static void test_CbOfEncoded(void) static void test_IsBadBoundedStringPtr(void) { - pIsBadBoundedStringPtr = (void*)GetProcAddress(hMapi32, "IsBadBoundedStringPtr(a)8"); if (!pIsBadBoundedStringPtr) { win_skip("IsBadBoundedStringPtr is not available\n"); @@ -200,9 +207,7 @@ START_TEST(util) return; } - hMapi32 = LoadLibraryA("mapi32.dll"); - - pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil(a)4"); + init_function_pointers(); if (!pScInitMapiUtil) {

1 0

Alexandre Julliard : ntdll: Avoid reporting a freed block twice to Valgrind .
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 156d66ec24f93657e3001d5ba4ea2e4cf5ffd248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156d66ec24f93657e3001d5ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 12:35:32 2010 +0100 ntdll: Avoid reporting a freed block twice to Valgrind. --- dlls/ntdll/heap.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 5e57fd0..4c73184 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -281,9 +281,8 @@ static void subheap_notify_free_all(SUBHEAP const *subheap) else { ARENA_INUSE const *pArena = (ARENA_INUSE const *)ptr; - if (pArena->magic != ARENA_INUSE_MAGIC && pArena->magic != ARENA_PENDING_MAGIC) - ERR("bad inuse_magic @%p\n", pArena); - notify_free(pArena + 1); + if (pArena->magic == ARENA_INUSE_MAGIC) notify_free(pArena + 1); + else if (pArena->magic != ARENA_PENDING_MAGIC) ERR("bad inuse_magic @%p\n", pArena); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); } }

1 0

Luca Bennati : wined3d: Add newer ATI/AMD cards vendor recognition.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 9f3c90973f19b30a0b9890490b70e36de0948255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3c90973f19b30a0b9890490… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Jan 30 18:10:59 2010 +0100 wined3d: Add newer ATI/AMD cards vendor recognition. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c2694eb..b708b33 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1129,6 +1129,7 @@ static enum wined3d_pci_vendor wined3d_guess_vendor(const char *gl_vendor, const return VENDOR_INTEL; if (strstr(gl_vendor, "Mesa") + || strstr(gl_vendor, "Advanced Micro Devices, Inc.") || strstr(gl_vendor, "DRI R300 Project") || strstr(gl_vendor, "Tungsten Graphics, Inc") || strstr(gl_vendor, "VMware, Inc."))

1 0

Andrew Nguyen : mapi32/tests: Fix prototype of FBinFromHex function pointer .
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 491201a8714fc1d03a945642aa9752d520885343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491201a8714fc1d03a945642a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Jan 30 18:58:33 2010 -0600 mapi32/tests: Fix prototype of FBinFromHex function pointer. --- dlls/mapi32/tests/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index 7450efe..c116b1f 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -34,7 +34,7 @@ static SCODE (WINAPI *pScInitMapiUtil)(ULONG); static void (WINAPI *pSwapPword)(PUSHORT,ULONG); static void (WINAPI *pSwapPlong)(PULONG,ULONG); static void (WINAPI *pHexFromBin)(LPBYTE,int,LPWSTR); -static void (WINAPI *pFBinFromHex)(LPWSTR,LPBYTE); +static BOOL (WINAPI *pFBinFromHex)(LPWSTR,LPBYTE); static UINT (WINAPI *pUFromSz)(LPCSTR); static ULONG (WINAPI *pUlFromSzHex)(LPCSTR); static ULONG (WINAPI *pCbOfEncoded)(LPCSTR);

1 0

Detlef Riekenberg : shlwapi/tests: UrlCombine* is not present on Win95B ( winetestbot).
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 10abf0fb2f3570b8401bb65170a304197dbbb97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=10abf0fb2f3570b8401bb6517… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 31 00:10:07 2010 +0100 shlwapi/tests: UrlCombine* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/url.c | 55 +++++++++++++++++++++++++++------------------ 1 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b024440..c5a4ae6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1,7 +1,7 @@ /* Unit test suite for Path functions * * Copyright 2002 Matthew Mastracci - * Copyright 2007,2008 Detlef Riekenberg + * Copyright 2007-2010 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,6 +31,8 @@ /* ################ */ static HMODULE hShlwapi; +static HRESULT (WINAPI *pUrlCombineA)(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD); +static HRESULT (WINAPI *pUrlCombineW)(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD); static HRESULT (WINAPI *pUrlCanonicalizeA)(LPCSTR, LPSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pUrlCanonicalizeW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pUrlApplySchemeA)(LPCSTR,LPSTR,LPDWORD,DWORD); @@ -842,43 +844,50 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla DWORD dwSize; DWORD dwExpectLen = lstrlen(szExpectUrl); - hr = UrlCombineA(szUrl1, szUrl2, NULL, NULL, dwFlags); + if (!pUrlCombineA) { + win_skip("UrlCombineA not found\n"); + return; + } + + hr = pUrlCombineA(szUrl1, szUrl2, NULL, NULL, dwFlags); ok(hr == E_INVALIDARG, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG); dwSize = 0; - hr = UrlCombineA(szUrl1, szUrl2, NULL, &dwSize, dwFlags); + hr = pUrlCombineA(szUrl1, szUrl2, NULL, &dwSize, dwFlags); ok(hr == E_POINTER, "Checking length of string, return was 0x%08x, expected 0x%08x\n", hr, E_POINTER); ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); dwSize--; - hr = UrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); + hr = pUrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); ok(hr == E_POINTER, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, E_POINTER); ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); - hr = UrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); + hr = pUrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); ok(hr == dwExpectReturn, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, dwExpectReturn); ok(dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen); if(SUCCEEDED(hr)) { ok(strcmp(szReturnUrl,szExpectUrl)==0, "Expected %s, but got %s\n", szExpectUrl, szReturnUrl); } - dwSize = 0; - hr = UrlCombineW(wszUrl1, wszUrl2, NULL, &dwSize, dwFlags); - ok(hr == E_POINTER, "Checking length of string, return was 0x%08x, expected 0x%08x\n", hr, E_POINTER); - ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); - - dwSize--; - hr = UrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); - ok(hr == E_POINTER, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, E_POINTER); - ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); - - hr = UrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); - ok(hr == dwExpectReturn, "UrlCombineW returned 0x%08x, expected 0x%08x\n", hr, dwExpectReturn); - ok(dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen); - if(SUCCEEDED(hr)) { - wszConvertedUrl = GetWideString(szReturnUrl); - ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ascii and unicode UrlCombine!\n"); - FreeWideString(wszConvertedUrl); + if (pUrlCombineW) { + dwSize = 0; + hr = pUrlCombineW(wszUrl1, wszUrl2, NULL, &dwSize, dwFlags); + ok(hr == E_POINTER, "Checking length of string, return was 0x%08x, expected 0x%08x\n", hr, E_POINTER); + ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); + + dwSize--; + hr = pUrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); + ok(hr == E_POINTER, "UrlCombineW returned 0x%08x, expected 0x%08x\n", hr, E_POINTER); + ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); + + hr = pUrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); + ok(hr == dwExpectReturn, "UrlCombineW returned 0x%08x, expected 0x%08x\n", hr, dwExpectReturn); + ok(dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen); + if(SUCCEEDED(hr)) { + wszConvertedUrl = GetWideString(szReturnUrl); + ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ascii and unicode UrlCombine!\n"); + FreeWideString(wszConvertedUrl); + } } FreeWideString(wszUrl1); @@ -1196,6 +1205,8 @@ START_TEST(url) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + pUrlCombineA = (void *) GetProcAddress(hShlwapi, "UrlCombineA"); + pUrlCombineW = (void *) GetProcAddress(hShlwapi, "UrlCombineW"); pUrlCanonicalizeA = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeA"); pUrlCanonicalizeW = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeW"); pUrlApplySchemeA = (void *) GetProcAddress(hShlwapi, "UrlApplySchemeA");

1 0

Detlef Riekenberg : shlwapi/tests: UrlIs* is not present on Win95B ( winetestbot).
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: ce7eb256bc77aea469c56e2c04b92e91aa3162de URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce7eb256bc77aea469c56e2c0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 31 01:22:46 2010 +0100 shlwapi/tests: UrlIs* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/url.c | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 8230756..c5d11a1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -31,6 +31,8 @@ /* ################ */ static HMODULE hShlwapi; +static BOOL (WINAPI *pUrlIsA)(LPCSTR,URLIS); +static BOOL (WINAPI *pUrlIsW)(LPCWSTR,URLIS); static HRESULT (WINAPI *pUrlHashA)(LPCSTR,LPBYTE,DWORD); static HRESULT (WINAPI *pUrlHashW)(LPCWSTR,LPBYTE,DWORD); static HRESULT (WINAPI *pUrlGetPartA)(LPCSTR,LPSTR,LPDWORD,DWORD,DWORD); @@ -995,39 +997,48 @@ static void test_UrlIs(void) size_t i; WCHAR wurl[80]; + if (!pUrlIsA) { + win_skip("UrlIsA not found\n"); + return; + } + for(i = 0; i < sizeof(TEST_PATH_IS_URL) / sizeof(TEST_PATH_IS_URL[0]); i++) { MultiByteToWideChar(CP_ACP, 0, TEST_PATH_IS_URL[i].path, -1, wurl, 80); - ret = UrlIsA( TEST_PATH_IS_URL[i].path, URLIS_URL ); + ret = pUrlIsA( TEST_PATH_IS_URL[i].path, URLIS_URL ); ok( ret == TEST_PATH_IS_URL[i].expect, "returned %d from path %s, expected %d\n", ret, TEST_PATH_IS_URL[i].path, TEST_PATH_IS_URL[i].expect ); - ret = UrlIsW( wurl, URLIS_URL ); - ok( ret == TEST_PATH_IS_URL[i].expect, - "returned %d from path (UrlIsW) %s, expected %d\n", ret, TEST_PATH_IS_URL[i].path, - TEST_PATH_IS_URL[i].expect ); + if (pUrlIsW) { + ret = pUrlIsW( wurl, URLIS_URL ); + ok( ret == TEST_PATH_IS_URL[i].expect, + "returned %d from path (UrlIsW) %s, expected %d\n", ret, + TEST_PATH_IS_URL[i].path, TEST_PATH_IS_URL[i].expect ); + } } for(i = 0; i < sizeof(TEST_URLIS_ATTRIBS) / sizeof(TEST_URLIS_ATTRIBS[0]); i++) { MultiByteToWideChar(CP_ACP, 0, TEST_URLIS_ATTRIBS[i].url, -1, wurl, 80); - ret = UrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_OPAQUE); + ret = pUrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_OPAQUE); ok( ret == TEST_URLIS_ATTRIBS[i].expectOpaque, "returned %d for URLIS_OPAQUE, url \"%s\", expected %d\n", ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectOpaque ); - ret = UrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_FILEURL); + ret = pUrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_FILEURL); ok( ret == TEST_URLIS_ATTRIBS[i].expectFile, "returned %d for URLIS_FILEURL, url \"%s\", expected %d\n", ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectFile ); - ret = UrlIsW( wurl, URLIS_OPAQUE); - ok( ret == TEST_URLIS_ATTRIBS[i].expectOpaque, - "returned %d for URLIS_OPAQUE (UrlIsW), url \"%s\", expected %d\n", ret, TEST_URLIS_ATTRIBS[i].url, - TEST_URLIS_ATTRIBS[i].expectOpaque ); - ret = UrlIsW( wurl, URLIS_FILEURL); - ok( ret == TEST_URLIS_ATTRIBS[i].expectFile, - "returned %d for URLIS_FILEURL (UrlIsW), url \"%s\", expected %d\n", ret, TEST_URLIS_ATTRIBS[i].url, - TEST_URLIS_ATTRIBS[i].expectFile ); + if (pUrlIsW) { + ret = pUrlIsW( wurl, URLIS_OPAQUE); + ok( ret == TEST_URLIS_ATTRIBS[i].expectOpaque, + "returned %d for URLIS_OPAQUE (UrlIsW), url \"%s\", expected %d\n", + ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectOpaque ); + ret = pUrlIsW( wurl, URLIS_FILEURL); + ok( ret == TEST_URLIS_ATTRIBS[i].expectFile, + "returned %d for URLIS_FILEURL (UrlIsW), url \"%s\", expected %d\n", + ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectFile ); + } } } @@ -1255,6 +1266,8 @@ START_TEST(url) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + pUrlIsA = (void *) GetProcAddress(hShlwapi, "UrlIsA"); + pUrlIsW = (void *) GetProcAddress(hShlwapi, "UrlIsW"); pUrlHashA = (void *) GetProcAddress(hShlwapi, "UrlHashA"); pUrlHashW = (void *) GetProcAddress(hShlwapi, "UrlHashW"); pUrlGetPartA = (void *) GetProcAddress(hShlwapi, "UrlGetPartA");

1 0

Detlef Riekenberg : shlwapi/tests: UrlHash* is not present on Win95B ( winetestbot).
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 4f4a47a1c97a069448509b4ef549d5ace9fbc8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4a47a1c97a069448509b4ef… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 31 01:11:32 2010 +0100 shlwapi/tests: UrlHash* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/url.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 69280e7..8230756 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -31,6 +31,8 @@ /* ################ */ static HMODULE hShlwapi; +static HRESULT (WINAPI *pUrlHashA)(LPCSTR,LPBYTE,DWORD); +static HRESULT (WINAPI *pUrlHashW)(LPCWSTR,LPBYTE,DWORD); static HRESULT (WINAPI *pUrlGetPartA)(LPCSTR,LPSTR,LPDWORD,DWORD,DWORD); static HRESULT (WINAPI *pUrlGetPartW)(LPCWSTR,LPWSTR,LPDWORD,DWORD,DWORD); static HRESULT (WINAPI *pUrlEscapeA)(LPCSTR,LPSTR,LPDWORD,DWORD); @@ -492,19 +494,29 @@ static void hash_url(const char* szUrl) { LPCSTR szTestUrl = szUrl; LPWSTR wszTestUrl = GetWideString(szTestUrl); + HRESULT res; DWORD cbSize = sizeof(DWORD); DWORD dwHash1, dwHash2; - ok(UrlHashA(szTestUrl, (LPBYTE)&dwHash1, cbSize) == S_OK, "UrlHashA didn't return S_OK\n"); - ok(UrlHashW(wszTestUrl, (LPBYTE)&dwHash2, cbSize) == S_OK, "UrlHashW didn't return S_OK\n"); - + res = pUrlHashA(szTestUrl, (LPBYTE)&dwHash1, cbSize); + ok(res == S_OK, "UrlHashA returned 0x%x (expected S_OK) for %s\n", res, szUrl); + if (pUrlHashW) { + res = pUrlHashW(wszTestUrl, (LPBYTE)&dwHash2, cbSize); + ok(res == S_OK, "UrlHashW returned 0x%x (expected S_OK) for %s\n", res, szUrl); + ok(dwHash1 == dwHash2, + "Hashes didn't match (A: 0x%x, W: 0x%x) for %s\n", dwHash1, dwHash2, szUrl); + } FreeWideString(wszTestUrl); - ok(dwHash1 == dwHash2, "Hashes didn't compare\n"); } static void test_UrlHash(void) { + if (!pUrlHashA) { + win_skip("UrlHashA not found\n"); + return; + } + hash_url(TEST_URL_1); hash_url(TEST_URL_2); hash_url(TEST_URL_3); @@ -1243,6 +1255,8 @@ START_TEST(url) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + pUrlHashA = (void *) GetProcAddress(hShlwapi, "UrlHashA"); + pUrlHashW = (void *) GetProcAddress(hShlwapi, "UrlHashW"); pUrlGetPartA = (void *) GetProcAddress(hShlwapi, "UrlGetPartA"); pUrlGetPartW = (void *) GetProcAddress(hShlwapi, "UrlGetPartW"); pUrlEscapeA = (void *) GetProcAddress(hShlwapi, "UrlEscapeA");

1 0

Detlef Riekenberg : shlwapi/tests: UrlCanonicalize* is not present on Win95B (winetestbot).
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 2cd5b05d4990e311c3ff2993d721a04c2c7fc322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd5b05d4990e311c3ff2993d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jan 30 23:56:12 2010 +0100 shlwapi/tests: UrlCanonicalize* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/url.c | 40 +++++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 70a5745..b024440 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -31,6 +31,7 @@ /* ################ */ static HMODULE hShlwapi; +static HRESULT (WINAPI *pUrlCanonicalizeA)(LPCSTR, LPSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pUrlCanonicalizeW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pUrlApplySchemeA)(LPCSTR,LPSTR,LPDWORD,DWORD); static HRESULT (WINAPI *pUrlApplySchemeW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); @@ -616,8 +617,9 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H DWORD dwSize; dwSize = INTERNET_MAX_URL_LENGTH; - ok(UrlCanonicalizeA(szUrl, NULL, &dwSize, dwFlags) != dwExpectReturn, "Unexpected return for NULL buffer, index %d\n", index); - ret = UrlCanonicalizeA(szUrl, szReturnUrl, &dwSize, dwFlags); + ret = pUrlCanonicalizeA(szUrl, NULL, &dwSize, dwFlags); + ok(ret != dwExpectReturn, "got 0s%x: Unexpected return for NULL buffer, index %d\n", ret, index); + ret = pUrlCanonicalizeA(szUrl, szReturnUrl, &dwSize, dwFlags); ok(ret == dwExpectReturn || ret == dwExpectReturnAlt, "UrlCanonicalizeA failed: expected=0x%08x or 0x%08x, got=0x%08x, index %d\n", dwExpectReturn, dwExpectReturnAlt, ret, index); @@ -627,13 +629,19 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H else ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); - dwSize = INTERNET_MAX_URL_LENGTH; - ok(UrlCanonicalizeW(wszUrl, NULL, &dwSize, dwFlags) != dwExpectReturn, "Unexpected return for NULL buffer, index %d\n", index); - ok(UrlCanonicalizeW(wszUrl, wszReturnUrl, &dwSize, dwFlags) == dwExpectReturn, "UrlCanonicalizeW didn't return 0x%08x, index %d\n", dwExpectReturn, index); - wszConvertedUrl = GetWideString(szReturnUrl); - ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ascii and unicode UrlCanonicalize, index %d!\n", index); - FreeWideString(wszConvertedUrl); + if (pUrlCanonicalizeW) { + dwSize = INTERNET_MAX_URL_LENGTH; + ret = pUrlCanonicalizeW(wszUrl, NULL, &dwSize, dwFlags); + ok(ret != dwExpectReturn, "got 0x%x: Unexpected return for NULL buffer, index %d\n", ret, index); + ret = pUrlCanonicalizeW(wszUrl, wszReturnUrl, &dwSize, dwFlags); + ok(ret == dwExpectReturn, "UrlCanonicalizeW failed: expected 0x%08x, got 0x%x, index %d\n", + dwExpectReturn, ret, index); + wszConvertedUrl = GetWideString(szReturnUrl); + ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, + "Strings didn't match between ascii and unicode UrlCanonicalize, index %d!\n", index); + FreeWideString(wszConvertedUrl); + } FreeWideString(wszUrl); FreeWideString(wszExpectUrl); @@ -687,6 +695,11 @@ static void test_UrlCanonicalizeA(void) DWORD urllen; HRESULT hr; + if (!pUrlCanonicalizeA) { + win_skip("UrlCanonicalizeA not found\n"); + return; + } + urllen = lstrlenA(winehqA); /* buffer has no space for the result */ @@ -694,7 +707,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), "got 0x%x with %u and size %u for '%s' and %u (expected 'E_POINTER' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen+1); @@ -704,7 +717,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), "got 0x%x with %u and size %u for '%s' and %u (expected 'E_POINTER' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen+1); @@ -714,7 +727,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == S_OK) && (dwSize == urllen), "got 0x%x with %u and size %u for '%s' and %u (expected 'S_OK' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen); @@ -724,7 +737,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == S_OK) && (dwSize == urllen), "got 0x%x with %u and size %u for '%s' and %u (expected 'S_OK' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen); @@ -751,7 +764,7 @@ static void test_UrlCanonicalizeW(void) if (!pUrlCanonicalizeW) { - skip("UrlCanonicalizeW\n"); + win_skip("UrlCanonicalizeW not found\n"); return; } urllen = lstrlenW(winehqW); @@ -1183,6 +1196,7 @@ START_TEST(url) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + pUrlCanonicalizeA = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeA"); pUrlCanonicalizeW = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeW"); pUrlApplySchemeA = (void *) GetProcAddress(hShlwapi, "UrlApplySchemeA"); pUrlApplySchemeW = (void *) GetProcAddress(hShlwapi, "UrlApplySchemeW");

1 0

Detlef Riekenberg : shlwapi/tests: UrlApplyScheme* is not present on Win95B (winetestbot).
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 4c6a4f66bd494db15bad8a511c7402524202ccbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6a4f66bd494db15bad8a511… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jan 30 23:48:23 2010 +0100 shlwapi/tests: UrlApplyScheme* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/url.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index af7f729..70a5745 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -32,6 +32,8 @@ /* ################ */ static HMODULE hShlwapi; static HRESULT (WINAPI *pUrlCanonicalizeW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); +static HRESULT (WINAPI *pUrlApplySchemeA)(LPCSTR,LPSTR,LPDWORD,DWORD); +static HRESULT (WINAPI *pUrlApplySchemeW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); static HRESULT (WINAPI *pParseURLA)(LPCSTR,PARSEDURLA*); static HRESULT (WINAPI *pParseURLW)(LPCWSTR,PARSEDURLW*); static HRESULT (WINAPI *pHashData)(LPBYTE, DWORD, LPBYTE, DWORD); @@ -408,10 +410,15 @@ static void test_UrlApplyScheme(void) DWORD len; DWORD i; + if (!pUrlApplySchemeA) { + win_skip("UrlApplySchemeA not found\n"); + return; + } + for(i = 0; i < sizeof(TEST_APPLY)/sizeof(TEST_APPLY[0]); i++) { len = TEST_APPLY_MAX_LENGTH; lstrcpyA(newurl, untouchedA); - res = UrlApplySchemeA(TEST_APPLY[i].url, newurl, &len, TEST_APPLY[i].flags); + res = pUrlApplySchemeA(TEST_APPLY[i].url, newurl, &len, TEST_APPLY[i].flags); ok( res == TEST_APPLY[i].res, "#%dA: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); @@ -427,7 +434,7 @@ static void test_UrlApplyScheme(void) MultiByteToWideChar(CP_ACP, 0, newurl, -1, newurlW, len); MultiByteToWideChar(CP_ACP, 0, TEST_APPLY[i].url, -1, urlW, len); - res = UrlApplySchemeW(urlW, newurlW, &len, TEST_APPLY[i].flags); + res = pUrlApplySchemeW(urlW, newurlW, &len, TEST_APPLY[i].flags); WideCharToMultiByte(CP_ACP, 0, newurlW, -1, newurl, TEST_APPLY_MAX_LENGTH, NULL, NULL); ok( res == TEST_APPLY[i].res, "#%dW: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); @@ -443,7 +450,7 @@ static void test_UrlApplyScheme(void) /* buffer too small */ lstrcpyA(newurl, untouchedA); len = lstrlenA(TEST_APPLY[0].newurl); - res = UrlApplySchemeA(TEST_APPLY[0].url, newurl, &len, TEST_APPLY[0].flags); + res = pUrlApplySchemeA(TEST_APPLY[0].url, newurl, &len, TEST_APPLY[0].flags); ok(res == E_POINTER, "got HRESULT 0x%x (expected E_POINTER)\n", res); /* The returned length include the space for the terminating 0 */ i = lstrlenA(TEST_APPLY[0].newurl)+1; @@ -453,18 +460,18 @@ static void test_UrlApplyScheme(void) /* NULL as parameter. The length and the buffer are not modified */ lstrcpyA(newurl, untouchedA); len = TEST_APPLY_MAX_LENGTH; - res = UrlApplySchemeA(NULL, newurl, &len, TEST_APPLY[0].flags); + res = pUrlApplySchemeA(NULL, newurl, &len, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); ok(len == TEST_APPLY_MAX_LENGTH, "got len %d\n", len); ok(!lstrcmpA(newurl, untouchedA), "got '%s' (expected '%s')\n", newurl, untouchedA); len = TEST_APPLY_MAX_LENGTH; - res = UrlApplySchemeA(TEST_APPLY[0].url, NULL, &len, TEST_APPLY[0].flags); + res = pUrlApplySchemeA(TEST_APPLY[0].url, NULL, &len, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); ok(len == TEST_APPLY_MAX_LENGTH, "got len %d\n", len); lstrcpyA(newurl, untouchedA); - res = UrlApplySchemeA(TEST_APPLY[0].url, newurl, NULL, TEST_APPLY[0].flags); + res = pUrlApplySchemeA(TEST_APPLY[0].url, newurl, NULL, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); ok(!lstrcmpA(newurl, untouchedA), "got '%s' (expected '%s')\n", newurl, untouchedA); @@ -1177,6 +1184,8 @@ START_TEST(url) hShlwapi = GetModuleHandleA("shlwapi.dll"); pUrlCanonicalizeW = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeW"); + pUrlApplySchemeA = (void *) GetProcAddress(hShlwapi, "UrlApplySchemeA"); + pUrlApplySchemeW = (void *) GetProcAddress(hShlwapi, "UrlApplySchemeW"); pParseURLA = (void*)GetProcAddress(hShlwapi, (LPCSTR)1); pParseURLW = (void*)GetProcAddress(hShlwapi, (LPCSTR)2); pHashData = (void*)GetProcAddress(hShlwapi, "HashData");

1 0