February 2010 - Wine-Commits

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

Feb. 1, 2010

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

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

Feb. 1, 2010

Module: wine Branch: master Commit: 5d1820e70ecb89bf272c6ea962f578f1f3fb8aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d1820e70ecb89bf272c6ea96… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 31 00:31:33 2010 +0100 shlwapi/tests: UrlEscape* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/url.c | 44 +++++++++++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index a82faf0..e549298 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -31,6 +31,8 @@ /* ################ */ static HMODULE hShlwapi; +static HRESULT (WINAPI *pUrlEscapeA)(LPCSTR,LPSTR,LPDWORD,DWORD); +static HRESULT (WINAPI *pUrlEscapeW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); static HRESULT (WINAPI *pUrlCreateFromPathA)(LPCSTR,LPSTR,LPDWORD,DWORD); static HRESULT (WINAPI *pUrlCreateFromPathW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); static HRESULT (WINAPI *pUrlCombineA)(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD); @@ -595,18 +597,23 @@ static void test_url_escape(const char *szUrl, DWORD dwFlags, HRESULT dwExpectRe WCHAR *urlW, *expected_urlW; dwEscaped=INTERNET_MAX_URL_LENGTH; - ok(UrlEscapeA(szUrl, szReturnUrl, &dwEscaped, dwFlags) == dwExpectReturn, "UrlEscapeA didn't return 0x%08x from \"%s\"\n", dwExpectReturn, szUrl); + ok(pUrlEscapeA(szUrl, szReturnUrl, &dwEscaped, dwFlags) == dwExpectReturn, + "UrlEscapeA didn't return 0x%08x from \"%s\"\n", dwExpectReturn, szUrl); ok(strcmp(szReturnUrl,szExpectUrl)==0, "Expected \"%s\", but got \"%s\" from \"%s\"\n", szExpectUrl, szReturnUrl, szUrl); - dwEscaped = INTERNET_MAX_URL_LENGTH; - urlW = GetWideString(szUrl); - expected_urlW = GetWideString(szExpectUrl); - ok(UrlEscapeW(urlW, ret_urlW, &dwEscaped, dwFlags) == dwExpectReturn, "UrlEscapeW didn't return 0x%08x from \"%s\"\n", dwExpectReturn, szUrl); - 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 %08x\n", szExpectUrl, szReturnUrl, szUrl, dwFlags); - FreeWideString(urlW); - FreeWideString(expected_urlW); - + if (pUrlEscapeW) { + dwEscaped = INTERNET_MAX_URL_LENGTH; + urlW = GetWideString(szUrl); + expected_urlW = GetWideString(szExpectUrl); + ok(pUrlEscapeW(urlW, ret_urlW, &dwEscaped, dwFlags) == dwExpectReturn, + "UrlEscapeW didn't return 0x%08x from \"%s\"\n", dwExpectReturn, szUrl); + 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 %08x\n", + szExpectUrl, szReturnUrl, szUrl, dwFlags); + FreeWideString(urlW); + FreeWideString(expected_urlW); + } } static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, HRESULT dwExpectReturn, HRESULT dwExpectReturnAlt, const char *szExpectUrl, BOOL todo) @@ -659,27 +666,32 @@ static void test_UrlEscape(void) unsigned int i; char empty_string[] = ""; - ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); + if (!pUrlEscapeA) { + win_skip("UrlEscapeA noz found\n"); + return; + } + + ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 0, "got %d, expected %d\n", size, 0); size = 0; - ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 0, "got %d, expected %d\n", size, 0); size = 1; - ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); + ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 1, "got %d, expected %d\n", size, 1); size = 1; - ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, NULL, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 1, "got %d, expected %d\n", size, 1); size = 1; - ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); ok(size == 34, "got %d, expected %d\n", size, 34); @@ -1215,6 +1227,8 @@ START_TEST(url) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + pUrlEscapeA = (void *) GetProcAddress(hShlwapi, "UrlEscapeA"); + pUrlEscapeW = (void *) GetProcAddress(hShlwapi, "UrlEscapeW"); pUrlCreateFromPathA = (void *) GetProcAddress(hShlwapi, "UrlCreateFromPathA"); pUrlCreateFromPathW = (void *) GetProcAddress(hShlwapi, "UrlCreateFromPathW"); pUrlCombineA = (void *) GetProcAddress(hShlwapi, "UrlCombineA");

1 0

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

Feb. 1, 2010

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: UrlCreateFromPath* is not present on Win95B (winetestbot).
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: cbcdd6c846ecf6bd8b7bd7295c71ad5147c41caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbcdd6c846ecf6bd8b7bd7295… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 31 00:21:25 2010 +0100 shlwapi/tests: UrlCreateFromPath* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/url.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index c5a4ae6..a82faf0 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -31,6 +31,8 @@ /* ################ */ static HMODULE hShlwapi; +static HRESULT (WINAPI *pUrlCreateFromPathA)(LPCSTR,LPSTR,LPDWORD,DWORD); +static HRESULT (WINAPI *pUrlCreateFromPathW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); 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); @@ -916,24 +918,32 @@ static void test_UrlCreateFromPath(void) WCHAR ret_urlW[INTERNET_MAX_URL_LENGTH]; WCHAR *pathW, *urlW; + if (!pUrlCreateFromPathA) { + win_skip("UrlCreateFromPathA not found\n"); + return; + } + for(i = 0; i < sizeof(TEST_URLFROMPATH) / sizeof(TEST_URLFROMPATH[0]); i++) { len = INTERNET_MAX_URL_LENGTH; - ret = UrlCreateFromPathA(TEST_URLFROMPATH[i].path, ret_url, &len, 0); + ret = pUrlCreateFromPathA(TEST_URLFROMPATH[i].path, ret_url, &len, 0); ok(ret == TEST_URLFROMPATH[i].ret, "ret %08x from path %s\n", ret, TEST_URLFROMPATH[i].path); ok(!lstrcmpi(ret_url, TEST_URLFROMPATH[i].url), "url %s from path %s\n", ret_url, TEST_URLFROMPATH[i].path); ok(len == strlen(ret_url), "ret len %d from path %s\n", len, TEST_URLFROMPATH[i].path); - len = INTERNET_MAX_URL_LENGTH; - pathW = GetWideString(TEST_URLFROMPATH[i].path); - urlW = GetWideString(TEST_URLFROMPATH[i].url); - ret = UrlCreateFromPathW(pathW, ret_urlW, &len, 0); - WideCharToMultiByte(CP_ACP, 0, ret_urlW, -1, ret_url, sizeof(ret_url),0,0); - ok(ret == TEST_URLFROMPATH[i].ret, "ret %08x from path L\"%s\", expected %08x\n", - ret, TEST_URLFROMPATH[i].path, TEST_URLFROMPATH[i].ret); - ok(!lstrcmpiW(ret_urlW, urlW), "got %s expected %s from path L\"%s\"\n", ret_url, TEST_URLFROMPATH[i].url, TEST_URLFROMPATH[i].path); - ok(len == lstrlenW(ret_urlW), "ret len %d from path L\"%s\"\n", len, TEST_URLFROMPATH[i].path); - FreeWideString(urlW); - FreeWideString(pathW); + if (pUrlCreateFromPathW) { + len = INTERNET_MAX_URL_LENGTH; + pathW = GetWideString(TEST_URLFROMPATH[i].path); + urlW = GetWideString(TEST_URLFROMPATH[i].url); + ret = pUrlCreateFromPathW(pathW, ret_urlW, &len, 0); + WideCharToMultiByte(CP_ACP, 0, ret_urlW, -1, ret_url, sizeof(ret_url),0,0); + ok(ret == TEST_URLFROMPATH[i].ret, "ret %08x from path L\"%s\", expected %08x\n", + ret, TEST_URLFROMPATH[i].path, TEST_URLFROMPATH[i].ret); + ok(!lstrcmpiW(ret_urlW, urlW), "got %s expected %s from path L\"%s\"\n", + ret_url, TEST_URLFROMPATH[i].url, TEST_URLFROMPATH[i].path); + ok(len == lstrlenW(ret_urlW), "ret len %d from path L\"%s\"\n", len, TEST_URLFROMPATH[i].path); + FreeWideString(urlW); + FreeWideString(pathW); + } } } @@ -1205,6 +1215,8 @@ START_TEST(url) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + pUrlCreateFromPathA = (void *) GetProcAddress(hShlwapi, "UrlCreateFromPathA"); + pUrlCreateFromPathW = (void *) GetProcAddress(hShlwapi, "UrlCreateFromPathW"); pUrlCombineA = (void *) GetProcAddress(hShlwapi, "UrlCombineA"); pUrlCombineW = (void *) GetProcAddress(hShlwapi, "UrlCombineW"); pUrlCanonicalizeA = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeA");

