[ros-diffs] [jgardou] 53171: [WIDL] - use -Oif flag to produce modern (!) NT4 stubs, with Microsoft extensions to IDL language. [ADVAPI32] - Initialize *pcbBytesNeeded, as it's marked as [in], it needs to be i...

Author: jgardou
Date: Wed Aug 10 23:19:52 2011
New Revision: 53171

URL: http://svn.reactos.org/svn/reactos?rev=53171&view=rev
Log:
[WIDL]
- use -Oif flag to produce modern (!) NT4 stubs, with Microsoft extensions to IDL
language.
[ADVAPI32]
- Initialize *pcbBytesNeeded, as it's marked as [in], it needs to be in the 0-8k range
before being passed to RPC.
Now 2nd stage got his mouse and keyboard again.

Modified:
    trunk/reactos/cmake/idl-support.cmake
    trunk/reactos/dll/win32/advapi32/service/scm.c
    trunk/reactos/tools/rbuild/backend/mingw/rules.mak

Modified: trunk/reactos/cmake/idl-support.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re…
==============================================================================
--- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Wed Aug 10 23:19:52 2011
@@ -22,8 +22,8 @@
     set(IDL_HEADER_ARG -h -o) #.h
     set(IDL_HEADER_ARG2 -h -H) #.h
     set(IDL_TYPELIB_ARG -t -o) #.tlb
-    set(IDL_SERVER_ARG -s -o) #.c for server library
-    set(IDL_CLIENT_ARG -c -o) #.c for stub client library
+    set(IDL_SERVER_ARG -Oif -s -o) #.c for server library
+    set(IDL_CLIENT_ARG -Oif -c -o) #.c for stub client library
     set(IDL_PROXY_ARG -p -o)
     set(IDL_INTERFACE_ARG -u -o)
     if(ARCH MATCHES i386)

Modified: trunk/reactos/dll/win32/advapi32/service/scm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Wed Aug 10 23:19:52 2011
@@ -1870,7 +1870,10 @@
 
     TRACE("QueryServiceConfigW(%p, %p, %lu, %p)\n",
            hService, lpServiceConfig, cbBufSize, pcbBytesNeeded);
-
+           
+    if(pcbBytesNeeded)
+        *pcbBytesNeeded = 0;
+    
     RpcTryExcept
     {
         /* Call to services.exe using RPC */

Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Wed Aug 10 23:19:52
2011
@@ -264,7 +264,7 @@
 
 ${call RBUILD_intermediate_path_noext,$(2)}_c: $(2) $(3) $$(widl_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
 	$$(ECHO_WIDL)
-	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H
${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call
RBUILD_intermediate_path_noext,$(2)}_c.c $(2)
+	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -Oif
-h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call
RBUILD_intermediate_path_noext,$(2)}_c.c $(2)
 	$${checkpoint} $$@>$(NUL)
 
 ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,,${call
RBUILD_intermediate_path_noext,$(2)}_c.o}
@@ -280,7 +280,7 @@
 
 ${call RBUILD_intermediate_path_noext,$(2)}_s: $(2) $(3) $$(widl_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
 	$$(ECHO_WIDL)
-	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H
${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call
RBUILD_intermediate_path_noext,$(2)}_s.c $(2)
+	$$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -Oif
-h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call
RBUILD_intermediate_path_noext,$(2)}_s.c $(2)
 	$${checkpoint} $$@>$(NUL)
 
 ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,,${call
RBUILD_intermediate_path_noext,$(2)}_s.o}