--- include/OleAuto.h.orig	2004-02-15 17:52:12.000000000 +0900
+++ include/OleAuto.h	2004-03-21 11:37:29.000000000 +0900
@@ -80,6 +80,12 @@
 #define V_DECIMAL(X) V_UNION(X,decVal)
 #define V_DECIMALREF(X) V_UNION(X,pdecVal)
 #define V_I1(X) V_UNION(X,cVal)
+#define V_UI2(X) V_UNION(X,uiVal)
+#define V_UI2REF(X) V_UNION(X,puiVal)
+#define V_UI4(X) V_UNION(X,ulVal)
+#define V_UI4REF(X) V_UNION(X,pulVal)
+#define V_UI8(X) V_UNION(X,ullVal)
+#define V_UI8REF(X) V_UNION(X,pullVal)
 
 #include <oaidl.h>
 
@@ -256,6 +262,33 @@
 WINOLEAUTAPI VarSub(LPVARIANT, LPVARIANT, LPVARIANT);
 WINOLEAUTAPI VarMul(LPVARIANT, LPVARIANT, LPVARIANT);
 WINOLEAUTAPI VarDiv(LPVARIANT, LPVARIANT, LPVARIANT);
+
+WINOLEAUTAPI VarUI1FromDec(DECIMAL *, BYTE *);
+WINOLEAUTAPI VarI2FromDec(DECIMAL *, SHORT *);
+WINOLEAUTAPI VarI4FromDec(DECIMAL *, LONG *);
+WINOLEAUTAPI VarR4FromDec(DECIMAL *, FLOAT *);
+WINOLEAUTAPI VarBstrFromDec(DECIMAL *, LCID, ULONG, BSTR *);
+WINOLEAUTAPI VarUI2FromDec(DECIMAL *, USHORT *);
+WINOLEAUTAPI VarUI4FromDec(DECIMAL *, ULONG *);
+WINOLEAUTAPI VarDecFromUI1(BYTE bIn, DECIMAL *);
+WINOLEAUTAPI VarDecFromI2(SHORT uiIn, DECIMAL *);
+WINOLEAUTAPI VarDecFromI4(LONG lIn, DECIMAL *);
+WINOLEAUTAPI VarDecFromR4(FLOAT, DECIMAL *);
+WINOLEAUTAPI VarDecFromStr(OLECHAR *, LCID, ULONG, DECIMAL *);
+WINOLEAUTAPI VarDecFromUI2(USHORT, DECIMAL *);
+WINOLEAUTAPI VarDecFromUI4(ULONG, DECIMAL *);
+
+STDAPI VarDecAdd(LPDECIMAL, LPDECIMAL, LPDECIMAL);
+STDAPI VarDecDiv(LPDECIMAL, LPDECIMAL, LPDECIMAL);
+STDAPI VarDecMul(LPDECIMAL, LPDECIMAL, LPDECIMAL);
+STDAPI VarDecSub(LPDECIMAL, LPDECIMAL, LPDECIMAL);
+STDAPI VarDecAbs(LPDECIMAL, LPDECIMAL);
+STDAPI VarDecFix(LPDECIMAL, LPDECIMAL);
+STDAPI VarDecInt(LPDECIMAL, LPDECIMAL);
+STDAPI VarDecNeg(LPDECIMAL, LPDECIMAL);
+STDAPI VarDecRound(LPDECIMAL, int, LPDECIMAL);
+STDAPI VarDecCmp(LPDECIMAL, LPDECIMAL);
+STDAPI VarDecCmpR8(LPDECIMAL, double);
 #pragma pack(pop)
 
 #endif
--- include/WTypes.h.orig	2004-02-15 17:52:15.000000000 +0900
+++ include/WTypes.h	2004-03-21 11:14:52.000000000 +0900
@@ -166,6 +166,7 @@
 		ULONGLONG Lo64;
 	} DUMMYUNIONNAME2;
 } DECIMAL;
+typedef DECIMAL *LPDECIMAL;
 typedef void *HMETAFILEPICT;
 #ifdef __cplusplus
 }