1 0

Detlef Riekenberg : wine.inf: Add a 16bit fake dll for ddeml.dll.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

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

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

Feb. 1, 2010

Module: wine Branch: master Commit: cb3e537b034e4000728d6ec264c512340f48e88a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb3e537b034e4000728d6ec26… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jan 30 16:34:52 2010 +0100 shlwapi/tests: HashData is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/url.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index a253c11..af7f729 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -34,6 +34,7 @@ static HMODULE hShlwapi; static HRESULT (WINAPI *pUrlCanonicalizeW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pParseURLA)(LPCSTR,PARSEDURLA*); static HRESULT (WINAPI *pParseURLW)(LPCWSTR,PARSEDURLW*); +static HRESULT (WINAPI *pHashData)(LPBYTE, DWORD, LPBYTE, DWORD); static const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; @@ -1102,36 +1103,36 @@ static void test_HashData(void) int i; /* Test hashing with identically sized input/output buffers. */ - res = HashData(input, 16, output, 16); + res = pHashData(input, 16, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected, sizeof(expected)), "Output buffer did not match expected contents\n"); /* Test hashing with larger output buffer. */ - res = HashData(input, 16, output, 32); + res = pHashData(input, 16, output, 32); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected2, sizeof(expected2)), "Output buffer did not match expected contents\n"); /* Test hashing with smaller input buffer. */ - res = HashData(input, 8, output, 16); + res = pHashData(input, 8, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected3, sizeof(expected3)), "Output buffer did not match expected contents\n"); /* Test passing NULL pointers for input/output parameters. */ - res = HashData(NULL, 0, NULL, 0); + res = pHashData(NULL, 0, NULL, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); - res = HashData(input, 0, NULL, 0); + res = pHashData(input, 0, NULL, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); - res = HashData(NULL, 0, output, 0); + res = pHashData(NULL, 0, output, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); @@ -1142,7 +1143,7 @@ static void test_HashData(void) for (i = 0; i < sizeof(output)/sizeof(BYTE); i++) output[i] = 0xFF; - res = HashData(input, 0, output, 0); + res = pHashData(input, 0, output, 0); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); /* The buffers should be unchanged. */ @@ -1159,12 +1160,12 @@ static void test_HashData(void) } /* Input/output parameters are not validated. */ - res = HashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); + res = pHashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if (0) { - res = HashData((BYTE *)0xdeadbeef, 1, (BYTE *)0xdeadbeef, 1); + res = pHashData((BYTE *)0xdeadbeef, 1, (BYTE *)0xdeadbeef, 1); trace("HashData returned 0x%08x\n", res); } } @@ -1178,6 +1179,7 @@ START_TEST(url) pUrlCanonicalizeW = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeW"); pParseURLA = (void*)GetProcAddress(hShlwapi, (LPCSTR)1); pParseURLW = (void*)GetProcAddress(hShlwapi, (LPCSTR)2); + pHashData = (void*)GetProcAddress(hShlwapi, "HashData"); test_UrlApplyScheme(); test_UrlHash();

