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

diff --git a/modules/rostests/winetests/oleacc/CMakeLists.txt b/modules/rostests/winetests/oleacc/CMakeLists.txt
index 5e64591..c4a6b15 100644 (file)
--- a/modules/rostests/winetests/oleacc/CMakeLists.txt
+++ b/modules/rostests/winetests/oleacc/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+add_definitions(-D__WINESRC__ -DWINETEST_USE_DBGSTR_LONGLONG)
+
 if(MSVC)
     # Disable warning C4477 (printf format warnings)
     add_compile_flags("/wd4477")
@@ -7,5 +9,5 @@ endif()
 add_executable(oleacc_winetest main.c testlist.c)
 set_module_type(oleacc_winetest win32cui)
 target_link_libraries(oleacc_winetest uuid)
-add_importlibs(oleacc_winetest oleacc oleaut32 ole32 user32 msvcrt kernel32)
+add_importlibs(oleacc_winetest oleacc oleaut32 ole32 user32 msvcrt kernel32 ntdll)
 add_rostests_file(TARGET oleacc_winetest)

diff --git a/modules/rostests/winetests/oleacc/main.c b/modules/rostests/winetests/oleacc/main.c
index c62fa79..dd7149a 100644 (file)
--- a/modules/rostests/winetests/oleacc/main.c
+++ b/modules/rostests/winetests/oleacc/main.c
@@ -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);