[ros-diffs] [akhaldi] 70864: [PSDK] Update some D3D10 related headers. CORE-10912

Author: akhaldi
Date: Wed Mar  2 10:41:10 2016
New Revision: 70864

URL: http://svn.reactos.org/svn/reactos?rev=70864&view=rev
Log:
[PSDK] Update some D3D10 related headers. CORE-10912

Modified:
    trunk/reactos/include/psdk/d3d10.idl
    trunk/reactos/include/psdk/d3d10effect.h
    trunk/reactos/include/psdk/d3d10misc.h
    trunk/reactos/include/psdk/d3d10shader.h

Modified: trunk/reactos/include/psdk/d3d10.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d10.idl?rev…
==============================================================================
--- trunk/reactos/include/psdk/d3d10.idl	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/d3d10.idl	[iso-8859-1] Wed Mar  2 10:41:10 2016
@@ -795,8 +795,9 @@
     UINT SysMemSlicePitch;
 } D3D10_SUBRESOURCE_DATA;
 
-typedef struct D3D10_SO_DECLARATION_ENTRY {
-    LPCSTR SemanticName;
+typedef struct D3D10_SO_DECLARATION_ENTRY
+{
+    const char *SemanticName;
     UINT SemanticIndex;
     BYTE StartComponent;
     BYTE ComponentCount;
@@ -808,8 +809,9 @@
     D3D10_INPUT_PER_INSTANCE_DATA,
 } D3D10_INPUT_CLASSIFICATION;
 
-typedef struct D3D10_INPUT_ELEMENT_DESC {
-    LPCSTR SemanticName;
+typedef struct D3D10_INPUT_ELEMENT_DESC
+{
+    const char *SemanticName;
     UINT SemanticIndex;
     DXGI_FORMAT Format;
     UINT InputSlot;
@@ -1559,11 +1561,11 @@
             [in] const D3D10_COUNTER_DESC *pDesc,
             [out] D3D10_COUNTER_TYPE *pType,
             [out] UINT *pActiveCounters,
-            [out] LPSTR szName,
+            [out] char *name,
             [in, out] UINT *pNameLength,
-            [out] LPSTR szUnits,
+            [out] char *units,
             [in, out] UINT *pUnitsLength,
-            [out] LPSTR szDescription,
+            [out] char *description,
             [in, out] UINT *pDescriptionLength);
         UINT GetCreationFlags();
         HRESULT OpenSharedResource(

Modified: trunk/reactos/include/psdk/d3d10effect.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d10effect.h…
==============================================================================
--- trunk/reactos/include/psdk/d3d10effect.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/d3d10effect.h	[iso-8859-1] Wed Mar  2 10:41:10 2016
@@ -60,7 +60,7 @@
 
 typedef struct _D3D10_EFFECT_TYPE_DESC
 {
-    LPCSTR TypeName;
+    const char *TypeName;
     D3D10_SHADER_VARIABLE_CLASS Class;
     D3D10_SHADER_VARIABLE_TYPE Type;
     UINT Elements;
@@ -74,8 +74,8 @@
 
 typedef struct _D3D10_EFFECT_VARIABLE_DESC
 {
-    LPCSTR Name;
-    LPCSTR Semantic;
+    const char *Name;
+    const char *Semantic;
     UINT Flags;
     UINT Annotations;
     UINT BufferOffset;
@@ -84,7 +84,7 @@
 
 typedef struct _D3D10_TECHNIQUE_DESC
 {
-    LPCSTR Name;
+    const char *Name;
     UINT Passes;
     UINT Annotations;
 } D3D10_TECHNIQUE_DESC;
@@ -133,14 +133,14 @@
     BOOL IsInline;
     const BYTE *pBytecode;
     UINT BytecodeLength;
-    LPCSTR SODecl;
+    const char *SODecl;
     UINT NumInputSignatureEntries;
     UINT NumOutputSignatureEntries;
 } D3D10_EFFECT_SHADER_DESC;
 
 typedef struct _D3D10_PASS_DESC
 {
-    LPCSTR Name;
+    const char *Name;
     UINT Annotations;
     BYTE *pIAInputSignature;
     SIZE_T IAInputSignatureSize;
@@ -167,10 +167,10 @@
     STDMETHOD_(BOOL, IsValid)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_TYPE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeBySemantic)(THIS_ LPCSTR semantic)
PURE;
-    STDMETHOD_(LPCSTR, GetMemberName)(THIS_ UINT index) PURE;
-    STDMETHOD_(LPCSTR, GetMemberSemantic)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeBySemantic)(THIS_ const char
*semantic) PURE;
+    STDMETHOD_(const char *, GetMemberName)(THIS_ UINT index) PURE;
+    STDMETHOD_(const char *, GetMemberSemantic)(THIS_ UINT index) PURE;
 };
 #undef INTERFACE
 
@@ -183,10 +183,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -217,10 +217,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -256,10 +256,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -303,10 +303,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -350,10 +350,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -393,10 +393,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -415,8 +415,8 @@
     STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE;
     /* ID3D10EffectStringVariable methods */
-    STDMETHOD(GetString)(THIS_ LPCSTR *str) PURE;
-    STDMETHOD(GetStringArray)(THIS_ LPCSTR *strs, UINT offset, UINT count) PURE;
+    STDMETHOD(GetString)(THIS_ const char **str) PURE;
+    STDMETHOD(GetStringArray)(THIS_ const char **strs, UINT offset, UINT count) PURE;
 };
 #undef INTERFACE
 
@@ -431,10 +431,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -471,10 +471,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -511,10 +511,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -550,10 +550,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -593,10 +593,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -631,10 +631,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -669,10 +669,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -707,10 +707,10 @@
     STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE;
     STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE;
@@ -742,9 +742,9 @@
     STDMETHOD_(BOOL, IsValid)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_TECHNIQUE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
     STDMETHOD_(struct ID3D10EffectPass *, GetPassByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10EffectPass *, GetPassByName)(THIS_ LPCSTR name) PURE;
+    STDMETHOD_(struct ID3D10EffectPass *, GetPassByName)(THIS_ const char *name) PURE;
     STDMETHOD(ComputeStateBlockMask)(THIS_ D3D10_STATE_BLOCK_MASK *mask) PURE;
 };
 #undef INTERFACE
