[ros-diffs] [tkreuzer] 50011: [CMAKE] Revert some idl changes from r49286 and r49293, that broke mouse and keyboard in 2nd stage.

Author: tkreuzer
Date: Sat Dec 11 17:04:24 2010
New Revision: 50011

URL: http://svn.reactos.org/svn/reactos?rev=50011&view=rev
Log:
[CMAKE]
Revert some idl changes from r49286 and r49293, that broke mouse
and keyboard in 2nd stage.

Modified:
    branches/cmake-bringup/base/system/services/rpcserver.c
    branches/cmake-bringup/include/reactos/idl/svcctl.idl

Modified: branches/cmake-bringup/base/system/services/rpcserver.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi…
==============================================================================
--- branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] (original)
+++ branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] Sat Dec 11
17:04:24 2010
@@ -2600,10 +2600,11 @@
 /* Function 17 */
 DWORD RQueryServiceConfigW(
     SC_RPC_HANDLE hService,
-    LPQUERY_SERVICE_CONFIGW lpServiceConfig,
+    LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGW lpServiceConfig,
     DWORD cbBufSize,
     LPBOUNDED_DWORD_8K pcbBytesNeeded)
 {
+    LPQUERY_SERVICE_CONFIGW lpServiceConfig = (LPQUERY_SERVICE_CONFIGW)lpBuf;
     DWORD dwError = ERROR_SUCCESS;
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService = NULL;
@@ -3777,10 +3778,11 @@
 /* Function 29 */
 DWORD RQueryServiceConfigA(
     SC_RPC_HANDLE hService,
-    LPQUERY_SERVICE_CONFIGA lpServiceConfig,
+    LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGA lpServiceConfig,
     DWORD cbBufSize,
     LPBOUNDED_DWORD_8K pcbBytesNeeded)
 {
+    LPQUERY_SERVICE_CONFIGA lpServiceConfig = (LPQUERY_SERVICE_CONFIGA)lpBuf;
     DWORD dwError = ERROR_SUCCESS;
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService = NULL;

Modified: branches/cmake-bringup/include/reactos/idl/svcctl.idl
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i…
==============================================================================
--- branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] (original)
+++ branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] Sat Dec 11 17:04:24
2010
@@ -434,7 +434,8 @@
     /* Function 17 */
     DWORD RQueryServiceConfigW(
         [in] SC_RPC_HANDLE hService,
-        [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig,
+        [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig,
+        /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, */
         [in, range(0, 1024*8)] DWORD cbBufSize,
         [out] LPBOUNDED_DWORD_8K pcbBytesNeeded);
 
@@ -545,7 +546,8 @@
     /* Function 29 */
     DWORD RQueryServiceConfigA(
         [in] SC_RPC_HANDLE hService,
-        [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig,
+        [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig,
+        /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, */
         [in, range(0, 1024*8)] DWORD cbBufSize,
         [out] LPBOUNDED_DWORD_8K pcbBytesNeeded);