Add trailing '\n's to ok() calls (shlwapi 2)

Francois Gouget fgouget at free.fr
Tue Jan 27 11:04:12 CST 2004


Changelog:

 * dlls/shlwapi/tests/path.c
   dlls/shlwapi/tests/shreg.c
   dlls/shlwapi/tests/string.c

   Add trailing '\n's to ok() calls.


Index: dlls/shlwapi/tests/path.c
===================================================================
RCS file: /home/cvs/wine/dlls/shlwapi/tests/path.c,v
retrieving revision 1.5
diff -u -r1.5 path.c
--- dlls/shlwapi/tests/path.c	7 Oct 2003 22:54:17 -0000	1.5
+++ dlls/shlwapi/tests/path.c	24 Jan 2004 20:03:46 -0000
@@ -56,12 +56,12 @@

   DWORD cbSize = sizeof(DWORD);
   DWORD dwHash1, dwHash2;
-  ok(UrlHashA(szTestUrl, (LPBYTE)&dwHash1, cbSize) == S_OK, "UrlHashA didn't return S_OK");
-  ok(UrlHashW(wszTestUrl, (LPBYTE)&dwHash2, cbSize) == S_OK, "UrlHashW didn't return S_OK");
+  ok(UrlHashA(szTestUrl, (LPBYTE)&dwHash1, cbSize) == S_OK, "UrlHashA didn't return S_OK\n");
+  ok(UrlHashW(wszTestUrl, (LPBYTE)&dwHash2, cbSize) == S_OK, "UrlHashW didn't return S_OK\n");

   FreeWideString(wszTestUrl);

-  ok(dwHash1 == dwHash2, "Hashes didn't compare");
+  ok(dwHash1 == dwHash2, "Hashes didn't compare\n");
 }

 static void test_UrlHash(void)
@@ -81,13 +81,13 @@
   DWORD dwSize;

   dwSize = INTERNET_MAX_URL_LENGTH;
-  ok( UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags) == S_OK, "UrlGetPartA didn't return S_OK" );
+  ok( UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags) == S_OK, "UrlGetPartA didn't return S_OK\n" );
   dwSize = INTERNET_MAX_URL_LENGTH;
-  ok( UrlGetPartW(wszUrl, wszPart, &dwSize, dwPart, dwFlags) == S_OK, "UrlGetPartW didn't return S_OK" );
+  ok( UrlGetPartW(wszUrl, wszPart, &dwSize, dwPart, dwFlags) == S_OK, "UrlGetPartW didn't return S_OK\n" );

   wszConvertedPart = GetWideString(szPart);

-  ok(strcmpW(wszPart,wszConvertedPart)==0, "Strings didn't match between ascii and unicode UrlGetPart!");
+  ok(strcmpW(wszPart,wszConvertedPart)==0, "Strings didn't match between ascii and unicode UrlGetPart!\n");

   FreeWideString(wszUrl);
   FreeWideString(wszConvertedPart);
@@ -95,7 +95,7 @@
   /* Note that v6.0 and later don't return '?' with the query */
   ok(strcmp(szPart,szExpected)==0 ||
      (*szExpected=='?' && !strcmp(szPart,szExpected+1)),
-	 "Expected %s, but got %s", szExpected, szPart);
+	 "Expected %s, but got %s\n", szExpected, szPart);
 }

 static void test_UrlGetPart(void)
Index: dlls/shlwapi/tests/shreg.c
===================================================================
RCS file: /home/cvs/wine/dlls/shlwapi/tests/shreg.c,v
retrieving revision 1.14
diff -u -r1.14 shreg.c
--- dlls/shlwapi/tests/shreg.c	7 Oct 2003 22:54:17 -0000	1.14
+++ dlls/shlwapi/tests/shreg.c	24 Jan 2004 20:03:46 -0000
@@ -78,13 +78,13 @@
         SetEnvironmentVariableA("LONGSYSTEMVAR", "bar");
         SetEnvironmentVariableA("FOO", "ImARatherLongButIndeedNeededString");

