Attachment #14346 for issue #24588

View | Details | Raw Unified | Return to issue 24588
Collapse All | Expand All

Lines 80-85 Link Here

(-)include/OleAuto.h.orig (+33 lines)
80	#define V_DECIMAL(X) V_UNION(X,decVal)	80	#define V_DECIMAL(X) V_UNION(X,decVal)
81	#define V_DECIMALREF(X) V_UNION(X,pdecVal)	81	#define V_DECIMALREF(X) V_UNION(X,pdecVal)
82	#define V_I1(X) V_UNION(X,cVal)	82	#define V_I1(X) V_UNION(X,cVal)
		83	#define V_UI2(X) V_UNION(X,uiVal)
		84	#define V_UI2REF(X) V_UNION(X,puiVal)
		85	#define V_UI4(X) V_UNION(X,ulVal)
		86	#define V_UI4REF(X) V_UNION(X,pulVal)
		87	#define V_UI8(X) V_UNION(X,ullVal)
		88	#define V_UI8REF(X) V_UNION(X,pullVal)
83		89
84	#include <oaidl.h>	90	#include <oaidl.h>
85		91
Lines 256-261 Link Here
256	WINOLEAUTAPI VarSub(LPVARIANT, LPVARIANT, LPVARIANT);	262	WINOLEAUTAPI VarSub(LPVARIANT, LPVARIANT, LPVARIANT);
257	WINOLEAUTAPI VarMul(LPVARIANT, LPVARIANT, LPVARIANT);	263	WINOLEAUTAPI VarMul(LPVARIANT, LPVARIANT, LPVARIANT);
258	WINOLEAUTAPI VarDiv(LPVARIANT, LPVARIANT, LPVARIANT);	264	WINOLEAUTAPI VarDiv(LPVARIANT, LPVARIANT, LPVARIANT);
		265
		266	WINOLEAUTAPI VarUI1FromDec(DECIMAL , BYTE );
		267	WINOLEAUTAPI VarI2FromDec(DECIMAL , SHORT );
		268	WINOLEAUTAPI VarI4FromDec(DECIMAL , LONG );
		269	WINOLEAUTAPI VarR4FromDec(DECIMAL , FLOAT );
		270	WINOLEAUTAPI VarBstrFromDec(DECIMAL , LCID, ULONG, BSTR );
		271	WINOLEAUTAPI VarUI2FromDec(DECIMAL , USHORT );
		272	WINOLEAUTAPI VarUI4FromDec(DECIMAL , ULONG );
		273	WINOLEAUTAPI VarDecFromUI1(BYTE bIn, DECIMAL *);
		274	WINOLEAUTAPI VarDecFromI2(SHORT uiIn, DECIMAL *);
		275	WINOLEAUTAPI VarDecFromI4(LONG lIn, DECIMAL *);
		276	WINOLEAUTAPI VarDecFromR4(FLOAT, DECIMAL *);
		277	WINOLEAUTAPI VarDecFromStr(OLECHAR , LCID, ULONG, DECIMAL );
		278	WINOLEAUTAPI VarDecFromUI2(USHORT, DECIMAL *);
		279	WINOLEAUTAPI VarDecFromUI4(ULONG, DECIMAL *);
		280
		281	STDAPI VarDecAdd(LPDECIMAL, LPDECIMAL, LPDECIMAL);
		282	STDAPI VarDecDiv(LPDECIMAL, LPDECIMAL, LPDECIMAL);
		283	STDAPI VarDecMul(LPDECIMAL, LPDECIMAL, LPDECIMAL);
		284	STDAPI VarDecSub(LPDECIMAL, LPDECIMAL, LPDECIMAL);
		285	STDAPI VarDecAbs(LPDECIMAL, LPDECIMAL);
		286	STDAPI VarDecFix(LPDECIMAL, LPDECIMAL);
		287	STDAPI VarDecInt(LPDECIMAL, LPDECIMAL);
		288	STDAPI VarDecNeg(LPDECIMAL, LPDECIMAL);
		289	STDAPI VarDecRound(LPDECIMAL, int, LPDECIMAL);
		290	STDAPI VarDecCmp(LPDECIMAL, LPDECIMAL);
		291	STDAPI VarDecCmpR8(LPDECIMAL, double);
259	#pragma pack(pop)	292	#pragma pack(pop)
260		293
261	#endif	294	#endif

