[SHLWAPI_WINETEST] Sync with Wine Staging 2.16. CORE-13762

diff --git a/modules/rostests/winetests/shlwapi/CMakeLists.txt b/modules/rostests/winetests/shlwapi/CMakeLists.txt
index 4d32cb3..dfd73e6 100644 (file)
--- a/modules/rostests/winetests/shlwapi/CMakeLists.txt
+++ b/modules/rostests/winetests/shlwapi/CMakeLists.txt
@@ -1,5 +1,7 @@
 
 

-add_definitions(-DUSE_WINE_TODOS)
+add_definitions(
+    -DUSE_WINE_TODOS
+    -DWINETEST_USE_DBGSTR_LONGLONG)

 
 list(APPEND SOURCE
     assoc.c
 
 list(APPEND SOURCE
     assoc.c

diff --git a/modules/rostests/winetests/shlwapi/string.c b/modules/rostests/winetests/shlwapi/string.c
index 7bd30fc..1d8a6af 100755 (executable)
--- a/modules/rostests/winetests/shlwapi/string.c
+++ b/modules/rostests/winetests/shlwapi/string.c
@@ -575,8 +575,8 @@ static void test_StrToInt64ExA(void)
     ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)
     ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)

-      ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n",
-         result->string, (DWORD)(return_val >> 32), (DWORD)return_val);
+      ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%s)\n",
+         result->string, wine_dbgstr_longlong(return_val));

     result++;
   }
 
     result++;
   }
 


@@ -588,8 +588,8 @@ static void test_StrToInt64ExA(void)
     ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)
     ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)

-      ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n",
-         result->string, (DWORD)(return_val >> 32), (DWORD)return_val);
+      ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%s)\n",
+         result->string, wine_dbgstr_longlong(return_val));

     result++;
   }
 }
     result++;
   }
 }


@@ -615,8 +615,8 @@ static void test_StrToInt64ExW(void)
     ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)
     ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)

-      ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n",
-         result->string, (DWORD)(return_val >> 32), (DWORD)return_val);
+      ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%s)\n",
+         result->string, wine_dbgstr_longlong(return_val));

     result++;
   }
 
     result++;
   }
 


@@ -629,8 +629,8 @@ static void test_StrToInt64ExW(void)
     ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)
     ok(!bRet || return_val != -1, "No result returned from '%s'\n",
        result->string);
     if (bRet)

-      ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n",
-         result->string, (DWORD)(return_val >> 32), (DWORD)return_val);
+      ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%s)\n",
+         result->string, wine_dbgstr_longlong(return_val));

     result++;
   }
 }
     result++;
   }
 }


@@ -677,8 +677,8 @@ static void test_StrFormatByteSize64A(void)
     pStrFormatByteSize64A(result->value, szBuff, 256);
 
     ok(!strcmp(result->byte_size_64, szBuff),
     pStrFormatByteSize64A(result->value, szBuff, 256);
 
     ok(!strcmp(result->byte_size_64, szBuff),

-        "Formatted %x%08x wrong: got %s, expected %s\n",
-       (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->byte_size_64);
+        "Formatted %s wrong: got %s, expected %s\n",
+       wine_dbgstr_longlong(result->value), szBuff, result->byte_size_64);

 
     result++;
   }
 
     result++;
   }


@@ -701,8 +701,8 @@ static void test_StrFormatKBSizeW(void)
     pStrFormatKBSizeW(result->value, szBuffW, 256);
     WideCharToMultiByte(CP_ACP,0,szBuffW,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR),NULL,NULL);
 
     pStrFormatKBSizeW(result->value, szBuffW, 256);
     WideCharToMultiByte(CP_ACP,0,szBuffW,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR),NULL,NULL);
 

-    ok(!strcmp(result->kb_size, szBuff), "Formatted %x%08x wrong: got %s, expected %s\n",
-       (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size);
+    ok(!strcmp(result->kb_size, szBuff), "Formatted %s wrong: got %s, expected %s\n",
+       wine_dbgstr_longlong(result->value), szBuff, result->kb_size);

     result++;
   }
 }
     result++;
   }
 }


@@ -726,8 +726,8 @@ static void test_StrFormatKBSizeA(void)
      * and does not correctly handle extremely large values. */
     ok(!strcmp(result->kb_size, szBuff) ||
       (result->kb_size_broken && !strcmp(result->kb_size2, szBuff)),
      * and does not correctly handle extremely large values. */
     ok(!strcmp(result->kb_size, szBuff) ||
       (result->kb_size_broken && !strcmp(result->kb_size2, szBuff)),

-        "Formatted %x%08x wrong: got %s, expected %s\n",
-       (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size);
+        "Formatted %s wrong: got %s, expected %s\n",
+       wine_dbgstr_longlong(result->value), szBuff, result->kb_size);

     result++;
   }
 }
     result++;
   }
 }