Eric Pouech : rpcss: Enable compilation with long types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f172957423d94fdb2a3ee2a51bc058773593d540
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f172957423d94fdb2a3ee2a51...

Author: Eric Pouech 
Date:   Fri Feb  4 09:57:42 2022 +0100

rpcss: Enable compilation with long types.

Signed-off-by: Eric Pouech 
Signed-off-by: Alexandre Julliard

---

programs/rpcss/Makefile.in  |  1 -
 programs/rpcss/epmp.c       | 10 +++++-----
 programs/rpcss/irotp.c      |  8 ++++----
 programs/rpcss/rpcss_main.c |  4 ++--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in
index b7a451f0001..a4d3533e55e 100644
--- a/programs/rpcss/Makefile.in
+++ b/programs/rpcss/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = rpcss.exe
 IMPORTS   = rpcrt4 advapi32

diff --git a/programs/rpcss/epmp.c b/programs/rpcss/epmp.c
index 656fa9cd246..2a13aaccb8b 100644
--- a/programs/rpcss/epmp.c
+++ b/programs/rpcss/epmp.c
@@ -98,7 +98,7 @@ void __cdecl ept_insert(handle_t h,
     unsigned32 i;
     RPC_STATUS rpc_status;

-    WINE_TRACE("(%p, %u, %p, %u, %p)\n", h, num_ents, entries, replace, status);
+    WINE_TRACE("(%p, %lu, %p, %lu, %p)\n", h, num_ents, entries, replace, status);

*status = RPC_S_OK;

@@ -119,7 +119,7 @@ void __cdecl ept_insert(handle_t h,
                                   &entry->address);
         if (rpc_status != RPC_S_OK)
         {
-            WINE_WARN("TowerExplode failed %u\n", rpc_status);
+            WINE_WARN("TowerExplode failed %lu\n", rpc_status);
             *status = rpc_status;
             HeapFree(GetProcessHeap(), 0, entry);
             break; /* FIXME: more cleanup? */
@@ -149,7 +149,7 @@ void __cdecl ept_delete(handle_t h,

*status = RPC_S_OK;

-    WINE_TRACE("(%p, %u, %p, %p)\n", h, num_ents, entries, status);
+    WINE_TRACE("(%p, %lu, %p, %p)\n", h, num_ents, entries, status);

EnterCriticalSection(&csEpm);

@@ -215,7 +215,7 @@ void __cdecl ept_map(handle_t h,
     *status = RPC_S_OK;
     *num_towers = 0;

-    WINE_TRACE("(%p, %p, %p, %p, %u, %p, %p, %p)\n", h, object, map_tower,
+    WINE_TRACE("(%p, %p, %p, %p, %lu, %p, %p, %p)\n", h, object, map_tower,
           entry_handle, max_towers, num_towers, towers, status);

rpc_status = TowerExplode(map_tower, &iface, &syntax, &protseq,
@@ -282,7 +282,7 @@ void __cdecl ept_mgmt_delete(handle_t h,
                              twr_p_t tower,
                              error_status_t *status)
 {
-    WINE_FIXME("(%p, %d, %p, %p, %p): stub\n", h, object_speced, object, tower, status);
+    WINE_FIXME("(%p, %ld, %p, %p, %p): stub\n", h, object_speced, object, tower, status);

*status = EPT_S_CANT_PERFORM_OP;
 }
diff --git a/programs/rpcss/irotp.c b/programs/rpcss/irotp.c
index 05abb90ad88..47a88852a2d 100644
--- a/programs/rpcss/irotp.c
+++ b/programs/rpcss/irotp.c
@@ -84,7 +84,7 @@ HRESULT __cdecl IrotRegister(

if (grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT))
     {
-        WINE_ERR("Invalid grfFlags: 0x%08x\n", grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT));
+        WINE_ERR("Invalid grfFlags: 0x%08lx\n", grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT));
         return E_INVALIDARG;
     }

@@ -132,7 +132,7 @@ HRESULT __cdecl IrotRegister(
             !memcmp(&data->abData, &existing_rot_entry->moniker_data->abData, data->ulCntData))
         {
             hr = MK_S_MONIKERALREADYREGISTERED;
-            WINE_TRACE("moniker already registered with cookie %d\n", existing_rot_entry->cookie);
+            WINE_TRACE("moniker already registered with cookie %ld\n", existing_rot_entry->cookie);
             break;
         }
     }
@@ -157,7 +157,7 @@ HRESULT __cdecl IrotRevoke(
 {
     struct rot_entry *rot_entry;

-    WINE_TRACE("%d\n", cookie);
+    WINE_TRACE("%ld\n", cookie);

EnterCriticalSection(&csRunningObjectTable);
     LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, struct rot_entry, entry)
@@ -269,7 +269,7 @@ HRESULT __cdecl IrotNoteChangeTime(
 {
     struct rot_entry *rot_entry;

-    WINE_TRACE("%d %p\n", cookie, last_modified_time);
+    WINE_TRACE("%ld %p\n", cookie, last_modified_time);

EnterCriticalSection(&csRunningObjectTable);
     LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, struct rot_entry, entry)
diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c
index 99b4020882b..2fef34d1171 100644
--- a/programs/rpcss/rpcss_main.c
+++ b/programs/rpcss/rpcss_main.c
@@ -230,7 +230,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_
         SetEvent( exit_event );
         return NO_ERROR;
     default:
-        FIXME( "got service ctrl %x\n", ctrl );
+        FIXME( "got service ctrl %lx\n", ctrl );
         status.dwCurrentState = SERVICE_RUNNING;
         SetServiceStatus( service_handle, &status );
         return NO_ERROR;
@@ -246,7 +246,7 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )

if ((ret = RPCSS_Initialize()))
     {
-        WARN("Failed to initialize rpc interfaces, status %d.\n", ret);
+        WARN("Failed to initialize rpc interfaces, status %ld.\n", ret);
         return;
     }