Lines 166-171 Link Here

(-)include/WTypes.h.orig (+1 lines)
166	ULONGLONG Lo64;	166	ULONGLONG Lo64;
167	} DUMMYUNIONNAME2;	167	} DUMMYUNIONNAME2;
168	} DECIMAL;	168	} DECIMAL;
		169	typedef DECIMAL *LPDECIMAL;
169	typedef void *HMETAFILEPICT;	170	typedef void *HMETAFILEPICT;
170	#ifdef __cplusplus	171	#ifdef __cplusplus
171	}	172	}




#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

	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;

#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)

Lines 8-14 Link Here

(-)include/errorrep.h.orig (-2 / +3 lines)
8	extern "C" {	8	extern "C" {
9	#endif	9	#endif
10		10
11	#if (_WIN32_WINNT >= 0x0501)	11	//#if (_WIN32_WINNT >= 0x0501)
12	typedef enum {	12	typedef enum {
13	frrvErr = 3,	13	frrvErr = 3,
14	frrvErrNoDW = 4,	14	frrvErrNoDW = 4,
Lines 22-28 Link Here
22	BOOL WINAPI AddERExcludedApplicationA(LPCSTR);	22	BOOL WINAPI AddERExcludedApplicationA(LPCSTR);
23	BOOL WINAPI AddERExcludedApplicationW(LPCWSTR);	23	BOOL WINAPI AddERExcludedApplicationW(LPCWSTR);
24	EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS,DWORD);	24	EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS,DWORD);
25	#endif	25	typedef EFaultRepRetVal (WINAPI *pfn_ADDEREXCLUDEDAPPLICATIONW)(LPCWSTR);
		26	//#endif
26		27
27	#ifdef UNICODE	28	#ifdef UNICODE
28	#if (_WIN32_WINNT >= 0x0501)	29	#if (_WIN32_WINNT >= 0x0501)

Lines 59-65 Link Here

(-)include/ocidl.h.orig (-1 / +1 lines)
59	LPOLESTR pstrName;	59	LPOLESTR pstrName;
60	CLSID clsid;	60	CLSID clsid;
61	} PROPBAG2;	61	} PROPBAG2;
62	enum tagQACONTAINERFLAGS	62	typedef enum tagQACONTAINERFLAGS
63	{	63	{
64	QACONTAINER_SHOWHATCHING = 1,	64	QACONTAINER_SHOWHATCHING = 1,
65	QACONTAINER_SHOWGRABHANDLES = 2,	65	QACONTAINER_SHOWGRABHANDLES = 2,

Lines 79-84 Link Here

(-)include/oleidl.h.orig (+4 lines)
79	DWORD fuFlags;	79	DWORD fuFlags;
80	DWORD grfAttribs;	80	DWORD grfAttribs;
81	} OLEVERB,*LPOLEVERB;	81	} OLEVERB,*LPOLEVERB;
		82	typedef enum tagOLEVERBATTRIB {
		83	OLEVERBATTRIB_NEVERDIRTIES=1,
		84	OLEVERBATTRIB_ONCONTAINERMENU=2
		85	} OLEVERBATTRIB;
82	typedef RECT BORDERWIDTHS;	86	typedef RECT BORDERWIDTHS;
83	typedef LPRECT LPBORDERWIDTHS;	87	typedef LPRECT LPBORDERWIDTHS;
84	typedef LPCRECT LPCBORDERWIDTHS;	88	typedef LPCRECT LPCBORDERWIDTHS;

Lines 49-55 Link Here

(-)include/shlobj.h.orig (-1 / +7 lines)
49	#endif	49	#endif
50	#define DVASPECT_SHORTNAME 2	50	#define DVASPECT_SHORTNAME 2
51	#define SHARD_PIDL 1	51	#define SHARD_PIDL 1
52	#define SHARD_PATH 2	52	#define SHARD_PATHA 2
		53	#define SHARD_PATHW 3
		54	#ifdef UNICODE
		55	#define SHARD_PATH SHARD_PATHW
		56	#else
		57	#define SHARD_PATH SHARD_PATHA
		58	#endif
53	#define SHCNE_RENAMEITEM 1	59	#define SHCNE_RENAMEITEM 1
54	#define SHCNE_CREATE 2	60	#define SHCNE_CREATE 2
55	#define SHCNE_DELETE 4	61	#define SHCNE_DELETE 4

