February 2010 - Wine-commits

Detlef Riekenberg : shlwapi/tests: UrlGetPart* is not present on Win95B ( winetestbot).
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: fb81d89a81405da6616d2c2012b57c99e734a5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb81d89a81405da6616d2c201… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 31 00:51:44 2010 +0100 shlwapi/tests: UrlGetPart* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/url.c | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index e549298..69280e7 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -31,6 +31,8 @@ /* ################ */ static HMODULE hShlwapi; +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); static HRESULT (WINAPI *pUrlEscapeW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); static HRESULT (WINAPI *pUrlCreateFromPathA)(LPCSTR,LPSTR,LPDWORD,DWORD); @@ -516,20 +518,29 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const WCHAR wszPart[INTERNET_MAX_URL_LENGTH]; LPWSTR wszUrl = GetWideString(szUrl); LPWSTR wszConvertedPart; - + HRESULT res; DWORD dwSize; dwSize = INTERNET_MAX_URL_LENGTH; - ok( UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags) == S_OK, "UrlGetPartA for \"%s\" part 0x%08x didn't return S_OK but \"%s\"\n", szUrl, dwPart, szPart); - dwSize = INTERNET_MAX_URL_LENGTH; - ok( UrlGetPartW(wszUrl, wszPart, &dwSize, dwPart, dwFlags) == S_OK, "UrlGetPartW didn't return S_OK\n" ); + res = pUrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); + ok(res == S_OK, + "UrlGetPartA for \"%s\" part 0x%08x returned 0x%x and \"%s\"\n", + szUrl, dwPart, res, szPart); + if (pUrlGetPartW) { + dwSize = INTERNET_MAX_URL_LENGTH; + res = pUrlGetPartW(wszUrl, wszPart, &dwSize, dwPart, dwFlags); + ok(res == S_OK, + "UrlGetPartW for \"%s\" part 0x%08x returned 0x%x\n", + szUrl, dwPart, res); - wszConvertedPart = GetWideString(szPart); + wszConvertedPart = GetWideString(szPart); - ok(lstrcmpW(wszPart,wszConvertedPart)==0, "Strings didn't match between ascii and unicode UrlGetPart!\n"); + ok(lstrcmpW(wszPart,wszConvertedPart)==0, + "Strings didn't match between ascii and unicode UrlGetPart!\n"); + FreeWideString(wszConvertedPart); + } FreeWideString(wszUrl); - FreeWideString(wszConvertedPart); /* Note that v6.0 and later don't return '?' with the query */ ok(strcmp(szPart,szExpected)==0 || @@ -548,16 +559,21 @@ static void test_UrlGetPart(void) DWORD dwSize; HRESULT res; + if (!pUrlGetPartA) { + win_skip("UrlGetPartA not found\n"); + return; + } + dwSize = sizeof szPart; szPart[0]='x'; szPart[1]=0; - res = UrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); + res = pUrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); todo_wine { ok (res==S_FALSE, "UrlGetPartA(\"hi\") returned %08X\n", res); ok(szPart[0]==0, "UrlGetPartA(\"hi\") return \"%s\" instead of \"\"\n", szPart); } dwSize = sizeof szPart; szPart[0]='x'; szPart[1]=0; - res = UrlGetPartA("hi", szPart, &dwSize, URL_PART_QUERY, 0); + res = pUrlGetPartA("hi", szPart, &dwSize, URL_PART_QUERY, 0); todo_wine { ok (res==S_FALSE, "UrlGetPartA(\"hi\") returned %08X\n", res); ok(szPart[0]==0, "UrlGetPartA(\"hi\") return \"%s\" instead of \"\"\n", szPart); @@ -576,12 +592,12 @@ static void test_UrlGetPart(void) test_url_part(http_url, URL_PART_PASSWORD, 0, "pass 123"); dwSize = sizeof(szPart); - res = UrlGetPartA("file://c:\\index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = pUrlGetPartA("file://c:\\index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==S_FALSE, "returned %08x\n", res); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = UrlGetPartA("file:some text", szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = pUrlGetPartA("file:some text", szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==S_FALSE, "returned %08x\n", res); ok(szPart[0] == '\0', "szPart[0] = %c\n", szPart[0]); ok(dwSize == 0, "dwSize = %d\n", dwSize); @@ -1227,6 +1243,8 @@ START_TEST(url) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + pUrlGetPartA = (void *) GetProcAddress(hShlwapi, "UrlGetPartA"); + pUrlGetPartW = (void *) GetProcAddress(hShlwapi, "UrlGetPartW"); pUrlEscapeA = (void *) GetProcAddress(hShlwapi, "UrlEscapeA"); pUrlEscapeW = (void *) GetProcAddress(hShlwapi, "UrlEscapeW"); pUrlCreateFromPathA = (void *) GetProcAddress(hShlwapi, "UrlCreateFromPathA");

1 0

Detlef Riekenberg : shlwapi/tests: UrlHash* is not present on Win95B ( winetestbot).
by Alexandre Julliard 01 Feb '10

01 Feb '10

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: UrlIs* is not present on Win95B ( winetestbot).
by Alexandre Julliard 01 Feb '10

01 Feb '10

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: UrlUnescape* is not present on Win95B ( winetestbot).
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: c318f4f76bd14e649b56c6a7dc080e900fcfd612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c318f4f76bd14e649b56c6a7d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 31 01:57:23 2010 +0100 shlwapi/tests: UrlUnescape* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/url.c | 68 +++++++++++++++++++++++++++++++++------------- 1 files changed, 49 insertions(+), 19 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index c5d11a1..4dd5d9c 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -31,6 +31,8 @@ /* ################ */ static HMODULE hShlwapi; +static HRESULT (WINAPI *pUrlUnescapeA)(LPSTR,LPSTR,LPDWORD,DWORD); +static HRESULT (WINAPI *pUrlUnescapeW)(LPWSTR,LPWSTR,LPDWORD,DWORD); static BOOL (WINAPI *pUrlIsA)(LPCSTR,URLIS); static BOOL (WINAPI *pUrlIsW)(LPCWSTR,URLIS); static HRESULT (WINAPI *pUrlHashA)(LPCSTR,LPBYTE,DWORD); @@ -1055,45 +1057,71 @@ static void test_UrlUnescape(void) static char another_inplace[] = "file:///C:/Program%20Files"; static const char expected[] = "file:///C:/Program Files"; static WCHAR inplaceW[] = {'f','i','l','e',':','/','/','/','C',':','/','P','r','o','g','r','a','m',' ','F','i','l','e','s',0}; - static WCHAR another_inplaceW[] = {'f','i','l','e',':','/','/','/','C',':','/','P','r','o','g','r','a','m','%','2','0','F','i','l','e','s',0}; + static WCHAR another_inplaceW[] ={'f','i','l','e',':','/','/','/', + 'C',':','/','P','r','o','g','r','a','m','%','2','0','F','i','l','e','s',0}; + HRESULT res; + if (!pUrlUnescapeA) { + win_skip("UrlUnescapeA not found\n"); + return; + } for(i=0; i<sizeof(TEST_URL_UNESCAPE)/sizeof(TEST_URL_UNESCAPE[0]); i++) { dwEscaped=INTERNET_MAX_URL_LENGTH; - ok(UrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, &dwEscaped, 0) == S_OK, "UrlUnescapeA didn't return 0x%08x from \"%s\"\n", S_OK, TEST_URL_UNESCAPE[i].url); + res = pUrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, &dwEscaped, 0); + ok(res == S_OK, + "UrlUnescapeA returned 0x%x (expected S_OK) for \"%s\"\n", + res, TEST_URL_UNESCAPE[i].url); ok(strcmp(szReturnUrl,TEST_URL_UNESCAPE[i].expect)==0, "Expected \"%s\", but got \"%s\" from \"%s\"\n", TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url); ZeroMemory(szReturnUrl, sizeof(szReturnUrl)); /* if we set the bufferpointer to NULL here UrlUnescape fails and string gets not converted */ - ok(UrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, NULL, 0) == E_INVALIDARG, "UrlUnescapeA didn't return 0x%08x from \"%s\"\n", E_INVALIDARG ,TEST_URL_UNESCAPE[i].url); + res = pUrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, NULL, 0); + ok(res == E_INVALIDARG, + "UrlUnescapeA returned 0x%x (expected E_INVALIDARG) for \"%s\"\n", + res, TEST_URL_UNESCAPE[i].url); ok(strcmp(szReturnUrl,"")==0, "Expected empty string\n"); - dwEscaped = INTERNET_MAX_URL_LENGTH; - urlW = GetWideString(TEST_URL_UNESCAPE[i].url); - expected_urlW = GetWideString(TEST_URL_UNESCAPE[i].expect); - ok(UrlUnescapeW(urlW, ret_urlW, &dwEscaped, 0) == S_OK, "UrlUnescapeW didn't return 0x%08x from \"%s\"\n", S_OK, TEST_URL_UNESCAPE[i].url); - WideCharToMultiByte(CP_ACP,0,ret_urlW,-1,szReturnUrl,INTERNET_MAX_URL_LENGTH,0,0); - ok(lstrcmpW(ret_urlW, expected_urlW)==0, "Expected \"%s\", but got \"%s\" from \"%s\" flags %08lx\n", TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url, 0L); - FreeWideString(urlW); - FreeWideString(expected_urlW); + if (pUrlUnescapeW) { + dwEscaped = INTERNET_MAX_URL_LENGTH; + urlW = GetWideString(TEST_URL_UNESCAPE[i].url); + expected_urlW = GetWideString(TEST_URL_UNESCAPE[i].expect); + res = pUrlUnescapeW(urlW, ret_urlW, &dwEscaped, 0); + ok(res == S_OK, + "UrlUnescapeW returned 0x%x (expected S_OK) for \"%s\"\n", + res, TEST_URL_UNESCAPE[i].url); + + WideCharToMultiByte(CP_ACP,0,ret_urlW,-1,szReturnUrl,INTERNET_MAX_URL_LENGTH,0,0); + ok(lstrcmpW(ret_urlW, expected_urlW)==0, + "Expected \"%s\", but got \"%s\" from \"%s\" flags %08lx\n", + TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url, 0L); + FreeWideString(urlW); + FreeWideString(expected_urlW); + } } dwEscaped = sizeof(inplace); - ok(UrlUnescapeA(inplace, NULL, &dwEscaped, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeA failed unexpectedly\n"); + res = pUrlUnescapeA(inplace, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); + ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK)\n", res); ok(!strcmp(inplace, expected), "got %s expected %s\n", inplace, expected); ok(dwEscaped == 27, "got %d expected 27\n", dwEscaped); /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ - ok(UrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeA failed unexpectedly\n"); + res = pUrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE); + ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK)\n", res); ok(!strcmp(another_inplace, expected), "got %s expected %s\n", another_inplace, expected); - dwEscaped = sizeof(inplaceW); - ok(UrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeW failed unexpectedly\n"); - ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); + if (pUrlUnescapeW) { + dwEscaped = sizeof(inplaceW); + res = pUrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); + ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); + ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); - /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ - ok(UrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeW failed unexpectedly\n"); - ok(lstrlenW(another_inplaceW) == 24, "got %d expected 24\n", lstrlenW(another_inplaceW)); + /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ + res = pUrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE); + ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); + ok(lstrlenW(another_inplaceW) == 24, "got %d expected 24\n", lstrlenW(another_inplaceW)); + } } static const struct parse_url_test_t { @@ -1266,6 +1294,8 @@ START_TEST(url) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + pUrlUnescapeA = (void *) GetProcAddress(hShlwapi, "UrlUnescapeA"); + pUrlUnescapeW = (void *) GetProcAddress(hShlwapi, "UrlUnescapeW"); pUrlIsA = (void *) GetProcAddress(hShlwapi, "UrlIsA"); pUrlIsW = (void *) GetProcAddress(hShlwapi, "UrlIsW"); pUrlHashA = (void *) GetProcAddress(hShlwapi, "UrlHashA");

1 0

Piotr Caban : shlwapi: Invoke ExpandEnvironmentStringsForUser on SHExpandEnvironmentStringsForUser call .
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 9310ee0ef44352f0761edab37f63c4759c75e5ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9310ee0ef44352f0761edab37… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jan 31 23:03:57 2010 +0100 shlwapi: Invoke ExpandEnvironmentStringsForUser on SHExpandEnvironmentStringsForUser call. --- dlls/shlwapi/Makefile.in | 2 +- dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 2594a19..673f4ad 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = shlwapi.dll IMPORTLIB = shlwapi IMPORTS = uuid user32 gdi32 advapi32 kernel32 ntdll -DELAYIMPORTS = oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version +DELAYIMPORTS = userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version C_SRCS = \ assoc.c \ diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 479443c..3091783 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -460,8 +460,8 @@ 460 stdcall -noname SHExpandEnvironmentStringsW(wstr ptr long) kernel32.ExpandEnvironmentStringsW 461 stdcall -noname SHGetAppCompatFlags(long) 462 stdcall -noname UrlFixupW(wstr wstr long) -463 stub -noname SHExpandEnvironmentStringsForUserA -464 stub -noname SHExpandEnvironmentStringsForUserW +463 stdcall -noname SHExpandEnvironmentStringsForUserA(ptr str ptr long) userenv.ExpandEnvironmentStringsForUserA +464 stdcall -noname SHExpandEnvironmentStringsForUserW(ptr wstr ptr long) userenv.ExpandEnvironmentStringsForUserW 465 stub -noname PathUnExpandEnvStringsForUserA 466 stub -noname PathUnExpandEnvStringsForUserW 467 stub -noname SHRunIndirectRegClientCommand

1 0

Piotr Caban : userenv: Added GetAllUsersProfileDirectory[AW] stubs.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 698181638851f08ca3e0b35f71b5527445d88c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=698181638851f08ca3e0b35f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jan 31 23:04:11 2010 +0100 userenv: Added GetAllUsersProfileDirectory[AW] stubs. --- dlls/userenv/userenv.spec | 2 ++ dlls/userenv/userenv_main.c | 12 ++++++++++++ include/userenv.h | 3 +++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index 95280bf..26475e5 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -2,6 +2,8 @@ @ stub DestroyEnvironmentBlock @ stdcall ExpandEnvironmentStringsForUserA(ptr str ptr long) @ stdcall ExpandEnvironmentStringsForUserW(ptr wstr ptr long) +@ stdcall GetAllUsersProfileDirectoryA(ptr ptr) +@ stdcall GetAllUsersProfileDirectoryW(ptr ptr) @ stdcall GetProfilesDirectoryA(ptr ptr) @ stdcall GetProfilesDirectoryW(ptr ptr) @ stdcall GetProfileType(ptr) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 01f3a1b..8782c94 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -115,6 +115,18 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize ) return FALSE; } +BOOL WINAPI GetAllUsersProfileDirectoryA( LPSTR lpProfileDir, LPDWORD lpcchSize ) +{ + FIXME("%p %p\n", lpProfileDir, lpcchSize); + return FALSE; +} + +BOOL WINAPI GetAllUsersProfileDirectoryW( LPWSTR lpProfileDir, LPDWORD lpcchSize ) +{ + FIXME("%p %p\n", lpProfileDir, lpcchSize); + return FALSE; +} + BOOL WINAPI GetProfileType( DWORD *pdwFlags ) { FIXME("%p\n", pdwFlags ); diff --git a/include/userenv.h b/include/userenv.h index 20d7fa1..507715f 100644 --- a/include/userenv.h +++ b/include/userenv.h @@ -40,6 +40,9 @@ BOOL WINAPI GetUserProfileDirectoryW(HANDLE,LPWSTR,LPDWORD); BOOL WINAPI GetProfilesDirectoryA(LPSTR,LPDWORD); BOOL WINAPI GetProfilesDirectoryW(LPWSTR,LPDWORD); #define GetProfilesDirectory WINELIB_NAME_AW(GetProfilesDirectory) +BOOL WINAPI GetAllUsersProfileDirectoryA(LPSTR,LPDWORD); +BOOL WINAPI GetAllUsersProfileDirectoryW(LPWSTR,LPDWORD); +#define GetAllUsersProfileDirectory WINELIB_NAME_AW(GetAllUsersProfileDirectory) BOOL WINAPI GetProfileType(DWORD*); BOOL WINAPI LoadUserProfileA(HANDLE,LPPROFILEINFOA); BOOL WINAPI LoadUserProfileW(HANDLE,LPPROFILEINFOW);

1 0

Erich Hoover : hhctrl.ocx: Remove a superfluous line that uses an uninitialized variable.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 1863a9c76d2c1f3a1d5fe901bd638f4b379254da URL: http://source.winehq.org/git/wine.git/?a=commit;h=1863a9c76d2c1f3a1d5fe901b… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Jan 31 21:09:23 2010 -0700 hhctrl.ocx: Remove a superfluous line that uses an uninitialized variable. --- dlls/hhctrl.ocx/hhctrl.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index c8ae0a1..99f7130 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -297,7 +297,6 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) space = strchr(ptr, ' '); memcpy(idtxt, ptr, space-ptr); idtxt[space-ptr] = '\0'; - filename += (space-ptr)+1; mapid = atoi(idtxt); szCmdLine = space+1; }

1 0

Detlef Riekenberg : wine.inf: Add a 16bit fake dll for ddeml.dll.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: d7069b61f4006d0949456684bc58954bcadc8fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7069b61f4006d0949456684b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 31 23:14:22 2010 +0100 wine.inf: Add a 16bit fake dll for ddeml.dll. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 5a9db4e..058f02c 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2426,7 +2426,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [FakeDllsSection] ; create some directories first 10,inf, -10,system, 10,temp, 11,mui, 11,spool\drivers\color, @@ -2441,6 +2440,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,winhelp.exe,winhelp.exe16 10,,winhlp32.exe 10,command,start.exe +10,system,ddeml.dll,ddeml.dll16 11,,ddhelp.exe 11,,dosx.exe 11,,dsound.vxd

1 0

Hans Leidekker : msi: Don't fail if the service to start is already running .
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 246f9305e9f8eb18e54018746143d95afed887be URL: http://source.winehq.org/git/wine.git/?a=commit;h=246f9305e9f8eb18e54018746… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 1 09:55:08 2010 +0100 msi: Don't fail if the service to start is already running. --- dlls/msi/action.c | 3 +- dlls/msi/tests/install.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0d765ea..462b9ff 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4492,7 +4492,8 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) vector = msi_service_args_to_vector(args, &numargs); - if (!StartServiceW(service, numargs, vector)) + if (!StartServiceW(service, numargs, vector) && + GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) { ERR("Failed to start service %s (%u)\n", debugstr_w(name), GetLastError()); goto done; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3904185..5da3ed6 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -349,6 +349,29 @@ static const CHAR service_control_dat[] = "ServiceControl\tName\tEvent\tArgument "ServiceControl\tServiceControl\n" "ServiceControl\tTestService\t8\t\t0\tservice_comp"; +static const CHAR sss_service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" + "s72\tl255\ti2\tL255\tI2\ts72\n" + "ServiceControl\tServiceControl\n" + "ServiceControl\tTermService\t1\t\t0\tservice_comp"; + +static const CHAR sss_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "ResolveSource\t\t950\n" + "MoveFiles\t\t1700\n" + "InstallFiles\t\t4000\n" + "DuplicateFiles\t\t4500\n" + "WriteEnvironmentStrings\t\t4550\n" + "CreateShortcuts\t\t4600\n" + "StartServices\t\t5000\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100\n"; + /* tables for test_continuouscabs */ static const CHAR cc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" @@ -1812,6 +1835,19 @@ static const msi_table cf_tables[] = ADD_TABLE(property) }; +static const msi_table sss_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(sss_install_exec_seq), + ADD_TABLE(sss_service_control), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -7410,6 +7446,69 @@ static void test_create_folder(void) delete_test_files(); } +static void test_start_services(void) +{ + UINT r; + SC_HANDLE scm, service; + BOOL ret; + DWORD error = ERROR_SUCCESS; + + scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(scm != NULL, "Failed to open the SC Manager\n"); + + service = OpenService(scm, "TermService", SC_MANAGER_ALL_ACCESS); + ok(service != NULL, "Failed to open TermService\n"); + + ret = StartService(service, 0, NULL); + if (!ret && (error = GetLastError()) != ERROR_SERVICE_ALREADY_RUNNING) + { + skip("Terminal service not available, skipping test\n"); + CloseServiceHandle(service); + CloseServiceHandle(scm); + return; + } + + CloseServiceHandle(service); + CloseServiceHandle(scm); + + create_test_files(); + create_database(msifile, sss_tables, sizeof(sss_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + delete_test_files(); + + if (error == ERROR_SUCCESS) + { + SERVICE_STATUS status; + + scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenService(scm, "TermService", SC_MANAGER_ALL_ACCESS); + + ret = ControlService(service, SERVICE_CONTROL_STOP, &status); + ok(ret, "ControlService failed %u\n", GetLastError()); + + CloseServiceHandle(service); + CloseServiceHandle(scm); + } +} + START_TEST(install) { DWORD len; @@ -7502,6 +7601,7 @@ START_TEST(install) test_allusers_prop(); test_feature_override(); test_create_folder(); + test_start_services(); DeleteFileA(log_file);

1 0

Detlef Riekenberg : shlwapi/tests: ChrCmpI* is not present on Win95B ( winetestbot).
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 29edebe0cccfc1757f96aba1576bafc618f6044f URL: http://source.winehq.org/git/wine.git/?a=commit;h=29edebe0cccfc1757f96aba15… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jan 30 16:25:05 2010 +0100 shlwapi/tests: ChrCmpI* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/string.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index eae8905..00f0b02 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -40,6 +40,8 @@ ok(ret == val1 || ret == val2, "Unexpected value of '" #expr "': " #fmt " instead of " #val1 " or " #val2 "\n", ret); \ } while (0); +static BOOL (WINAPI *pChrCmpIA)(CHAR, CHAR); +static BOOL (WINAPI *pChrCmpIW)(WCHAR, WCHAR); static BOOL (WINAPI *pIntlStrEqWorkerA)(BOOL,LPCSTR,LPCSTR,int); static BOOL (WINAPI *pIntlStrEqWorkerW)(BOOL,LPCWSTR,LPCWSTR,int); static DWORD (WINAPI *pSHAnsiToAnsi)(LPCSTR,LPSTR,int); @@ -608,9 +610,13 @@ static void test_StrCmpA(void) static const char str2[] = {'a','B','c','d','e','f'}; ok(0 != StrCmpNA(str1, str2, 6), "StrCmpNA is case-insensitive\n"); ok(0 == StrCmpNIA(str1, str2, 6), "StrCmpNIA is case-sensitive\n"); - ok(!ChrCmpIA('a', 'a'), "ChrCmpIA doesn't work at all!\n"); - ok(!ChrCmpIA('b', 'B'), "ChrCmpIA is not case-insensitive\n"); - ok(ChrCmpIA('a', 'z'), "ChrCmpIA believes that a == z!\n"); + if (pChrCmpIA) { + ok(!pChrCmpIA('a', 'a'), "ChrCmpIA doesn't work at all!\n"); + ok(!pChrCmpIA('b', 'B'), "ChrCmpIA is not case-insensitive\n"); + ok(pChrCmpIA('a', 'z'), "ChrCmpIA believes that a == z!\n"); + } + else + win_skip("ChrCmpIA() is not available\n"); if (pStrIsIntlEqualA) { @@ -635,9 +641,13 @@ static void test_StrCmpW(void) static const WCHAR str2[] = {'a','B','c','d','e','f'}; ok(0 != StrCmpNW(str1, str2, 5), "StrCmpNW is case-insensitive\n"); ok(0 == StrCmpNIW(str1, str2, 5), "StrCmpNIW is case-sensitive\n"); - ok(!ChrCmpIW('a', 'a'), "ChrCmpIW doesn't work at all!\n"); - ok(!ChrCmpIW('b', 'B'), "ChrCmpIW is not case-insensitive\n"); - ok(ChrCmpIW('a', 'z'), "ChrCmpIW believes that a == z!\n"); + if (pChrCmpIW) { + ok(!pChrCmpIW('a', 'a'), "ChrCmpIW doesn't work at all!\n"); + ok(!pChrCmpIW('b', 'B'), "ChrCmpIW is not case-insensitive\n"); + ok(pChrCmpIW('a', 'z'), "ChrCmpIW believes that a == z!\n"); + } + else + win_skip("ChrCmpIW() is not available\n"); if (pStrIsIntlEqualW) { @@ -925,6 +935,8 @@ START_TEST(string) GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimalDelim, 8); hShlwapi = GetModuleHandleA("shlwapi"); + pChrCmpIA = (void *)GetProcAddress(hShlwapi, "ChrCmpIA"); + pChrCmpIW = (void *)GetProcAddress(hShlwapi, "ChrCmpIW"); pIntlStrEqWorkerA = (void *)GetProcAddress(hShlwapi, "IntlStrEqWorkerA"); pIntlStrEqWorkerW = (void *)GetProcAddress(hShlwapi, "IntlStrEqWorkerW"); pSHAnsiToAnsi = (void *)GetProcAddress(hShlwapi, (LPSTR)345);

1 0