From: Amine Khaldi Date: Wed, 9 Jun 2010 17:19:06 +0000 (+0000) Subject: [DDK] X-Git-Tag: backups/header-work@57446~4 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=a8cc636ac734bb2864247015d7f70e381aba8ebd;hp=513fbfa56fe8c498929c9dcdd9be054e24381248 [DDK] - Replace dciddi.h with the one from mingw-w64 [PSDK] - Get rid of duplicate dciddi.h svn path=/branches/header-work/; revision=47716 --- diff --git a/include/ddk/dciddi.h b/include/ddk/dciddi.h index 4163c1ea9c3..16514bdc798 100644 --- a/include/ddk/dciddi.h +++ b/include/ddk/dciddi.h @@ -1,73 +1,145 @@ -#pragma once +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#ifndef _INC_DCIDDI +#define _INC_DCIDDI #ifdef __cplusplus extern "C" { #endif -/* DCI Command Escape */ -#define DCICOMMAND 3075 -#define DCI_VERSION 0x0100 - -#define DCICREATEPRIMARYSURFACE 1 -#define DCICREATEOFFSCREENSURFACE 2 -#define DCICREATEOVERLAYSURFACE 3 -#define DCIENUMSURFACE 4 -#define DCIESCAPE 5 - -/* DCI Errors */ -#define DCI_OK 0 -#define DCI_FAIL_GENERIC -1 -#define DCI_FAIL_UNSUPPORTEDVERSION -2 -#define DCI_FAIL_INVALIDSURFACE -3 -#define DCI_FAIL_UNSUPPORTED -4 -#define DCI_ERR_CURRENTLYNOTAVAIL -5 -#define DCI_ERR_INVALIDRECT -6 -#define DCI_ERR_UNSUPPORTEDFORMAT -7 -#define DCI_ERR_UNSUPPORTEDMASK -8 -#define DCI_ERR_TOOBIGHEIGHT -9 -#define DCI_ERR_TOOBIGWIDTH -10 -#define DCI_ERR_TOOBIGSIZE -11 -#define DCI_ERR_OUTOFMEMORY -12 -#define DCI_ERR_INVALIDPOSITION -13 -#define DCI_ERR_INVALIDSTRETCH -14 -#define DCI_ERR_INVALIDCLIPLIST -15 -#define DCI_ERR_SURFACEISOBSCURED -16 -#define DCI_ERR_XALIGN -17 -#define DCI_ERR_YALIGN -18 -#define DCI_ERR_XYALIGN -19 -#define DCI_ERR_WIDTHALIGN -20 -#define DCI_ERR_HEIGHTALIGN -21 - -#define DCI_STATUS_POINTERCHANGED 1 -#define DCI_STATUS_STRIDECHANGED 2 -#define DCI_STATUS_FORMATCHANGED 4 -#define DCI_STATUS_SURFACEINFOCHANGED 8 -#define DCI_STATUS_CHROMAKEYCHANGED 16 -#define DCI_STATUS_WASSTILLDRAWING 32 +#define DCICOMMAND 3075 +#define DCI_VERSION 0x0100 + +#define DCICREATEPRIMARYSURFACE 1 +#define DCICREATEOFFSCREENSURFACE 2 +#define DCICREATEOVERLAYSURFACE 3 +#define DCIENUMSURFACE 4 +#define DCIESCAPE 5 + +#define DCI_OK 0 +#define DCI_FAIL_GENERIC -1 +#define DCI_FAIL_UNSUPPORTEDVERSION -2 +#define DCI_FAIL_INVALIDSURFACE -3 +#define DCI_FAIL_UNSUPPORTED -4 + +#define DCI_ERR_CURRENTLYNOTAVAIL -5 +#define DCI_ERR_INVALIDRECT -6 +#define DCI_ERR_UNSUPPORTEDFORMAT -7 +#define DCI_ERR_UNSUPPORTEDMASK -8 +#define DCI_ERR_TOOBIGHEIGHT -9 +#define DCI_ERR_TOOBIGWIDTH -10 +#define DCI_ERR_TOOBIGSIZE -11 +#define DCI_ERR_OUTOFMEMORY -12 +#define DCI_ERR_INVALIDPOSITION -13 +#define DCI_ERR_INVALIDSTRETCH -14 +#define DCI_ERR_INVALIDCLIPLIST -15 +#define DCI_ERR_SURFACEISOBSCURED -16 +#define DCI_ERR_XALIGN -17 +#define DCI_ERR_YALIGN -18 +#define DCI_ERR_XYALIGN -19 +#define DCI_ERR_WIDTHALIGN -20 +#define DCI_ERR_HEIGHTALIGN -21 + +#define DCI_STATUS_POINTERCHANGED 1 +#define DCI_STATUS_STRIDECHANGED 2 +#define DCI_STATUS_FORMATCHANGED 4 +#define DCI_STATUS_SURFACEINFOCHANGED 8 +#define DCI_STATUS_CHROMAKEYCHANGED 16 +#define DCI_STATUS_WASSTILLDRAWING 32 #define DCI_SUCCESS(error) (((DCIRVAL)error) >= 0) -/* DCI Capability Flags */ -#define DCI_SURFACE_TYPE 0x0000000F -#define DCI_PRIMARY 0x00000000 -#define DCI_OFFSCREEN 0x00000001 -#define DCI_OVERLAY 0x00000002 -#define DCI_VISIBLE 0x00000010 -#define DCI_CHROMAKEY 0x00000020 -#define DCI_1632_ACCESS 0x00000040 -#define DCI_DWORDSIZE 0x00000080 -#define DCI_DWORDALIGN 0x00000100 -#define DCI_WRITEONLY 0x00000200 -#define DCI_ASYNC 0x00000400 -#define DCI_CAN_STRETCHX 0x00001000 -#define DCI_CAN_STRETCHY 0x00002000 -#define DCI_CAN_STRETCHXY (DCI_CAN_STRETCHX | DCI_CAN_STRETCHY) -#define DCI_CAN_STRETCHXN 0x00004000 -#define DCI_CAN_STRETCHYN 0x00008000 -#define DCI_CAN_STRETCHXYN (DCI_CAN_STRETCHXN | DCI_CAN_STRETCHYN) -#define DCI_CANOVERLAY 0x00010000 - -/* DCI FOURCC definitions for extended DIB formats */ +#define DCI_SURFACE_TYPE 0x0000000F +#define DCI_PRIMARY 0x00000000 +#define DCI_OFFSCREEN 0x00000001 +#define DCI_OVERLAY 0x00000002 +#define DCI_VISIBLE 0x00000010 +#define DCI_CHROMAKEY 0x00000020 +#define DCI_1632_ACCESS 0x00000040 +#define DCI_DWORDSIZE 0x00000080 +#define DCI_DWORDALIGN 0x00000100 +#define DCI_WRITEONLY 0x00000200 +#define DCI_ASYNC 0x00000400 + +#define DCI_CAN_STRETCHX 0x00001000 +#define DCI_CAN_STRETCHY 0x00002000 +#define DCI_CAN_STRETCHXY (DCI_CAN_STRETCHX | DCI_CAN_STRETCHY) + +#define DCI_CAN_STRETCHXN 0x00004000 +#define DCI_CAN_STRETCHYN 0x00008000 +#define DCI_CAN_STRETCHXYN (DCI_CAN_STRETCHXN | DCI_CAN_STRETCHYN) + +#define DCI_CANOVERLAY 0x00010000 + + typedef int DCIRVAL; + + typedef struct _DCICMD { + DWORD dwCommand; + DWORD dwParam1; + DWORD dwParam2; + DWORD dwVersion; + DWORD dwReserved; + } DCICMD; + + typedef struct _DCICREATEINPUT { + DCICMD cmd; + DWORD dwCompression; + DWORD dwMask[3]; + DWORD dwWidth; + DWORD dwHeight; + DWORD dwDCICaps; + DWORD dwBitCount; + LPVOID lpSurface; + } DCICREATEINPUT,*LPDCICREATEINPUT; + + typedef struct _DCISURFACEINFO { + DWORD dwSize; + DWORD dwDCICaps; + DWORD dwCompression; + DWORD dwMask[3]; + DWORD dwWidth; + DWORD dwHeight; + LONG lStride; + DWORD dwBitCount; + ULONG_PTR dwOffSurface; + WORD wSelSurface; + WORD wReserved; + DWORD dwReserved1; + DWORD dwReserved2; + DWORD dwReserved3; + DCIRVAL (CALLBACK *BeginAccess) (LPVOID,LPRECT); + void (CALLBACK *EndAccess) (LPVOID); + void (CALLBACK *DestroySurface) (LPVOID); + } DCISURFACEINFO,*LPDCISURFACEINFO; + + typedef void (*ENUM_CALLBACK)(LPDCISURFACEINFO lpSurfaceInfo,LPVOID lpContext); + + typedef struct _DCIENUMINPUT { + DCICMD cmd; + RECT rSrc; + RECT rDst; + void (CALLBACK *EnumCallback)(LPDCISURFACEINFO,LPVOID); + LPVOID lpContext; + } DCIENUMINPUT,*LPDCIENUMINPUT; + + typedef DCISURFACEINFO DCIPRIMARY,*LPDCIPRIMARY; + + typedef struct _DCIOFFSCREEN { + DCISURFACEINFO dciInfo; + DCIRVAL (CALLBACK *Draw) (LPVOID); + DCIRVAL (CALLBACK *SetClipList) (LPVOID,LPRGNDATA); + DCIRVAL (CALLBACK *SetDestination) (LPVOID,LPRECT,LPRECT); + } DCIOFFSCREEN,*LPDCIOFFSCREEN; + + typedef struct _DCIOVERLAY { + DCISURFACEINFO dciInfo; + DWORD dwChromakeyValue; + DWORD dwChromakeyMask; + } DCIOVERLAY,*LPDCIOVERLAY; + #ifndef YVU9 #define YVU9 mmioFOURCC('Y','V','U','9') #endif @@ -87,107 +159,7 @@ extern "C" { #define Y211 mmioFOURCC('Y','2','1','1') #endif -#if (WINVER < 0x0400) - -#ifndef RDH_RECTANGLES - -typedef struct tagRECTL { - LONG left; - LONG top; - LONG right; - LONG bottom; -} RECTL, *PRECTL, NEAR* NPRECTL, FAR* LPRECTL, CONST FAR* LPCRECTL; - -#define RDH_RECTANGLES 0 - -typedef struct tagRGNDATAHEADER { - DWORD dwSize; - DWORD iType; - DWORD nCount; - DWORD nRgnSize; - RECTL rcBound; -} RGNDATAHEADER, *PRGNDATAHEADER, NEAR* NPRGNDATAHEADER, FAR* LPRGNDATAHEADER, CONST FAR* LPCRGNDATAHEADER; - -typedef struct tagRGNDATA { - RGNDATAHEADER rdh; - char Buffer[1]; -} RGNDATA, *PRGNDATA, NEAR* NPRGNDATA, FAR* LPRGNDATA, CONST FAR* LPCRGNDATA; - -#endif /* RDH_RECTANGLES */ - -#endif /* (WINVER < 0x0400) */ - -typedef int DCIRVAL; /* DCI callback return type */ - -/* Escape command structures */ - -typedef struct _DCICMD { - DWORD dwCommand; - DWORD dwParam1; - DWORD dwParam2; - DWORD dwVersion; - DWORD dwReserved; -} DCICMD,*LPDCICMD; - -typedef struct _DCICREATEINPUT { - DCICMD cmd; - DWORD dwCompression; - DWORD dwMask[3]; - DWORD dwWidth; - DWORD dwHeight; - DWORD dwDCICaps; - DWORD dwBitCount; - LPVOID lpSurface; -} DCICREATEINPUT, FAR *LPDCICREATEINPUT; - -typedef struct _DCISURFACEINFO { - DWORD dwSize; - DWORD dwDCICaps; - DWORD dwCompression; - DWORD dwMask[3]; - DWORD dwWidth; - DWORD dwHeight; - LONG lStride; - DWORD dwBitCount; - ULONG_PTR dwOffSurface; - WORD wSelSurface; - WORD wReserved; - DWORD dwReserved1; - DWORD dwReserved2; - DWORD dwReserved3; - DCIRVAL (CALLBACK *BeginAccess) (LPVOID, LPRECT); - void (CALLBACK *EndAccess) (LPVOID); - void (CALLBACK *DestroySurface) (LPVOID); -} DCISURFACEINFO, FAR *LPDCISURFACEINFO; - -typedef void -(*ENUM_CALLBACK)( - LPDCISURFACEINFO lpSurfaceInfo, - LPVOID lpContext); - -typedef struct _DCIENUMINPUT { - DCICMD cmd; - RECT rSrc; - RECT rDst; - void (CALLBACK *EnumCallback)(LPDCISURFACEINFO, LPVOID); - LPVOID lpContext; -} DCIENUMINPUT, FAR *LPDCIENUMINPUT; - -typedef DCISURFACEINFO DCIPRIMARY, FAR *LPDCIPRIMARY; - -typedef struct _DCIOFFSCREEN { - DCISURFACEINFO dciInfo; - DCIRVAL (CALLBACK *Draw) (LPVOID); - DCIRVAL (CALLBACK *SetClipList) (LPVOID, LPRGNDATA); - DCIRVAL (CALLBACK *SetDestination) (LPVOID, LPRECT, LPRECT); -} DCIOFFSCREEN, FAR *LPDCIOFFSCREEN; - -typedef struct _DCIOVERLAY{ - DCISURFACEINFO dciInfo; - DWORD dwChromakeyValue; - DWORD dwChromakeyMask; -} DCIOVERLAY, FAR *LPDCIOVERLAY; - #ifdef __cplusplus -} /* extern "C" */ +} +#endif #endif diff --git a/include/psdk/dciddi.h b/include/psdk/dciddi.h deleted file mode 100644 index f4a76c6e6d9..00000000000 --- a/include/psdk/dciddi.h +++ /dev/null @@ -1,185 +0,0 @@ -/* - * DCI driver interface - * - * Copyright (C) 2001 Ove Kaaven - * Copyright (C) 2008 Magnus Olsen, Aleksey Bragin - * - * 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 __INC_DCIDDI -#define __INC_DCIDDI - -#ifdef __cplusplus -extern "C" { -#endif - -/* DCI Command Escape */ -#define DCICOMMAND 3075 -#define DCI_VERSION 0x0100 - -#define DCICREATEPRIMARYSURFACE 1 -#define DCICREATEOFFSCREENSURFACE 2 -#define DCICREATEOVERLAYSURFACE 3 -#define DCIENUMSURFACE 4 -#define DCIESCAPE 5 - -typedef int DCIRVAL; /* DCI callback return type */ - -/* DCI Errors and success codes*/ -#define DCI_SUCCESS(error) (((DCIRVAL)error) >= 0) - -#define DCI_STATUS_POINTERCHANGED 1 -#define DCI_STATUS_STRIDECHANGED 2 -#define DCI_STATUS_FORMATCHANGED 4 -#define DCI_STATUS_SURFACEINFOCHANGED 8 -#define DCI_STATUS_CHROMAKEYCHANGED 16 -#define DCI_STATUS_WASSTILLDRAWING 32 - -#define DCI_OK 0 -#define DCI_FAIL_GENERIC -1 -#define DCI_FAIL_UNSUPPORTEDVERSION -2 -#define DCI_FAIL_INVALIDSURFACE -3 -#define DCI_FAIL_UNSUPPORTED -4 - -#define DCI_ERR_CURRENTLYNOTAVAIL -5 -#define DCI_ERR_INVALIDRECT -6 -#define DCI_ERR_UNSUPPORTEDFORMAT -7 -#define DCI_ERR_UNSUPPORTEDMASK -8 -#define DCI_ERR_TOOBIGHEIGHT -9 -#define DCI_ERR_TOOBIGWIDTH -10 -#define DCI_ERR_TOOBIGSIZE -11 -#define DCI_ERR_OUTOFMEMORY -12 -#define DCI_ERR_INVALIDPOSITION -13 -#define DCI_ERR_INVALIDSTRETCH -14 -#define DCI_ERR_INVALIDCLIPLIST -15 -#define DCI_ERR_SURFACEISOBSCURED -16 -#define DCI_ERR_XALIGN -17 -#define DCI_ERR_YALIGN -18 -#define DCI_ERR_XYALIGN -19 -#define DCI_ERR_WIDTHALIGN -20 -#define DCI_ERR_HEIGHTALIGN -21 - -/* Capabilities */ -#define DCI_SURFACE_TYPE 0x0000000F -#define DCI_PRIMARY 0x00000000 -#define DCI_OFFSCREEN 0x00000001 -#define DCI_OVERLAY 0x00000002 -#define DCI_VISIBLE 0x00000010 -#define DCI_CHROMAKEY 0x00000020 -#define DCI_1632_ACCESS 0x00000040 -#define DCI_DWORDSIZE 0x00000080 -#define DCI_DWORDALIGN 0x00000100 -#define DCI_WRITEONLY 0x00000200 -#define DCI_ASYNC 0x00000400 -#define DCI_CAN_STRETCHX 0x00001000 -#define DCI_CAN_STRETCHY 0x00002000 -#define DCI_CAN_STRETCHXY (DCI_CAN_STRETCHX | DCI_CAN_STRETCHY) -#define DCI_CAN_STRETCHXN 0x00004000 -#define DCI_CAN_STRETCHYN 0x00008000 -#define DCI_CAN_STRETCHXYN (DCI_CAN_STRETCHXN | DCI_CAN_STRETCHYN) -#define DCI_CANOVERLAY 0x00010000 - -/* FOURCC codes */ -#ifndef YVU9 -#define YVU9 mmioFOURCC('Y','V','U','9') -#endif -#ifndef Y411 -#define Y411 mmioFOURCC('Y','4','1','1') -#endif -#ifndef YUY2 -#define YUY2 mmioFOURCC('Y','U','Y','2') -#endif -#ifndef YVYU -#define YVYU mmioFOURCC('Y','V','Y','U') -#endif -#ifndef UYVY -#define UYVY mmioFOURCC('U','Y','V','Y') -#endif -#ifndef Y211 -#define Y211 mmioFOURCC('Y','2','1','1') -#endif - -/***************************************************************************** - * Escape command structures - */ -typedef struct _DCICMD { - DWORD dwCommand; - DWORD dwParam1; - DWORD dwParam2; - DWORD dwVersion; - DWORD dwReserved; -} DCICMD; - -typedef struct _DCICREATEINPUT { - DCICMD cmd; - DWORD dwCompression; - DWORD dwMask[3]; - DWORD dwWidth; - DWORD dwHeight; - DWORD dwDCICaps; - DWORD dwBitCount; - LPVOID lpSurface; -} DCICREATEINPUT, *LPDCICREATEINPUT; - -typedef struct _DCISURFACEINFO { - DWORD dwSize; - DWORD dwDCICaps; - DWORD dwCompression; - DWORD dwMask[3]; - DWORD dwWidth; - DWORD dwHeight; - LONG lStride; - DWORD dwBitCount; - ULONG_PTR dwOffSurface; - WORD wSelSurface; - WORD wReserved; - DWORD dwReserved1; - DWORD dwReserved2; - DWORD dwReserved3; - DCIRVAL (CALLBACK *BeginAccess)(LPVOID, LPRECT); - void (CALLBACK *EndAccess)(LPVOID); - void (CALLBACK *DestroySurface)(LPVOID); -} DCISURFACEINFO, *LPDCISURFACEINFO, DCIPRIMARY, *LPDCIPRIMARY; - -typedef void (*ENUM_CALLBACK)(LPDCISURFACEINFO lpSurfaceInfo, - LPVOID lpContext); - -typedef struct _DCIENUMINPUT { - DCICMD cmd; - RECT rSrc; - RECT rDst; - void (CALLBACK *EnumCallback)(LPDCISURFACEINFO, LPVOID); - LPVOID lpContext; -} DCIENUMINPUT, *LPDCIENUMINPUT; - -typedef struct _DCIOFFSCREEN { - DCISURFACEINFO dciInfo; - DCIRVAL (CALLBACK *Draw) (LPVOID); - DCIRVAL (CALLBACK *SetClipList) (LPVOID, LPRGNDATA); - DCIRVAL (CALLBACK *SetDestination) (LPVOID, LPRECT, LPRECT); -} DCIOFFSCREEN, *LPDCIOFFSCREEN; - -typedef struct _DCIOVERLAY { - DCISURFACEINFO dciInfo; - DWORD dwChromakeyValue; - DWORD dwChromakeyMask; -} DCIOVERLAY, *LPDCIOVERLAY; - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __INC_DCIDDI */