@@ -755,7 +755,7 @@
 DECLARE_INTERFACE_(ID3D10Effect, IUnknown)
 {
     /* IUnknown methods */
-    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE;
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
     STDMETHOD_(ULONG, AddRef)(THIS) PURE;
     STDMETHOD_(ULONG, Release)(THIS) PURE;
     /* ID3D10Effect methods */
@@ -764,12 +764,12 @@
     STDMETHOD(GetDevice)(THIS_ ID3D10Device **device) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT
index) PURE;
-    STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetConstantBufferByName)(THIS_ LPCSTR
name) PURE;
+    STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetConstantBufferByName)(THIS_ const
char *name) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetVariableByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetVariableByName)(THIS_ LPCSTR name)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetVariableBySemantic)(THIS_ LPCSTR
semantic) PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetVariableByName)(THIS_ const char *name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetVariableBySemantic)(THIS_ const char
*semantic) PURE;
     STDMETHOD_(struct ID3D10EffectTechnique *, GetTechniqueByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectTechnique *, GetTechniqueByName)(THIS_ LPCSTR name)
PURE;
+    STDMETHOD_(struct ID3D10EffectTechnique *, GetTechniqueByName)(THIS_ const char
*name) PURE;
     STDMETHOD(Optimize)(THIS) PURE;
     STDMETHOD_(BOOL, IsOptimized)(THIS) PURE;
 };
@@ -781,7 +781,7 @@
 DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown)
 {
     /* IUnknown methods */
-    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE;
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
     STDMETHOD_(ULONG, AddRef)(THIS) PURE;
     STDMETHOD_(ULONG, Release)(THIS) PURE;
     /* ID3D10EffectPool methods */
@@ -800,7 +800,7 @@
     STDMETHOD(GetGeometryShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *desc) PURE;
     STDMETHOD(GetPixelShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index)
PURE;
-    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name)
PURE;
+    STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ const char
*name) PURE;
     STDMETHOD(Apply)(THIS_ UINT flags) PURE;
     STDMETHOD(ComputeStateBlockMask)(THIS_ D3D10_STATE_BLOCK_MASK *mask) PURE;
 };

Modified: trunk/reactos/include/psdk/d3d10misc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d10misc.h?r…
==============================================================================
--- trunk/reactos/include/psdk/d3d10misc.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/d3d10misc.h	[iso-8859-1] Wed Mar  2 10:41:10 2016
@@ -30,6 +30,7 @@
     D3D10_DRIVER_TYPE_REFERENCE = 1,
     D3D10_DRIVER_TYPE_NULL      = 2,
     D3D10_DRIVER_TYPE_SOFTWARE  = 3,