Lines 745-751 Link Here

(-)include/winbase.h.orig (-1 / +1 lines)
745	HANDLE hThread;	745	HANDLE hThread;
746	DWORD dwProcessId;	746	DWORD dwProcessId;
747	DWORD dwThreadId;	747	DWORD dwThreadId;
748	} PROCESS_INFORMATION,*LPPROCESS_INFORMATION;	748	} PROCESS_INFORMATION,PPROCESS_INFORMATION,LPPROCESS_INFORMATION;
749	typedef struct _CRITICAL_SECTION_DEBUG {	749	typedef struct _CRITICAL_SECTION_DEBUG {
750	WORD Type;	750	WORD Type;
751	WORD CreatorBackTraceIndex;	751	WORD CreatorBackTraceIndex;

Lines 539-544 Link Here

(-)include/wingdi.h.orig (+8 lines)
539	#define DC_PAPERSIZE 3	539	#define DC_PAPERSIZE 3
540	#define DC_SIZE 8	540	#define DC_SIZE 8
541	#define DC_TRUETYPE 15	541	#define DC_TRUETYPE 15
		542	#if(WINVER >= 0x0400)
		543	#define DC_BINADJUST 19
		544	#define DC_EMF_COMPLIANT 20
		545	#define DC_DATATYPE_PRODUCED 21
		546	#define DC_COLLATE 22
		547	#define DC_MANUFACTURER 23
		548	#define DC_MODEL 24
		549	#endif /* WINVER >= 0x0400 */
542	#define DCTT_BITMAP 1	550	#define DCTT_BITMAP 1
543	#define DCTT_DOWNLOAD 2	551	#define DCTT_DOWNLOAD 2
544	#define DCTT_SUBDEV 4	552	#define DCTT_SUBDEV 4

Lines 2495-2500 Link Here

(-)include/winnt.h.orig (+1 lines)
2495	IMAGE_FILE_HEADER FileHeader;	2495	IMAGE_FILE_HEADER FileHeader;
2496	IMAGE_OPTIONAL_HEADER OptionalHeader;	2496	IMAGE_OPTIONAL_HEADER OptionalHeader;
2497	} IMAGE_NT_HEADERS,*PIMAGE_NT_HEADERS;	2497	} IMAGE_NT_HEADERS,*PIMAGE_NT_HEADERS;
		2498	#define PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS
2498	typedef struct _IMAGE_ROM_HEADERS {	2499	typedef struct _IMAGE_ROM_HEADERS {
2499	IMAGE_FILE_HEADER FileHeader;	2500	IMAGE_FILE_HEADER FileHeader;
2500	IMAGE_ROM_OPTIONAL_HEADER OptionalHeader;	2501	IMAGE_ROM_OPTIONAL_HEADER OptionalHeader;

Lines 1-14 Link Here

(-)include/winres.h.orig (-7 / +2 lines)
1	#ifndef _WINRESRC_H	1	#ifndef _WINRES_H
2	#define _WINRESRC_H	2	#define _WINRES_H
3	#if __GNUC__ >=3	3	#if __GNUC__ >=3
4	#pragma GCC system_header	4	#pragma GCC system_header
5	#endif	5	#endif
6		6
7	#define WIN32_LEAN_AND_MEAN
8	#include <winuser.h>
9	#include <winnt.h>
10	#include <winver.h>
11	#include <dde.h>

Return to issue 24588

Lines 1176-1181 Link Here

(-)include/commctrl.h.orig (+40 lines)
1176	#define LVKF_CONTROL 0x0002	1176	#define LVKF_CONTROL 0x0002
1177	#define LVKF_SHIFT 0x0004	1177	#define LVKF_SHIFT 0x0004
1178	#define LVGIT_UNFOLDED 1	1178	#define LVGIT_UNFOLDED 1
		1179	#if (_WIN32_WINNT >= 0x0501)
		1180	#define LVM_INSERTGROUP (LVM_FIRST + 145)
		1181	#define LVM_ENABLEGROUPVIEW (LVM_FIRST + 157)
		1182	#define LVGF_NONE 0
		1183	#define LVGF_HEADER 1
		1184	#define LVGF_FOOTER 2
		1185	#define LVGF_STATE 4
		1186	#define LVGF_ALIGN 8
		1187	#define LVGF_GROUPID 16
		1188	#define LVGS_NORMAL 0
		1189	#define LVGS_COLLAPSED 1
		1190	#define LVGS_HIDDEN 2
		1191	#define LVGA_HEADER_LEFT 1
		1192	#define LVGA_HEADER_CENTER 2
		1193	#define LVGA_HEADER_RIGHT 4
		1194	#define LVGA_FOOTER_LEFT 8
		1195	#define LVGA_FOOTER_CENTER 16
		1196	#define LVGA_FOOTER_RIGHT 32
		1197	#endif
1179	#endif	1198	#endif
1180	#define TVS_HASBUTTONS 1	1199	#define TVS_HASBUTTONS 1
1181	#define TVS_HASLINES 2	1200	#define TVS_HASLINES 2
Lines 2440-2445 Link Here
2440	int iTo;	2459	int iTo;
2441	} NMLVCACHEHINT, *PNMLVCACHEHINT;	2460	} NMLVCACHEHINT, *PNMLVCACHEHINT;
2442	#define NM_CACHEHINT NMLVCACHEHINT	2461	#define NM_CACHEHINT NMLVCACHEHINT
		2462	#if (_WIN32_IE >= 0x0400)
		2463	#if (_WIN32_WINNT >= 0x501)
		2464	typedef struct tagLVGROUP
		2465	{
		2466	UINT cbSize;
		2467	UINT mask;
		2468	LPWSTR pszHeader;
		2469	int cchHeader;
		2470	LPWSTR pszFooter;
		2471	int cchFooter;
		2472	int iGroupId;
		2473	UINT stateMask;
		2474	UINT state;
		2475	UINT uAlign;
		2476	} LVGROUP, *PLVGROUP;
		2477	#endif
		2478	#endif
