June 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : wininet/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 68e4cf4a0bc298f68368e772260fe80655f3e7ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68e4cf4a0bc298f68368e77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 13:58:30 2006 +0200 wininet/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings. --- dlls/wininet/tests/internet.c | 6 +++--- dlls/wininet/tests/url.c | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index d3596ae..51c6b6a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -43,7 +43,7 @@ static void InternetQueryOptionA_test(vo len=strlen(useragent)+1; retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,NULL,&len); err=GetLastError(); - ok(len == strlen(useragent)+1,"Got wrong user agent length %ld instead of %d\n",len,strlen(useragent)); + ok(len == strlen(useragent)+1,"Got wrong user agent length %ld instead of %d\n",len,lstrlenA(useragent)); ok(retval == 0,"Got wrong return value %d\n",retval); todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code%ld\n",err); @@ -53,7 +53,7 @@ static void InternetQueryOptionA_test(vo retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,buffer,&len); err=GetLastError(); todo_wine ok(!strcmp(useragent,buffer),"Got wrong user agent string %s instead of %s\n",buffer,useragent); - todo_wine ok(len == strlen(useragent),"Got wrong user agent length %ld instead of %d\n",len,strlen(useragent)); + todo_wine ok(len == strlen(useragent),"Got wrong user agent length %ld instead of %d\n",len,lstrlenA(useragent)); todo_wine ok(retval == 1,"Got wrong return value %d\n",retval); ok(err == 0xdeadbeef, "Got wrong error code %ld\n",err); HeapFree(GetProcessHeap(),0,buffer); @@ -63,7 +63,7 @@ static void InternetQueryOptionA_test(vo buffer=HeapAlloc(GetProcessHeap(),0,100); retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,buffer,&len); err=GetLastError(); - todo_wine ok(len == strlen(useragent) + 1,"Got wrong user agent length %ld instead of %d\n", len, strlen(useragent) + 1); + todo_wine ok(len == strlen(useragent) + 1,"Got wrong user agent length %ld instead of %d\n", len, lstrlenA(useragent) + 1); ok(!retval, "Got wrong return value %d\n", retval); todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code %ld\n", err); HeapFree(GetProcessHeap(),0,buffer); diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index e74a55c..4afefbd 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -138,9 +138,9 @@ static void InternetCrackUrl_test(void) zero_compsA(&urlComponents, 1, 1, 1, 1, 1, 1); ok(InternetCrackUrlA(TEST_URL, strlen(TEST_URL), 0, &urlComponents),"InternetCrackUrl failed with GLE 0x%lx\n",GetLastError()); - ok(urlComponents.dwUrlPathLength == strlen(TEST_URL_PATH),".dwUrlPathLength should be %d, but is %ld\n", strlen(TEST_URL_PATH), urlComponents.dwUrlPathLength); + ok(urlComponents.dwUrlPathLength == strlen(TEST_URL_PATH),".dwUrlPathLength should be %d, but is %ld\n", lstrlenA(TEST_URL_PATH), urlComponents.dwUrlPathLength); ok(!strncmp(urlComponents.lpszUrlPath,TEST_URL_PATH,strlen(TEST_URL_PATH)),"lpszUrlPath should be %s but is %s\n", TEST_URL_PATH, urlComponents.lpszUrlPath); - ok(urlComponents.dwHostNameLength == strlen(TEST_URL_HOST),".dwHostNameLength should be %d, but is %ld\n", strlen(TEST_URL_HOST), urlComponents.dwHostNameLength); + ok(urlComponents.dwHostNameLength == strlen(TEST_URL_HOST),".dwHostNameLength should be %d, but is %ld\n", lstrlenA(TEST_URL_HOST), urlComponents.dwHostNameLength); ok(!strncmp(urlComponents.lpszHostName,TEST_URL_HOST,strlen(TEST_URL_HOST)),"lpszHostName should be %s but is %s\n", TEST_URL_HOST, urlComponents.lpszHostName); ok(urlComponents.nPort == INTERNET_DEFAULT_HTTP_PORT,"urlComponents->nPort should have been 80 instead of %d\n", urlComponents.nPort); ok(urlComponents.nScheme == INTERNET_SCHEME_HTTP,"urlComponents->nScheme should have been INTERNET_SCHEME_HTTP instead of %d\n", urlComponents.nScheme); @@ -536,7 +536,7 @@ static void InternetCreateUrlA_test(void szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL6), "Expected len %d, got %ld\n", strlen(CREATE_URL6) + 1, len); + ok(len == strlen(CREATE_URL6), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL6) + 1, len); ok(!strcmp(szUrl, CREATE_URL6), "Expected %s, got %s\n", CREATE_URL6, szUrl); /* if lpszScheme != "http" or nPort != 80, display nPort */ @@ -573,7 +573,7 @@ static void InternetCreateUrlA_test(void szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL1), "Expected len %d, got %ld\n", strlen(CREATE_URL1), len); + ok(len == strlen(CREATE_URL1), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL1), len); ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl); memset(&urlComp, 0, sizeof(urlComp)); @@ -596,7 +596,7 @@ static void InternetCreateUrlA_test(void szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL8), "Expected len %d, got %ld\n", strlen(CREATE_URL8), len); + ok(len == strlen(CREATE_URL8), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL8), len); ok(!strcmp(szUrl, CREATE_URL8), "Expected %s, got %s\n", CREATE_URL8, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); @@ -612,7 +612,7 @@ static void InternetCreateUrlA_test(void szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL9), "Expected len %d, got %ld\n", strlen(CREATE_URL9), len); + ok(len == strlen(CREATE_URL9), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL9), len); ok(!strcmp(szUrl, CREATE_URL9), "Expected %s, got %s\n", CREATE_URL9, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); @@ -627,7 +627,7 @@ static void InternetCreateUrlA_test(void szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL10), "Expected len %d, got %ld\n", strlen(CREATE_URL10), len); + ok(len == strlen(CREATE_URL10), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL10), len); ok(!strcmp(szUrl, CREATE_URL10), "Expected %s, got %s\n", CREATE_URL10, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); @@ -640,7 +640,7 @@ static void InternetCreateUrlA_test(void szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL11), "Expected len %d, got %ld\n", strlen(CREATE_URL11), len); + ok(len == strlen(CREATE_URL11), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL11), len); ok(!strcmp(szUrl, CREATE_URL11), "Expected %s, got %s\n", CREATE_URL11, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); @@ -657,7 +657,7 @@ static void InternetCreateUrlA_test(void szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL12), "Expected len %d, got %ld\n", strlen(CREATE_URL12), len); + ok(len == strlen(CREATE_URL12), "Expected len %d, got %ld\n", lstrlenA(CREATE_URL12), len); ok(!strcmp(szUrl, CREATE_URL12), "Expected %s, got %s\n", CREATE_URL12, szUrl); HeapFree(GetProcessHeap(), 0, szUrl);