--- include/commctrl.h.orig	2004-02-15 17:52:10.000000000 +0900
+++ include/commctrl.h	2004-03-13 18:04:01.000000000 +0900
@@ -1176,6 +1176,25 @@
 #define LVKF_CONTROL	0x0002
 #define LVKF_SHIFT	0x0004
 #define LVGIT_UNFOLDED  1
+#if (_WIN32_WINNT >= 0x0501)
+#define LVM_INSERTGROUP	(LVM_FIRST + 145)
+#define LVM_ENABLEGROUPVIEW	(LVM_FIRST + 157)
+#define LVGF_NONE 0
+#define LVGF_HEADER 1
+#define LVGF_FOOTER 2
+#define LVGF_STATE 4
+#define LVGF_ALIGN 8
+#define LVGF_GROUPID 16
+#define LVGS_NORMAL 0
+#define LVGS_COLLAPSED 1
+#define LVGS_HIDDEN 2
+#define LVGA_HEADER_LEFT 1
+#define LVGA_HEADER_CENTER 2
+#define LVGA_HEADER_RIGHT 4
+#define LVGA_FOOTER_LEFT 8
+#define LVGA_FOOTER_CENTER 16
+#define LVGA_FOOTER_RIGHT 32
+#endif
 #endif
 #define TVS_HASBUTTONS	1
 #define TVS_HASLINES	2
@@ -2440,6 +2459,23 @@
 	int iTo;
 } NMLVCACHEHINT, *PNMLVCACHEHINT;
 #define NM_CACHEHINT NMLVCACHEHINT
+#if (_WIN32_IE >= 0x0400)
+#if (_WIN32_WINNT >= 0x501)
+typedef struct tagLVGROUP
+{
+	UINT cbSize;
+	UINT mask;
+	LPWSTR pszHeader;
+	int cchHeader;
+	LPWSTR pszFooter;
+	int cchFooter;
+	int iGroupId;
+	UINT stateMask;
+	UINT state;
+	UINT uAlign;
+} LVGROUP, *PLVGROUP;
+#endif
+#endif
 typedef struct _TREEITEM *HTREEITEM;
 typedef struct tagTVITEMA {
 	UINT mask;
@@ -3143,6 +3179,10 @@
 #define ListView_SetSelectionMark(w,i) (INT)SNDMSG((w),LVM_SETSELECTIONMARK,0,(LPARAM)(i))
 #define ListView_SetToolTips(w,n) (HWND)SNDMSG((w),LVM_SETTOOLTIPS,(WPARAM)(n),0)
 #define ListView_GetToolTips(w) (HWND)SNDMSG((w),LVM_GETTOOLTIPS,0,0)
+#if (_WIN32_WINNT >= 0x501)
+#define ListView_InsertGroup(hwnd,n,p) SNDMSG((hwnd), LVM_INSERTGROUP, (WPARAM)(n), (LPARAM)(p))
+#define ListView_EnableGroupView(hwnd,f) SNDMSG((hwnd), LVM_ENABLEGROUPVIEW, (WPARAM)(f), 0)
+#endif
 #define TabCtrl_HighlightItem(hwnd, i, fHighlight) SNDMSG((hwnd), TCM_HIGHLIGHTITEM, (WPARAM)i, (LPARAM)MAKELONG (fHighlight, 0))
 #define TabCtrl_SetExtendedStyle(hwnd, dw) SNDMSG((hwnd), TCM_SETEXTENDEDSTYLE, 0, dw)
 #define TabCtrl_GetExtendedStyle(hwnd) SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0)
--- include/errorrep.h.orig	2004-02-15 17:52:10.000000000 +0900
+++ include/errorrep.h	2004-03-21 10:19:25.000000000 +0900
@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 
-#if (_WIN32_WINNT >= 0x0501)
+//#if (_WIN32_WINNT >= 0x0501)
 typedef enum {
 	frrvErr = 3,
 	frrvErrNoDW = 4,
@@ -22,7 +22,8 @@
 BOOL WINAPI AddERExcludedApplicationA(LPCSTR);
 BOOL WINAPI AddERExcludedApplicationW(LPCWSTR);
 EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS,DWORD);
-#endif
+typedef EFaultRepRetVal (WINAPI *pfn_ADDEREXCLUDEDAPPLICATIONW)(LPCWSTR);
+//#endif
 
 #ifdef UNICODE
 #if (_WIN32_WINNT >= 0x0501)
--- include/ocidl.h.orig	2004-02-15 17:52:12.000000000 +0900
+++ include/ocidl.h	2004-02-26 01:09:16.000000000 +0900
@@ -59,7 +59,7 @@
 	LPOLESTR pstrName;
 	CLSID clsid;
 } PROPBAG2;
