Author: tkreuzer Date: Mon Mar 29 04:48:28 2010 New Revision: 46548
URL: http://svn.reactos.org/svn/reactos?rev=46548&view=rev Log: Reintegrate header branch part 4/x - don't prepend ddk/ before the header includes - move atsmedia.h to psdk - add mce.h, devpropdef.h, evntprov.h, ntiologc.h to psdk - replace ntstatus.h
Added: trunk/reactos/include/ddk/mce.h - copied unchanged from r46492, trunk/reactos/include/ddk/mce.h trunk/reactos/include/psdk/atsmedia.h - copied unchanged from r46492, trunk/reactos/include/psdk/atsmedia.h trunk/reactos/include/psdk/devpropdef.h - copied unchanged from r46492, trunk/reactos/include/psdk/devpropdef.h trunk/reactos/include/psdk/evntprov.h - copied unchanged from r46492, trunk/reactos/include/psdk/evntprov.h trunk/reactos/include/psdk/ntiologc.h - copied unchanged from r46492, trunk/reactos/include/psdk/ntiologc.h trunk/reactos/include/psdk/ntstatus.h - copied unchanged from r46492, trunk/reactos/include/psdk/ntstatus.h trunk/reactos/include/psdk/tvout.h - copied unchanged from r46492, trunk/reactos/include/psdk/tvout.h Removed: trunk/reactos/include/ddk/atsmedia.h trunk/reactos/include/ddk/tvout.h Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h trunk/reactos/drivers/directx/dxg/dxg_int.h
Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/dxapi... ============================================================================== --- trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] Mon Mar 29 04:48:28 2010 @@ -1,10 +1,10 @@
/* DDK/NDK/SDK Headers */ -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/ntifs.h> -#include <ddk/tvout.h> -#include <ndk/ntndk.h> +#include <ntddk.h> +#include <ntddmou.h> +#include <ntifs.h> +#include <tvout.h> +#include <ntndk.h>
#include <stdarg.h> #include <windef.h> @@ -16,7 +16,7 @@ #include <dde.h>
-#include <ddk/ddkmapi.h> +#include <ddkmapi.h>
/* Prototypes */ VOID DxGetVersionNumber(PVOID lpvInBuffer, LPDDGETVERSIONNUMBER lpvOutBuffer);
Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_int... ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] Mon Mar 29 04:48:28 2010 @@ -1,9 +1,9 @@ /* DDK/NDK/SDK Headers */ -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/ntifs.h> -#include <ddk/tvout.h> -#include <ndk/ntndk.h> +#include <ntddk.h> +#include <ntddmou.h> +#include <ntifs.h> +#include <tvout.h> +#include <ntndk.h>
/* Win32 Headers */ #define WINBASEAPI
Removed: trunk/reactos/include/ddk/atsmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/atsmedia.h?rev=... ============================================================================== --- trunk/reactos/include/ddk/atsmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/atsmedia.h (removed) @@ -1,17 +1,0 @@ - -/* $Id: $ - * - * COPYRIGHT: This file is in the public domain. - * PROJECT: ReactOS kernel - * FILE: - * PURPOSE: headers - * PROGRAMMER: Magnus Olsen (greatlrd) - * - */ - -#if !defined(_ATSCMEDIA_) -#define _ATSCMEDIA_ -#define BDANETWORKTYPE_ATSC DEFINE_GUIDNAMED(BDANETWORKTYPE_ATSC) -#define STATIC_BDANETWORKTYPE_ATSC 0x71985F51, 0x1CA1, 0x11D3, 0x9C, 0xC8, 0x0, 0xC0, 0x4F, 0x79, 0x71, 0xE0 -DEFINE_GUIDSTRUCT("71985F51-1CA1-11D3-9CC8-00C04F7971E0", BDANETWORKTYPE_ATSC); -#endif
Removed: trunk/reactos/include/ddk/tvout.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tvout.h?rev=465... ============================================================================== --- trunk/reactos/include/ddk/tvout.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/tvout.h (removed) @@ -1,113 +1,0 @@ -/* - * tvout.h - * - * Definitions for TV-out support - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup chorns@users.sourceforge.net - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __TVOUT_H -#define __TVOUT_H - - -#if _MSC_VER > 1000 -#pragma once -#endif - - -#ifndef GUID_DEFINED -#include <guiddef.h> -#endif - -/* VIDEOPARAMETERS.dwCommand constants */ -#define VP_COMMAND_GET 0x00000001 -#define VP_COMMAND_SET 0x00000002 - -/* VIDEOPARAMETERS.dwFlags constants */ -#define VP_FLAGS_TV_MODE 0x00000001 -#define VP_FLAGS_TV_STANDARD 0x00000002 -#define VP_FLAGS_FLICKER 0x00000004 -#define VP_FLAGS_OVERSCAN 0x00000008 -#define VP_FLAGS_MAX_UNSCALED 0x00000010 -#define VP_FLAGS_POSITION 0x00000020 -#define VP_FLAGS_BRIGHTNESS 0x00000040 -#define VP_FLAGS_CONTRAST 0x00000080 -#define VP_FLAGS_COPYPROTECT 0x00000100 - -/* VIDEOPARAMETERS.dwMode constants */ -#define VP_MODE_WIN_GRAPHICS 0x00000001 -#define VP_MODE_TV_PLAYBACK 0x00000002 - -/* VIDEOPARAMETERS.dwTVStandard/dwAvailableTVStandard constants */ -#define VP_TV_STANDARD_NTSC_M 0x00000001 -#define VP_TV_STANDARD_NTSC_M_J 0x00000002 -#define VP_TV_STANDARD_PAL_B 0x00000004 -#define VP_TV_STANDARD_PAL_D 0x00000008 -#define VP_TV_STANDARD_PAL_H 0x00000010 -#define VP_TV_STANDARD_PAL_I 0x00000020 -#define VP_TV_STANDARD_PAL_M 0x00000040 -#define VP_TV_STANDARD_PAL_N 0x00000080 -#define VP_TV_STANDARD_SECAM_B 0x00000100 -#define VP_TV_STANDARD_SECAM_D 0x00000200 -#define VP_TV_STANDARD_SECAM_G 0x00000400 -#define VP_TV_STANDARD_SECAM_H 0x00000800 -#define VP_TV_STANDARD_SECAM_K 0x00001000 -#define VP_TV_STANDARD_SECAM_K1 0x00002000 -#define VP_TV_STANDARD_SECAM_L 0x00004000 -#define VP_TV_STANDARD_WIN_VGA 0x00008000 -#define VP_TV_STANDARD_NTSC_433 0x00010000 -#define VP_TV_STANDARD_PAL_G 0x00020000 -#define VP_TV_STANDARD_PAL_60 0x00040000 -#define VP_TV_STANDARD_SECAM_L1 0x00080000 - -/* VIDEOPARAMETERS.dwMode constants */ -#define VP_CP_TYPE_APS_TRIGGER 0x00000001 -#define VP_CP_TYPE_MACROVISION 0x00000002 - -/* VIDEOPARAMETERS.dwCPCommand constants */ -#define VP_CP_CMD_ACTIVATE 0x00000001 -#define VP_CP_CMD_DEACTIVATE 0x00000002 -#define VP_CP_CMD_CHANGE 0x00000004 - -typedef struct _VIDEOPARAMETERS { - GUID Guid; - ULONG dwOffset; - ULONG dwCommand; - ULONG dwFlags; - ULONG dwMode; - ULONG dwTVStandard; - ULONG dwAvailableModes; - ULONG dwAvailableTVStandard; - ULONG dwFlickerFilter; - ULONG dwOverScanX; - ULONG dwOverScanY; - ULONG dwMaxUnscaledX; - ULONG dwMaxUnscaledY; - ULONG dwPositionX; - ULONG dwPositionY; - ULONG dwBrightness; - ULONG dwContrast; - ULONG dwCPType; - ULONG dwCPCommand; - ULONG dwCPStandard; - ULONG dwCPKey; - ULONG bCP_APSTriggerBits; - UCHAR bOEMCopyProtection[256]; -} VIDEOPARAMETERS, *PVIDEOPARAMETERS, FAR *LPVIDEOPARAMETERS; - - -#endif /* __TVOUT_H */