1 0

Alexandre Julliard : version/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 298d80c2bd41d85f6d77bdb8b1f1405ca778e163 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=298d80c2bd41d85f6d77bdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 13:58:12 2006 +0200 version/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings. --- dlls/version/tests/install.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/version/tests/install.c b/dlls/version/tests/install.c index a2651b7..310ef4c 100644 --- a/dlls/version/tests/install.c +++ b/dlls/version/tests/install.c @@ -75,7 +75,7 @@ static void test_find_file(void) switch(ret) { case VFF_CURNEDEST: ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: " - "got %d(%s) expected %d\n", dwCur, curdir, strlen(windir)+1); + "got %d(%s) expected %d\n", dwCur, curdir, lstrlenA(windir)+1); ok(dwOut == 1, "Wrong length of buffer for the recommended installation location: " "got %d(%s) expected 1\n", dwOut, outBuf); break; @@ -97,7 +97,7 @@ static void test_find_file(void) switch(ret) { case VFF_CURNEDEST: ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: " - "got %d(%s) expected %d\n", dwCur, curdir, strlen(windir)+1); + "got %d(%s) expected %d\n", dwCur, curdir, lstrlenA(windir)+1); ok(dwOut == 1, "Wrong length of buffer for the recommended installation location: " "got %d(%s) expected 1\n", dwOut, outBuf); break; @@ -149,7 +149,7 @@ static void test_find_file(void) ret = VerFindFileA(VFFF_ISSHAREDFILE, filename, NULL, appdir, curdir, &dwCur, outBuf, &dwOut); todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); ok(dwOut == 1 + strlen(windir), "Wrong length of buffer for current location: " - "got %d(%s) expected %d\n", dwOut, outBuf, strlen(windir)+1); + "got %d(%s) expected %d\n", dwOut, outBuf, lstrlenA(windir)+1); dwCur=MAX_PATH; dwOut=MAX_PATH; @@ -158,7 +158,7 @@ static void test_find_file(void) ret = VerFindFileA(0, filename, NULL, appdir, curdir, &dwCur, outBuf, &dwOut); todo_wine ok(VFF_CURNEDEST == ret, "Wrong return value got %lx expected VFF_CURNEDEST\n", ret); ok(dwOut == 1 + strlen(appdir), "Wrong length of buffer for current location: " - "got %d(%s) expected %d\n", dwOut, outBuf, strlen(appdir)+1); + "got %d(%s) expected %d\n", dwOut, outBuf, lstrlenA(appdir)+1); } }

