From da6926f487706a930a276b0e278142f5aef58de4 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Fri, 28 Nov 2008 20:24:36 +0000 Subject: [PATCH] - Add a header guard for pnp.idl's RESOURCEID, and add an internal define for setupapi as it uses incompatible Wine headers svn path=/trunk/; revision=37710 --- reactos/dll/win32/setupapi/setupapi_private.h | 5 +++++ reactos/include/reactos/idl/pnp.idl | 2 ++ 2 files changed, 7 insertions(+) diff --git a/reactos/dll/win32/setupapi/setupapi_private.h b/reactos/dll/win32/setupapi/setupapi_private.h index 7e28cde618a..43247a38bfe 100644 --- a/reactos/dll/win32/setupapi/setupapi_private.h +++ b/reactos/dll/win32/setupapi/setupapi_private.h @@ -44,6 +44,11 @@ #include +/* This hack definition is necessary as long as setupapi + depends on Wine "compatibility" headers */ +typedef ULONG RESOURCEID; +typedef RESOURCEID *PRESOURCEID; + #include #include "rpc_private.h" #include "resource.h" diff --git a/reactos/include/reactos/idl/pnp.idl b/reactos/include/reactos/idl/pnp.idl index f9e706ac337..a668de5afcb 100644 --- a/reactos/include/reactos/idl/pnp.idl +++ b/reactos/include/reactos/idl/pnp.idl @@ -14,7 +14,9 @@ const unsigned long PNP_MAX_PROP_SIZE = 65534; 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;