2443	typedef struct _TREEITEM *HTREEITEM;	2479	typedef struct _TREEITEM *HTREEITEM;
2444	typedef struct tagTVITEMA {	2480	typedef struct tagTVITEMA {
2445	UINT mask;	2481	UINT mask;
Lines 3143-3148 Link Here
3143	#define ListView_SetSelectionMark(w,i) (INT)SNDMSG((w),LVM_SETSELECTIONMARK,0,(LPARAM)(i))	3179	#define ListView_SetSelectionMark(w,i) (INT)SNDMSG((w),LVM_SETSELECTIONMARK,0,(LPARAM)(i))
3144	#define ListView_SetToolTips(w,n) (HWND)SNDMSG((w),LVM_SETTOOLTIPS,(WPARAM)(n),0)	3180	#define ListView_SetToolTips(w,n) (HWND)SNDMSG((w),LVM_SETTOOLTIPS,(WPARAM)(n),0)
3145	#define ListView_GetToolTips(w) (HWND)SNDMSG((w),LVM_GETTOOLTIPS,0,0)	3181	#define ListView_GetToolTips(w) (HWND)SNDMSG((w),LVM_GETTOOLTIPS,0,0)
		3182	#if (_WIN32_WINNT >= 0x501)
		3183	#define ListView_InsertGroup(hwnd,n,p) SNDMSG((hwnd), LVM_INSERTGROUP, (WPARAM)(n), (LPARAM)(p))
		3184	#define ListView_EnableGroupView(hwnd,f) SNDMSG((hwnd), LVM_ENABLEGROUPVIEW, (WPARAM)(f), 0)
		3185	#endif
3146	#define TabCtrl_HighlightItem(hwnd, i, fHighlight) SNDMSG((hwnd), TCM_HIGHLIGHTITEM, (WPARAM)i, (LPARAM)MAKELONG (fHighlight, 0))	3186	#define TabCtrl_HighlightItem(hwnd, i, fHighlight) SNDMSG((hwnd), TCM_HIGHLIGHTITEM, (WPARAM)i, (LPARAM)MAKELONG (fHighlight, 0))
3147	#define TabCtrl_SetExtendedStyle(hwnd, dw) SNDMSG((hwnd), TCM_SETEXTENDEDSTYLE, 0, dw)	3187	#define TabCtrl_SetExtendedStyle(hwnd, dw) SNDMSG((hwnd), TCM_SETEXTENDEDSTYLE, 0, dw)
3148	#define TabCtrl_GetExtendedStyle(hwnd) SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0)	3188	#define TabCtrl_GetExtendedStyle(hwnd) SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0)