wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

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

01 Feb '10

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

01 Feb '10

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

01 Feb '10

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 01 Feb '10

01 Feb '10

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

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

01 Feb '10

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

01 Feb '10

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: 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

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 : 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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010