1 0

Alexandre Julliard : shlwapi/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 0cbd0a367d0de56a41e57e7b6afdfb1057e4eb68 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0cbd0a367d0de56a41e57e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 13:57:59 2006 +0200 shlwapi/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings. --- dlls/shlwapi/tests/ordinal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 5424298..44873bc 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -102,12 +102,12 @@ static void test_GetAcceptLanguagesA(voi "last error wrong: got %08lx; expected ERROR_SUCCESS(NT4)/ERROR_CALL_NOT_IMPLEMENTED(98/ME)/" "ERROR_PROC_NOT_FOUND(NT4)/ERROR_NO_IMPERSONATION_TOKEN(XP)\n", GetLastError()); ok(exactsize == strlen(buffer), - "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), exactsize); + "buffer content (length) wrong: got %08x, expected %08lx\n", lstrlenA(buffer), exactsize); } else if((buffersize +1) == buffersize2) { ok(ERROR_SUCCESS == GetLastError(), "last error wrong: got %08lx; expected ERROR_SUCCESS\n", GetLastError()); ok(buffersize == strlen(buffer), - "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize); + "buffer content (length) wrong: got %08x, expected %08lx\n", lstrlenA(buffer), buffersize); } else ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n", retval, buffersize, buffer, GetLastError()); @@ -118,7 +118,7 @@ static void test_GetAcceptLanguagesA(voi ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "last error wrong: got %08lx; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); ok(buffersize2 == strlen(buffer), - "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize2); + "buffer content (length) wrong: got %08x, expected %08lx\n", lstrlenA(buffer), buffersize2); break; default: ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n", @@ -137,7 +137,7 @@ static void test_GetAcceptLanguagesA(voi if((buffersize == exactsize) /* XP */ || ((buffersize +1)== exactsize) /* 98 */) ok(buffersize == strlen(buffer), - "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize); + "buffer content (length) wrong: got %08x, expected %08lx\n", lstrlenA(buffer), buffersize); else ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n", retval, buffersize, buffer, GetLastError()); @@ -148,7 +148,7 @@ static void test_GetAcceptLanguagesA(voi ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "last error wrong: got %08lx; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); ok(buffersize2 == strlen(buffer), - "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize2); + "buffer content (length) wrong: got %08x, expected %08lx\n", lstrlenA(buffer), buffersize2); break; default: ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n",

1 0

Alexandre Julliard : ntdll/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 8e5eaaad1b9771dde6b5d7943c14d280c2546800 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e5eaaad1b9771dde6b5d79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 13:57:40 2006 +0200 ntdll/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings. --- dlls/ntdll/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 8423c09..3c35624 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -213,7 +213,7 @@ static void test_RtlIsNameLegalDOS8Dot3( strcpy( str, test->path ); for (i = 0; str[i]; i++) str[i] = toupper(str[i]); ok( oem_ret.Length == strlen(test->path), "Wrong length %d/%d for '%s'\n", - oem_ret.Length, strlen(test->path), test->path ); + oem_ret.Length, lstrlenA(test->path), test->path ); ok( !memcmp( oem_ret.Buffer, str, oem_ret.Length ), "Wrong string '%.*s'/'%s'\n", oem_ret.Length, oem_ret.Buffer, str ); }