-	ok(!RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEY, &hKey), "RegCreateKeyA failed");
+	ok(!RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEY, &hKey), "RegCreateKeyA failed\n");

 	if (hKey)
 	{
-           ok(!RegSetValueExA(hKey,"Test1",0,REG_EXPAND_SZ, sTestpath1, strlen(sTestpath1)+1), "RegSetValueExA failed");
-           ok(!RegSetValueExA(hKey,"Test2",0,REG_SZ, sTestpath1, strlen(sTestpath1)+1), "RegSetValueExA failed");
-           ok(!RegSetValueExA(hKey,"Test3",0,REG_EXPAND_SZ, sTestpath2, strlen(sTestpath2)+1), "RegSetValueExA failed");
+           ok(!RegSetValueExA(hKey,"Test1",0,REG_EXPAND_SZ, sTestpath1, strlen(sTestpath1)+1), "RegSetValueExA failed\n");
+           ok(!RegSetValueExA(hKey,"Test2",0,REG_SZ, sTestpath1, strlen(sTestpath1)+1), "RegSetValueExA failed\n");
+           ok(!RegSetValueExA(hKey,"Test3",0,REG_EXPAND_SZ, sTestpath2, strlen(sTestpath2)+1), "RegSetValueExA failed\n");
 	}

 	sExpLen1 = ExpandEnvironmentStringsA(sTestpath1, sExpTestpath1, sizeof(sExpTestpath1));
@@ -104,16 +104,16 @@
 	strcpy(buf, sEmptyBuffer);
 	dwSize = MAX_PATH;
 	dwType = -1;