+    D3D10_DRIVER_TYPE_WARP      = 5,
 } D3D10_DRIVER_TYPE;
 
 HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,

Modified: trunk/reactos/include/psdk/d3d10shader.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d10shader.h…
==============================================================================
--- trunk/reactos/include/psdk/d3d10shader.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/d3d10shader.h	[iso-8859-1] Wed Mar  2 10:41:10 2016
@@ -72,7 +72,7 @@
 
 typedef struct _D3D10_SHADER_INPUT_BIND_DESC
 {
-    LPCSTR Name;
+    const char *Name;
     D3D10_SHADER_INPUT_TYPE Type;
     UINT BindPoint;
     UINT BindCount;
@@ -84,7 +84,7 @@
 
 typedef struct _D3D10_SIGNATURE_PARAMETER_DESC
 {
-    LPCSTR SemanticName;
+    const char *SemanticName;
     UINT SemanticIndex;
     UINT Register;
     D3D10_NAME SystemValueType;
@@ -96,7 +96,7 @@
 typedef struct _D3D10_SHADER_DESC
 {
     UINT Version;
-    LPCSTR Creator;
+    const char *Creator;
     UINT Flags;
     UINT ConstantBuffers;
     UINT BoundResources;
@@ -127,7 +127,7 @@
 
 typedef struct _D3D10_SHADER_BUFFER_DESC
 {
-    LPCSTR Name;
+    const char *Name;
     D3D10_CBUFFER_TYPE Type;
     UINT Variables;
     UINT Size;
@@ -136,11 +136,11 @@
 
 typedef struct _D3D10_SHADER_VARIABLE_DESC
 {
-    LPCSTR Name;
+    const char *Name;
     UINT StartOffset;
     UINT Size;
     UINT uFlags;
-    LPVOID DefaultValue;
+    void *DefaultValue;
 } D3D10_SHADER_VARIABLE_DESC;
 
 typedef struct _D3D10_SHADER_TYPE_DESC
@@ -161,8 +161,8 @@
 {
     STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_TYPE_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByIndex)(THIS_ UINT
index) PURE;
-    STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByName)(THIS_ LPCSTR
name) PURE;
-    STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ UINT index) PURE;
+    STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByName)(THIS_ const char
*name) PURE;
+    STDMETHOD_(const char *, GetMemberTypeName)(THIS_ UINT index) PURE;
 };
 #undef INTERFACE
 
@@ -183,7 +183,7 @@
 {
     STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_BUFFER_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByIndex)(THIS_ UINT
index) PURE;
-    STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR
name) PURE;
+    STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ const
char *name) PURE;
 };
 #undef INTERFACE
 
@@ -193,13 +193,13 @@
 DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown)
 {
     /* IUnknown methods */
-    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE;
+    STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
     STDMETHOD_(ULONG, AddRef)(THIS) PURE;
     STDMETHOD_(ULONG, Release)(THIS) PURE;
     /* ID3D10ShaderReflection methods */
     STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_DESC *desc) PURE;
     STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *,
GetConstantBufferByIndex)(THIS_ UINT index) PURE;
-    STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *,
GetConstantBufferByName)(THIS_ LPCSTR name) PURE;
+    STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *,
GetConstantBufferByName)(THIS_ const char *name) PURE;
     STDMETHOD(GetResourceBindingDesc)(THIS_ UINT index, D3D10_SHADER_INPUT_BIND_DESC
*desc) PURE;
     STDMETHOD(GetInputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC
*desc) PURE;
     STDMETHOD(GetOutputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC
*desc) PURE;
@@ -211,14 +211,14 @@
 extern "C" {
 #endif
 
-HRESULT WINAPI D3D10CompileShader(LPCSTR data, SIZE_T data_size, LPCSTR filename,
-        const D3D10_SHADER_MACRO *defines, ID3D10Include *include, LPCSTR entrypoint,
-        LPCSTR profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages);
+HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char
*filename,
+        const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char
*entrypoint,
+        const char *profile, UINT flags, ID3D10Blob **shader, ID3D10Blob
**error_messages);
 HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size,
         BOOL color_code, const char *comments, ID3D10Blob **disassembly);
-LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device);
-LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device);
-LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);
+const char * WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device);
+const char * WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device);
+const char * WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);
 
 HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size,
ID3D10ShaderReflection **reflector);
 HRESULT WINAPI D3D10GetInputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob
**blob);