1 0

Alexandre Julliard : mscms/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 1369719d2c18fb09a1452a95ca9a4afc7ce2eccf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1369719d2c18fb09a1452a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 13:57:27 2006 +0200 mscms/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings. --- dlls/mscms/tests/profile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index c3f4b8e..27ef1c9 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -494,7 +494,7 @@ static void enum_registered_color_profil lstrcpynA(known_colorspaces[i].filename, profile, MAX_PATH); known_colorspaces[i].registered = TRUE; present++; - trace(" found %s, pointing to '%s' (%d chars)\n", known_colorspaces[i].szName, profile, strlen(profile)); + trace(" found %s, pointing to '%s' (%d chars)\n", known_colorspaces[i].szName, profile, lstrlenA(profile)); } } trace("Total profiles found: %ld.\n", present); @@ -571,7 +571,7 @@ static void check_registry(void) } ok( dwType == REG_SZ, "RegEnumValueA() returned unexpected value type (%ld)\n", dwType ); if (dwType != REG_SZ) break; - trace(" found '%s' value containing '%s' (%d chars)\n", szName, szData, strlen(szData)); + trace(" found '%s' value containing '%s' (%d chars)\n", szName, szData, lstrlenA(szData)); } RegCloseKey( hkIcmKey );

1 0

