Patch to mingw 3.1.0-1
"Jeremy Bettis" <jeremy-PhGaUD7sGqRWk0Htik3J/[email protected]> Wed, 24 Sep 2003 14:06:04 -0500
| Newsgroups | gmane.comp.gnu.mingw.patches |
|---|---|
| Message-ID | <[email protected]> |
This is a patch relative to Mingw 3.1.0-1. I have only changed headers so I suppose that it is actually a patch to the win32 api package. Hmmm a changelog: * basetyps.h: Added COM macros for the OBJC language * commctrl.h: Added missing macros for Rebar control * windows.h: Added COM macros for OBJC language * winuser.h: Added missing color macros and menu animation macros for Windows XP
mingwpatch.txt
(text/plain, 4.4 KB)
diff -ru c:\orig-mingw-3.1.0-1\include/basetyps.h c:\msys\1.0\mingw\include/basetyps.h
--- c:\orig-mingw-3.1.0-1\include/basetyps.h Fri Sep 12 10:13:59 2003
+++ c:\msys\1.0\mingw\include/basetyps.h Tue Sep 23 13:31:06 2003
@@ -96,7 +96,52 @@
STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \
}
# define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)
+#else /* __OBJC__ */
+# define EXTERN_C extern
+# define STDMETHODCALLTYPE __stdcall
+# define STDMETHODVCALLTYPE __cdecl
+# define STDAPICALLTYPE __stdcall
+# define STDAPIVCALLTYPE __cdecl
+# define STDAPI EXTERN_C HRESULT STDAPICALLTYPE
+# define STDAPI_(t) EXTERN_C t STDAPICALLTYPE
+# define STDMETHODIMP HRESULT STDMETHODCALLTYPE
+# define STDMETHODIMP_(t) t STDMETHODCALLTYPE
+# define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE
+# define STDAPIV_(t) EXTERN_C t STDAPIVCALLTYPE
+# define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE
+# define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE
+# define interface struct
+# define STDMETHOD(m) HRESULT(STDMETHODCALLTYPE *m)
+# define STDMETHOD_(t,m) t(STDMETHODCALLTYPE *m)
+# define PURE
+# define THIS_ INTERFACE *,
+# define THIS INTERFACE *
+# ifndef CONST_VTABLE
+# define CONST_VTABLE
+# endif /* CONST_VTABLE */
+# define DECLARE_INTERFACE(i) \
+typedef struct i { CONST_VTABLE struct i##Vtbl *lpVtbl; } i; \
+typedef CONST_VTABLE struct i##Vtbl i##Vtbl; \
+CONST_VTABLE struct i##Vtbl
+# define DECLARE_INTERFACE_(i,b) DECLARE_INTERFACE(i)
+# define BEGIN_INTERFACE
+# define END_INTERFACE
+# define FWD_DECL(i) typedef struct i i
+# define IENUM_THIS(T) T*
+# define IENUM_THIS_(T) T*,
+# define DECLARE_ENUMERATOR_(I,T) \
+DECLARE_INTERFACE_(I,IUnknown) \
+{ \
+ STDMETHOD(QueryInterface)(IENUM_THIS_(I) REFIID,PVOID*) PURE; \
+ STDMETHOD_(ULONG,AddRef)(IENUM_THIS(I)) PURE; \
+ STDMETHOD_(ULONG,Release)(IENUM_THIS(I)) PURE; \
+ STDMETHOD(Next)(IENUM_THIS_(I) ULONG,T*,ULONG*) PURE; \
+ STDMETHOD(Skip)(IENUM_THIS_(I) ULONG) PURE; \
+ STDMETHOD(Reset)(IENUM_THIS(I)) PURE; \
+ STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \
+}
+# define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)
#endif /* __OBJC__ */
#ifdef _GUID_DEFINED
diff -ru c:\orig-mingw-3.1.0-1\include/commctrl.h c:\msys\1.0\mingw\include/commctrl.h
--- c:\orig-mingw-3.1.0-1\include/commctrl.h Fri Sep 12 10:13:59 2003
+++ c:\msys\1.0\mingw\include/commctrl.h Tue Sep 23 14:47:40 2003
@@ -1580,6 +1580,12 @@
#define RBBS_HIDDEN 8
#define RBBS_NOVERT 16
#define RBBS_FIXEDBMP 32
+#define RBBS_VARIABLEHEIGHT 64
+#define RBBS_GRIPPERALWAYS 128
+#define RBBS_NOGRIPPER 256
+#define RBBS_USECHEVRON 512
+#define RBBS_HIDETITLE 1024
+#define RBBS_TOPALIGN 2048
#define RBBIM_STYLE 1
#define RBBIM_COLORS 2
#define RBBIM_TEXT 4
@@ -1697,6 +1703,9 @@
#define RBN_DELETINGBAND (RBN_FIRST-6)
#define RBN_DELETEDBAND (RBN_FIRST-7)
#define RBN_CHILDSIZE (RBN_FIRST-8)
+#define RBN_CHEVRONPUSHED (RBN_FIRST-10)
+#define RBN_MINMAX (RBN_FIRST-21)
+#define RBN_AUTOBREAK (RBN_FIRST-22)
#define RBNM_ID 1
#define RBNM_STYLE 2
#define RBNM_LPARAM 4
diff -ru c:\orig-mingw-3.1.0-1\include/windows.h c:\msys\1.0\mingw\include/windows.h
--- c:\orig-mingw-3.1.0-1\include/windows.h Fri Sep 12 10:14:03 2003
+++ c:\msys\1.0\mingw\include/windows.h Tue Sep 23 13:20:20 2003
@@ -106,11 +106,11 @@
#endif /* (_WIN32_WINNT >= 0x0400) */
#endif
#ifndef NOGDI
-#if !defined (__OBJC__)
+/* #if !defined (__OBJC__) */
#if (__GNUC__ >= 3) || defined (__WATCOMC__)
#include <ole2.h>
#endif
-#endif /* __OBJC__ */
+/* #endif __OBJC__ */
#endif
#endif /* WIN32_LEAN_AND_MEAN */
@@ -123,6 +123,7 @@
windows.h
*/
#undef BOOL
+#undef interface
#endif
#endif
diff -ru c:\orig-mingw-3.1.0-1\include/winuser.h c:\msys\1.0\mingw\include/winuser.h
--- c:\orig-mingw-3.1.0-1\include/winuser.h Fri Sep 12 10:14:03 2003
+++ c:\msys\1.0\mingw\include/winuser.h Tue Sep 23 14:48:47 2003
@@ -803,6 +803,8 @@
#define COLOR_WINDOW 5
#define COLOR_WINDOWFRAME 6
#define COLOR_WINDOWTEXT 8
+#define COLOR_MENUHILIGHT 29
+#define COLOR_MENUBAR 30
#define CTLCOLOR_MSGBOX 0
#define CTLCOLOR_EDIT 1
#define CTLCOLOR_LISTBOX 2
@@ -1785,6 +1787,10 @@
#define TPM_RETURNCMD 256
#if (_WIN32_WINNT >= _NT5 || _WIN32_WINDOWS >= _W98)
#define TPM_RECURSE 1
+#define TPM_HORPOSANIMATION 1024
+#define TPM_HORNEGANIMATION 2048
+#define TPM_VERPOSANIMATION 4096
+#define TPM_VERNEGANIMATION 8192
#endif
#define HELP_COMMAND 0x102
#define HELP_CONTENTS 3