[OLEACC_WINETEST] Sync with Wine Staging 4.18. CORE-16441

[reactos.git] / modules / rostests / winetests / oleacc / main.c

diff --git a/modules/rostests/winetests/oleacc/main.c b/modules/rostests/winetests/oleacc/main.c
index 88e412e..dd7149a 100644 (file)
--- a/modules/rostests/winetests/oleacc/main.c
+++ b/modules/rostests/winetests/oleacc/main.c
@@ -20,10 +20,10 @@
 
 #define COBJMACROS
 
-#include <wine/test.h>
+#include "wine/test.h"
 #include <stdio.h>
 
-//#include "initguid.h"
+#include "initguid.h"
 #include <oleacc.h>
 
 #define DEFINE_EXPECT(func) \
@@ -410,7 +410,7 @@ static void test_getroletext(void)
         memset(buff2W, 0, sizeof(buff2W));
 
         ret = GetRoleTextW(role, NULL, 0);
-        GetRoleTextW(role, buff2W, sizeof(buff2W)/sizeof(WCHAR));
+        GetRoleTextW(role, buff2W, ARRAY_SIZE(buff2W));
         ok(ret == lstrlenW(buff2W),
            "GetRoleTextW: returned length doesn't match returned buffer for role %d\n", role);
     }
@@ -543,7 +543,7 @@ static void test_LresultFromObject(const char *name)
     ok(SUCCEEDED(lres), "got %lx\n", lres);
     ok(Object_ref > 1, "Object_ref = %d\n", Object_ref);
 
-    sprintf(cmdline, "\"%s\" main ObjectFromLresult %lx", name, lres);
+    sprintf(cmdline, "\"%s\" main ObjectFromLresult %s", name, wine_dbgstr_longlong(lres));
     memset(&startup, 0, sizeof(startup));
     startup.cb = sizeof(startup);
     CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &proc);
@@ -992,7 +992,7 @@ START_TEST(main)
         HRESULT hres;
         LRESULT lres;
 
-        sscanf(argv[3], "%lx", &lres);
+        lres = _strtoi64( argv[3], NULL, 16 );
         hres = ObjectFromLresult(lres, &IID_IUnknown, 0, (void**)&unk);
         ok(hres == S_OK, "hres = %x\n", hres);
         IUnknown_Release(unk);