-	ok(! SHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", &dwType, buf, &dwSize), "SHGetValueA failed");
-	ok( 0 == strcmp(sExpTestpath1, buf), "(%s,%s)", buf, sExpTestpath1);
-	ok( REG_SZ == dwType, "(%lx)", dwType);
+	ok(! SHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", &dwType, buf, &dwSize), "SHGetValueA failed\n");
+	ok( 0 == strcmp(sExpTestpath1, buf), "(%s,%s)\n", buf, sExpTestpath1);
+	ok( REG_SZ == dwType, "(%lx)\n", dwType);

 	strcpy(buf, sEmptyBuffer);
 	dwSize = MAX_PATH;
 	dwType = -1;
-	ok(! SHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", &dwType, buf, &dwSize), "SHGetValueA failed");
-	ok( 0 == strcmp(sTestpath1, buf) , "(%s)", buf);
-	ok( REG_SZ == dwType , "(%lx)", dwType);
+	ok(! SHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", &dwType, buf, &dwSize), "SHGetValueA failed\n");
+	ok( 0 == strcmp(sTestpath1, buf) , "(%s)\n", buf);
+	ok( REG_SZ == dwType , "(%lx)\n", dwType);
 }

 static void test_SHGetRegPath(void)
@@ -124,8 +124,8 @@
 		return;

 	strcpy(buf, sEmptyBuffer);
-	ok(! (*pSHRegGetPathA)(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", buf, 0), "SHRegGetPathA failed");
-	ok( 0 == strcmp(sExpTestpath1, buf) , "(%s)", buf);
+	ok(! (*pSHRegGetPathA)(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", buf, 0), "SHRegGetPathA failed\n");
+	ok( 0 == strcmp(sExpTestpath1, buf) , "(%s)\n", buf);
 }

 static void test_SHQUeryValueEx(void)
@@ -138,7 +138,7 @@
 	const char * sTestedFunction = "";
 	DWORD nUsedBuffer1,nUsedBuffer2;

-	ok(! RegOpenKeyExA(HKEY_CURRENT_USER, REG_TEST_KEY, 0,  KEY_QUERY_VALUE, &hKey), "test4 RegOpenKey");
+	ok(! RegOpenKeyExA(HKEY_CURRENT_USER, REG_TEST_KEY, 0,  KEY_QUERY_VALUE, &hKey), "test4 RegOpenKey\n");

 	/****** SHQueryValueExA ******/

@@ -148,29 +148,29 @@
 	/*
 	 * Case 1.1 All arguments are NULL
 	 */
-	ok(! SHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, NULL), "SHQueryValueExA failed");
+	ok(! SHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, NULL), "SHQueryValueExA failed\n");

 	/*
 	 * Case 1.2 dwType is set
 	 */
 	dwType = -1;
-	ok(! SHQueryValueExA( hKey, "Test1", NULL, &dwType, NULL, NULL), "SHQueryValueExA failed");
-	ok( dwType == REG_SZ, "(%lu)", dwType);
+	ok(! SHQueryValueExA( hKey, "Test1", NULL, &dwType, NULL, NULL), "SHQueryValueExA failed\n");
+	ok( dwType == REG_SZ, "(%lu)\n", dwType);

 	/*
 	 * dwSize is set
          * dwExpanded < dwUnExpanded
 	 */
 	dwSize = 6;
-	ok(! SHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, &dwSize), "SHQueryValueExA failed");
-	ok( dwSize == nUsedBuffer1, "(%lu,%lu)", dwSize, nUsedBuffer1);
+	ok(! SHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, &dwSize), "SHQueryValueExA failed\n");
+	ok( dwSize == nUsedBuffer1, "(%lu,%lu)\n", dwSize, nUsedBuffer1);

 	/*
          * dwExpanded > dwUnExpanded
 	 */
 	dwSize = 6;
-	ok(! SHQueryValueExA( hKey, "Test3", NULL, NULL, NULL, &dwSize), "SHQueryValueExA failed");
-	ok( dwSize == nUsedBuffer2, "(%lu,%lu)", dwSize, nUsedBuffer2);
+	ok(! SHQueryValueExA( hKey, "Test3", NULL, NULL, NULL, &dwSize), "SHQueryValueExA failed\n");
+	ok( dwSize == nUsedBuffer2, "(%lu,%lu)\n", dwSize, nUsedBuffer2);


 	/*
@@ -180,10 +180,10 @@
 	dwSize = 6;
 	dwType = -1;
 	dwRet = SHQueryValueExA( hKey, "Test1", NULL, &dwType, buf, &dwSize);
-	ok( dwRet == ERROR_MORE_DATA, "(%lu)", dwRet);
-	ok( 0 == strcmp(sEmptyBuffer, buf), "(%s)", buf);
-	ok( dwType == REG_SZ, "(%lu)" , dwType);
-	ok( dwSize == nUsedBuffer1, "(%lu,%lu)" , dwSize, nUsedBuffer1);
+	ok( dwRet == ERROR_MORE_DATA, "(%lu)\n", dwRet);
+	ok( 0 == strcmp(sEmptyBuffer, buf), "(%s)\n", buf);
+	ok( dwType == REG_SZ, "(%lu)\n" , dwType);
+	ok( dwSize == nUsedBuffer1, "(%lu,%lu)\n" , dwSize, nUsedBuffer1);

 	/*
 	 * string grows during expanding
@@ -192,10 +192,10 @@
 	dwSize = 6;
 	dwType = -1;
 	dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize);
-	ok( ERROR_MORE_DATA == dwRet, "ERROR_MORE_DATA");
-	ok( 0 == strcmp(sEmptyBuffer, buf), "(%s)", buf);
-	ok( dwSize == nUsedBuffer2, "(%lu,%lu)" , dwSize, nUsedBuffer2);
-	ok( dwType == REG_SZ, "(%lu)" , dwType);
+	ok( ERROR_MORE_DATA == dwRet, "ERROR_MORE_DATA\n");
+	ok( 0 == strcmp(sEmptyBuffer, buf), "(%s)\n", buf);
+	ok( dwSize == nUsedBuffer2, "(%lu,%lu)\n" , dwSize, nUsedBuffer2);
+	ok( dwType == REG_SZ, "(%lu)\n" , dwType);

 	/*
 	 * if the unexpanded string fits into the buffer it can get cut when expanded
@@ -203,11 +203,11 @@
 	strcpy(buf, sEmptyBuffer);
 	dwSize = sExpLen2 - 4;
 	dwType = -1;
-	ok( ERROR_MORE_DATA == SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize), "Expected ERROR_MORE_DATA");
-	ok( 0 == strncmp(sExpTestpath2, buf, sExpLen2 - 4 - 1), "(%s)", buf);
-	ok( sExpLen2 - 4 - 1 == strlen(buf), "(%s)", buf);
-	ok( dwSize == nUsedBuffer2, "(%lu,%lu)" , dwSize, nUsedBuffer2);
-	ok( dwType == REG_SZ, "(%lu)" , dwType);
+	ok( ERROR_MORE_DATA == SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize), "Expected ERROR_MORE_DATA\n");
+	ok( 0 == strncmp(sExpTestpath2, buf, sExpLen2 - 4 - 1), "(%s)\n", buf);
+	ok( sExpLen2 - 4 - 1 == strlen(buf), "(%s)\n", buf);
+	ok( dwSize == nUsedBuffer2, "(%lu,%lu)\n" , dwSize, nUsedBuffer2);
+	ok( dwType == REG_SZ, "(%lu)\n" , dwType);

 	/*
 	 * The buffer is NULL but the size is set
@@ -216,9 +216,9 @@
 	dwSize = 6;
 	dwType = -1;
 	dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, NULL, &dwSize);
-	ok( ERROR_SUCCESS == dwRet, "(%lu)", dwRet);
-	ok( dwSize == nUsedBuffer2, "(%lu,%lu)" , dwSize, nUsedBuffer2);
-	ok( dwType == REG_SZ, "(%lu)" , dwType);
+	ok( ERROR_SUCCESS == dwRet, "(%lu)\n", dwRet);
+	ok( dwSize == nUsedBuffer2, "(%lu,%lu)\n" , dwSize, nUsedBuffer2);
+	ok( dwType == REG_SZ, "(%lu)\n" , dwType);


 	RegCloseKey(hKey);
@@ -239,20 +239,20 @@
 	hKeyDst = NULL;
 	if (RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination", &hKeyDst) || !hKeyDst)
 	{
-		ok(0, "didn't open dest");
+		ok(0, "didn't open dest\n");
 		return;
 	}

 	hKeySrc = NULL;
 	if (RegOpenKeyA(HKEY_LOCAL_MACHINE, REG_CURRENT_VERSION, &hKeySrc) || !hKeySrc)
 	{
-		ok(0, "didn't open source");
+		ok(0, "didn't open source\n");
 		return;
 	}


 	if (pSHCopyKeyA)
-		ok (!(*pSHCopyKeyA)(hKeyDst, NULL, hKeySrc, 0), "failed copy");
+		ok (!(*pSHCopyKeyA)(hKeyDst, NULL, hKeySrc, 0), "failed copy\n");

 	RegCloseKey(hKeySrc);
 	RegCloseKey(hKeyDst);
@@ -261,12 +261,12 @@
 	hKeyDst = NULL;
 	if (RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination\\AeDebug", &hKeyDst) || !hKeyDst)
 	{
-		ok(0, "didn't open copy");
+		ok(0, "didn't open copy\n");
 		return;
 	}

 	/* And the we copied the values too */
-	ok(!SHQueryValueExA(hKeyDst, "Debugger", NULL, NULL, NULL, NULL), "SHQueryValueExA failed");
+	ok(!SHQueryValueExA(hKeyDst, "Debugger", NULL, NULL, NULL, NULL), "SHQueryValueExA failed\n");

 	RegCloseKey(hKeyDst);
 }
Index: dlls/shlwapi/tests/string.c
===================================================================
RCS file: /home/cvs/wine/dlls/shlwapi/tests/string.c,v
retrieving revision 1.2
diff -u -r1.2 string.c
--- dlls/shlwapi/tests/string.c	22 Nov 2003 00:00:53 -0000	1.2
+++ dlls/shlwapi/tests/string.c	24 Jan 2004 20:03:46 -0000
@@ -159,7 +159,7 @@
   WORD count;

   /* this test crashes on win2k SP4 */
-  /*ok(!StrChrA(NULL,'\0'), "found a character in a NULL string!");*/
+  /*ok(!StrChrA(NULL,'\0'), "found a character in a NULL string!\n");*/

   for (count = 32; count < 128; count++)
     string[count] = (char)count;
@@ -186,7 +186,7 @@
   WORD count;

   /* this test crashes on win2k SP4 */
-  /*ok(!StrChrW(NULL,'\0'), "found a character in a NULL string!");*/
+  /*ok(!StrChrW(NULL,'\0'), "found a character in a NULL string!\n");*/

   for (count = 32; count < 16384; count++)
     string[count] = count;
@@ -195,13 +195,13 @@
   for (count = 32; count < 16384; count++)
   {
     LPWSTR result = StrChrW(string+32, count);
-    ok((result - string) == count, "found char %d in wrong place", count);
+    ok((result - string) == count, "found char %d in wrong place\n", count);
   }

   for (count = 32; count < 16384; count++)
   {
     LPWSTR result = StrChrW(string+count+1, count);
-    ok(!result, "found char not in the string");
+    ok(!result, "found char not in the string\n");
   }
 }

