Remove unnecessary executable bits

[reactos.git] / modules / rostests / winetests / shlwapi / string.c

diff --git a/modules/rostests/winetests/shlwapi/string.c b/modules/rostests/winetests/shlwapi/string.c
old mode 100755 (executable)
new mode 100644 (file)
index 7bd30fc..7f069a4
--- a/modules/rostests/winetests/shlwapi/string.c
+++ b/modules/rostests/winetests/shlwapi/string.c
@@ -17,23 +17,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdio.h>
 
-//#include <stdio.h>
-
-#include <wine/test.h>
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winnls.h>
-#include <ole2.h>
+#include "wine/test.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winnls.h"
 #define NO_SHLWAPI_REG
 #define NO_SHLWAPI_PATH
 #define NO_SHLWAPI_GDI
 #define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
-//#include "shtypes.h"
+#include "shlwapi.h"
+#include "shtypes.h"
 
 #define expect_eq(expr, val, type, fmt) do { \
     type ret = expr; \
@@ -575,8 +570,8 @@ static void test_StrToInt64ExA(void)
     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++;
   }
 
@@ -588,8 +583,8 @@ static void test_StrToInt64ExA(void)
     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++;
   }
 }
@@ -615,8 +610,8 @@ static void test_StrToInt64ExW(void)
     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++;
   }
 
@@ -629,8 +624,8 @@ static void test_StrToInt64ExW(void)
     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++;
   }
 }
@@ -677,8 +672,8 @@ static void test_StrFormatByteSize64A(void)
     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++;
   }
@@ -701,8 +696,8 @@ static void test_StrFormatKBSizeW(void)
     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++;
   }
 }
@@ -726,8 +721,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)),
-        "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++;
   }
 }