[CMAKE]

Revert some idl changes from r49286 and r49293, that broke mouse
and keyboard in 2nd stage.

svn path=/branches/cmake-bringup/; revision=50011

diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c
index ad3e460..58de5e6 100644 (file)
--- a/base/system/services/rpcserver.c
+++ b/base/system/services/rpcserver.c
@@ -2600,10 +2600,11 @@ DWORD ROpenServiceW(
 /* 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 @@ DWORD ROpenServiceA(
 /* 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;

diff --git a/include/reactos/idl/svcctl.idl b/include/reactos/idl/svcctl.idl
index 583263c..fe4dc89 100644 (file)
--- a/include/reactos/idl/svcctl.idl
+++ b/include/reactos/idl/svcctl.idl
@@ -434,7 +434,8 @@ interface svcctl
     /* 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 @@ interface svcctl
     /* 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);