[ros-diffs] [ekohl] 33052: Don't terminate a cpp_quote statement with a semicolon. New versions of WIDL will emit an error.

ekohl at svn.reactos.org ekohl at svn.reactos.org
Sun Apr 20 12:10:18 CEST 2008


Author: ekohl
Date: Sun Apr 20 05:10:18 2008
New Revision: 33052

URL: http://svn.reactos.org/svn/reactos?rev=33052&view=rev
Log:
Don't terminate a cpp_quote statement with a semicolon. New versions of WIDL will emit an error.

Modified:
    trunk/reactos/dll/win32/atl/atliface.idl
    trunk/reactos/include/reactos/idl/eventlogrpc.idl
    trunk/reactos/include/reactos/idl/pnp.idl
    trunk/reactos/include/reactos/idl/svcctl.idl

Modified: trunk/reactos/dll/win32/atl/atliface.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atliface.idl?rev=33052&r1=33051&r2=33052&view=diff
==============================================================================
--- trunk/reactos/dll/win32/atl/atliface.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/atliface.idl [iso-8859-1] Sun Apr 20 05:10:18 2008
@@ -74,6 +74,6 @@
 cpp_quote("HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);")
 cpp_quote("BOOL WINAPI AtlAxWinInit(void);")
 
-cpp_quote("HWND WINAPI AtlAxCreateDialogW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);");
-cpp_quote("HWND WINAPI AtlAxCreateDialogA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);");
-cpp_quote("#define     AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog");
+cpp_quote("HWND WINAPI AtlAxCreateDialogW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);")
+cpp_quote("HWND WINAPI AtlAxCreateDialogA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);")
+cpp_quote("#define     AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog")

Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventlogrpc.idl?rev=33052&r1=33051&r2=33052&view=diff
==============================================================================
--- trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] Sun Apr 20 05:10:18 2008
@@ -64,7 +64,7 @@
 #else
 	#define LOGHANDLE unsigned int
 	#define PLOGHANDLE unsigned int*
-	cpp_quote("typedef unsigned int LOGHANDLE, *PLOGHANDLE;");
+	cpp_quote("typedef unsigned int LOGHANDLE, *PLOGHANDLE;")
 #endif
 
 	/* Function 0x00 */

Modified: trunk/reactos/include/reactos/idl/pnp.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.idl?rev=33052&r1=33051&r2=33052&view=diff
==============================================================================
--- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Sun Apr 20 05:10:18 2008
@@ -294,9 +294,9 @@
         [in] PNP_RPC_STRING_LEN ulLength);
 
     /* Function 8 */
-    cpp_quote("#define PNP_GET_PARENT_DEVICE_INSTANCE  0x1");
-    cpp_quote("#define PNP_GET_CHILD_DEVICE_INSTANCE   0x2");
-    cpp_quote("#define PNP_GET_SIBLING_DEVICE_INSTANCE 0x3");
+    cpp_quote("#define PNP_GET_PARENT_DEVICE_INSTANCE  0x1")
+    cpp_quote("#define PNP_GET_CHILD_DEVICE_INSTANCE   0x2")
+    cpp_quote("#define PNP_GET_SIBLING_DEVICE_INSTANCE 0x3")
     DWORD PNP_GetRelatedDeviceInstance(
         [in] handle_t hBinding,
         [in] DWORD ulRelationship,
@@ -306,8 +306,8 @@
         [in] DWORD ulFlags);
 
     /* Function 9 */
-    cpp_quote("#define PNP_ENUMERATOR_SUBKEYS 0x1");
-    cpp_quote("#define PNP_CLASS_SUBKEYS      0x2");
+    cpp_quote("#define PNP_ENUMERATOR_SUBKEYS 0x1")
+    cpp_quote("#define PNP_CLASS_SUBKEYS      0x2")
     DWORD PNP_EnumerateSubKeys(
         [in] handle_t hBinding,
         [in] DWORD ulBranch,
@@ -557,8 +557,8 @@
         [in] handle_t hBinding);
 
     /* Function 40 */
-    cpp_quote("#define PNP_GET_HWPROFFLAGS 0x1");
-    cpp_quote("#define PNP_SET_HWPROFFLAGS 0x2");
+    cpp_quote("#define PNP_GET_HWPROFFLAGS 0x1")
+    cpp_quote("#define PNP_SET_HWPROFFLAGS 0x2")
     DWORD PNP_HwProfFlags(
         [in] handle_t hBinding,
         [in] DWORD ulAction,

Modified: trunk/reactos/include/reactos/idl/svcctl.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl.idl?rev=33052&r1=33051&r2=33052&view=diff
==============================================================================
--- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sun Apr 20 05:10:18 2008
@@ -239,7 +239,7 @@
     [size_is(cElements)] SC_RPC_NOTIFY_PARAMS NotifyParamsArray[];
 } SC_RPC_NOTIFY_PARAMS_LIST, *PSC_RPC_NOTIFY_PARAMS_LIST;
 
-cpp_quote("#if 0");
+cpp_quote("#if 0")
 
 #if 0
 typedef
@@ -297,7 +297,9 @@
   uuid(367abb81-9844-35f1-ad32-98f038001003),
   version(2.0),
   pointer_default(unique),
-  explicit_handle
+  #ifndef __midl
+  ,explicit_handle
+  #endif
 ]
 interface svcctl
 {



More information about the Ros-diffs mailing list