Alexandre Julliard : kernel32/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: e2e61151930548920bfa1a97c8a04e7dac7942cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e2e61151930548920bfa1a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 13:57:12 2006 +0200 kernel32/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings. --- dlls/kernel/tests/module.c | 2 +- dlls/kernel/tests/path.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/tests/module.c b/dlls/kernel/tests/module.c index 8b7aae8..caf2f68 100644 --- a/dlls/kernel/tests/module.c +++ b/dlls/kernel/tests/module.c @@ -54,7 +54,7 @@ static void testGetModuleFileName(const ok(len1W > 0, "Getting module filename for handle %p\n", hMod); } - ok(len1A == strlen(bufA), "Unexpected length of GetModuleFilenameA (%ld/%d)\n", len1A, strlen(bufA)); + ok(len1A == strlen(bufA), "Unexpected length of GetModuleFilenameA (%ld/%d)\n", len1A, lstrlenA(bufA)); if (is_unicode_enabled) { diff --git a/dlls/kernel/tests/path.c b/dlls/kernel/tests/path.c index 98a0c0e..12d3500 100644 --- a/dlls/kernel/tests/path.c +++ b/dlls/kernel/tests/path.c @@ -512,7 +512,7 @@ static void test_PathNameA(CHAR *curdir, rc2=(*pGetLongPathNameA)(curdir,NULL,0); ok((rc1-strlen(tmpstr))==(rc2-strlen(curdir)), "GetLongPathNameA: wrong return code, %ld instead of %d\n", - rc1, strlen(tmpstr)+1); + rc1, lstrlenA(tmpstr)+1); sprintf(dir,"%c:",curDrive); rc1=(*pGetLongPathNameA)(dir,tmpstr,sizeof(tmpstr));

1 0

Alexandre Julliard : crypt32/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 93fd4524e4aae9c76927a76c580e9921400774ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93fd4524e4aae9c76927a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 13:56:39 2006 +0200 crypt32/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings. --- dlls/crypt32/tests/base64.c | 2 +- dlls/crypt32/tests/encode.c | 4 ++-- dlls/crypt32/tests/str.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 998ea60..d6ebf20 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -293,7 +293,7 @@ static void decodeAndCompareBase64_A(LPC ret = pCryptStringToBinaryA(str, 0, useFormat, buf, &bufLen, &skipped, &usedFormat); ok(skipped == strlen(garbage), - "Expected %d characters skipped, got %ld\n", strlen(garbage), + "Expected %d characters skipped, got %ld\n", lstrlenA(garbage), skipped); HeapFree(GetProcessHeap(), 0, buf); } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index da5b975..ac6f18c 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -272,7 +272,7 @@ static void test_decodeInt(DWORD dwEncod CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)buf; ok(blob->cbData == strlen((const char*)bigInts[i].decoded), - "Expected len %d, got %ld\n", strlen((const char*)bigInts[i].decoded), + "Expected len %d, got %ld\n", lstrlenA((const char*)bigInts[i].decoded), blob->cbData); ok(!memcmp(blob->pbData, bigInts[i].decoded, blob->cbData), "Unexpected value\n"); @@ -299,7 +299,7 @@ static void test_decodeInt(DWORD dwEncod CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)buf; ok(blob->cbData == strlen((const char*)bigUInts[i].val), - "Expected len %d, got %ld\n", strlen((const char*)bigUInts[i].val), + "Expected len %d, got %ld\n", lstrlenA((const char*)bigUInts[i].val), blob->cbData); ok(!memcmp(blob->pbData, bigUInts[i].val, blob->cbData), "Unexpected value\n"); diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 9e5da9b..c7c2e97 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -223,7 +223,7 @@ static void test_CertRDNValueToStrA(void ret = pCertRDNValueToStrA(attrs[i].dwValueType, &attrs[i].Value, buffer, sizeof(buffer)); ok(ret == strlen(attrs[i].str) + 1, "Expected length %d, got %ld\n", - strlen(attrs[i].str) + 1, ret); + lstrlenA(attrs[i].str) + 1, ret); ok(!strcmp(buffer, attrs[i].str), "Expected %s, got %s\n", attrs[i].str, buffer); } @@ -299,7 +299,7 @@ static void test_NameToStrConversionA(PC i = pCertNameToStrA(X509_ASN_ENCODING,pName, dwStrType, buffer, sizeof(buffer)); ok(i == strlen(expected) + 1, "Expected %d chars, got %ld\n", - strlen(expected) + 1, i); + lstrlenA(expected) + 1, i); ok(!strcmp(buffer, expected), "Expected %s, got %s\n", expected, buffer); }

1 0