-enum tagQACONTAINERFLAGS
+typedef enum tagQACONTAINERFLAGS
 {
 	QACONTAINER_SHOWHATCHING = 1,
 	QACONTAINER_SHOWGRABHANDLES = 2,
--- include/oleidl.h.orig	2004-02-15 17:52:12.000000000 +0900
+++ include/oleidl.h	2004-03-13 19:52:11.000000000 +0900
@@ -79,6 +79,10 @@
 	DWORD fuFlags;
 	DWORD grfAttribs;
 } OLEVERB,*LPOLEVERB;
+typedef enum tagOLEVERBATTRIB {
+	OLEVERBATTRIB_NEVERDIRTIES=1,
+	OLEVERBATTRIB_ONCONTAINERMENU=2
+} OLEVERBATTRIB;
 typedef RECT BORDERWIDTHS;
 typedef LPRECT LPBORDERWIDTHS;
 typedef LPCRECT LPCBORDERWIDTHS;
--- include/shlobj.h.orig	2004-02-15 17:52:14.000000000 +0900
+++ include/shlobj.h	2004-03-13 17:36:50.000000000 +0900
@@ -49,7 +49,13 @@
 #endif
 #define DVASPECT_SHORTNAME 2
 #define SHARD_PIDL	1
-#define SHARD_PATH	2
+#define SHARD_PATHA     2
+#define SHARD_PATHW     3
+#ifdef UNICODE
+#define SHARD_PATH  SHARD_PATHW
+#else
+#define SHARD_PATH  SHARD_PATHA
+#endif
 #define SHCNE_RENAMEITEM	1
 #define SHCNE_CREATE	2
 #define SHCNE_DELETE	4
--- include/winbase.h.orig	2004-02-15 17:52:14.000000000 +0900
+++ include/winbase.h	2004-03-13 15:05:52.000000000 +0900
@@ -745,7 +745,7 @@
 	HANDLE hThread;
 	DWORD dwProcessId;
 	DWORD dwThreadId;
-} PROCESS_INFORMATION,*LPPROCESS_INFORMATION;
+} PROCESS_INFORMATION,*PPROCESS_INFORMATION,*LPPROCESS_INFORMATION;
 typedef struct _CRITICAL_SECTION_DEBUG {
 	WORD Type;
 	WORD CreatorBackTraceIndex;
--- include/wingdi.h.orig	2004-02-15 17:52:15.000000000 +0900
+++ include/wingdi.h	2004-03-21 10:01:37.000000000 +0900
@@ -539,6 +539,14 @@
 #define DC_PAPERSIZE	3
 #define DC_SIZE	8
 #define DC_TRUETYPE	15
+#if(WINVER >= 0x0400)
+#define DC_BINADJUST            19
+#define DC_EMF_COMPLIANT        20
+#define DC_DATATYPE_PRODUCED    21
+#define DC_COLLATE              22
+#define DC_MANUFACTURER         23
+#define DC_MODEL                24
+#endif /* WINVER >= 0x0400 */
 #define DCTT_BITMAP	1
 #define DCTT_DOWNLOAD	2
 #define DCTT_SUBDEV	4
--- include/winnt.h.orig	2004-02-15 17:52:15.000000000 +0900
+++ include/winnt.h	2004-03-13 15:23:01.000000000 +0900
@@ -2495,6 +2495,7 @@
 	IMAGE_FILE_HEADER FileHeader;
 	IMAGE_OPTIONAL_HEADER OptionalHeader;
 } IMAGE_NT_HEADERS,*PIMAGE_NT_HEADERS;
+#define PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS
 typedef struct _IMAGE_ROM_HEADERS {
 	IMAGE_FILE_HEADER FileHeader;
 	IMAGE_ROM_OPTIONAL_HEADER OptionalHeader;