2003-12-08 Roald Ribe <rrib@users.sourceforge.net>

	* include/winuser.h (RT_MANIFEST): Add define.

2003-12-08  Pascal Buhler <pbuhler@users.sourceforge.net>

	* include/oleidl.h (IViewObject2): Inherit from IViewObject.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 7f2113f..6a71cdd 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-08  Roald Ribe <rrib@users.sourceforge.net>
+
+       * include/winuser.h (RT_MANIFEST): Add define.
+
+2003-12-08  Pascal Buhler <pbuhler@users.sourceforge.net>
+
+       * include/oleidl.h (IViewObject2): Inherit from IViewObject.
+
 2003-12-01  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/winnt.h (GetCurrentFiber): Remove duplicate prototype.

diff --git a/winsup/w32api/include/oleidl.h b/winsup/w32api/include/oleidl.h
index 1fbc56a..9d919b1 100644 (file)
--- a/winsup/w32api/include/oleidl.h
+++ b/winsup/w32api/include/oleidl.h
@@ -338,7 +338,7 @@ DECLARE_INTERFACE_(IViewObject,IUnknown)
 EXTERN_C const IID IID_IViewObject2;
 #undef INTERFACE
 #define INTERFACE IViewObject2
-DECLARE_INTERFACE_(IViewObject2,IUnknown)
+DECLARE_INTERFACE_(IViewObject2,IViewObject)
 {
        STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
        STDMETHOD_(ULONG,AddRef)(THIS) PURE;

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index abe43f3..9aa2d3c 100644 (file)
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -562,6 +562,7 @@ extern "C" {
 #define RT_ANICURSOR MAKEINTRESOURCE(21)
 #define RT_ANIICON MAKEINTRESOURCE(22)
 #define RT_HTML MAKEINTRESOURCE(23)
+#define RT_MANIFEST MAKEINTRESOURCE(24)
 #define EWX_FORCE 4
 #define EWX_LOGOFF 0
 #define EWX_POWEROFF 8