Alexandre Julliard : advapi32/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 290ddd8e38da0ee984a39539ac150e6c8630f1a8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=290ddd8e38da0ee984a3953… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 13:56:18 2006 +0200 advapi32/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings. --- dlls/advapi32/tests/crypt.c | 2 +- dlls/advapi32/tests/registry.c | 8 ++++---- dlls/advapi32/tests/security.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index b55d54b..6b77630 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -764,7 +764,7 @@ static void test_set_provider_ex(void) result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, pszProvName, &cbProvName); ok(result && !strcmp(MS_DEF_PROV, pszProvName), "expected %s, got %s\n", MS_DEF_PROV, pszProvName); - ok(result && cbProvName==(strlen(MS_DEF_PROV) + 1), "expected %i, got %ld\n", (strlen(MS_DEF_PROV) + 1), cbProvName); + ok(result && cbProvName==(strlen(MS_DEF_PROV) + 1), "expected %i, got %ld\n", (lstrlenA(MS_DEF_PROV) + 1), cbProvName); LocalFree(pszProvName); } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 9fee593..577838d 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -439,7 +439,7 @@ static void test_get_value(void) buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); ret = pRegGetValueA(hkey_main, NULL, "TP1_SZ", RRF_RT_REG_SZ, &type, buf, &size); ok(ret == ERROR_SUCCESS, "ret=%ld\n", ret); - ok(size == strlen(sTestpath1)+1, "strlen(sTestpath1)=%d size=%ld\n", strlen(sTestpath1), size); + ok(size == strlen(sTestpath1)+1, "strlen(sTestpath1)=%d size=%ld\n", lstrlenA(sTestpath1), size); ok(type == REG_SZ, "type=%ld\n", type); ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); @@ -447,7 +447,7 @@ static void test_get_value(void) buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); ret = pRegGetValueA(hkey_main, NULL, "TP1_SZ", RRF_RT_REG_SZ|RRF_NOEXPAND, &type, buf, &size); ok(ret == ERROR_SUCCESS, "ret=%ld\n", ret); - ok(size == strlen(sTestpath1)+1, "strlen(sTestpath1)=%d size=%ld\n", strlen(sTestpath1), size); + ok(size == strlen(sTestpath1)+1, "strlen(sTestpath1)=%d size=%ld\n", lstrlenA(sTestpath1), size); ok(type == REG_SZ, "type=%ld\n", type); ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); @@ -457,7 +457,7 @@ static void test_get_value(void) ok(ret == ERROR_SUCCESS, "ret=%ld\n", ret); /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath1 length + 1 here. */ ok((size == strlen(expanded)+1) || (size == strlen(sTestpath1)+1), - "strlen(expanded)=%d, strlen(sTestpath1)=%d, size=%ld\n", strlen(expanded), strlen(sTestpath1), size); + "strlen(expanded)=%d, strlen(sTestpath1)=%d, size=%ld\n", lstrlenA(expanded), lstrlenA(sTestpath1), size); ok(type == REG_SZ, "type=%ld\n", type); ok(!strcmp(expanded, buf), "expanded=\"%s\" buf=\"%s\"\n", expanded, buf); @@ -465,7 +465,7 @@ static void test_get_value(void) buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_EXPAND_SZ|RRF_NOEXPAND, &type, buf, &size); ok(ret == ERROR_SUCCESS, "ret=%ld\n", ret); - ok(size == strlen(sTestpath1)+1, "strlen(sTestpath1)=%d size=%ld\n", strlen(sTestpath1), size); + ok(size == strlen(sTestpath1)+1, "strlen(sTestpath1)=%d size=%ld\n", lstrlenA(sTestpath1), size); ok(type == REG_EXPAND_SZ, "type=%ld\n", type); ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 62611de..f4b43a1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -405,7 +405,7 @@ static void test_lookupPrivilegeName(voi ok(cchName == strlen("SeCreateTokenPrivilege") + 1, "LookupPrivilegeNameA returned an incorrect required length for\n" "SeCreateTokenPrivilege (got %ld, expected %d)\n", cchName, - strlen("SeCreateTokenPrivilege") + 1); + lstrlenA("SeCreateTokenPrivilege") + 1); /* check a known value and its returned length on success */ cchName = sizeof(buf); ok(pLookupPrivilegeNameA(NULL, &luid, buf, &cchName) &&

1 0

Nick Burns : include: Use force_align_arg_pointer on MacOS to fix the stack on entry to Wine.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 0da92ec9ca5822667e75ddae490943be9a1c320e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0da92ec9ca5822667e75dda… Author: Nick Burns <adger44(a)hotmail.com> Date: Thu Jun 8 19:57:42 2006 -0700 include: Use force_align_arg_pointer on MacOS to fix the stack on entry to Wine. --- include/windef.h | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/windef.h b/include/windef.h index 63fdcf7..2908cfc 100644 --- a/include/windef.h +++ b/include/windef.h @@ -52,7 +52,11 @@ #endif #ifndef __stdcall # ifdef __i386__ # ifdef __GNUC__ -# define __stdcall __attribute__((__stdcall__)) +# ifdef __APPLE__ /* Mac OSX uses 16-byte aligned stack and not a 4-byte one */ +# define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__)) +# else +# define __stdcall __attribute__((__stdcall__)) +# endif # elif defined(_MSC_VER) /* Nothing needs to be done. __stdcall already exists */ # else @@ -65,7 +69,11 @@ #endif /* __stdcall */ #ifndef __cdecl # if defined(__i386__) && defined(__GNUC__) -# define __cdecl __attribute__((__cdecl__)) +# ifdef __APPLE__ /* Mac OSX uses 16-byte aligned stack and not a 4-byte one */ +# define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) +# else +# define __cdecl __attribute__((__cdecl__)) +# endif # elif !defined(_MSC_VER) # define __cdecl # endif

1 0

Mike McCormack : include: Remove non-ASCII characters in headers for winelib compatibility.
by Alexandre Julliard June 13, 2006

June 13, 2006

Module: wine Branch: refs/heads/master Commit: e09aecff892c4276a1e24d2baefad094893c790f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e09aecff892c4276a1e24d2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 13 18:34:27 2006 +0900 include: Remove non-ASCII characters in headers for winelib compatibility. --- include/custcntl.h | 2 +- include/dispdib.h | 2 +- include/mapi.h | 2 +- include/objbase.h | 2 +- include/storage.h | 2 +- include/twain.h | 2 +- include/winnls32.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/custcntl.h b/include/custcntl.h index 7860b3b..1f2fe43 100644 --- a/include/custcntl.h +++ b/include/custcntl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 Gy�rgy 'Nog' Jeney + * Copyright (C) 2002 Gyorgy 'Nog' Jeney * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/include/dispdib.h b/include/dispdib.h index cf97bc8..a378dae 100644 --- a/include/dispdib.h +++ b/include/dispdib.h @@ -1,7 +1,7 @@ /* * DISPDIB.dll * - * Copyright 1998 Ove K�ven + * Copyright 1998 Ove Kaaven * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/include/mapi.h b/include/mapi.h index c5faab1..73b6f0e 100644 --- a/include/mapi.h +++ b/include/mapi.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Fran�ois Gouget + * Copyright (C) 2000 Francois Gouget * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/include/objbase.h b/include/objbase.h index 129506a..a248e98 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-1999 Fran�ois Gouget + * Copyright (C) 1998-1999 Francois Gouget * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/include/storage.h b/include/storage.h index dcdc5c4..e60c622 100644 --- a/include/storage.h +++ b/include/storage.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Fran�ois Gouget + * Copyright (C) 1999 Francois Gouget * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/include/twain.h b/include/twain.h index b8d2878..b64e9d9 100644 --- a/include/twain.h +++ b/include/twain.h @@ -7,7 +7,7 @@ Fujitsu, Genoa Technology, Hewlett-Packard, Kofax Imaging Products, and Ricoh Corporation. All rights reserved. - Copyright � 1998 TWAIN Working Group: Adobe Systems Incorporated, + Copyright (C) 1998 TWAIN Working Group: Adobe Systems Incorporated, Canon Information Systems, Eastman Kodak Company, Fujitsu Computer Products of America, Genoa Technology, Hewlett-Packard Company, Intel Corporation, Kofax Image Products, diff --git a/include/winnls32.h b/include/winnls32.h index c39daf1..caf4768 100644 --- a/include/winnls32.h +++ b/include/winnls32.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Diego Petten� + * Copyright (C) 2005 Diego Petteno * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0