| blob | 5e4207d48243989b47800e4c8f4b5ec2e2a9053f |
1 --- include/crtdbg.h.orig 2006-09-18 01:21:38.968750000 +0900
2 +++ include/crtdbg.h 2006-09-02 23:12:50.109375000 +0900
3 @@ -0,0 +1,11 @@
4 +#ifndef _CRTDBG_H
5 +#define _CRTDBG_H
6 +#if __GNUC__ >=3
7 +#pragma GCC system_header
8 +#endif
9 +
10 +#ifndef _ASSERTE
11 +#define _ASSERTE(expr) ((void)0)
12 +#endif
13 +
14 +#endif
15 --- include/excpt.h.orig 2009-01-11 04:32:43.000000000 +0900
16 +++ include/excpt.h 2009-08-21 09:21:56.000000000 +0900
17 @@ -16,8 +16,11 @@
19 /* All the headers include this file. */
20 #include <_mingw.h>
21 +#include <setjmp.h>
22 +#include <stdarg.h>
24 #include <windef.h>
25 +#include <winbase.h>
27 /*
28 * NOTE: The constants structs and typedefs below should be defined in the
29 @@ -52,7 +55,7 @@
30 * The type of function that is expected as an exception handler to be
31 * installed with __try1.
32 */
33 -typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER)
34 +typedef EXCEPTION_DISPOSITION (* PEXCEPTION_HANDLER)
35 (struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*);
37 /*
38 @@ -93,8 +96,122 @@
39 __asm__ ("movl (%%esp),%%eax;movl %%eax,%%fs:0;addl $8,%%esp;" \
40 : : : "%eax");
42 +WINBASEAPI
43 +VOID
44 +WINAPI
45 +RtlUnwind (
46 + IN PVOID TargetFrame OPTIONAL,
47 + IN PVOID TargetIp OPTIONAL,
48 + IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL,
49 + IN PVOID ReturnValue
50 + );
51 #ifdef __cplusplus
52 }
53 +
54 +class __SEHandler
55 +{
56 + public:
57 + __SEHandler() {}
58 + ~__SEHandler() {}
59 + typedef int (*PF)(void *, LPEXCEPTION_POINTERS);
60 + typedef void (*PH)(void *, LPEXCEPTION_POINTERS);
61 + typedef void (*PN)(void *);
62 + void Set(jmp_buf jb, void *pdata=NULL, PF pfilter=NULL, PH phandlerbody=NULL, PN pfinal=NULL)
63 + {
64 + __builtin_memcpy(m_jmpbuf, jb, sizeof(jmp_buf));
65 + m_pData=pdata;
66 + switch (reinterpret_cast<int>(pfilter))
67 + {
68 + default:
69 + m_filter=pfilter;
70 + break;
71 + case EXCEPTION_CONTINUE_EXECUTION:
72 + m_filter=DefaultFilterContinueExecution;
73 + break;
74 + case EXCEPTION_EXECUTE_HANDLER:
75 + m_filter=DefaultFilterExecuteHandler;
76 + break;
77 + case EXCEPTION_CONTINUE_SEARCH:
78 + m_filter=DefaultFilterContinueSearch;
79 + break;
80 + }
81 + if (phandlerbody)
82 + m_handlerbody=phandlerbody;
83 + else
84 + m_handlerbody=DefaultHandler;
85 + if (pfinal)
86 + m_final=pfinal;
87 + else
88 + m_final=DefaultFinal;
89 + m_ER.pHandlerClass = this;
90 + m_ER.hp = handler;
91 + asm("movl %%fs:0, %%eax\n\t"
92 + "movl %%eax, %0": : "m" (m_ER.prev): "%eax" );
93 + asm("movl %0, %%eax\n\t"
94 + "movl %%eax, %%fs:0": : "r" (&m_ER): "%eax" );
95 + }
96 + void Reset()
97 + {
98 + m_final(m_pData);
99 + asm("movl %0, %%eax \n\t"
100 + "movl %%eax, %%fs:0"
101 + : : "m" (m_ER.prev): "%eax");
102 + }
103 + private:
104 + __SEHandler(const __SEHandler&);
105 + __SEHandler& operator=(const __SEHandler&);
106 + struct _ER {
107 + _ER* prev;
108 + PEXCEPTION_HANDLER hp;
109 + __SEHandler *pHandlerClass;
110 + };
111 + static EXCEPTION_DISPOSITION handler(
112 + struct _EXCEPTION_RECORD *pExceptionRecord,
113 + void * EstablisherFrame,
114 + struct _CONTEXT *ContextRecord,
115 + void * /*DispatcherContext*/)
116 + {
117 + __SEHandler* pThis = reinterpret_cast< _ER * >(EstablisherFrame)->pHandlerClass;
118 + if ( pExceptionRecord->ExceptionFlags & EH_UNWINDING )
119 + {
120 + pThis->m_final(pThis->m_pData);
121 + return ExceptionContinueSearch;
122 + }
123 + EXCEPTION_POINTERS ep={pExceptionRecord, ContextRecord};
124 + switch ( pThis->m_filter(pThis->m_pData, &ep) )
125 + {
126 + case EXCEPTION_EXECUTE_HANDLER:
127 + RtlUnwind(EstablisherFrame, &&__set_label, pExceptionRecord, 0);
128 +__set_label:
129 + pThis->m_handlerbody(pThis->m_pData, &ep);
130 + ContextRecord->Ebp = pThis->m_jmpbuf[0];
131 + ContextRecord->Eip = pThis->m_jmpbuf[1];
132 + ContextRecord->Esp = pThis->m_jmpbuf[2];
133 + return ExceptionContinueExecution;
134 + case EXCEPTION_CONTINUE_SEARCH:
135 + return ExceptionContinueSearch;
136 + case EXCEPTION_CONTINUE_EXECUTION:
137 + return ExceptionContinueExecution;
138 + }
139 + return ExceptionContinueExecution;
140 + }
141 + static int DefaultFilterContinueSearch(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_SEARCH; }
142 + static int DefaultFilterContinueExecution(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_EXECUTION; }
143 + static int DefaultFilterExecuteHandler(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_EXECUTE_HANDLER; }
144 + static void DefaultHandler(void *, LPEXCEPTION_POINTERS) {}
145 + static void DefaultFinal(void *) {}
146 + typedef int (*handler_p)(
147 + struct _EXCEPTION_RECORD *ExceptionRecord,
148 + void * EstablisherFrame,
149 + struct _CONTEXT *ContextRecord,
150 + void * DispatcherContext);
151 + _ER m_ER;
152 + void *m_pData;
153 + PN m_final;
154 + PH m_handlerbody;
155 + PF m_filter;
156 + jmp_buf m_jmpbuf;
157 +};
158 #endif
160 #endif /* Not RC_INVOKED */
161 --- include/tchar.h.orig 2009-01-11 04:32:46.000000000 +0900
162 +++ include/tchar.h 2009-08-21 09:21:56.000000000 +0900
163 @@ -223,6 +223,9 @@
164 #define _ttelldir _wtelldir
165 #define _tseekdir _wseekdir
167 +#define _ttempnam _wtempnam
168 +
169 +
170 #else /* Not _UNICODE */
172 /*
173 @@ -407,6 +410,8 @@
174 #define _ttelldir telldir
175 #define _tseekdir seekdir
177 +#define _ttempnam _tempnam
178 +
179 #endif /* Not _UNICODE */
181 /*
182 --- include/amvideo.h.orig 2008-12-06 11:31:53.000000000 +0900
183 +++ include/amvideo.h 2009-08-21 09:21:56.000000000 +0900
184 @@ -52,10 +52,10 @@
185 BITMAPINFOHEADER bmiHeader;
186 } VIDEOINFOHEADER;
187 typedef struct tagVIDEOINFO {
188 - RECT rcSource,
189 - RECT rcTarget,
190 - DWORD dwBitRate,
191 - DWORD dwBitErrorRate,
192 + RECT rcSource;
193 + RECT rcTarget;
194 + DWORD dwBitRate;
195 + DWORD dwBitErrorRate;
196 REFERENCE_TIME AvgTimePerFrame;
197 BITMAPINFOHEADER bmiHeader;
198 union {
199 --- include/basetyps.h.orig 2008-12-06 11:31:53.000000000 +0900
200 +++ include/basetyps.h 2009-08-21 09:21:56.000000000 +0900
201 @@ -80,6 +80,8 @@
202 CONST_VTABLE struct i##Vtbl
203 # define DECLARE_INTERFACE_(i,b) DECLARE_INTERFACE(i)
204 # endif
205 +# define DECLARE_INTERFACE_IID(i,s) EXTERN_C const IID IID_##i; DECLARE_INTERFACE(i)
206 +# define DECLARE_INTERFACE_IID_(i,b,s) EXTERN_C const IID IID_##i; DECLARE_INTERFACE_(i,b)
207 # define BEGIN_INTERFACE
208 # define END_INTERFACE
210 --- include/oaidl.h.orig 2008-12-06 11:32:03.000000000 +0900
211 +++ include/oaidl.h 2009-08-21 09:21:56.000000000 +0900
212 @@ -65,8 +65,11 @@
214 typedef _COM_interface ITypeLib *LPTYPELIB;
215 typedef _COM_interface ITypeLib2 *LPTYPELIB2;
216 +typedef _COM_interface ICreateTypeInfo ICreateTypeInfo;
217 typedef _COM_interface ICreateTypeInfo *LPCREATETYPEINFO;
218 typedef _COM_interface ICreateTypeInfo2 *LPCREATETYPEINFO2;
219 +typedef _COM_interface ICreateTypeLib ICreateTypeLib;
220 +typedef _COM_interface ICreateTypeLib2 ICreateTypeLib2;
221 typedef _COM_interface ICreateTypeLib *LPCREATETYPELIB;
222 typedef _COM_interface ICreateTypeLib2 *LPCREATETYPELIB2;
223 typedef _COM_interface ITypeComp *LPTYPECOMP;
224 @@ -78,6 +81,8 @@
225 typedef _COM_interface ICreateErrorInfo *LPCREATEERRORINFO;
226 typedef _COM_interface ISupportErrorInfo *LPSUPPORTERRORINFO;
227 typedef _COM_interface IRecordInfo *LPRECORDINFO;
228 +typedef _COM_interface IErrorLog *LPERRORLOG;
229 +typedef _COM_interface IPropertyBag *LPPROPERTYBAG;
231 extern const IID IID_ITypeLib;
232 extern const IID IID_ITypeLib2;
233 @@ -772,6 +777,29 @@
234 };
235 #undef INTERFACE
237 +EXTERN_C const IID IID_IErrorLog;
238 +#define INTERFACE IErrorLog
239 +DECLARE_INTERFACE_(IErrorLog,IUnknown)
240 +{
241 + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
242 + STDMETHOD_(ULONG,AddRef)(THIS) PURE;
243 + STDMETHOD_(ULONG,Release)(THIS) PURE;
244 + STDMETHOD(AddError)(THIS_ LPCOLESTR,LPEXCEPINFO) PURE;
245 +};
246 +#undef INTERFACE
247 +
248 +EXTERN_C const IID IID_IPropertyBag;
249 +#define INTERFACE IPropertyBag
250 +DECLARE_INTERFACE_(IPropertyBag,IUnknown)
251 +{
252 + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
253 + STDMETHOD_(ULONG,AddRef)(THIS) PURE;
254 + STDMETHOD_(ULONG,Release)(THIS) PURE;
255 + STDMETHOD(Read)(THIS_ LPCOLESTR,LPVARIANT,LPERRORLOG) PURE;
256 + STDMETHOD(Write)(THIS_ LPCOLESTR,LPVARIANT) PURE;
257 +};
258 +#undef INTERFACE
259 +
260 #ifdef __cplusplus
261 }
262 #endif
263 --- include/objidl.h.orig 2008-12-06 11:32:04.000000000 +0900
264 +++ include/objidl.h 2009-08-21 09:21:56.000000000 +0900
265 @@ -1,3 +1,6 @@
266 +#include <windows.h>
267 +#include <ole2.h>
268 +
269 #ifndef _OBJIDL_H
270 #define _OBJIDL_H
271 #if __GNUC__ >= 3
272 @@ -880,8 +883,8 @@
273 STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
274 STDMETHOD_(ULONG,AddRef)(THIS) PURE;
275 STDMETHOD_(ULONG,Release)(THIS) PURE;
276 - STDMETHOD(AddConnection)(THIS_ DWORD,DWORD) PURE;
277 - STDMETHOD(ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE;
278 + STDMETHOD_(DWORD,AddConnection)(THIS_ DWORD,DWORD) PURE;
279 + STDMETHOD_(DWORD,ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE;
280 };
281 #undef INTERFACE
283 --- include/specstrings.h.orig 2008-12-06 11:32:09.000000000 +0900
284 +++ include/specstrings.h 2009-08-21 09:21:56.000000000 +0900
285 @@ -11,8 +11,31 @@
286 /* __in and __out currently conflict with libstdc++, use with caution */
289 +#define __RPC__deref_inout_opt
290 +#define __RPC__deref_opt_inout_ecount_full_opt(size)
291 +#define __RPC__deref_opt_inout_opt
292 +#define __RPC__deref_out
293 +#define __RPC__deref_out_ecount_full_opt(size)
294 +#define __RPC__deref_out_opt
295 +#define __RPC__deref_out_opt_string
296 +#define __RPC__in
297 +#define __RPC__in_ecount_full(size)
298 +#define __RPC__in_ecount_full_opt(size)
299 +#define __RPC__in_opt
300 +#define __RPC__inout
301 +#define __RPC__inout_ecount_full(size)
302 +#define __RPC__inout_ecount_full_opt(size)
303 +#define __RPC__inout_opt
304 +#define __RPC__out
305 +#define __RPC__out_ecount_full(size)
306 +#define __RPC__out_ecount_full_string(size)
307 +#define __RPC__out_ecount_part(size,init)
308 +#define __RPC_unique_pointer
309 #define __bcount(size)
310 #define __bcount_opt(size)
311 +#define __callback
312 +#define __checkReturn
313 +#define __deref
314 #define __deref_bcount(size)
315 #define __deref_bcount_opt(size)
316 #define __deref_ecount(size)
317 @@ -36,6 +59,7 @@
318 #define __deref_inout_ecount_opt(size)
319 #define __deref_inout_ecount_part(size,length)
320 #define __deref_inout_ecount_part_opt(size,length)
321 +#define __deref_inout_ecount_z(size)
322 #define __deref_inout_opt
323 #define __deref_opt_bcount(size)
324 #define __deref_opt_bcount_opt(size)
325 @@ -89,14 +113,23 @@
326 #define __deref_out_ecount_part(size,length)
327 #define __deref_out_ecount_part_opt(size,length)
328 #define __deref_out_opt
329 +#define __deref_out_z
330 +#define __deref_out_z_opt
331 #define __ecount(size)
332 #define __ecount_opt(size)
333 +#define __field_bcount(size)
334 +#define __field_ecount(size)
335 +#define __field_ecount_opt(size)
336 +#define __format_string
337 +#define __gdi_entry
338 #define __in
339 #define __in_bcount(size)
340 #define __in_bcount_opt(size)
341 #define __in_ecount(size)
342 #define __in_ecount_opt(size)
343 #define __in_opt
344 +#define __in_xcount(size)
345 +#define __in_z_opt
346 #define __inout
347 #define __inout_bcount(size)
348 #define __inout_bcount_full(size)
349 @@ -111,7 +144,12 @@
350 #define __inout_ecount_part(size,length)
351 #define __inout_ecount_part_opt(size,length)
352 #define __inout_opt
353 +#define __inout_xcount(size)
354 +#define __notnull
355 +#define __nullnullterminated
356 +#define __nullterminated
357 #define __out
358 +#define __out_awcount(expr,size)
359 #define __out_bcount(size)
360 #define __out_bcount_full(size)
361 #define __out_bcount_full_opt(size)
362 @@ -119,12 +157,20 @@
363 #define __out_bcount_part(size,length)
364 #define __out_bcount_part_opt(size,length)
365 #define __out_ecount(size)
366 +#define __out_ecount(size)
367 #define __out_ecount_full(size)
368 #define __out_ecount_full_opt(size)
369 #define __out_ecount_opt(size)
370 #define __out_ecount_part(size,length)
371 #define __out_ecount_part_opt(size,length)
372 #define __out_opt
373 +#define __out_xcount(size)
374 +#define __out_xcount_opt(size)
375 +#define __reserved
376 +#define __struct_bcount(size)
377 +#define __success(expr)
378 +#define __typefix(ctype)
379 +#define __unaligned
382 #endif /*_SPECSTRINGS_H */
383 --- include/uxtheme.h.orig 2008-12-06 11:32:11.000000000 +0900
384 +++ include/uxtheme.h 2009-08-21 09:21:56.000000000 +0900
385 @@ -10,7 +10,7 @@
386 extern "C" {
387 #endif
389 -#if (_WIN32_WINNT >= 0x0501)
390 +#if (_WIN32_WINNT >= 0x0500)
391 #define DTBG_CLIPRECT 0x00000001
392 #define DTBG_DRAWSOLID 0x00000002
393 #define DTBG_OMITBORDER 0x00000004
394 --- include/winbase.h.orig 2008-12-06 11:32:11.000000000 +0900
395 +++ include/winbase.h 2009-08-21 09:21:56.000000000 +0900
396 @@ -1354,8 +1354,8 @@
397 WINBASEAPI HANDLE WINAPI FindFirstFileExW(LPCWSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOID,DWORD);
398 WINBASEAPI BOOL WINAPI FindFirstFreeAce(PACL,PVOID*);
399 #if (_WIN32_WINNT >= 0x0500)
400 -WINBASEAPI HANDLE WINAPI FindFirstVolumeA(LPCSTR,DWORD);
401 -WINBASEAPI HANDLE WINAPI FindFirstVolumeW(LPCWSTR,DWORD);
402 +WINBASEAPI HANDLE WINAPI FindFirstVolumeA(LPSTR,DWORD);
403 +WINBASEAPI HANDLE WINAPI FindFirstVolumeW(LPWSTR,DWORD);
404 WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointA(LPSTR,LPSTR,DWORD);
405 WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointW(LPWSTR,LPWSTR,DWORD);
406 #endif
407 @@ -1363,7 +1363,7 @@
408 WINBASEAPI BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA);
409 WINBASEAPI BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW);
410 #if (_WIN32_WINNT >= 0x0500)
411 -WINBASEAPI BOOL WINAPI FindNextVolumeA(HANDLE,LPCSTR,DWORD);
412 +WINBASEAPI BOOL WINAPI FindNextVolumeA(HANDLE,LPSTR,DWORD);
413 WINBASEAPI BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD);
414 WINBASEAPI BOOL WINAPI FindNextVolumeMountPointA(HANDLE,LPSTR,DWORD);
415 WINBASEAPI BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD);
416 @@ -1475,10 +1475,10 @@
417 WINBASEAPI DWORD WINAPI GetLogicalDrives(void);
418 WINBASEAPI DWORD WINAPI GetLogicalDriveStringsA(DWORD,LPSTR);
419 WINBASEAPI DWORD WINAPI GetLogicalDriveStringsW(DWORD,LPWSTR);
420 -#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
421 +//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
422 WINBASEAPI DWORD WINAPI GetLongPathNameA(LPCSTR,LPSTR,DWORD);
423 WINBASEAPI DWORD WINAPI GetLongPathNameW(LPCWSTR,LPWSTR,DWORD);
424 -#endif
425 +//#endif
426 WINBASEAPI BOOL WINAPI GetMailslotInfo(HANDLE,PDWORD,PDWORD,PDWORD,PDWORD);
427 WINBASEAPI DWORD WINAPI GetModuleFileNameA(HINSTANCE,LPSTR,DWORD);
428 WINBASEAPI DWORD WINAPI GetModuleFileNameW(HINSTANCE,LPWSTR,DWORD);
429 @@ -1519,9 +1519,9 @@
430 #endif
431 WINBASEAPI HANDLE WINAPI GetProcessHeap(VOID);
432 WINBASEAPI DWORD WINAPI GetProcessHeaps(DWORD,PHANDLE);
433 -#if (_WIN32_WINNT >= 0x0501)
434 +//#if (_WIN32_WINNT >= 0x0501)
435 WINBASEAPI DWORD WINAPI GetProcessId(HANDLE);
436 -#endif
437 +//#endif
438 #if (_WIN32_WINNT >= 0x0500)
439 WINBASEAPI BOOL WINAPI GetProcessIoCounters(HANDLE,PIO_COUNTERS);
440 #endif
441 @@ -1802,9 +1802,9 @@
442 WINBASEAPI BOOL WINAPI OpenProcessToken(HANDLE,DWORD,PHANDLE);
443 WINBASEAPI HANDLE WINAPI OpenSemaphoreA(DWORD,BOOL,LPCSTR);
444 WINBASEAPI HANDLE WINAPI OpenSemaphoreW(DWORD,BOOL,LPCWSTR);
445 -#if (_WIN32_WINNT >= 0x0500) || (_WIN32_WINDOWS >= 0x0490)
446 +//#if (_WIN32_WINNT >= 0x0500) || (_WIN32_WINDOWS >= 0x0490)
447 WINBASEAPI HANDLE WINAPI OpenThread(DWORD,BOOL,DWORD);
448 -#endif
449 +//#endif
450 WINBASEAPI BOOL WINAPI OpenThreadToken(HANDLE,DWORD,BOOL,PHANDLE);
451 WINBASEAPI HANDLE WINAPI OpenWaitableTimerA(DWORD,BOOL,LPCSTR);
452 WINBASEAPI HANDLE WINAPI OpenWaitableTimerW(DWORD,BOOL,LPCWSTR);
453 @@ -2029,6 +2029,7 @@
454 WINBASEAPI DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL);
455 WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD);
456 WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD);
457 +WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT);
458 WINBASEAPI BOOL WINAPI WinLoadTrustProvider(GUID*);
459 WINBASEAPI BOOL WINAPI WriteFile(HANDLE,PCVOID,DWORD,PDWORD,LPOVERLAPPED);
460 WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,PCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
461 @@ -2151,9 +2152,9 @@
462 #define GetFileAttributesEx GetFileAttributesExW
463 #define GetFullPathName GetFullPathNameW
464 #define GetLogicalDriveStrings GetLogicalDriveStringsW
465 -#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
466 +//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
467 #define GetLongPathName GetLongPathNameW
468 -#endif
469 +//#endif
470 #define GetModuleFileName GetModuleFileNameW
471 #define GetModuleHandle GetModuleHandleW
472 #if (_WIN32_WINNT >= 0x0500)
473 @@ -2346,9 +2347,9 @@
474 #define GetFileAttributesEx GetFileAttributesExA
475 #define GetFullPathName GetFullPathNameA
476 #define GetLogicalDriveStrings GetLogicalDriveStringsA
477 -#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
478 +//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
479 #define GetLongPathName GetLongPathNameA
480 -#endif
481 +//#endif
482 #define GetNamedPipeHandleState GetNamedPipeHandleStateA
483 #define GetModuleHandle GetModuleHandleA
484 #if (_WIN32_WINNT >= 0x0500)
485 --- include/windef.h.orig 2008-12-06 11:32:12.000000000 +0900
486 +++ include/windef.h 2009-08-21 09:21:56.000000000 +0900
487 @@ -251,6 +251,7 @@
488 typedef unsigned int UINT,*PUINT,*LPUINT;
490 #include <winnt.h>
491 +#include <specstrings.h>
493 typedef UINT_PTR WPARAM;
494 typedef LONG_PTR LPARAM;
495 --- include/wininet.h.orig 2008-12-06 11:32:13.000000000 +0900
496 +++ include/wininet.h 2009-08-21 09:21:56.000000000 +0900
497 @@ -868,6 +868,7 @@
498 BOOL WINAPI InternetAutodial(DWORD,DWORD);
499 BOOL WINAPI InternetAutodialHangup(DWORD);
500 BOOL WINAPI InternetGetConnectedState(LPDWORD,DWORD);
501 +BOOL WINAPI InternetGetConnectedStateEx(LPDWORD,LPTSTR,DWORD,DWORD);
502 BOOL WINAPI InternetSetDialState(LPCTSTR,DWORD,DWORD);
503 BOOL WINAPI InternetReadFileExA(HINTERNET,LPINTERNET_BUFFERSA,DWORD,DWORD_PTR);
504 BOOL WINAPI InternetReadFileExW(HINTERNET,LPINTERNET_BUFFERSW,DWORD,DWORD_PTR);
505 --- include/winver.h.orig 2008-12-06 11:32:14.000000000 +0900
506 +++ include/winver.h 2009-08-21 09:21:56.000000000 +0900
507 @@ -101,10 +101,10 @@
508 DWORD WINAPI VerFindFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT);
509 DWORD WINAPI VerInstallFileA(DWORD,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,PUINT);
510 DWORD WINAPI VerInstallFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT);
511 -DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,PDWORD);
512 -DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,PDWORD);
513 -BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,PVOID);
514 -BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,PVOID);
515 +DWORD WINAPI GetFileVersionInfoSizeA(LPSTR,PDWORD);
516 +DWORD WINAPI GetFileVersionInfoSizeW(LPWSTR,PDWORD);
517 +BOOL WINAPI GetFileVersionInfoA(LPSTR,DWORD,DWORD,PVOID);
518 +BOOL WINAPI GetFileVersionInfoW(LPWSTR,DWORD,DWORD,PVOID);
519 DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD);
520 DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD);
521 BOOL WINAPI VerQueryValueA(const LPVOID,LPSTR,LPVOID*,PUINT);
522 --- include/wtypes.h.orig 2008-12-06 11:32:14.000000000 +0900
523 +++ include/wtypes.h 2009-08-21 09:21:56.000000000 +0900
524 @@ -66,6 +66,19 @@
525 unsigned short asData[1];
526 }FLAGGED_WORD_BLOB;
528 +typedef struct _COAUTHIDENTITY
529 + {
530 + /* [size_is] */ USHORT *User;
531 + /* [range] */ ULONG UserLength;
532 + /* [size_is] */ USHORT *Domain;
533 + /* [range] */ ULONG DomainLength;
534 + /* [size_is] */ USHORT *Password;
535 + /* [range] */ ULONG PasswordLength;
536 + ULONG Flags;
537 + } COAUTHIDENTITY;
538 +
539 +typedef WORD CLIPFORMAT,*LPCLIPFORMAT;
540 +
541 #ifndef OLE2ANSI
542 typedef WCHAR OLECHAR;
543 typedef LPWSTR LPOLESTR;
544 @@ -94,6 +107,7 @@
545 }_STRUCT_NAME(s);
546 LONGLONG int64;
547 } CY;
548 +typedef union tagCY *LPCY;
549 typedef double DATE;
550 typedef struct tagBSTRBLOB {
551 ULONG cbSize;
552 @@ -165,6 +179,52 @@
553 #define DECIMAL_SETZERO(d) {(d).Lo64=(d).Hi32=(d).signscale=0;}
554 #endif
555 typedef void *HMETAFILEPICT;
556 +
557 +typedef enum tagTYSPEC {
558 + TYSPEC_CLSID,
559 + TYSPEC_FILEEXT,
560 + TYSPEC_MIMETYPE,
561 + TYSPEC_FILENAME,
562 + TYSPEC_PROGID,
563 + TYSPEC_PACKAGENAME,
564 + TYSPEC_OBJECTID
565 +} TYSPEC;
566 +
567 +typedef union {
568 + CLSID clsid;
569 + LPOLESTR pFileExt;
570 + LPOLESTR pMimeType;
571 + LPOLESTR pProgId;
572 + LPOLESTR pFileName;
573 + struct {
574 + LPOLESTR pPackageName;
575 + GUID PolicyId;
576 + } ByName;
577 + struct {
578 + GUID ObjectId;
579 + GUID PolicyId;
580 + } ByObjectId;
581 +} uCLSSPEC;
582 +
583 +typedef struct tagCSPLATFORM {
584 + DWORD dwContext;
585 + DWORD dwVersionHi;
586 + DWORD dwVersionLo;
587 + DWORD dwProcessorArch;
588 +} CSPLATFORM;
589 +
590 +typedef struct tagQUERYCONTEXT {
591 + DWORD dwContext;
592 + CSPLATFORM Platform;
593 + LCID Locale;
594 + DWORD dwVersionHi;
595 + DWORD dwVersionLo;
596 +} QUERYCONTEXT;
597 +typedef struct
598 +{
599 + GUID fmtid;
600 + DWORD pid;
601 +} PROPERTYKEY;
602 #ifdef __cplusplus
603 }
604 #endif
605 --- include/adoctint.h.orig 2008-01-18 22:17:10.000000000 +0900
606 +++ include/adoctint.h 2009-08-21 09:21:56.000000000 +0900
607 @@ -11,6 +11,9 @@
608 //--------------------------------------------------------------------
609 #ifndef _ADOCTINT_H_
610 #define _ADOCTINT_H_
611 +#if __GNUC__ >=3
612 +#pragma GCC system_header
613 +#endif
615 #ifndef _INC_TCHAR
616 #include <tchar.h>
617 @@ -2489,11 +2492,11 @@
618 #endif /* __Procedure_INTERFACE_DEFINED__ */
619 EXTERN_C const CLSID CLSID_Catalog;
620 #ifdef __cplusplus
621 -Catalog;
622 +//Catalog;
623 #endif
624 EXTERN_C const CLSID CLSID_Table;
625 #ifdef __cplusplus
626 -Table;
627 +//Table;
628 #endif
629 #ifndef __Property_INTERFACE_DEFINED__
630 #define __Property_INTERFACE_DEFINED__
631 @@ -2635,23 +2638,23 @@
632 #endif /* __Property_INTERFACE_DEFINED__ */
633 EXTERN_C const CLSID CLSID_Group;
634 #ifdef __cplusplus
635 -Group;
636 +//Group;
637 #endif
638 EXTERN_C const CLSID CLSID_User;
639 #ifdef __cplusplus
640 -User;
641 +//User;
642 #endif
643 EXTERN_C const CLSID CLSID_Column;
644 #ifdef __cplusplus
645 -Column;
646 +//Column;
647 #endif
648 EXTERN_C const CLSID CLSID_Index;
649 #ifdef __cplusplus
650 -Index;
651 +//Index;
652 #endif
653 EXTERN_C const CLSID CLSID_Key;
654 #ifdef __cplusplus
655 -Key;
656 +//Key;
657 #endif
658 #ifndef __Tables_INTERFACE_DEFINED__
659 #define __Tables_INTERFACE_DEFINED__
660 @@ -3332,8 +3335,8 @@
661 /* [in] */ VARIANT Item,
662 /* [defaultvalue][in] */ KeyTypeEnum Type,
663 /* [optional][in] */ VARIANT Column,
664 - /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOTable = L"",
665 - /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOColumn = L"") = 0;
666 + /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOTable = const_cast<BSTR>(L""),
667 + /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOColumn = const_cast<BSTR>(L"")) = 0;
669 virtual /* [helpcontext] */ HRESULT STDMETHODCALLTYPE Delete(
670 /* [in] */ VARIANT Item) = 0;
671 --- include/adodef.h.orig 2008-01-18 22:17:10.000000000 +0900
672 +++ include/adodef.h 2009-08-21 09:21:56.000000000 +0900
673 @@ -12,6 +12,9 @@
675 #ifndef _ADODEF_H_
676 #define _ADODEF_H_
677 +#if __GNUC__ >=3
678 +#pragma GCC system_header
679 +#endif
681 // TYPELIB MAJOR VERSIONS
682 #define ADO_MAJOR 6
683 --- include/adoguids.h.orig 2008-01-18 22:17:10.000000000 +0900
684 +++ include/adoguids.h 2009-08-21 09:21:56.000000000 +0900
685 @@ -11,6 +11,10 @@
686 //-----------------------------------------------------------------------------
689 +#if __GNUC__ >=3
690 +#pragma GCC system_header
691 +#endif
692 +
693 #define STRING_GUID(l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) l##-##w1##-##w2##-##b1##b2##-##b3##b4##b5##b6##b7##b8
695 #if defined(__midl) || defined(GEN_MIDL)
696 --- include/adoint.h.orig 2008-01-18 22:17:10.000000000 +0900
697 +++ include/adoint.h 2009-08-21 09:21:56.000000000 +0900
698 @@ -11,6 +11,9 @@
699 //--------------------------------------------------------------------
700 #ifndef _ADOINT_H_
701 #define _ADOINT_H_
702 +#if __GNUC__ >=3
703 +#pragma GCC system_header
704 +#endif
706 #ifndef _INC_TCHAR
707 #include <tchar.h>
708 @@ -3494,7 +3497,7 @@
709 #endif /* __ADOConnectionConstruction_INTERFACE_DEFINED__ */
710 EXTERN_C const CLSID CLSID_Connection;
711 #ifdef __cplusplus
712 -Connection;
713 +//Connection;
714 #endif
715 #ifndef ___Record_INTERFACE_DEFINED__
716 #define ___Record_INTERFACE_DEFINED__
717 @@ -3793,7 +3796,7 @@
718 #endif /* ___Record_INTERFACE_DEFINED__ */
719 EXTERN_C const CLSID CLSID_Record;
720 #ifdef __cplusplus
721 -Record;
722 +//Record;
723 #endif
724 #ifndef ___Stream_INTERFACE_DEFINED__
725 #define ___Stream_INTERFACE_DEFINED__
726 @@ -4123,7 +4126,7 @@
727 #endif /* ___Stream_INTERFACE_DEFINED__ */
728 EXTERN_C const CLSID CLSID_Stream;
729 #ifdef __cplusplus
730 -Stream;
731 +//Stream;
732 #endif
733 #ifndef __ADORecordConstruction_INTERFACE_DEFINED__
734 #define __ADORecordConstruction_INTERFACE_DEFINED__
735 @@ -4405,11 +4408,11 @@
736 #endif /* __ADOCommandConstruction_INTERFACE_DEFINED__ */
737 EXTERN_C const CLSID CLSID_Command;
738 #ifdef __cplusplus
739 -Command;
740 +//Command;
741 #endif
742 EXTERN_C const CLSID CLSID_Recordset;
743 #ifdef __cplusplus
744 -Recordset;
745 +//Recordset;
746 #endif
747 #ifndef __Recordset15_INTERFACE_DEFINED__
748 #define __Recordset15_INTERFACE_DEFINED__
749 @@ -8305,7 +8308,7 @@
750 #endif /* ___Parameter_INTERFACE_DEFINED__ */
751 EXTERN_C const CLSID CLSID_Parameter;
752 #ifdef __cplusplus
753 -Parameter;
754 +//Parameter;
755 #endif
756 #ifndef __Parameters_INTERFACE_DEFINED__
757 #define __Parameters_INTERFACE_DEFINED__
758 --- include/bcrypt.h.orig 2008-01-18 22:17:12.000000000 +0900
759 +++ include/bcrypt.h 2008-04-10 22:57:54.410750000 +0900
760 @@ -40,12 +40,6 @@
761 #define OPTIONAL
762 #endif
764 -#if !defined(__midl)
765 -#define BCRYPT_STRUCT_ALIGNMENT __declspec(align(BCRYPT_OBJECT_ALIGNMENT))
766 -#else
767 -#define BCRYPT_STRUCT_ALIGNMENT
768 -#endif /*!defined(__midl)*/
769 -
770 //
771 // Alignment macros
772 //
773 @@ -57,11 +51,7 @@
774 #define BCRYPT_OBJECT_ALIGNMENT 4
775 #endif
777 -#if !defined(__midl)
778 -#define BCRYPT_STRUCT_ALIGNMENT __declspec(align(BCRYPT_OBJECT_ALIGNMENT))
779 -#else
780 #define BCRYPT_STRUCT_ALIGNMENT
781 -#endif /*!defined(__midl)*/
783 //
784 // DeriveKey KDF Types
785 @@ -108,7 +98,11 @@
787 typedef BCRYPT_KEY_LENGTHS_STRUCT BCRYPT_AUTH_TAG_LENGTHS_STRUCT;
789 -#pragma pack(push, BCRYPT_OBJECT_ALIGNMENT)
790 +#if defined(_IA64_) || defined(_AMD64_)
791 +#pragma pack(push, 8)
792 +#else
793 +#pragma pack(push, 4)
794 +#endif
795 typedef BCRYPT_STRUCT_ALIGNMENT struct _BCRYPT_OID
796 {
797 ULONG cbOID;
798 --- include/commctrl.h.orig 2008-01-18 22:17:14.000000000 +0900
799 +++ include/commctrl.h 2009-08-21 09:21:56.000000000 +0900
800 @@ -14,6 +14,14 @@
801 #ifndef _INC_COMMCTRL
802 #define _INC_COMMCTRL
804 +#define __in
805 +#define __out
806 +#ifdef __cplusplus
807 +#define __inline inline
808 +#else
809 +#define __inline static __inline__
810 +#endif
811 +
812 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
813 #pragma warning(push)
814 #pragma warning(disable:4001) /* nonstandard extension : single line comment */
815 @@ -369,8 +377,10 @@
817 // Shell reserved (0U-580U) - (0U-589U)
819 +#ifndef CDN_FIRST
820 #define CDN_FIRST (0U-601U) // common dialog (new)
821 #define CDN_LAST (0U-699U)
822 +#endif
824 #define TBN_FIRST (0U-700U) // toolbar
825 #define TBN_LAST (0U-720U)
826 @@ -683,7 +693,7 @@
827 #define ILP_DOWNLEVEL 1 // Write or reads the stream using downlevel sematics.
830 -WINCOMMCTRLAPI HRESULT WINAPI ImageList_ReadEx(DWORD dwFlags, LPSTREAM pstm, REFIID riid, PVOID* ppv);
831 +//WINCOMMCTRLAPI HRESULT WINAPI ImageList_ReadEx(DWORD dwFlags, LPSTREAM pstm, REFIID riid, PVOID* ppv);
832 WINCOMMCTRLAPI HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD dwFlags, LPSTREAM pstm);
833 #endif
835 @@ -713,7 +723,7 @@
836 #endif
838 #if (_WIN32_WINNT >= 0x0501)
839 -WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST himl, REFIID riid, void** ppv);
840 +//WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST himl, REFIID riid, void** ppv);
842 #ifdef __cplusplus
843 FORCEINLINE HIMAGELIST IImageListToHIMAGELIST(struct IImageList *himl)
844 @@ -8056,8 +8066,10 @@
845 #if (_WIN32_WINNT >= 0x0501)
847 // custom combobox control messages
848 +#ifndef CB_SETMINVISIBLE
849 #define CB_SETMINVISIBLE (CBM_FIRST + 1)
850 #define CB_GETMINVISIBLE (CBM_FIRST + 2)
851 +#endif
852 #define CB_SETCUEBANNER (CBM_FIRST + 3)
853 #define CB_GETCUEBANNER (CBM_FIRST + 4)
855 @@ -8651,7 +8663,7 @@
857 #if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
858 #if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0)
859 -#include "commctrl.inl"
860 +//#include "commctrl.inl"
861 #endif /* ISOLATION_AWARE_ENABLED */
862 #endif /* RC */
864 @@ -8666,6 +8678,10 @@
865 #pragma warning(pop)
866 #endif
868 +#undef __in
869 +#undef __out
870 +#undef __inline
871 +
872 #endif /* _INC_COMMCTRL */
875 --- include/control.h.orig 2008-01-18 22:17:14.000000000 +0900
876 +++ include/control.h 2009-08-21 09:21:56.000000000 +0900
877 @@ -1,3 +1,6 @@
878 +#if __GNUC__ >=3
879 +#pragma GCC system_header
880 +#endif
883 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
884 --- include/dispex.h.orig 2008-01-18 22:17:16.000000000 +0900
885 +++ include/dispex.h 2009-08-21 09:21:56.000000000 +0900
886 @@ -1,3 +1,6 @@
887 +#if __GNUC__ >=3
888 +#pragma GCC system_header
889 +#endif
892 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
893 --- include/filter.h.orig 2008-01-18 22:17:18.000000000 +0900
894 +++ include/filter.h 2009-08-21 09:21:56.000000000 +0900
895 @@ -1,3 +1,6 @@
896 +#if __GNUC__ >=3
897 +#pragma GCC system_header
898 +#endif
901 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
902 --- include/gdiplusbitmap.h.orig 2008-01-18 22:17:46.000000000 +0900
903 +++ include/gdiplusbitmap.h 2009-08-21 09:21:56.000000000 +0900
904 @@ -1,3 +1,6 @@
905 +#if __GNUC__ >=3
906 +#pragma GCC system_header
907 +#endif
908 /**************************************************************************\
909 *
910 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
911 --- include/gdiplusbrush.h.orig 2008-01-18 22:17:46.000000000 +0900
912 +++ include/gdiplusbrush.h 2009-08-21 09:21:56.000000000 +0900
913 @@ -1,3 +1,6 @@
914 +#if __GNUC__ >=3
915 +#pragma GCC system_header
916 +#endif
917 /**************************************************************************\
918 *
919 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
920 --- include/gdiplusenums.h.orig 2008-01-18 22:17:46.000000000 +0900
921 +++ include/gdiplusenums.h 2009-08-21 09:21:56.000000000 +0900
922 @@ -542,7 +542,7 @@
924 #define GDIP_EMFPLUS_RECORD_BASE 0x00004000
925 #define GDIP_WMF_RECORD_BASE 0x00010000
926 -#define GDIP_WMF_RECORD_TO_EMFPLUS(n) ((EmfPlusRecordType)((n) | GDIP_WMF_RECORD_BASE))
927 +#define GDIP_WMF_RECORD_TO_EMFPLUS(n) ((n) | GDIP_WMF_RECORD_BASE)
928 #define GDIP_EMFPLUS_RECORD_TO_WMF(n) ((n) & (~GDIP_WMF_RECORD_BASE))
929 #define GDIP_IS_WMF_RECORDTYPE(n) (((n) & GDIP_WMF_RECORD_BASE) != 0)
931 --- include/gdiplusfont.h.orig 2008-01-18 22:17:46.000000000 +0900
932 +++ include/gdiplusfont.h 2009-08-21 09:21:56.000000000 +0900
933 @@ -1,3 +1,6 @@
934 +#if __GNUC__ >=3
935 +#pragma GCC system_header
936 +#endif
937 /**************************************************************************\
938 *
939 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
940 --- include/gdiplusheaders.h.orig 2008-01-18 22:17:46.000000000 +0900
941 +++ include/gdiplusheaders.h 2008-03-28 21:44:34.907750000 +0900
942 @@ -704,7 +704,7 @@
944 class CachedBitmap : public GdiplusBase
945 {
946 - friend Graphics;
947 + friend class Graphics;
949 public:
950 CachedBitmap(IN Bitmap *bitmap,
951 @@ -888,7 +888,7 @@
953 UINT GetDownLevelRasterizationLimit() const;
955 - static UINT Metafile::EmfToWmfBits(
956 + static UINT EmfToWmfBits(
957 IN HENHMETAFILE hemf,
958 IN UINT cbData16,
959 OUT LPBYTE pData16,
960 --- include/gdiplusimageattributes.h.orig 2008-01-18 22:17:46.000000000 +0900
961 +++ include/gdiplusimageattributes.h 2009-08-21 09:21:56.000000000 +0900
962 @@ -32,6 +32,9 @@
964 #ifndef _GDIPLUSIMAGEATTRIBUTES_H
965 #define _GDIPLUSIMAGEATTRIBUTES_H
966 +#if __GNUC__ >=3
967 +#pragma GCC system_header
968 +#endif
970 class GpImageAttributes;
972 --- include/gdiplusimaging.h.orig 2008-01-18 22:17:46.000000000 +0900
973 +++ include/gdiplusimaging.h 2009-08-21 09:21:56.000000000 +0900
974 @@ -160,7 +160,7 @@
975 UINT Width;
976 UINT Height;
977 INT Stride;
978 - PixelFormat PixelFormat;
979 + ::Gdiplus::PixelFormat PixelFormat;
980 VOID* Scan0;
981 UINT_PTR Reserved;
982 };
983 --- include/gdiplusmatrix.h.orig 2008-01-18 22:17:46.000000000 +0900
984 +++ include/gdiplusmatrix.h 2009-08-21 09:21:56.000000000 +0900
985 @@ -1,3 +1,6 @@
986 +#if __GNUC__ >=3
987 +#pragma GCC system_header
988 +#endif
989 /**************************************************************************\
990 *
991 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
992 --- include/gdipluspath.h.orig 2008-01-18 22:17:46.000000000 +0900
993 +++ include/gdipluspath.h 2009-08-21 09:21:56.000000000 +0900
994 @@ -1,3 +1,6 @@
995 +#if __GNUC__ >=3
996 +#pragma GCC system_header
997 +#endif
998 /**************************************************************************\
999 *
1000 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
1001 --- include/gdipluspen.h.orig 2008-01-18 22:17:46.000000000 +0900
1002 +++ include/gdipluspen.h 2009-08-21 09:21:56.000000000 +0900
1003 @@ -1,3 +1,6 @@
1004 +#if __GNUC__ >=3
1005 +#pragma GCC system_header
1006 +#endif
1007 /**************************************************************************\
1008 *
1009 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
1010 --- include/gdiplusregion.h.orig 2008-01-18 22:17:46.000000000 +0900
1011 +++ include/gdiplusregion.h 2009-08-21 09:21:56.000000000 +0900
1012 @@ -1,3 +1,6 @@
1013 +#if __GNUC__ >=3
1014 +#pragma GCC system_header
1015 +#endif
1016 /**************************************************************************\
1017 *
1018 * Copyright (c) 1998-2001, Microsoft Corp. All Rights Reserved.
1019 --- include/gdiplusstringformat.h.orig 2008-01-18 22:17:46.000000000 +0900
1020 +++ include/gdiplusstringformat.h 2009-08-21 09:21:56.000000000 +0900
1021 @@ -217,7 +217,7 @@
1022 ));
1023 }
1025 - StringTrimming StringFormat::GetTrimming() const
1026 + StringTrimming GetTrimming() const
1027 {
1028 StringTrimming trimming;
1029 SetStatus(DllExports::GdipGetStringFormatTrimming(
1030 --- include/imm.h.orig 2008-01-18 22:17:20.000000000 +0900
1031 +++ include/imm.h 2009-08-21 09:21:56.000000000 +0900
1032 @@ -7,6 +7,13 @@
1033 #ifndef _IMM_
1034 #define _IMM_
1036 +#define __in
1037 +#define __out
1038 +#ifdef __cplusplus
1039 +#define __inline inline
1040 +#else
1041 +#define __inline static __inline__
1042 +#endif
1044 #ifdef __cplusplus
1045 extern "C" {
1046 @@ -715,5 +722,9 @@
1047 }
1048 #endif
1050 +#undef __in
1051 +#undef __out
1052 +#undef __inline
1053 +
1054 #endif // _IMM_
1056 --- include/imagehlp.h.orig 2008-01-18 22:17:20.000000000 +0900
1057 +++ include/imagehlp.h 2009-08-21 09:21:56.000000000 +0900
1058 @@ -1,3 +1,6 @@
1059 +#if __GNUC__ >=3
1060 +#pragma GCC system_header
1061 +#endif
1062 /*++ BUILD Version: 0000 Increment this if a change has global effects
1064 Copyright (c) Microsoft Corporation. All rights reserved.
1065 @@ -59,6 +62,13 @@
1066 #include <wintrust.h>
1067 #endif
1069 +#define __in
1070 +#define __out
1071 +#ifdef __cplusplus
1072 +#define __inline inline
1073 +#else
1074 +#define __inline static __inline__
1075 +#endif
1077 #ifdef __cplusplus
1078 extern "C" {
1079 @@ -407,7 +417,7 @@
1080 IMAGEAPI
1081 TouchFileTimes (
1082 __in HANDLE FileHandle,
1083 - __in_opt PSYSTEMTIME pSystemTime
1084 + __in_opt LPSYSTEMTIME pSystemTime
1085 );
1087 BOOL
1088 @@ -3950,7 +3960,7 @@
1089 // ThreadId must be 4 bytes on all architectures.
1090 //
1092 -C_ASSERT (sizeof ( ((PPROCESS_INFORMATION)0)->dwThreadId ) == 4);
1093 +//C_ASSERT (sizeof ( ((PPROCESS_INFORMATION)0)->dwThreadId ) == 4);
1095 typedef struct _MINIDUMP_THREAD {
1096 ULONG32 ThreadId;
1097 @@ -4684,5 +4694,9 @@
1098 #endif
1101 +#undef __in
1102 +#undef __out
1103 +#undef __inline
1104 +
1105 #endif // _IMAGEHLP_
1107 --- include/mapiwin.h.orig 2008-01-18 22:17:22.000000000 +0900
1108 +++ include/mapiwin.h 2009-08-21 09:21:56.000000000 +0900
1109 @@ -428,5 +428,5 @@
1110 #endif
1112 #endif /* __MAPIWIN_H__ */
1113 -\x1a
1114 +
1116 --- include/msdasc.h.orig 2008-01-18 22:17:26.000000000 +0900
1117 +++ include/msdasc.h 2009-08-21 09:21:56.000000000 +0900
1118 @@ -1,3 +1,6 @@
1119 +#if __GNUC__ >=3
1120 +#pragma GCC system_header
1121 +#endif
1124 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1125 --- include/msi.h.orig 2008-01-18 22:17:28.000000000 +0900
1126 +++ include/msi.h 2009-08-21 09:21:56.000000000 +0900
1127 @@ -59,6 +59,14 @@
1128 #endif // _MSI_NO_CRYPTO
1129 #endif //(_WIN32_MSI >= 150)
1131 +#define __in
1132 +#define __out
1133 +#ifdef __cplusplus
1134 +#define __inline inline
1135 +#else
1136 +#define __inline static __inline__
1137 +#endif
1138 +
1139 // --------------------------------------------------------------------------
1140 // Installer generic handle definitions
1141 // --------------------------------------------------------------------------
1142 @@ -2248,5 +2256,9 @@
1143 // LOCALIZE END
1146 +#undef __in
1147 +#undef __out
1148 +#undef __inline
1149 +
1150 #endif // _MSI_H_
1152 --- include/msiquery.h.orig 2008-01-18 22:17:28.000000000 +0900
1153 +++ include/msiquery.h 2009-08-21 09:21:56.000000000 +0900
1154 @@ -21,6 +21,14 @@
1155 #define _MSIQUERY_H_
1156 #include "msi.h" // INSTALLSTATE
1158 +#define __in
1159 +#define __out
1160 +#ifdef __cplusplus
1161 +#define __inline inline
1162 +#else
1163 +#define __inline static __inline__
1164 +#endif
1165 +
1166 #define MSI_NULL_INTEGER 0x80000000 // integer value reserved for null
1168 // MsiOpenDatabase persist predefine values, otherwise output database path is used
1169 @@ -1026,5 +1034,9 @@
1170 }
1171 #endif
1173 +#undef __in
1174 +#undef __out
1175 +#undef __inline
1176 +
1177 #endif // _MSIQUERY_H_
1179 --- include/multimon.h.orig 2008-01-18 22:17:30.000000000 +0900
1180 +++ include/multimon.h 2009-08-21 09:21:56.000000000 +0900
1181 @@ -175,7 +175,7 @@
1183 BOOL IsPlatformNT()
1184 {
1185 - OSVERSIONINFOA osvi = {0};
1186 + OSVERSIONINFOA osvi;
1187 osvi.dwOSVersionInfoSize = sizeof(osvi);
1188 GetVersionExA((OSVERSIONINFOA*)&osvi);
1189 return (VER_PLATFORM_WIN32_NT == osvi.dwPlatformId);
1190 --- include/ntquery.h.orig 2008-01-18 22:17:30.000000000 +0900
1191 +++ include/ntquery.h 2009-02-16 21:34:39.065125000 +0900
1192 @@ -1,3 +1,6 @@
1193 +#if __GNUC__ >=3
1194 +#pragma GCC system_header
1195 +#endif
1196 //+---------------------------------------------------------------------------
1197 //
1198 // Microsoft Windows
1199 @@ -18,6 +21,14 @@
1201 #include "stgprop.h"
1203 +#define __in
1204 +#define __out
1205 +#ifdef __cplusplus
1206 +#define __inline inline
1207 +#else
1208 +#define __inline static __inline__
1209 +#endif
1210 +
1211 #if defined(__cplusplus)
1212 extern "C"
1213 {
1214 @@ -404,6 +415,10 @@
1215 }
1216 #endif
1218 +#undef __in
1219 +#undef __out
1220 +#undef __inline
1221 +
1222 #endif // __NTQUERY_H__
1225 --- include/ocidl.h.orig 2008-01-18 22:17:32.000000000 +0900
1226 +++ include/ocidl.h 2009-08-21 09:21:56.000000000 +0900
1227 @@ -1,3 +1,6 @@
1228 +#if __GNUC__ >=3
1229 +#pragma GCC system_header
1230 +#endif
1233 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1234 @@ -294,6 +297,14 @@
1235 #include "servprov.h"
1236 #include "urlmon.h"
1238 +#define __in
1239 +#define __out
1240 +#ifdef __cplusplus
1241 +#define __inline inline
1242 +#else
1243 +#define __inline static __inline__
1244 +#endif
1245 +
1246 #ifdef __cplusplus
1247 extern "C"{
1248 #endif
1249 @@ -4595,11 +4606,13 @@
1250 HITRESULT_HIT = 3
1251 } HITRESULT;
1253 +#if 0
1254 typedef /* [v1_enum] */
1255 enum tagDVASPECT2
1256 { DVASPECT_OPAQUE = 16,
1257 DVASPECT_TRANSPARENT = 32
1258 } DVASPECT2;
1259 +#endif
1261 typedef struct tagExtentInfo
1262 {
1263 @@ -6554,6 +6567,10 @@
1264 }
1265 #endif
1267 +#undef __in
1268 +#undef __out
1269 +#undef __inline
1270 +
1271 #endif
1274 --- include/oleauto.h.orig 2008-01-18 22:17:32.000000000 +0900
1275 +++ include/oleauto.h 2009-08-21 09:21:56.000000000 +0900
1276 @@ -56,6 +56,14 @@
1277 /* pull in the MIDL generated header */
1278 #include <oaidl.h>
1280 +#define __in
1281 +#define __out
1282 +#ifdef __cplusplus
1283 +#define __inline inline
1284 +#else
1285 +#define __inline static __inline__
1286 +#endif
1287 +
1289 /*---------------------------------------------------------------------*/
1290 /* BSTR API */
1291 @@ -1160,7 +1168,7 @@
1293 // Declare variant access functions.
1295 -#if __STDC__ || defined(NONAMELESSUNION)
1296 +#ifdef NONAMELESSUNION
1297 #define V_UNION(X, Y) ((X)->n1.n2.n3.Y)
1298 #define V_VT(X) ((X)->n1.n2.vt)
1299 #define V_RECORDINFO(X) ((X)->n1.n2.n3.brecVal.pRecInfo)
1300 @@ -1242,5 +1250,9 @@
1301 #include <poppack.h>
1302 #endif // RC_INVOKED
1304 +#undef __in
1305 +#undef __out
1306 +#undef __inline
1307 +
1308 #endif // __OLEAUTO_H__
1310 --- include/olectl.h.orig 2008-01-18 22:17:32.000000000 +0900
1311 +++ include/olectl.h 2009-08-21 09:21:56.000000000 +0900
1312 @@ -28,6 +28,14 @@
1313 #include <ocidl.h>
1314 #endif // _MAC
1316 +#define __in
1317 +#define __out
1318 +#ifdef __cplusplus
1319 +#define __inline inline
1320 +#else
1321 +#define __inline static __inline__
1322 +#endif
1323 +
1324 #ifdef _OLEAUT32_
1325 #define WINOLECTLAPI STDAPI
1326 #define WINOLECTLAPI_(type) STDAPI_(type)
1327 @@ -616,5 +624,9 @@
1329 #endif // defined(__MKTYPLIB__) || defined(__midl)
1331 +#undef __in
1332 +#undef __out
1333 +#undef __inline
1334 +
1335 #endif // _OLECTL_H_
1337 --- include/oledb.h.orig 2008-01-18 22:17:32.000000000 +0900
1338 +++ include/oledb.h 2009-08-21 09:21:56.000000000 +0900
1339 @@ -1,3 +1,6 @@
1340 +#if __GNUC__ >=3
1341 +#pragma GCC system_header
1342 +#endif
1345 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1346 @@ -797,7 +800,7 @@
1348 //@@@+ V2.0
1349 #if( OLEDBVER >= 0x0200 )
1350 -#if !defined(_WINBASE_) && !defined(_FILETIME_)
1351 +#if !defined(_WINBASE_H) && !defined(_FILETIME_)
1352 #define _FILETIME_
1353 typedef struct _FILETIME {
1354 DWORD dwLowDateTime;
1355 --- include/oleidl.h.orig 2008-01-18 22:17:32.000000000 +0900
1356 +++ include/oleidl.h 2009-08-21 09:21:56.000000000 +0900
1357 @@ -1,3 +1,6 @@
1358 +#if __GNUC__ >=3
1359 +#pragma GCC system_header
1360 +#endif
1363 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1364 @@ -189,6 +192,14 @@
1365 /* header files for imported files */
1366 #include "objidl.h"
1368 +#define __in
1369 +#define __out
1370 +#ifdef __cplusplus
1371 +#define __inline inline
1372 +#else
1373 +#define __inline static __inline__
1374 +#endif
1375 +
1376 #ifdef __cplusplus
1377 extern "C"{
1378 #endif
1379 @@ -3868,6 +3879,10 @@
1380 }
1381 #endif
1383 +#undef __in
1384 +#undef __out
1385 +#undef __inline
1386 +
1387 #endif
1390 --- include/propidl.h.orig 2008-01-18 22:17:32.000000000 +0900
1391 +++ include/propidl.h 2009-08-21 09:21:56.000000000 +0900
1392 @@ -76,6 +76,14 @@
1393 #include "objidl.h"
1394 #include "oaidl.h"
1396 +#define __in
1397 +#define __out
1398 +#ifdef __cplusplus
1399 +#define __inline inline
1400 +#else
1401 +#define __inline static __inline__
1402 +#endif
1403 +
1404 #ifdef __cplusplus
1405 extern "C"{
1406 #endif
1407 @@ -143,6 +151,7 @@
1408 CHAR *pElems;
1409 } CAC;
1411 +#if 0
1412 typedef struct tagCAUB
1413 {
1414 ULONG cElems;
1415 @@ -268,6 +277,7 @@
1416 ULONG cElems;
1417 CLSID *pElems;
1418 } CACLSID;
1419 +#endif
1421 #ifdef MIDL_PASS
1422 // This is the PROPVARIANT padding layout for marshaling.
1423 @@ -509,6 +519,7 @@
1425 #define PRSPEC_PROPID ( 1 )
1427 +#if 0
1428 typedef struct tagPROPSPEC
1429 {
1430 ULONG ulKind;
1431 @@ -526,12 +537,14 @@
1432 PROPID propid;
1433 VARTYPE vt;
1434 } STATPROPSTG;
1435 +#endif
1437 // Macros for parsing the OS Version of the Property Set Header
1438 #define PROPSETHDR_OSVER_KIND(dwOSVer) HIWORD( (dwOSVer) )
1439 #define PROPSETHDR_OSVER_MAJOR(dwOSVer) LOBYTE(LOWORD( (dwOSVer) ))
1440 #define PROPSETHDR_OSVER_MINOR(dwOSVer) HIBYTE(LOWORD( (dwOSVer) ))
1441 #define PROPSETHDR_OSVERSION_UNKNOWN 0xFFFFFFFF
1442 +#if 0
1443 typedef struct tagSTATPROPSETSTG
1444 {
1445 FMTID fmtid;
1446 @@ -542,12 +555,14 @@
1447 FILETIME atime;
1448 DWORD dwOSVersion;
1449 } STATPROPSETSTG;
1450 +#endif
1454 extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0000_v0_0_c_ifspec;
1455 extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0000_v0_0_s_ifspec;
1457 +#if 0
1458 #ifndef __IPropertyStorage_INTERFACE_DEFINED__
1459 #define __IPropertyStorage_INTERFACE_DEFINED__
1461 @@ -1136,6 +1151,7 @@
1464 #endif /* __IEnumSTATPROPSETSTG_INTERFACE_DEFINED__ */
1465 +#endif
1468 /* interface __MIDL_itf_propidl_0000_0004 */
1469 @@ -1268,6 +1284,10 @@
1470 }
1471 #endif
1473 +#undef __in
1474 +#undef __out
1475 +#undef __inline
1476 +
1477 #endif
1480 --- include/propkeydef.h.orig 2008-01-18 22:17:32.000000000 +0900
1481 +++ include/propkeydef.h 2009-08-21 09:21:56.000000000 +0900
1482 @@ -2,6 +2,10 @@
1483 #define PID_FIRST_USABLE 2
1484 #endif
1486 +#ifndef __MIDL_CONST
1487 +#define __MIDL_CONST const
1488 +#endif
1489 +
1490 #ifndef REFPROPERTYKEY
1491 #ifdef __cplusplus
1492 #define REFPROPERTYKEY const PROPERTYKEY &
1493 --- include/propsys.h.orig 2008-01-18 22:17:34.000000000 +0900
1494 +++ include/propsys.h 2009-08-21 09:21:56.000000000 +0900
1495 @@ -228,6 +228,14 @@
1496 #endif // 0
1497 #include <propkeydef.h>
1499 +#define __in
1500 +#define __out
1501 +#ifdef __cplusplus
1502 +#define __inline inline
1503 +#else
1504 +#define __inline static __inline__
1505 +#endif
1506 +
1508 extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_c_ifspec;
1509 extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_s_ifspec;
1510 @@ -3600,6 +3608,10 @@
1511 }
1512 #endif
1514 +#undef __in
1515 +#undef __out
1516 +#undef __inline
1517 +
1518 #endif
1521 --- include/shlobj.h.orig 2008-01-18 22:17:36.000000000 +0900
1522 +++ include/shlobj.h 2009-08-21 09:21:56.000000000 +0900
1523 @@ -1,3 +1,6 @@
1524 +#if __GNUC__ >=3
1525 +#pragma GCC system_header
1526 +#endif
1527 /*===========================================================================
1529 Copyright (c) Microsoft Corporation. All rights reserved.
1530 @@ -103,6 +106,14 @@
1531 #include <shtypes.h>
1532 #include <shobjidl.h>
1534 +#define __in
1535 +#define __out
1536 +#ifdef __cplusplus
1537 +#define __inline inline
1538 +#else
1539 +#define __inline static __inline__
1540 +#endif
1541 +
1542 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
1543 #pragma once
1544 #endif
1545 @@ -3117,7 +3128,7 @@
1546 SHSTDAPI_(BOOL) ILIsEqual(__in PCIDLIST_ABSOLUTE pidl1, __in PCIDLIST_ABSOLUTE pidl2);
1547 SHSTDAPI_(BOOL) ILIsParent(__in PCIDLIST_ABSOLUTE pidl1, __in PCIDLIST_ABSOLUTE pidl2, BOOL fImmediate);
1548 SHSTDAPI ILSaveToStream(__in IStream *pstm, __in PCUIDLIST_RELATIVE pidl);
1549 -DECLSPEC_DEPRECATED SHSTDAPI ILLoadFromStream(__in IStream *pstm, __inout PIDLIST_RELATIVE *pidl);
1550 +SHSTDAPI ILLoadFromStream(__in IStream *pstm, __inout PIDLIST_RELATIVE *pidl);
1551 SHSTDAPI ILLoadFromStreamEx(__in IStream *pstm, __deref_out PIDLIST_RELATIVE *pidl);
1553 #if (_WIN32_IE >= 0x0400)
1554 @@ -4578,5 +4589,9 @@
1555 #endif
1556 #endif
1558 +#undef __in
1559 +#undef __out
1560 +#undef __inline
1561 +
1562 #endif /* _SHLOBJ_H_ */
1564 --- include/shobjidl.h.orig 2008-01-18 22:17:36.000000000 +0900
1565 +++ include/shobjidl.h 2009-08-21 09:21:56.000000000 +0900
1566 @@ -1,3 +1,6 @@
1567 +#if __GNUC__ >=3
1568 +#pragma GCC system_header
1569 +#endif
1572 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1573 @@ -1667,6 +1670,14 @@
1574 #include "prsht.h"
1575 #include "propsys.h"
1577 +#define __in
1578 +#define __out
1579 +#ifdef __cplusplus
1580 +#define __inline inline
1581 +#else
1582 +#define __inline static __inline__
1583 +#endif
1584 +
1585 #ifdef __cplusplus
1586 extern "C"{
1587 #endif
1588 @@ -6384,7 +6395,6 @@
1590 typedef ICommDlgBrowser2 *LPCOMMDLGBROWSER2;
1592 -#endif // NTDDI_WIN2K
1593 #if (_WIN32_IE >= _WIN32_IE_IE70)
1596 @@ -6727,6 +6737,7 @@
1597 /* [local] */
1599 #endif // (_WIN32_IE >= _WIN32_IE_IE70)
1600 +#endif // NTDDI_WIN2K
1603 extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0026_v0_0_c_ifspec;
1604 @@ -7331,6 +7342,13 @@
1605 typedef LPTBBUTTON LPTBBUTTONSB;
1606 #endif //_NEVER_
1608 +#define __in
1609 +#define __out
1610 +#ifdef __cplusplus
1611 +#define __inline inline
1612 +#else
1613 +#define __inline static __inline__
1614 +#endif
1616 extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0032_v0_0_c_ifspec;
1617 extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0032_v0_0_s_ifspec;
1618 @@ -29000,6 +29018,10 @@
1619 }
1620 #endif
1622 +#undef __in
1623 +#undef __out
1624 +#undef __inline
1625 +
1626 #endif
1629 --- include/shtypes.h.orig 2008-01-18 22:17:36.000000000 +0900
1630 +++ include/shtypes.h 2009-08-21 09:21:56.000000000 +0900
1631 @@ -1,3 +1,6 @@
1632 +#if __GNUC__ >=3
1633 +#pragma GCC system_header
1634 +#endif
1637 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1638 @@ -137,7 +140,7 @@
1640 #endif // defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)
1641 #include <poppack.h>
1642 -typedef /* [unique] */ __RPC_unique_pointer BYTE_BLOB *wirePIDL;
1643 +//typedef /* [unique] */ __RPC_unique_pointer BYTE_BLOB *wirePIDL;
1645 typedef /* [wire_marshal] */ ITEMIDLIST __unaligned *LPITEMIDLIST;
1647 --- include/sspi.h.orig 2008-01-18 22:17:38.000000000 +0900
1648 +++ include/sspi.h 2009-08-21 09:21:56.000000000 +0900
1649 @@ -20,6 +20,14 @@
1650 #define __SSPI_H__
1651 // end_ntifs
1653 +#define __in
1654 +#define __out
1655 +#ifdef __cplusplus
1656 +#define __inline inline
1657 +#else
1658 +#define __inline static __inline__
1659 +#endif
1660 +
1661 #if _MSC_VER > 1000
1662 #pragma once
1663 #endif
1664 @@ -2154,8 +2162,7 @@
1666 // begin_ntifs
1668 -#ifndef _AUTH_IDENTITY_DEFINED
1669 -#define _AUTH_IDENTITY_DEFINED
1670 +#ifndef SEC_WINNT_AUTH_IDENTITY_ANSI
1672 //
1673 // This was not defined in NTIFS.h for windows 2000 however
1674 @@ -2326,6 +2333,10 @@
1675 } // extern "C"
1676 #endif
1678 +#undef __in
1679 +#undef __out
1680 +#undef __inline
1681 +
1682 // begin_ntifs
1683 #endif // __SSPI_H__
1684 // end_ntifs
1685 --- include/strmif.h.orig 2008-01-18 22:17:38.000000000 +0900
1686 +++ include/strmif.h 2009-02-16 21:34:39.065125000 +0900
1687 @@ -1,3 +1,6 @@
1688 +#if __GNUC__ >=3
1689 +#pragma GCC system_header
1690 +#endif
1693 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1694 @@ -888,6 +891,14 @@
1695 #include "oaidl.h"
1696 #include "ocidl.h"
1698 +#define __in
1699 +#define __out
1700 +#ifdef __cplusplus
1701 +#define __inline inline
1702 +#else
1703 +#define __inline static __inline__
1704 +#endif
1705 +
1706 #ifdef __cplusplus
1707 extern "C"{
1708 #endif
1709 @@ -16250,7 +16261,7 @@
1710 #define _IAMFilterGraphCallback_
1711 // Note: Because this interface was not defined as a proper interface it is
1712 // supported under C++ only. Methods aren't stdcall.
1713 -EXTERN_GUID(IID_IAMFilterGraphCallback,0x56a868fd,0x0ad4,0x11ce,0xb0,0xa3,0x0,0x20,0xaf,0x0b,0xa7,0x70);
1714 +DEFINE_GUID(IID_IAMFilterGraphCallback,0x56a868fd,0x0ad4,0x11ce,0xb0,0xa3,0x0,0x20,0xaf,0x0b,0xa7,0x70);
1715 interface IAMFilterGraphCallback : public IUnknown
1716 {
1717 // S_OK means rendering complete, S_FALSE means retry now.
1718 @@ -21934,7 +21945,7 @@
1719 typedef struct tagVMRGUID
1720 {
1721 GUID *pGUID;
1722 - GUID GUID;
1723 + GUID aGUID;
1724 } VMRGUID;
1726 typedef struct tagVMRMONITORINFO
1727 @@ -23341,6 +23352,10 @@
1728 }
1729 #endif
1731 +#undef __in
1732 +#undef __out
1733 +#undef __inline
1734 +
1735 #endif
1738 --- include/strsafe.h.orig 2008-01-18 22:17:38.000000000 +0900
1739 +++ include/strsafe.h 2009-02-16 21:34:39.065125000 +0900
1740 @@ -13,12 +13,23 @@
1741 #if (_MSC_VER > 1000)
1742 #pragma once
1743 #endif
1744 +#if __GNUC__ >=3
1745 +#pragma GCC system_header
1746 +#endif
1748 #include <stdio.h> // for _vsnprintf, _vsnwprintf, getc, getwc
1749 #include <string.h> // for memset
1750 #include <stdarg.h> // for va_start, etc.
1751 #include <specstrings.h> // for __in, etc.
1753 +#define __in
1754 +#define __out
1755 +#ifdef __cplusplus
1756 +#define __inline inline
1757 +#else
1758 +#define __inline static __inline__
1759 +#endif
1760 +
1761 #if !defined(_W64)
1762 #if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && (_MSC_VER >= 1300)
1763 #define _W64 __w64
1764 @@ -9254,7 +9265,7 @@
1765 wchar_t ch = getwc(stdin);
1766 // ASSERT(sizeof(wchar_t) == sizeof(wint_t));
1768 - if (ch == WEOF)
1769 + if (ch == 0xffff)
1770 {
1771 if (cchNewDestLength == 0)
1772 {
1773 @@ -9763,5 +9774,9 @@
1775 #pragma warning(pop)
1777 +#undef __in
1778 +#undef __out
1779 +#undef __inline
1780 +
1781 #endif // _STRSAFE_H_INCLUDED_
1783 --- include/structuredquery.h.orig 2008-01-18 22:17:38.000000000 +0900
1784 +++ include/structuredquery.h 2009-08-21 09:21:56.000000000 +0900
1785 @@ -233,6 +233,14 @@
1786 #include "ocidl.h"
1787 #include "propidl.h"
1789 +#define __in
1790 +#define __out
1791 +#ifdef __cplusplus
1792 +#define __inline inline
1793 +#else
1794 +#define __inline static __inline__
1795 +#endif
1796 +
1797 #ifdef __cplusplus
1798 extern "C"{
1799 #endif
1800 @@ -2472,6 +2480,10 @@
1801 }
1802 #endif
1804 +#undef __in
1805 +#undef __out
1806 +#undef __inline
1807 +
1808 #endif
1811 --- include/urlmon.h.orig 2008-01-18 22:17:40.000000000 +0900
1812 +++ include/urlmon.h 2009-08-21 09:21:56.000000000 +0900
1813 @@ -1,3 +1,6 @@
1814 +#if __GNUC__ >=3
1815 +#pragma GCC system_header
1816 +#endif
1819 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
1820 @@ -330,6 +333,14 @@
1821 #include "servprov.h"
1822 #include "msxml.h"
1824 +#define __in
1825 +#define __out
1826 +#ifdef __cplusplus
1827 +#define __inline inline
1828 +#else
1829 +#define __inline static __inline__
1830 +#endif
1831 +
1832 #ifdef __cplusplus
1833 extern "C"{
1834 #endif
1835 @@ -8880,6 +8891,10 @@
1836 }
1837 #endif
1839 +#undef __in
1840 +#undef __out
1841 +#undef __inline
1842 +
1843 #endif
1846 --- include/wincrypt.h.orig 2008-01-18 22:17:42.000000000 +0900
1847 +++ include/wincrypt.h 2009-02-16 21:34:39.065125000 +0900
1848 @@ -14,6 +14,14 @@
1850 #include <specstrings.h> /* for SAL annotations */
1852 +#define __in
1853 +#define __out
1854 +#ifdef __cplusplus
1855 +#define __inline inline
1856 +#else
1857 +#define __inline static __inline__
1858 +#endif
1859 +
1860 #if defined (_MSC_VER)
1862 #if ( _MSC_VER >= 800 )
1863 @@ -1927,6 +1935,14 @@
1864 #include <bcrypt.h>
1865 #include <ncrypt.h>
1867 +#define __in
1868 +#define __out
1869 +#ifdef __cplusplus
1870 +#define __inline inline
1871 +#else
1872 +#define __inline static __inline__
1873 +#endif
1874 +
1875 // This type is used when the API can take either the CAPI1 HCRYPTPROV or
1876 // the CNG NCRYPT_KEY_HANDLE. Where appropriate, the HCRYPTPROV will be
1877 // converted to a NCRYPT_KEY_HANDLE via the CNG NCryptTranslateHandle().
1878 @@ -17113,8 +17129,8 @@
1879 __in DWORD dwFlags,
1880 __in_opt PCRYPT_KEY_PROV_INFO pKeyProvInfo,
1881 __in_opt PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm,
1882 - __in_opt PSYSTEMTIME pStartTime,
1883 - __in_opt PSYSTEMTIME pEndTime,
1884 + __in_opt LPSYSTEMTIME pStartTime,
1885 + __in_opt LPSYSTEMTIME pEndTime,
1886 __in_opt PCERT_EXTENSIONS pExtensions
1887 );
1889 @@ -19174,6 +19190,10 @@
1890 #endif
1891 #endif
1893 +#undef __in
1894 +#undef __out
1895 +#undef __inline
1896 +
1897 #endif // __WINCRYPT_H__
1900 --- include/winerror.h.orig 2008-01-18 22:17:42.000000000 +0900
1901 +++ include/winerror.h 2009-08-21 09:21:56.000000000 +0900
1902 @@ -23,6 +23,11 @@
1904 #include <specstrings.h>
1906 +#ifdef __cplusplus
1907 +#define __inline inline
1908 +#else
1909 +#define __inline static __inline__
1910 +#endif
1911 //
1912 // Values are 32 bit values laid out as follows:
1913 //
1914 --- include/wingdi.h.orig 2008-01-18 22:17:42.000000000 +0900
1915 +++ include/wingdi.h 2009-08-21 09:21:56.000000000 +0900
1916 @@ -9,6 +9,13 @@
1917 #ifndef _WINGDI_
1918 #define _WINGDI_
1920 +#define __in
1921 +#define __out
1922 +#ifdef __cplusplus
1923 +#define __inline inline
1924 +#else
1925 +#define __inline static __inline__
1926 +#endif
1928 #pragma once
1930 @@ -1901,7 +1908,7 @@
1931 /* size of a form name string */
1932 #define CCHFORMNAME 32
1934 -#if (_WIN32_WINNT >= ((OSVER(NTDDI_WINXPSP2)) >> 16))
1935 +#if (_WIN32_WINNT >= ((NTDDI_WINXPSP2 & 0xFFFF0000) >> 16))
1936 typedef struct _devicemodeA {
1937 BYTE dmDeviceName[CCHDEVICENAME];
1938 WORD dmSpecVersion;
1939 @@ -5424,6 +5431,10 @@
1940 }
1941 #endif
1943 +#undef __in
1944 +#undef __out
1945 +#undef __inline
1946 +
1947 #endif /* _WINGDI_ */
1950 --- include/wintrust.h.orig 2008-01-18 22:17:42.000000000 +0900
1951 +++ include/wintrust.h 2009-08-21 09:21:56.000000000 +0900
1952 @@ -1252,6 +1252,7 @@
1953 //
1954 #ifdef WT_DEFINE_ALL_APIS
1956 +#if 0
1957 typedef struct _WIN_CERTIFICATE
1958 {
1959 DWORD dwLength;
1960 @@ -1260,6 +1261,7 @@
1961 BYTE bCertificate[ANYSIZE_ARRAY];
1963 } WIN_CERTIFICATE, *LPWIN_CERTIFICATE;
1964 +#endif
1966 #define WIN_CERT_REVISION_1_0 (0x0100)
1967 #define WIN_CERT_REVISION_2_0 (0x0200)
1968 --- include/winuser.h.orig 2008-01-18 22:17:44.000000000 +0900
1969 +++ include/winuser.h 2009-08-21 09:21:56.000000000 +0900
1970 @@ -11,6 +11,15 @@
1971 #ifndef _WINUSER_
1972 #define _WINUSER_
1974 +#define __in
1975 +#define __out
1976 +#ifdef __cplusplus
1977 +#define __inline inline
1978 +#else
1979 +#define __inline static __inline__
1980 +#endif
1981 +DECLARE_HANDLE(HHOOK);
1982 +typedef CONST GUID *LPCGUID;
1985 #pragma once
1986 @@ -39,7 +48,7 @@
1987 #define WINVER 0x0500 /* version 5.0 */
1988 #endif /* !WINVER */
1990 -#include <stdarg.h>
1991 +#include <../include/stdarg.h>
1993 #ifndef NOUSER
1995 @@ -10717,7 +10726,7 @@
1996 #define CDS_RESET 0x40000000
1997 #define CDS_NORESET 0x10000000
1999 -#include <tvout.h>
2000 +//#include <tvout.h>
2002 /* Return values for ChangeDisplaySettings */
2003 #define DISP_CHANGE_SUCCESSFUL 0
2004 @@ -12571,16 +12580,20 @@
2008 -#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
2009 -#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0)
2010 -#include "winuser.inl"
2011 -#endif /* ISOLATION_AWARE_ENABLED */
2012 -#endif /* RC */
2013 +//#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
2014 +//#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0)
2015 +//#include "winuser.inl"
2016 +//#endif /* ISOLATION_AWARE_ENABLED */
2017 +//#endif /* RC */
2019 #ifdef __cplusplus
2020 }
2021 #endif /* __cplusplus */
2023 +#undef __in
2024 +#undef __out
2025 +#undef __inline
2026 +
2027 #endif /* !_WINUSER_ */
2030 --- include/wspiapi.h.orig 2008-01-18 22:17:44.000000000 +0900
2031 +++ include/wspiapi.h 2009-08-21 09:21:56.000000000 +0900
2032 @@ -15,6 +15,9 @@
2034 #ifndef _WSPIAPI_H_
2035 #define _WSPIAPI_H_
2036 +#if __GNUC__ >=3
2037 +#pragma GCC system_header
2038 +#endif
2040 #pragma once
2042 @@ -85,6 +88,11 @@
2044 #ifdef __cplusplus
2045 extern "C" {
2046 +#define _inline inline
2047 +#define __inline inline
2048 +#else
2049 +#define _inline static __inline__
2050 +#define __inline static __inline__
2051 #endif
2053 ////////////////////////////////////////////////////////////
2054 @@ -1052,6 +1060,8 @@
2055 (*pfFreeAddrInfo)(ai);
2056 }
2058 +#undef _inline
2059 +#undef __inline
2060 #ifdef __cplusplus
2061 }
2062 #endif
2063 --- include/d3dtypes.h.orig 2004-09-27 12:34:16.000000000 +0900
2064 +++ include/d3dtypes.h 2007-11-30 21:42:09.558750000 +0900
2065 @@ -1,3 +1,6 @@
2066 +#if __GNUC__ >=3
2067 +#pragma GCC system_header
2068 +#endif
2069 /*==========================================================================;
2070 *
2071 * Copyright (C) Microsoft Corporation. All Rights Reserved.
2072 --- include/d3dx9core.h.orig 2006-03-31 12:16:02.000000000 +0900
2073 +++ include/d3dx9core.h 2009-08-21 09:21:56.000000000 +0900
2074 @@ -1,3 +1,6 @@
2075 +#if __GNUC__ >=3
2076 +#pragma GCC system_header
2077 +#endif
2078 ///////////////////////////////////////////////////////////////////////////
2079 //
2080 // Copyright (C) Microsoft Corporation. All Rights Reserved.
2081 --- include/d3dx9math.h.orig 2005-07-22 17:00:18.000000000 +0900
2082 +++ include/d3dx9math.h 2009-08-21 09:21:56.000000000 +0900
2083 @@ -1,3 +1,6 @@
2084 +#if __GNUC__ >=3
2085 +#pragma GCC system_header
2086 +#endif
2087 //////////////////////////////////////////////////////////////////////////////
2088 //
2089 // Copyright (C) Microsoft Corporation. All Rights Reserved.
2090 --- include/d3dx9math.inl.orig 2005-03-18 17:26:56.000000000 +0900
2091 +++ include/d3dx9math.inl 2009-08-21 09:21:56.000000000 +0900
2092 @@ -1,3 +1,6 @@
2093 +#if __GNUC__ >=3
2094 +#pragma GCC system_header
2095 +#endif
2096 //////////////////////////////////////////////////////////////////////////////
2097 //
2098 // Copyright (C) Microsoft Corporation. All Rights Reserved.
2099 --- include/dxtrans.h.orig 2004-09-28 00:18:32.000000000 +0900
2100 +++ include/dxtrans.h 2007-01-02 22:08:41.640625000 +0900
2101 @@ -1,3 +1,6 @@
2102 +#if __GNUC__ >=3
2103 +#pragma GCC system_header
2104 +#endif
2106 #pragma warning( disable: 4049 ) /* more than 64k source lines */