@@ -211,7 +211,7 @@
   WORD count;

   /* this test crashes on win2k SP4 */
-  /*ok(!StrChrIA(NULL,'\0'), "found a character in a NULL string!");*/
+  /*ok(!StrChrIA(NULL,'\0'), "found a character in a NULL string!\n");*/

   for (count = 32; count < 128; count++)
     string[count] = (char)count;
@@ -221,14 +221,14 @@
   {
     LPSTR result = StrChrIA(string+32, count);

-    ok(result - string == count, "found char '%c' in wrong place", count);
-    ok(StrChrIA(result, count)!=NULL, "didn't find lowercase '%c'", count);
+    ok(result - string == count, "found char '%c' in wrong place\n", count);
+    ok(StrChrIA(result, count)!=NULL, "didn't find lowercase '%c'\n", count);
   }

   for (count = 'a'; count < 'z'; count++)
   {
     LPSTR result = StrChrIA(string+count+1, count);
-    ok(!result, "found char not in the string");
+    ok(!result, "found char not in the string\n");
   }
 }

@@ -238,7 +238,7 @@
   WORD count;

   /* this test crashes on win2k SP4 */
-  /*ok(!StrChrIA(NULL,'\0'), "found a character in a NULL string!");*/
+  /*ok(!StrChrIA(NULL,'\0'), "found a character in a NULL string!\n");*/

   for (count = 32; count < 128; count++)
     string[count] = count;
