[RPCSS]

* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60550

diff --git a/reactos/base/services/rpcss/epmp.c b/reactos/base/services/rpcss/epmp.c
index 2d3041f..aef5fde 100644 (file)
--- a/reactos/base/services/rpcss/epmp.c
+++ b/reactos/base/services/rpcss/epmp.c
@@ -19,6 +19,7 @@
  */
 
 #include <epm_s.h>
+
 #include <wine/debug.h>
 #include <wine/list.h>
 
@@ -88,16 +89,16 @@ void __RPC_USER ept_lookup_handle_t_rundown(ept_lookup_handle_t entry_handle)
     WINE_FIXME("%p\n", entry_handle);
 }
 
-void ept_insert(handle_t h,
-                unsigned32 num_ents,
-                ept_entry_t entries[],
-                boolean32 replace,
-                error_status_t *status)
+void __cdecl ept_insert(handle_t h,
+                        unsigned32 num_ents,
+                        ept_entry_t entries[],
+                        boolean32 replace,
+                        error_status_t *status)
 {
     unsigned32 i;
     RPC_STATUS rpc_status;
 
-    WINE_TRACE("(%p, %lu, %p, %lu, %p)\n", h, num_ents, entries, replace, status);
+    WINE_TRACE("(%p, %u, %p, %u, %p)\n", h, num_ents, entries, replace, status);
 
     *status = RPC_S_OK;
 
@@ -119,7 +120,7 @@ void ept_insert(handle_t h,
                                   &entry->address);
         if (rpc_status != RPC_S_OK)
         {
-            WINE_WARN("TowerExplode failed %lu\n", rpc_status);
+            WINE_WARN("TowerExplode failed %u\n", rpc_status);
             *status = rpc_status;
             break; /* FIXME: more cleanup? */
         }
@@ -138,17 +139,17 @@ void ept_insert(handle_t h,
     LeaveCriticalSection(&csEpm);
 }
 
-void ept_delete(handle_t h,
-                unsigned32 num_ents,
-                ept_entry_t entries[],
-                error_status_t *status)
+void __cdecl ept_delete(handle_t h,
+                        unsigned32 num_ents,
+                        ept_entry_t entries[],
+                        error_status_t *status)
 {
     unsigned32 i;
     RPC_STATUS rpc_status;
 
     *status = RPC_S_OK;
 
-    WINE_TRACE("(%p, %lu, %p, %p)\n", h, num_ents, entries, status);
+    WINE_TRACE("(%p, %u, %p, %p)\n", h, num_ents, entries, status);
 
     EnterCriticalSection(&csEpm);
 
@@ -179,30 +180,30 @@ void ept_delete(handle_t h,
     LeaveCriticalSection(&csEpm);
 }
 
-void ept_lookup(handle_t h,
-                unsigned32 inquiry_type,
-                uuid_p_t object,
-                rpc_if_id_p_t interface_id,
-                unsigned32 vers_option,
-                ept_lookup_handle_t *entry_handle,
-                unsigned32 max_ents,
-                unsigned32 *num_ents,
-                ept_entry_t entries[],
-                error_status_t *status)
+void __cdecl ept_lookup(handle_t h,
+                        unsigned32 inquiry_type,
+                        uuid_p_t object,
+                        rpc_if_id_p_t interface_id,
+                        unsigned32 vers_option,
+                        ept_lookup_handle_t *entry_handle,
+                        unsigned32 max_ents,
+                        unsigned32 *num_ents,
+                        ept_entry_t entries[],
+                        error_status_t *status)
 {
     WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status);
 
     *status = EPT_S_CANT_PERFORM_OP;
 }
 
-void ept_map(handle_t h,
-             uuid_p_t object,
-             twr_p_t map_tower,
-             ept_lookup_handle_t *entry_handle,
-             unsigned32 max_towers,
-             unsigned32 *num_towers,
-             twr_p_t *towers,
-             error_status_t *status)
+void __cdecl ept_map(handle_t h,
+                     uuid_p_t object,
+                     twr_p_t map_tower,
+                     ept_lookup_handle_t *entry_handle,
+                     unsigned32 max_towers,
+                     unsigned32 *num_towers,
+                     twr_p_t *towers,
+                     error_status_t *status)
 {
     RPC_STATUS rpc_status;
     RPC_SYNTAX_IDENTIFIER iface, syntax;
@@ -212,7 +213,7 @@ void ept_map(handle_t h,
     *status = RPC_S_OK;
     *num_towers = 0;
 
-    WINE_TRACE("(%p, %p, %p, %p, %lu, %p, %p, %p)\n", h, object, map_tower,
+    WINE_TRACE("(%p, %p, %p, %p, %u, %p, %p, %p)\n", h, object, map_tower,
           entry_handle, max_towers, num_towers, towers, status);
 
     rpc_status = TowerExplode(map_tower, &iface, &syntax, &protseq,
@@ -253,31 +254,31 @@ void ept_map(handle_t h,
     LeaveCriticalSection(&csEpm);
 }
 
-void ept_lookup_handle_free(handle_t h,
-                            ept_lookup_handle_t *entry_handle,
-                            error_status_t *status)
+void __cdecl ept_lookup_handle_free(handle_t h,
+                                    ept_lookup_handle_t *entry_handle,
+                                    error_status_t *status)
 {
     WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status);
 
     *status = EPT_S_CANT_PERFORM_OP;
 }
 
-void ept_inq_object(handle_t h,
-                    GUID *ept_object,
-                    error_status_t *status)
+void __cdecl ept_inq_object(handle_t h,
+                            GUID *ept_object,
+                            error_status_t *status)
 {
     WINE_FIXME("(%p, %p, %p): stub\n", h, ept_object, status);
 
     *status = EPT_S_CANT_PERFORM_OP;
 }
 
-void ept_mgmt_delete(handle_t h,
-                     boolean32 object_speced,
-                     uuid_p_t object,
-                     twr_p_t tower,
-                     error_status_t *status)
+void __cdecl ept_mgmt_delete(handle_t h,
+                             boolean32 object_speced,
+                             uuid_p_t object,
+                             twr_p_t tower,
+                             error_status_t *status)
 {
-    WINE_FIXME("(%p, %ld, %p, %p, %p): stub\n", h, object_speced, object, tower, status);
+    WINE_FIXME("(%p, %d, %p, %p, %p): stub\n", h, object_speced, object, tower, status);
 
     *status = EPT_S_CANT_PERFORM_OP;
 }

diff --git a/reactos/base/services/rpcss/irotp.c b/reactos/base/services/rpcss/irotp.c
index 015a89f..368dea6 100644 (file)
--- a/reactos/base/services/rpcss/irotp.c
+++ b/reactos/base/services/rpcss/irotp.c
@@ -1,5 +1,5 @@
 /*
- *       Running Object Table
+ *     Running Object Table
  *
  *      Copyright 2007  Robert Shearman
  *
@@ -60,7 +60,7 @@ static inline void rot_entry_release(struct rot_entry *rot_entry)
     }
 }
 
-HRESULT IrotRegister(
+HRESULT __cdecl IrotRegister(
     IrotHandle h,
     const MonikerComparisonData *data,
     const InterfaceData *obj,
@@ -140,7 +140,7 @@ HRESULT IrotRegister(
     return hr;
 }
 
-HRESULT IrotRevoke(
+HRESULT __cdecl IrotRevoke(
     IrotHandle h,
     IrotCookie cookie,
     IrotContextHandle *ctxt_handle,
@@ -187,7 +187,7 @@ HRESULT IrotRevoke(
     return E_INVALIDARG;
 }
 
-HRESULT IrotIsRunning(
+HRESULT __cdecl IrotIsRunning(
     IrotHandle h,
     const MonikerComparisonData *data)
 {
@@ -212,7 +212,7 @@ HRESULT IrotIsRunning(
     return hr;
 }
 
-HRESULT IrotGetObject(
+HRESULT __cdecl IrotGetObject(
     IrotHandle h,
     const MonikerComparisonData *moniker_data,
     PInterfaceData *obj,
@@ -254,7 +254,7 @@ HRESULT IrotGetObject(
     return MK_E_UNAVAILABLE;
 }
 
-HRESULT IrotNoteChangeTime(
+HRESULT __cdecl IrotNoteChangeTime(
     IrotHandle h,
     IrotCookie cookie,
     const FILETIME *last_modified_time)
@@ -278,7 +278,7 @@ HRESULT IrotNoteChangeTime(
     return E_INVALIDARG;
 }
 
-HRESULT IrotGetTimeOfLastChange(
+HRESULT __cdecl IrotGetTimeOfLastChange(
     IrotHandle h,
     const MonikerComparisonData *moniker_data,
     FILETIME *time)
@@ -306,7 +306,7 @@ HRESULT IrotGetTimeOfLastChange(
     return hr;
 }
 
-HRESULT IrotEnumRunning(
+HRESULT __cdecl IrotEnumRunning(
     IrotHandle h,
     PInterfaceList *list)
 {

diff --git a/reactos/base/services/rpcss/rpcss_main.c b/reactos/base/services/rpcss/rpcss_main.c
index 87496bf..f225502 100644 (file)
--- a/reactos/base/services/rpcss/rpcss_main.c
+++ b/reactos/base/services/rpcss/rpcss_main.c
@@ -122,7 +122,7 @@ BOOL RPCSS_Shutdown(void)
   return TRUE;
 }
 
-#if 0
+#ifndef __REACTOS__
 int main( int argc, char **argv )
 {
   /* 

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index a6cb463..0745ec6 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -233,7 +233,7 @@ reactos/base/applications/reg             # Autosync
 reactos/base/applications/regedit         # Out of sync
 reactos/base/applications/winhlp32        # Synced to Wine-1.5.26
 reactos/base/applications/wordpad         # Synced to Wine-1.5.26
-reactos/base/services/rpcss               # Synced to Wine-20081105
+reactos/base/services/rpcss               # Synced to Wine-1.7.1
 reactos/base/system/expand                # Synced to Wine-1.5.26
 reactos/base/system/msiexec               # Synced to Wine-1.5.26
 reactos/modules/rosapps/winfile           # Autosync