Author: sginsberg Date: Fri Nov 28 14:24:36 2008 New Revision: 37710
URL: http://svn.reactos.org/svn/reactos?rev=37710&view=rev Log: - Add a header guard for pnp.idl's RESOURCEID, and add an internal define for setupapi as it uses incompatible Wine headers
Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/include/reactos/idl/pnp.idl
Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi... ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Fri Nov 28 14:24:36 2008 @@ -43,6 +43,11 @@ #include <ndk/ntndk.h>
#include <pseh/pseh.h> + +/* This hack definition is necessary as long as setupapi + depends on Wine "compatibility" headers */ +typedef ULONG RESOURCEID; +typedef RESOURCEID *PRESOURCEID;
#include <pnp_c.h> #include "rpc_private.h"
Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.idl... ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Fri Nov 28 14:24:36 2008 @@ -14,7 +14,9 @@ const unsigned long PNP_MAX_PROP_COUNT = 32767; const unsigned long PNP_MAX_BUFFER_SIZE = 16000000;
+cpp_quote("#ifndef _CFGMGR32_H_") typedef unsigned long RESOURCEID; +cpp_quote("#endif") typedef unsigned long DEVPROPTYPE; typedef [range(0, PNP_MAX_PROP_SIZE)] unsigned long PNP_PROP_SIZE, *PPNP_PROP_SIZE; typedef [range(0, PNP_MAX_PROP_COUNT)] unsigned long PNP_PROP_COUNT, *PPNP_PROP_COUNT;