@@ -248,14 +248,14 @@
   {
     LPWSTR result = StrChrIW(string+32, count);

-    ok(result - string == count, "found char '%c' in wrong place", count);
-    ok(StrChrIW(result, count)!=NULL, "didn't find lowercase '%c'", count);
+    ok(result - string == count, "found char '%c' in wrong place\n", count);
+    ok(StrChrIW(result, count)!=NULL, "didn't find lowercase '%c'\n", count);
   }

   for (count = 'a'; count < 'z'; count++)
   {
     LPWSTR result = StrChrIW(string+count+1, count);
-    ok(!result, "found char not in the string");
+    ok(!result, "found char not in the string\n");
   }
 }

@@ -265,7 +265,7 @@
   WORD count;

   /* this test crashes on win2k SP4 */
-  /*ok(!StrRChrA(NULL, NULL,'\0'), "found a character in a NULL string!");*/
+  /*ok(!StrRChrA(NULL, NULL,'\0'), "found a character in a NULL string!\n");*/

   for (count = 32; count < 128; count++)
     string[count] = (char)count;
@@ -274,19 +274,19 @@
   for (count = 32; count < 128; count++)
   {
     LPSTR result = StrRChrA(string+32, NULL, count);
-    ok(result - string == count, "found char %d in wrong place", count);
+    ok(result - string == count, "found char %d in wrong place\n", count);
   }

   for (count = 32; count < 128; count++)
   {
     LPSTR result = StrRChrA(string+count+1, NULL, count);
-    ok(!result, "found char not in the string");
+    ok(!result, "found char not in the string\n");
   }

   for (count = 32; count < 128; count++)
   {
     LPSTR result = StrRChrA(string+count+1, string + 127, count);
-    ok(!result, "found char not in the string");
+    ok(!result, "found char not in the string\n");
   }
 }

@@ -296,7 +296,7 @@
   WORD count;

   /* this test crashes on win2k SP4 */
-  /*ok(!StrRChrW(NULL, NULL,'\0'), "found a character in a NULL string!");*/
+  /*ok(!StrRChrW(NULL, NULL,'\0'), "found a character in a NULL string!\n");*/

   for (count = 32; count < 128; count++)
     string[count] = count;
@@ -335,7 +335,7 @@
     MultiByteToWideChar(0,0,result->byte_size_64,-1,szSrc,sizeof(szSrc)/sizeof(WCHAR));

     StrCpyW(szBuff, szSrc);
