From fd993b97d5a2f1eb3ccd44920cd15358aa626d01 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 10 Oct 2014 11:38:00 +0000 Subject: [PATCH] [RPCSS] * Sync with Wine 1.7.27. CORE-8540 svn path=/trunk/; revision=64654 --- reactos/base/services/rpcss/epm.idl | 2 ++ reactos/base/services/rpcss/irot.idl | 2 ++ reactos/base/services/rpcss/rpcss_main.c | 5 ++++- reactos/media/doc/README.WINE | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/reactos/base/services/rpcss/epm.idl b/reactos/base/services/rpcss/epm.idl index 67fad348c88..09eff626be6 100644 --- a/reactos/base/services/rpcss/epm.idl +++ b/reactos/base/services/rpcss/epm.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep server + #include "wine/epm.idl" diff --git a/reactos/base/services/rpcss/irot.idl b/reactos/base/services/rpcss/irot.idl index 95236db6e44..b6ea6e766c0 100644 --- a/reactos/base/services/rpcss/irot.idl +++ b/reactos/base/services/rpcss/irot.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep server + #include "wine/irot.idl" diff --git a/reactos/base/services/rpcss/rpcss_main.c b/reactos/base/services/rpcss/rpcss_main.c index de2a9978543..04560437f9b 100644 --- a/reactos/base/services/rpcss/rpcss_main.c +++ b/reactos/base/services/rpcss/rpcss_main.c @@ -94,8 +94,11 @@ BOOL RPCSS_Initialize(void) if (status != RPC_S_OK) goto fail; - //exit_event = __wine_make_process_system(); +#ifndef __REACTOS__ + exit_event = __wine_make_process_system(); +#else exit_event = CreateEventW(NULL, FALSE, FALSE, NULL); // never fires +#endif return TRUE; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index da6082afba5..e06342defab 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -244,7 +244,7 @@ reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to Wine-1.7.27 reactos/base/applications/wordpad # Synced to Wine-1.7.9 -reactos/base/services/rpcss # Synced to Wine-1.7.1 +reactos/base/services/rpcss # Synced to Wine-1.7.27 reactos/base/system/expand # Synced to Wine-1.7.1 reactos/base/system/msiexec # Synced to Wine-1.7.1 reactos/modules/rosapps/winfile # Autosync