[RPCSS] Sync to wine-10.0

Author: MishaProductions

base/services/rpcss/CMakeLists.txt

@@ -1,7 +1,8 @@
 
 add_rpc_files(server
     ${REACTOS_SOURCE_DIR}/sdk/include/wine/epm.idl
-    ${REACTOS_SOURCE_DIR}/sdk/include/wine/irot.idl)
+    ${REACTOS_SOURCE_DIR}/sdk/include/wine/irot.idl
+    ${REACTOS_SOURCE_DIR}/sdk/include/wine/irpcss.idl)
 
 
 list(APPEND SOURCE
@@ -11,9 +12,10 @@ list(APPEND SOURCE
     setup.c
     precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/epm_s.c
-    ${CMAKE_CURRENT_BINARY_DIR}/irot_s.c)
+    ${CMAKE_CURRENT_BINARY_DIR}/irot_s.c
+    ${CMAKE_CURRENT_BINARY_DIR}/irpcss_s.c)
 
-include_directories(${REACTOS_BINARY_DIR}/sdk/include/reactos/wine)
+include_directories(${REACTOS_BINARY_DIR}/sdk/include/wine)
 add_executable(rpcss ${SOURCE} rpcss.rc)
 
 if(CMAKE_C_COMPILER_ID STREQUAL "Clang")

base/services/rpcss/epmp.c

@@ -18,7 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifdef __REACTOS__
 #include "epm_s.h"
+#else
+#include "epm.h"
+#endif
 
 #include "wine/debug.h"
 #include "wine/list.h"
@@ -57,7 +61,7 @@ static void delete_registered_ept_entry(struct registered_ept_entry *entry)
     I_RpcFree(entry->endpoint);
     I_RpcFree(entry->address);
     list_remove(&entry->entry);
-    HeapFree(GetProcessHeap(), 0, entry);
+    free(entry);
 }
 
 static struct registered_ept_entry *find_ept_entry(
@@ -98,15 +102,15 @@ 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;
 
     EnterCriticalSection(&csEpm);
 
     for (i = 0; i < num_ents; i++)
     {
-        struct registered_ept_entry *entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry));
+        struct registered_ept_entry *entry = malloc(sizeof(*entry));
         if (!entry)
         {
             /* FIXME: cleanup code to delete added entries */
@@ -119,9 +123,9 @@ 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);
+            free(entry);
             break; /* FIXME: more cleanup? */
         }
 
@@ -149,7 +153,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 +219,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 +286,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;
 }

base/services/rpcss/irotp.c

@@ -25,7 +25,11 @@
 #include "windef.h"
 #include "winbase.h"
 
+#ifdef __REACTOS__
 #include "irot_s.h"
+#else
+#include "irot.h"
+#endif
 
 #include "wine/list.h"
 #include "wine/debug.h"
@@ -61,10 +65,10 @@ static inline void rot_entry_release(struct rot_entry *rot_entry)
 {
     if (!InterlockedDecrement(&rot_entry->refs))
     {
-        HeapFree(GetProcessHeap(), 0, rot_entry->object);
-        HeapFree(GetProcessHeap(), 0, rot_entry->moniker);
-        HeapFree(GetProcessHeap(), 0, rot_entry->moniker_data);
-        HeapFree(GetProcessHeap(), 0, rot_entry);
+        free(rot_entry->object);
+        free(rot_entry->moniker);
+        free(rot_entry->moniker_data);
+        free(rot_entry);
     }
 }
 
@@ -84,16 +88,15 @@ 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;
     }
 
-    rot_entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rot_entry));
-    if (!rot_entry)
+    if (!(rot_entry = calloc(1, sizeof(*rot_entry))))
         return E_OUTOFMEMORY;
 
     rot_entry->refs = 1;
-    rot_entry->object = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[obj->ulCntData]));
+    rot_entry->object = malloc(FIELD_OFFSET(InterfaceData, abData[obj->ulCntData]));
     if (!rot_entry->object)
     {
         rot_entry_release(rot_entry);
@@ -104,7 +107,7 @@ HRESULT __cdecl IrotRegister(
 
     rot_entry->last_modified = *time;
 
-    rot_entry->moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[mk->ulCntData]));
+    rot_entry->moniker = malloc(FIELD_OFFSET(InterfaceData, abData[mk->ulCntData]));
     if (!rot_entry->moniker)
     {
         rot_entry_release(rot_entry);
@@ -113,8 +116,7 @@ HRESULT __cdecl IrotRegister(
     rot_entry->moniker->ulCntData = mk->ulCntData;
     memcpy(&rot_entry->moniker->abData, mk->abData, mk->ulCntData);
 
-    rot_entry->moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MonikerComparisonData, abData[data->ulCntData]));
-    if (!rot_entry->moniker_data)
+    if (!(rot_entry->moniker_data = malloc(FIELD_OFFSET(MonikerComparisonData, abData[data->ulCntData]))))
     {
         rot_entry_release(rot_entry);
         return E_OUTOFMEMORY;
@@ -132,7 +134,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 +159,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 +271,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)
@@ -370,10 +372,10 @@ void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle)
 
 void * __RPC_USER MIDL_user_allocate(SIZE_T size)
 {
-    return HeapAlloc(GetProcessHeap(), 0, size);
+    return I_RpcAllocate(size);
 }
 
 void __RPC_USER MIDL_user_free(void * p)
 {
-    HeapFree(GetProcessHeap(), 0, p);
+    I_RpcFree(p);
 }

base/services/rpcss/irpcss.idl

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2019 Nikolay Sivov for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#pragma makedep server
+
+#include "wine/irpcss.idl"

base/services/rpcss/precomp.h

@@ -2,21 +2,20 @@
 #ifndef _RPCSS_PRECOMP_H_
 #define _RPCSS_PRECOMP_H_
 
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
+#define COBJMACROS
 
 #include <windef.h>
 #include <winbase.h>
 
 #include <irot_s.h>
 #include <epm_s.h>
+#include <irpcss_s.h>
 
 #include <wine/list.h>
 
+
 #endif /* !_RPCSS_PRECOMP_H_ */