4 Dec
2005
4 Dec
'05
5:10 p.m.
delete wine header dxdiag.h for we have 100% correct one. Did not border
check see if wine header was correct or not
All most all dx header are being rewriting by me. adding dxsdkver.h
Deleted: trunk/reactos/w32api/include/dxdiag.h
Added: trunk/reactos/w32api/include/dxsdkver.h
Modified: trunk/reactos/w32api/include/evcode.h
_____
Deleted: trunk/reactos/w32api/include/dxdiag.h
--- trunk/reactos/w32api/include/dxdiag.h 2005-12-04 17:09:48 UTC
(rev 19877)
+++ trunk/reactos/w32api/include/dxdiag.h 2005-12-04 17:10:26 UTC
(rev 19878)
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2004 Raphael Junqueira
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
- */
-
-#ifndef __WINE_DXDIAG_H
-#define __WINE_DXDIAG_H
-
-#include <ole2.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* defined(__cplusplus) */
-
-/**********************************************************************
*******
- * #defines and error codes
- */
-#define DXDIAG_DX9_SDK_VERSION 111
-
-#define _FACDXDIAG 0x007
-#define MAKE_DXDIAGHRESULT( code ) MAKE_HRESULT( 1, _FACDXDIAG, code )
-
-/*
- * DXDiag Errors
- */
-#define DXDIAG_E_INSUFFICIENT_BUFFER MAKE_DXDIAGHRESULT(0x007A)
-
-
-/**********************************************************************
*******
- * DXDiag structures Typedefs
- */
-typedef struct _DXDIAG_INIT_PARAMS {
- DWORD dwSize;
- DWORD dwDxDiagHeaderVersion;
- BOOL bAllowWHQLChecks;
- VOID* pReserved;
-} DXDIAG_INIT_PARAMS;
-
-
-/**********************************************************************
*******
- * Predeclare the interfaces
- */
-/* CLSIDs */
-DEFINE_GUID(CLSID_DxDiagProvider, 0xA65B8071, 0x3BFE, 0x4213, 0x9A,
0x5B, 0x49, 0x1D, 0xA4, 0x46, 0x1C, 0xA7);
-
-/* IIDs */
-DEFINE_GUID(IID_IDxDiagProvider, 0x9C6B4CB0, 0x23F8, 0x49CC, 0xA3,
0xED, 0x45, 0xA5, 0x50, 0x00, 0xA6, 0xD2);
-DEFINE_GUID(IID_IDxDiagContainer, 0x7D0F462F, 0x4064, 0x4862, 0xBC,
0x7F, 0x93, 0x3E, 0x50, 0x58, 0xC1, 0x0F);
-
-/* typedef definitions */
-typedef struct IDxDiagProvider *LPDXDIAGPROVIDER, *PDXDIAGPROVIDER;
-typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER;
-
-/**********************************************************************
*******
- * IDxDiagContainer interface
- */
-#ifdef __WINESRC__
-#undef GetProp
-#endif
-
-#define INTERFACE IDxDiagContainer
-DECLARE_INTERFACE_(IDxDiagContainer,IUnknown)
-{
- /*** IUnknown methods ***/
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void**
ppvObject) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- /*** IDxDiagContainer methods ***/
- STDMETHOD(GetNumberOfChildContainers)(THIS_ DWORD* pdwCount) PURE;
- STDMETHOD(EnumChildContainerNames)(THIS_ DWORD dwIndex, LPWSTR
pwszContainer, DWORD cchContainer) PURE;
- STDMETHOD(GetChildContainer)(THIS_ LPCWSTR pwszContainer,
IDxDiagContainer** ppInstance) PURE;
- STDMETHOD(GetNumberOfProps)(THIS_ DWORD* pdwCount) PURE;
- STDMETHOD(EnumPropNames)(THIS_ DWORD dwIndex, LPWSTR pwszPropName,
DWORD cchPropName) PURE;
- STDMETHOD(GetProp)(THIS_ LPCWSTR pwszPropName, VARIANT* pvarProp)
PURE;
-};
-#undef INTERFACE
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-/*** IUnknown methods ***/
-#define IDxDiagContainer_QueryInterface(p,a,b)
(p)->lpVtbl->QueryInterface(p,a,b)
-#define IDxDiagContainer_AddRef(p)
(p)->lpVtbl->AddRef(p)
-#define IDxDiagContainer_Release(p)
(p)->lpVtbl->Release(p)
-/*** IDxDiagContainer methods ***/
-#define IDxDiagContainer_GetNumberOfChildContainers(p,a)
(p)->lpVtbl->GetNumberOfChildContainers(p,a)
-#define IDxDiagContainer_EnumChildContainerNames(p,a,b,c)
(p)->lpVtbl->EnumChildContainerNames(p,a,b,c)
-#define IDxDiagContainer_GetChildContainer(p,a,b)
(p)->lpVtbl->GetChildContainer(p,a,b)
-#define IDxDiagContainer_GetNumberOfProps(p,a)
(p)->lpVtbl->GetNumberOfProps(p,a)
-#define IDxDiagContainer_EnumPropNames(p,a,b,c)
(p)->lpVtbl->EnumPropNames(p,a,b,c)
-#define IDxDiagContainer_GetProp(p,a,b)
(p)->lpVtbl->GetProp(p,a,b)
-#else
-/*** IUnknown methods ***/
-#define IDxDiagContainer_QueryInterface(p,a,b)
(p)->QueryInterface(a,b)
-#define IDxDiagContainer_AddRef(p)
(p)->AddRef()
-#define IDxDiagContainer_Release(p)
(p)->Release()
-/*** IDxDiagContainer methods ***/
-#define IDxDiagContainer_GetNumberOfChildContainers(p,a)
(p)->GetNumberOfChildContainers(a)
-#define IDxDiagContainer_EnumChildContainerNames(p,a,b,c)
(p)->EnumChildContainerNames(a,b,c)
-#define IDxDiagContainer_GetChildContainer(p,a,b)
(p)->GetChildContainer(a,b)
-#define IDxDiagContainer_GetNumberOfProps(p,a)
(p)->GetNumberOfProps(a)
-#define IDxDiagContainer_EnumPropNames(p,a,b,c)
(p)->EnumPropNames(a,b,c)
-#define IDxDiagContainer_GetProp(p,a,b)
(p)->GetProp(a,b)
-#endif
-
-/**********************************************************************
*******
- * IDxDiagProvider interface
- */
-#define INTERFACE IDxDiagProvider
-DECLARE_INTERFACE_(IDxDiagProvider,IUnknown)
-{
- /*** IUnknown methods ***/
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void**
ppvObject) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- /*** IDxDiagProvider methods ***/
- STDMETHOD(Initialize)(THIS_ DXDIAG_INIT_PARAMS* pParams) PURE;
- STDMETHOD(GetRootContainer)(THIS_ IDxDiagContainer** ppInstance)
PURE;
-};
-#undef INTERFACE
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-/*** IUnknown methods ***/
-#define IDxDiagProvider_QueryInterface(p,a,b)
(p)->lpVtbl->QueryInterface(p,a,b)
-#define IDxDiagProvider_AddRef(p)
(p)->lpVtbl->AddRef(p)
-#define IDxDiagProvider_Release(p)
(p)->lpVtbl->Release(p)
-/*** IDxDiagProvider methods ***/
-#define IDxDiagProvider_Initialize(p,a)
(p)->lpVtbl->Initialize(p,a)
-#define IDxDiagProvider_GetRootContainer(p,a)
(p)->lpVtbl->GetRootContainer(p,a)
-#else
-/*** IUnknown methods ***/
-#define IDxDiagProvider_QueryInterface(p,a,b)
(p)->QueryInterface(a,b)
-#define IDxDiagProvider_AddRef(p)
(p)->AddRef()
-#define IDxDiagProvider_Release(p)
(p)->Release()
-/*** IDxDiagProvider methods ***/
-#define IDxDiagProvider_Initialize(p,a)
(p)->Initialize(a)
-#define IDxDiagProvider_GetRootContainer(p,a)
(p)->GetRootContainer(a)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
_____
Added: trunk/reactos/w32api/include/dxsdkver.h
--- trunk/reactos/w32api/include/dxsdkver.h 2005-12-04 17:09:48 UTC
(rev 19877)
+++ trunk/reactos/w32api/include/dxsdkver.h 2005-12-04 17:10:26 UTC
(rev 19878)
@@ -0,0 +1,10 @@
+
+#ifndef _DXSDKVER_H_
+#define _DXSDKVER_H_
+
+#define _DXSDK_PRODUCT_MAJOR 9
+#define _DXSDK_PRODUCT_MINOR 06
+#define _DXSDK_BUILD_MAJOR 168
+#define _DXSDK_BUILD_MINOR 0000
+#endif
+
Property changes on: trunk/reactos/w32api/include/dxsdkver.h
___________________________________________________________________
Name: svn:eol-style
+ native
_____
Modified: trunk/reactos/w32api/include/evcode.h
--- trunk/reactos/w32api/include/evcode.h 2005-12-04 17:09:48 UTC
(rev 19877)
+++ trunk/reactos/w32api/include/evcode.h 2005-12-04 17:10:26 UTC
(rev 19878)
@@ -43,4 +43,4 @@
#define EC_WMT_INDEX_EVENT EC_WMT_EVENT_BASE
#define EC_USER 0x8000
-#endif
\ No newline at end of file
+#endif