2010-02-20 Ozkan Sezer <sezeroz@gmail.com> * dvdmedia.h: added from the wine sources. * Sync'ed with wine-1.1.39 release version. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@1926 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/direct-x/ChangeLog b/mingw-w64-headers/direct-x/ChangeLog index 8088aa5..295760f 100644 --- a/mingw-w64-headers/direct-x/ChangeLog +++ b/mingw-w64-headers/direct-x/ChangeLog
@@ -1,3 +1,8 @@ +2010-02-20 Ozkan Sezer <sezeroz@gmail.com> + + * dvdmedia.h: added from the wine sources. + * Sync'ed with wine-1.1.39 release version. + 2010-02-14 Ozkan Sezer <sezeroz@gmail.com> * amaudio.h: quartz: Fix IAMDirectSound interface definition. (from
diff --git a/mingw-w64-headers/direct-x/include/amstream.h b/mingw-w64-headers/direct-x/include/amstream.h index 6418aeb..949a9cb 100644 --- a/mingw-w64-headers/direct-x/include/amstream.h +++ b/mingw-w64-headers/direct-x/include/amstream.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.1.38 from amstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.1.39 from amstream.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h>
diff --git a/mingw-w64-headers/direct-x/include/amvideo.h b/mingw-w64-headers/direct-x/include/amvideo.h index 54a0fb0..f89534f 100644 --- a/mingw-w64-headers/direct-x/include/amvideo.h +++ b/mingw-w64-headers/direct-x/include/amvideo.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.1.38 from amvideo.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.1.39 from amvideo.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h>
diff --git a/mingw-w64-headers/direct-x/include/ddstream.h b/mingw-w64-headers/direct-x/include/ddstream.h index 71b5e1f..23979f0 100644 --- a/mingw-w64-headers/direct-x/include/ddstream.h +++ b/mingw-w64-headers/direct-x/include/ddstream.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.1.38 from ddstream.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.1.39 from ddstream.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h>
diff --git a/mingw-w64-headers/direct-x/include/dmdls.h b/mingw-w64-headers/direct-x/include/dmdls.h index c44d30d..1079452 100644 --- a/mingw-w64-headers/direct-x/include/dmdls.h +++ b/mingw-w64-headers/direct-x/include/dmdls.h
@@ -112,11 +112,12 @@ ULONG ulFirstExtCkIdx; WAVELINK WaveLink; WSMPL WSMP; - /* Removed as it leads to compiler error, as WLOOP is a struct typedef. */ +/* WLOOP is a struct typedef, leads to + * a compiler error if __cplusplus . */ #ifdef __cplusplus - WLOOP WWLOOP[1]; + WLOOP WWLOOP[1]; #else - WLOOP WLOOP[1]; + WLOOP WLOOP[1]; #endif };
diff --git a/mingw-w64-headers/direct-x/include/dmodshow.h b/mingw-w64-headers/direct-x/include/dmodshow.h index 35ed8e5..81fb0ef 100644 --- a/mingw-w64-headers/direct-x/include/dmodshow.h +++ b/mingw-w64-headers/direct-x/include/dmodshow.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.1.38 from dmodshow.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.1.39 from dmodshow.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h>
diff --git a/mingw-w64-headers/direct-x/include/dmoreg.h b/mingw-w64-headers/direct-x/include/dmoreg.h index e4b584a..b1fedb8 100644 --- a/mingw-w64-headers/direct-x/include/dmoreg.h +++ b/mingw-w64-headers/direct-x/include/dmoreg.h
@@ -76,4 +76,3 @@ #endif #endif /* __DMOREG_H__ */ -
diff --git a/mingw-w64-headers/direct-x/include/dmusici.h b/mingw-w64-headers/direct-x/include/dmusici.h index faa9b28..82a137b 100644 --- a/mingw-w64-headers/direct-x/include/dmusici.h +++ b/mingw-w64-headers/direct-x/include/dmusici.h
@@ -34,7 +34,7 @@ #include <dmplugin.h> #include <pshpack8.h> -#ifdef __WINESRC__ +#ifdef WINE_NO_UNICODE_MACROS #undef AddPort #endif
diff --git a/mingw-w64-headers/direct-x/include/docobj.h b/mingw-w64-headers/direct-x/include/docobj.h index 180bb9a..402c4e7 100644 --- a/mingw-w64-headers/direct-x/include/docobj.h +++ b/mingw-w64-headers/direct-x/include/docobj.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.1.38 from docobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.1.39 from docobj.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h>
diff --git a/mingw-w64-headers/direct-x/include/downloadmgr.h b/mingw-w64-headers/direct-x/include/downloadmgr.h index 0cb669f..fbfa72b 100644 --- a/mingw-w64-headers/direct-x/include/downloadmgr.h +++ b/mingw-w64-headers/direct-x/include/downloadmgr.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.1.38 from downloadmgr.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.1.39 from downloadmgr.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h>
diff --git a/mingw-w64-headers/direct-x/include/dvdmedia.h b/mingw-w64-headers/direct-x/include/dvdmedia.h new file mode 100644 index 0000000..9a29994 --- /dev/null +++ b/mingw-w64-headers/direct-x/include/dvdmedia.h
@@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __DVDMEDIA_H__ +#define __DVDMEDIA_H__ + +#define AMCONTROL_USED 0x00000001 +#define AMCONTROL_PAD_TO_4x3 0x00000002 +#define AMCONTROL_PAD_TO_16x9 0x00000004 + +typedef struct tagVIDEOINFOHEADER2 { + RECT rcSource; + RECT rcTarget; + DWORD dwBitRate; + DWORD dwBitErrorRate; + REFERENCE_TIME AvgTimePerFrame; + DWORD dwInterlaceFlags; + DWORD dwCopyProtectFlags; + DWORD dwPictAspectRatioX; + DWORD dwPictAspectRatioY; + union { + DWORD dwControlFlags; + DWORD dwReserved1; + } DUMMYUNIONNAME; + DWORD dwReserved2; + BITMAPINFOHEADER bmiHeader; +} VIDEOINFOHEADER2; + +#endif /* __DVDMEDIA_H__ */
diff --git a/mingw-w64-headers/direct-x/include/dxdiag.h b/mingw-w64-headers/direct-x/include/dxdiag.h index f080ec8..47cd36e 100644 --- a/mingw-w64-headers/direct-x/include/dxdiag.h +++ b/mingw-w64-headers/direct-x/include/dxdiag.h
@@ -67,7 +67,7 @@ /***************************************************************************** * IDxDiagContainer interface */ -#ifdef __WINESRC__ +#ifdef WINE_NO_UNICODE_MACROS #undef GetProp #endif
diff --git a/mingw-w64-headers/direct-x/include/mediaobj.h b/mingw-w64-headers/direct-x/include/mediaobj.h index 36a001a..92cf827 100644 --- a/mingw-w64-headers/direct-x/include/mediaobj.h +++ b/mingw-w64-headers/direct-x/include/mediaobj.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.1.38 from mediaobj.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.1.39 from mediaobj.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h>
diff --git a/mingw-w64-headers/direct-x/include/medparam.h b/mingw-w64-headers/direct-x/include/medparam.h index 45f728c..538de31 100644 --- a/mingw-w64-headers/direct-x/include/medparam.h +++ b/mingw-w64-headers/direct-x/include/medparam.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.1.38 from medparam.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.1.39 from medparam.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h>
diff --git a/mingw-w64-headers/direct-x/include/qnetwork.h b/mingw-w64-headers/direct-x/include/qnetwork.h index 275b57b..6c03fd3 100644 --- a/mingw-w64-headers/direct-x/include/qnetwork.h +++ b/mingw-w64-headers/direct-x/include/qnetwork.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.1.38 from qnetwork.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.1.39 from qnetwork.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h>
diff --git a/mingw-w64-headers/direct-x/include/vmr9.h b/mingw-w64-headers/direct-x/include/vmr9.h index 48bec59..c5a75f0 100644 --- a/mingw-w64-headers/direct-x/include/vmr9.h +++ b/mingw-w64-headers/direct-x/include/vmr9.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.1.38 from vmr9.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.1.39 from vmr9.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h>
diff --git a/mingw-w64-headers/direct-x/readme.txt b/mingw-w64-headers/direct-x/readme.txt index 63f911a..55a59dc 100644 --- a/mingw-w64-headers/direct-x/readme.txt +++ b/mingw-w64-headers/direct-x/readme.txt
@@ -8,7 +8,7 @@ by the MINGW_DDRAW_VERSION macro. This is an optional SDK. Its license is LGPL and you can obtain the original -source by the wine project. We base on the released wine-1.1.38 from the +source by the wine project. We base on the released wine-1.1.39 from the wine project. For further details on license please read at the wine project and the COPYING.LIB file included here.