[ros-diffs] [reactos] 01/04: [RPCRT4_WINETEST] Fix 64 bit build

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a656d23debe192cac3dcf…

commit a656d23debe192cac3dcf1c81f7d4f2f56aeebd9
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Fri Jul 9 10:29:58 2021 +0200
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Sat Jul 10 18:41:12 2021 +0200

    [RPCRT4_WINETEST] Fix 64 bit build
    
    "Should be sent to wine"(tm)
---
 modules/rostests/winetests/CMakeLists.txt  | 4 +---
 modules/rostests/winetests/rpcrt4/server.c | 8 ++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/rostests/winetests/CMakeLists.txt
b/modules/rostests/winetests/CMakeLists.txt
index 580e81e4b5c..c6a7ab402f3 100644
--- a/modules/rostests/winetests/CMakeLists.txt
+++ b/modules/rostests/winetests/CMakeLists.txt
@@ -99,9 +99,7 @@ add_subdirectory(reg)
 add_subdirectory(regedit)
 add_subdirectory(riched20)
 add_subdirectory(riched32)
-if(NOT ARCH STREQUAL "amd64")
-    add_subdirectory(rpcrt4)
-endif()
+add_subdirectory(rpcrt4)
 add_subdirectory(rsaenh)
 add_subdirectory(schannel)
 add_subdirectory(scrrun)
diff --git a/modules/rostests/winetests/rpcrt4/server.c
b/modules/rostests/winetests/rpcrt4/server.c
index 05252877d4e..0622e81877b 100644
--- a/modules/rostests/winetests/rpcrt4/server.c
+++ b/modules/rostests/winetests/rpcrt4/server.c
@@ -2261,7 +2261,11 @@ static HANDLE create_server_process(void)
     ready_event = CreateEventW(&sec_attr, TRUE, FALSE, NULL);
     ok(ready_event != NULL, "CreateEvent failed: %u\n", GetLastError());
 
+#ifdef __REACTOS__
+    sprintf(cmdline, "%s server run %Ix", progname, (UINT_PTR)ready_event);
+#else
     sprintf(cmdline, "%s server run %lx", progname, (UINT_PTR)ready_event);
+#endif
     trace("running server process...\n");
     ok(CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0L, NULL, NULL, &startup,
&info), "CreateProcess\n");
     ret = WaitForSingleObject(ready_event, 10000);
@@ -2517,7 +2521,11 @@ START_TEST(server)
     else if(!strcmp(argv[2], "run"))
     {
       UINT_PTR event;
+#ifdef __REACTOS__
+      sscanf(argv[3], "%Ix", &event);
+#else
       sscanf(argv[3], "%lx", &event);
+#endif
       run_server((HANDLE)event);
     }
   }