1 0

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

Feb. 1, 2010

Module: wine Branch: master Commit: e3b3b1e27d5dd48c6f6eb53d794821bf03daf834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b3b1e27d5dd48c6f6eb53d7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jan 30 22:59:01 2010 +0100 shlwapi/tests: PathCreateFromUrl* is not present on Win95B (winetestbot). --- dlls/shlwapi/tests/path.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 5d64a24..e52502f 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -32,6 +32,8 @@ static HMODULE hShlwapi; static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD); static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); static LPWSTR (WINAPI *pPathCombineW)(LPWSTR, LPCWSTR, LPCWSTR); +static HRESULT (WINAPI *pPathCreateFromUrlA)(LPCSTR, LPSTR, LPDWORD, DWORD); +static HRESULT (WINAPI *pPathCreateFromUrlW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); /* ################ */ @@ -207,31 +209,39 @@ static void test_PathCreateFromUrl(void) WCHAR *pathW, *urlW; static const char url[] = "http://www.winehq.org"; + if (!pPathCreateFromUrlA) { + win_skip("PathCreateFromUrlA not found\n"); + return; + } + /* Check ret_path = NULL */ len = sizeof(url); - ret = PathCreateFromUrlA(url, NULL, &len, 0); + ret = pPathCreateFromUrlA(url, NULL, &len, 0); ok ( ret == E_INVALIDARG, "got 0x%08x expected E_INVALIDARG\n", ret); for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; - ret = PathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); + ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); if(TEST_PATHFROMURL[i].path) { ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); ok(len == strlen(ret_path), "ret len %d from url %s\n", len, TEST_PATHFROMURL[i].url); } - len = INTERNET_MAX_URL_LENGTH; - pathW = GetWideString(TEST_PATHFROMURL[i].path); - urlW = GetWideString(TEST_PATHFROMURL[i].url); - ret = PathCreateFromUrlW(urlW, ret_pathW, &len, 0); - WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),0,0); - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); - if(TEST_PATHFROMURL[i].path) { - ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); - ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url); + if (pPathCreateFromUrlW) { + len = INTERNET_MAX_URL_LENGTH; + pathW = GetWideString(TEST_PATHFROMURL[i].path); + urlW = GetWideString(TEST_PATHFROMURL[i].url); + ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0); + WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),0,0); + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); + if(TEST_PATHFROMURL[i].path) { + ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", + ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); + ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url); + } + FreeWideString(urlW); + FreeWideString(pathW); } - FreeWideString(urlW); - FreeWideString(pathW); } } @@ -1307,6 +1317,8 @@ static void test_PathUnquoteSpaces(void) START_TEST(path) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + pPathCreateFromUrlA = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlA"); + pPathCreateFromUrlW = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlW"); test_PathSearchAndQualify(); test_PathCreateFromUrl();

1 0

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

Feb. 1, 2010

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

Piotr Caban : userenv: Added GetAllUsersProfileDirectory[AW] stubs.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

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 Feb. 1, 2010

Feb. 1, 2010

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