-    ok(!StrCmpW(szSrc, szBuff), "Copied string %s wrong", result->byte_size_64);
+    ok(!StrCmpW(szSrc, szBuff), "Copied string %s wrong\n", result->byte_size_64);
     result++;
   }
 }
@@ -349,7 +349,7 @@
   while (result->string)
   {
     return_val = StrToIntA(result->string);
-    ok(return_val == result->str_to_int, "converted '%s' wrong (%d)",
+    ok(return_val == result->str_to_int, "converted '%s' wrong (%d)\n",
        result->string, return_val);
     result++;
   }
@@ -365,7 +365,7 @@
   {
     MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR));
     return_val = StrToIntW(szBuff);
-    ok(return_val == result->str_to_int, "converted '%s' wrong (%d)",
+    ok(return_val == result->str_to_int, "converted '%s' wrong (%d)\n",
        result->string, return_val);
     result++;
   }
@@ -381,10 +381,10 @@
   {
     return_val = -1;
     bRet = StrToIntExA(result->string,0,&return_val);
-    ok(!bRet || return_val != -1, "No result returned from '%s'",
+    ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)
-      ok(return_val == result->str_to_int_ex, "converted '%s' wrong (%d)",
+      ok(return_val == result->str_to_int_ex, "converted '%s' wrong (%d)\n",
          result->string, return_val);
     result++;
   }
@@ -394,10 +394,10 @@
   {
     return_val = -1;
     bRet = StrToIntExA(result->string,STIF_SUPPORT_HEX,&return_val);
-    ok(!bRet || return_val != -1, "No result returned from '%s'",
+    ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)
-      ok(return_val == result->str_to_int_hex, "converted '%s' wrong (%d)",
+      ok(return_val == result->str_to_int_hex, "converted '%s' wrong (%d)\n",
          result->string, return_val);
     result++;
   }
@@ -415,10 +415,10 @@
     return_val = -1;
     MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR));
     bRet = StrToIntExW(szBuff, 0, &return_val);
-    ok(!bRet || return_val != -1, "No result returned from '%s'",
+    ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)
-      ok(return_val == result->str_to_int_ex, "converted '%s' wrong (%d)",
+      ok(return_val == result->str_to_int_ex, "converted '%s' wrong (%d)\n",
          result->string, return_val);
     result++;
   }
@@ -429,10 +429,10 @@
     return_val = -1;
     MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR));
     bRet = StrToIntExW(szBuff, STIF_SUPPORT_HEX, &return_val);
-    ok(!bRet || return_val != -1, "No result returned from '%s'",
+    ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)
-      ok(return_val == result->str_to_int_hex, "converted '%s' wrong (%d)",
+      ok(return_val == result->str_to_int_hex, "converted '%s' wrong (%d)\n",
          result->string, return_val);
     result++;
   }
@@ -447,10 +447,10 @@
   {
     lpszStr = StrDupA(result->byte_size_64);

-    ok(lpszStr != NULL, "Dup failed");
+    ok(lpszStr != NULL, "Dup failed\n");
     if (lpszStr)
     {
-      ok(!strcmp(result->byte_size_64, lpszStr), "Copied string wrong");
+      ok(!strcmp(result->byte_size_64, lpszStr), "Copied string wrong\n");
       LocalFree((HLOCAL)lpszStr);
     }
     result++;
@@ -460,7 +460,7 @@
    * returned an empty string (as Wine does).
    */
   lpszStr = StrDupA(NULL);
-  ok(lpszStr == NULL || *lpszStr == '\0', "NULL string returned %p", lpszStr);
+  ok(lpszStr == NULL || *lpszStr == '\0', "NULL string returned %p\n", lpszStr);
 }

 static void test_StrFormatByteSize64A(void)
@@ -531,7 +531,7 @@
   {
     StrFromTimeIntervalA(szBuff, 256, result->ms, result->digits);

-    ok(!strcmp(result->time_interval, szBuff), "Formatted %ld %d wrong",
+    ok(!strcmp(result->time_interval, szBuff), "Formatted %ld %d wrong\n",
        result->ms, result->digits);
     result++;
   }



-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
      Any sufficiently advanced bug is indistinguishable from a feature.
                            -- from some indian guy



More information about the wine-patches mailing list