Rob Shearman : include: Include winuser.h from generated oleidl.h header.

Alexandre Julliard julliard at winehq.org
Mon Dec 29 08:47:59 CST 2008


Module: wine
Branch: master
Commit: 4a67e7a71e4775286deadc70930f826112127907
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4a67e7a71e4775286deadc70930f826112127907

Author: Rob Shearman <robertshearman at gmail.com>
Date:   Mon Dec 29 12:05:12 2008 +0000

include: Include winuser.h from generated oleidl.h header.

oleidl.h isn't usable without winuser.h being included first due to
using the LPMSG type, so explicitly include it by adding a cpp_quote
statement to oleidl.idl. In the PSDK it is implicitly included as
IDL-generated header includes windows.h, which in turn includes
winuser.h.

---

 dlls/ole32/ole32_oleidl.idl      |    1 -
 dlls/oleaut32/oleaut32_ocidl.idl |    1 -
 include/oleidl.idl               |    2 ++
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ole32/ole32_oleidl.idl b/dlls/ole32/ole32_oleidl.idl
index b9315b3..93cf079 100644
--- a/dlls/ole32/ole32_oleidl.idl
+++ b/dlls/ole32/ole32_oleidl.idl
@@ -16,5 +16,4 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-cpp_quote("#include <winuser.h>")
 #include "oleidl.idl"
diff --git a/dlls/oleaut32/oleaut32_ocidl.idl b/dlls/oleaut32/oleaut32_ocidl.idl
index 379df5b..dcd3ea4 100644
--- a/dlls/oleaut32/oleaut32_ocidl.idl
+++ b/dlls/oleaut32/oleaut32_ocidl.idl
@@ -16,5 +16,4 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-cpp_quote("#include <winuser.h>")
 #include "ocidl.idl"
diff --git a/include/oleidl.idl b/include/oleidl.idl
index 5c92cb1..74962ff 100644
--- a/include/oleidl.idl
+++ b/include/oleidl.idl
@@ -24,6 +24,8 @@ import "objidl.idl";
 
 interface IOleInPlaceActiveObject;
 
+cpp_quote("#include <winuser.h>")
+
 /*****************************************************************************
  * IOleTypes interface
  */




More information about the wine-cvs mailing list