winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2010
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
866 discussions
Start a n
N
ew thread
Rico Schüller : d3dcompiler: Add stub ID3D11ShaderReflection interface.
by Alexandre Julliard
02 Nov '10
02 Nov '10
Module: wine Branch: master Commit: a7cf4d16fada5d76ba3c570e2eb21543f7249794 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a7cf4d16fada5d76ba3c570e2…
Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Nov 1 22:18:56 2010 +0100 d3dcompiler: Add stub ID3D11ShaderReflection interface. --- dlls/d3dcompiler_43/Makefile.in | 1 + dlls/d3dcompiler_43/d3dcompiler_43_main.c | 18 ++- dlls/d3dcompiler_43/d3dcompiler_private.h | 8 + dlls/d3dcompiler_43/reflection.c | 243 +++++++++++++++++++++++++++++ 4 files changed, 269 insertions(+), 1 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7cf4d16fada5d76ba3c5…
1
0
0
0
Rico Schüller : dxguid: Add shader and dx11 includes to dx10guid.c.
by Alexandre Julliard
02 Nov '10
02 Nov '10
Module: wine Branch: master Commit: 257c4b687a37f99c12fdc160bf15edcfd58a96bb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=257c4b687a37f99c12fdc160b…
Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Nov 1 22:18:53 2010 +0100 dxguid: Add shader and dx11 includes to dx10guid.c. --- dlls/dxguid/dx10guid.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/dxguid/dx10guid.c b/dlls/dxguid/dx10guid.c index de6490f..1d07a4d 100644 --- a/dlls/dxguid/dx10guid.c +++ b/dlls/dxguid/dx10guid.c @@ -31,4 +31,7 @@ #include "olectl.h" #include "initguid.h" -#include "d3d10.h" +#include "d3d10_1.h" +#include "d3d11.h" +#include "d3d10_1shader.h" +#include "d3d11shader.h"
1
0
0
0
Rico Schüller : include: Add ID3D10ShaderReflection1 interface.
by Alexandre Julliard
02 Nov '10
02 Nov '10
Module: wine Branch: master Commit: 5fb34ab4e2a17bcbf1e24a40ad1eca2a0eacc782 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5fb34ab4e2a17bcbf1e24a40a…
Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Nov 1 22:18:49 2010 +0100 include: Add ID3D10ShaderReflection1 interface. --- include/Makefile.in | 1 + include/d3d10_1shader.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 70fa9f0..d112efa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -151,6 +151,7 @@ SRCDIR_INCLUDES = \ custcntl.h \ cvconst.h \ d3d.h \ + d3d10_1shader.h \ d3d10effect.h \ d3d10misc.h \ d3d10shader.h \ diff --git a/include/d3d10_1shader.h b/include/d3d10_1shader.h new file mode 100644 index 0000000..6eda20c --- /dev/null +++ b/include/d3d10_1shader.h @@ -0,0 +1,52 @@ +/* + * Copyright 2010 Rico Schüller + * + * 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 __D3D10_1SHADER_H__ +#define __D3D10_1SHADER_H__ + +#include "d3d10shader.h" + +DEFINE_GUID(IID_ID3D10ShaderReflection1, 0xc3457783, 0xa846, 0x47ce, 0x95, 0x20, 0xce, 0xa6, 0xf6, 0x6e, 0x74, 0x47); + +#define INTERFACE ID3D10ShaderReflection1 +DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown) +{ + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* ID3D10ShaderReflection1 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(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; + STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE; + STDMETHOD(GetResourceBindingDescByName)(THIS_ LPCSTR name, D3D10_SHADER_INPUT_BIND_DESC *desc) PURE; + STDMETHOD(GetMovInstructionCount)(THIS_ UINT *count) PURE; + STDMETHOD(GetMovcInstructionCount)(THIS_ UINT *count) PURE; + STDMETHOD(GetConversionInstructionCount)(THIS_ UINT *count) PURE; + STDMETHOD(GetBitwiseInstructionCount)(THIS_ UINT *count) PURE; + STDMETHOD(GetGSInputPrimitive)(THIS_ D3D10_PRIMITIVE *prim) PURE; + STDMETHOD(IsLevel9Shader)(THIS_ BOOL *level9shader) PURE; + STDMETHOD(IsSampleFrequencyShader)(THIS_ BOOL *samplefrequency) PURE; +}; +#undef INTERFACE + +#endif
1
0
0
0
Rico Schüller : include: Add ID3D11ShaderReflection interface.
by Alexandre Julliard
02 Nov '10
02 Nov '10
Module: wine Branch: master Commit: d37b3c8280f2eb78fda91b4b21d8aa1014ecedf5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d37b3c8280f2eb78fda91b4b2…
Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Nov 1 22:18:45 2010 +0100 include: Add ID3D11ShaderReflection interface. --- include/d3d11shader.h | 180 +++++++++++++++++++++++++++++++++++++++++++++++++ include/d3dcommon.idl | 50 ++++++++++++++ include/d3dx9effect.h | 1 + 3 files changed, 231 insertions(+), 0 deletions(-) diff --git a/include/d3d11shader.h b/include/d3d11shader.h index f6d4b31..6a0ee51 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -21,8 +21,188 @@ #include "d3dcommon.h" +/* These are defined as version-neutral in d3dcommon.h */ typedef D3D_CBUFFER_TYPE D3D11_CBUFFER_TYPE; typedef D3D_RESOURCE_RETURN_TYPE D3D11_RESOURCE_RETURN_TYPE; +typedef D3D_TESSELLATOR_DOMAIN D3D11_TESSELLATOR_DOMAIN; + +typedef D3D_TESSELLATOR_PARTITIONING D3D11_TESSELLATOR_PARTITIONING; + +typedef D3D_TESSELLATOR_OUTPUT_PRIMITIVE D3D11_TESSELLATOR_OUTPUT_PRIMITIVE; + +typedef struct _D3D11_SHADER_DESC +{ + UINT Version; + LPCSTR Creator; + UINT Flags; + UINT ConstantBuffers; + UINT BoundResources; + UINT InputParameters; + UINT OutputParameters; + UINT InstructionCount; + UINT TempRegisterCount; + UINT TempArrayCount; + UINT DefCount; + UINT DclCount; + UINT TextureNormalInstructions; + UINT TextureLoadInstructions; + UINT TextureCompInstructions; + UINT TextureBiasInstructions; + UINT TextureGradientInstructions; + UINT FloatInstructionCount; + UINT IntInstructionCount; + UINT UintInstructionCount; + UINT StaticFlowControlCount; + UINT DynamicFlowControlCount; + UINT MacroInstructionCount; + UINT ArrayInstructionCount; + UINT CutInstructionCount; + UINT EmitInstructionCount; + D3D_PRIMITIVE_TOPOLOGY GSOutputTopology; + UINT GSMaxOutputVertexCount; + D3D_PRIMITIVE InputPrimitive; + UINT PatchConstantParameters; + UINT cGSInstanceCount; + UINT cControlPoints; + D3D_TESSELLATOR_OUTPUT_PRIMITIVE HSOutputPrimitive; + D3D_TESSELLATOR_PARTITIONING HSPartitioning; + D3D_TESSELLATOR_DOMAIN TessellatorDomain; + UINT cBarrierInstructions; + UINT cInterlockedInstructions; + UINT cTextureStoreInstructions; +} D3D11_SHADER_DESC; + +typedef struct _D3D11_SHADER_VARIABLE_DESC +{ + LPCSTR Name; + UINT StartOffset; + UINT Size; + UINT uFlags; + LPVOID DefaultValue; + UINT StartTexture; + UINT TextureSize; + UINT StartSampler; + UINT SamplerSize; +} D3D11_SHADER_VARIABLE_DESC; + +typedef struct _D3D11_SHADER_TYPE_DESC +{ + D3D_SHADER_VARIABLE_CLASS Class; + D3D_SHADER_VARIABLE_TYPE Type; + UINT Rows; + UINT Columns; + UINT Elements; + UINT Members; + UINT Offset; + LPCSTR Name; +} D3D11_SHADER_TYPE_DESC; + +typedef struct _D3D11_SHADER_BUFFER_DESC +{ + LPCSTR Name; + D3D_CBUFFER_TYPE Type; + UINT Variables; + UINT Size; + UINT uFlags; +} D3D11_SHADER_BUFFER_DESC; + +typedef struct _D3D11_SHADER_INPUT_BIND_DESC +{ + LPCSTR Name; + D3D_SHADER_INPUT_TYPE Type; + UINT BindPoint; + UINT BindCount; + UINT uFlags; + D3D_RESOURCE_RETURN_TYPE ReturnType; + D3D_SRV_DIMENSION Dimension; + UINT NumSamples; +} D3D11_SHADER_INPUT_BIND_DESC; + +typedef struct _D3D11_SIGNATURE_PARAMETER_DESC +{ + LPCSTR SemanticName; + UINT SemanticIndex; + UINT Register; + D3D_NAME SystemValueType; + D3D_REGISTER_COMPONENT_TYPE ComponentType; + BYTE Mask; + BYTE ReadWriteMask; + UINT Stream; +} D3D11_SIGNATURE_PARAMETER_DESC; + +DEFINE_GUID(IID_ID3D11ShaderReflectionType, 0x6e6ffa6a, 0x9bae, 0x4613, 0xa5, 0x1e, 0x91, 0x65, 0x2d, 0x50, 0x8c, 0x21); + +#define INTERFACE ID3D11ShaderReflectionType +DECLARE_INTERFACE(ID3D11ShaderReflectionType) +{ + STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_TYPE_DESC *desc) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetMemberTypeByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetMemberTypeByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ UINT index) PURE; + STDMETHOD(IsEqual)(THIS_ struct ID3D11ShaderReflectionType *type) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetSubType)(THIS) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetBaseClass)(THIS) PURE; + STDMETHOD_(UINT, GetNumInterfaces)(THIS) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetInterfaceByIndex)(THIS_ UINT index) PURE; + STDMETHOD(IsOfType)(THIS_ struct ID3D11ShaderReflectionType *type) PURE; + STDMETHOD(ImplementsInterface)(THIS_ ID3D11ShaderReflectionType *base) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_ID3D11ShaderReflectionVariable, 0x51f23923, 0xf3e5, 0x4bd1, 0x91, 0xcb, 0x60, 0x61, 0x77, 0xd8, 0xdb, 0x4c); + +#define INTERFACE ID3D11ShaderReflectionVariable +DECLARE_INTERFACE(ID3D11ShaderReflectionVariable) +{ + STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionType *, GetType)(THIS) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionConstantBuffer *, GetBuffer)(THIS) PURE; + STDMETHOD_(UINT, GetInterfaceSlot)(THIS_ UINT index) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_ID3D11ShaderReflectionConstantBuffer, 0xeb62d63d, 0x93dd, 0x4318, 0x8a, 0xe8, 0xc6, 0xf8, 0x3a, 0xd3, 0x71, 0xb8); + +#define INTERFACE ID3D11ShaderReflectionConstantBuffer +DECLARE_INTERFACE(ID3D11ShaderReflectionConstantBuffer) +{ + STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_BUFFER_DESC *desc) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionVariable *, GetVariableByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_ID3D11ShaderReflection, 0x0a233719, 0x3960, 0x4578, 0x9d, 0x7c, 0x20, 0x3b, 0x8b, 0x1d, 0x9c, 0xc1); + +#define INTERFACE ID3D11ShaderReflection +DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) +{ + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* ID3D11ShaderReflection methods */ + STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_DESC *desc) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ LPCSTR name) PURE; + STDMETHOD(GetResourceBindingDesc)(THIS_ UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc) PURE; + STDMETHOD(GetInputParameterDesc)(THIS_ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) PURE; + STDMETHOD(GetOutputParameterDesc)(THIS_ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) PURE; + STDMETHOD(GetPatchConstantParameterDesc)(THIS_ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) PURE; + STDMETHOD_(struct ID3D11ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE; + STDMETHOD(GetResourceBindingDescByName)(THIS_ LPCSTR name, D3D11_SHADER_INPUT_BIND_DESC *desc) PURE; + STDMETHOD_(UINT, GetMovInstructionCount)(THIS) PURE; + STDMETHOD_(UINT, GetMovcInstructionCount)(THIS) PURE; + STDMETHOD_(UINT, GetConversionInstructionCount)(THIS) PURE; + STDMETHOD_(UINT, GetBitwiseInstructionCount)(THIS) PURE; + STDMETHOD_(D3D_PRIMITIVE, GetGSInputPrimitive)(THIS) PURE; + STDMETHOD_(BOOL, IsSampleFrequencyShader)(THIS) PURE; + STDMETHOD_(UINT, GetNumInterfaceSlots)(THIS) PURE; + STDMETHOD(GetMinFeatureLevel)(THIS_ enum D3D_FEATURE_LEVEL *level) PURE; + STDMETHOD_(UINT, GetThreadGroupSize)(THIS_ UINT *sizex, UINT *sizey, UINT *sizez) PURE; +}; +#undef INTERFACE + #endif diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 24649a7..598abd5 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -68,6 +68,16 @@ interface ID3DInclude typedef ID3DInclude* LPD3DINCLUDE; +typedef enum D3D_FEATURE_LEVEL +{ + D3D_FEATURE_LEVEL_9_1 = 0x9100, + D3D_FEATURE_LEVEL_9_2 = 0x9200, + D3D_FEATURE_LEVEL_9_3 = 0x9300, + D3D_FEATURE_LEVEL_10_0 = 0xa000, + D3D_FEATURE_LEVEL_10_1 = 0xa100, + D3D_FEATURE_LEVEL_11_0 = 0xb000, +} D3D_FEATURE_LEVEL; + typedef enum _D3D_SHADER_VARIABLE_CLASS { D3D_SVC_SCALAR, @@ -382,6 +392,46 @@ typedef enum D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST, } D3D_PRIMITIVE_TOPOLOGY; +typedef enum D3D_TESSELLATOR_DOMAIN +{ + D3D_TESSELLATOR_DOMAIN_UNDEFINED, + D3D_TESSELLATOR_DOMAIN_ISOLINE, + D3D_TESSELLATOR_DOMAIN_TRI, + D3D_TESSELLATOR_DOMAIN_QUAD, + D3D11_TESSELLATOR_DOMAIN_UNDEFINED = 0, + D3D11_TESSELLATOR_DOMAIN_ISOLINE, + D3D11_TESSELLATOR_DOMAIN_TRI, + D3D11_TESSELLATOR_DOMAIN_QUAD, +} D3D_TESSELLATOR_DOMAIN; + +typedef enum D3D_TESSELLATOR_PARTITIONING +{ + D3D_TESSELLATOR_PARTITIONING_UNDEFINED, + D3D_TESSELLATOR_PARTITIONING_INTEGER, + D3D_TESSELLATOR_PARTITIONING_POW2, + D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD, + D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN, + D3D11_TESSELLATOR_PARTITIONING_UNDEFINED = 0, + D3D11_TESSELLATOR_PARTITIONING_INTEGER, + D3D11_TESSELLATOR_PARTITIONING_POW2, + D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD, + D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN, +} D3D_TESSELLATOR_PARTITIONING; + +typedef enum D3D_TESSELLATOR_OUTPUT_PRIMITIVE +{ + D3D_TESSELLATOR_OUTPUT_UNDEFINED, + D3D_TESSELLATOR_OUTPUT_POINT, + D3D_TESSELLATOR_OUTPUT_LINE, + D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW, + D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW, + D3D11_TESSELLATOR_OUTPUT_UNDEFINED = 0, + D3D11_TESSELLATOR_OUTPUT_POINT, + D3D11_TESSELLATOR_OUTPUT_LINE, + D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CW, + D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW, +} D3D_TESSELLATOR_OUTPUT_PRIMITIVE; + typedef enum D3D_CBUFFER_TYPE { D3D_CT_CBUFFER, diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 3bb2878..79b635c 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -351,6 +351,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) STDMETHOD(CompileShader)(THIS_ D3DXHANDLE function, LPCSTR target, DWORD flags, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_msgs, LPD3DXCONSTANTTABLE* constant_table) PURE; }; +#undef INTERFACE #ifdef __cplusplus extern "C" {
1
0
0
0
Rico Schüller : d3dcompiler: Add D3DReflect() stub.
by Alexandre Julliard
02 Nov '10
02 Nov '10
Module: wine Branch: master Commit: 02264a7628c82042e33dce24e0ee5ed7ba8ab215 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=02264a7628c82042e33dce24e…
Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Nov 1 22:18:24 2010 +0100 d3dcompiler: Add D3DReflect() stub. --- dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 7 +++++++ include/d3dcompiler.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index bb9a13d..d7e0305 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -12,6 +12,6 @@ @ stdcall D3DGetInputSignatureBlob(ptr long ptr) @ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) -@ stub D3DReflect +@ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReturnFailure1 @ stdcall D3DStripShader(ptr long long ptr) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index 37937a6..9096036 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -123,3 +123,10 @@ HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID return d3dcompiler_strip_shader(data, data_size, flags, blob); } + +HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void **reflector) +{ + FIXME("data %p, data_size %lu, riid %s, blob %p stub!\n", data, data_size, debugstr_guid(riid), reflector); + + return E_NOTIMPL; +} diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index c3bdb53..43af264 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -77,6 +77,8 @@ HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3 HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob); +HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void **reflector); + HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename,
1
0
0
0
Henri Verbeet : wined3d: Translate drawable coordinates in flush_to_framebuffer_drawpixels().
by Alexandre Julliard
02 Nov '10
02 Nov '10
Module: wine Branch: master Commit: 8e059205ba6aa3bad33ac3ef5252e50b9a9baddd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8e059205ba6aa3bad33ac3ef5…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 2 12:02:49 2010 +0100 wined3d: Translate drawable coordinates in flush_to_framebuffer_drawpixels(). --- dlls/wined3d/surface.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5ac4881..428be78 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1765,12 +1765,17 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum buffer = surface_get_gl_buffer(This); TRACE("Unlocking %#x buffer.\n", buffer); context_set_draw_buffer(context, buffer); + + surface_translate_drawable_coords(This, context->win_handle, &rect); + glPixelZoom(1.0f, -1.0f); } else { /* Primary offscreen render target */ TRACE("Offscreen render target.\n"); context_set_draw_buffer(context, device->offscreenBuffer); + + glPixelZoom(1.0f, 1.0f); } glRasterPos3i(rect.left, rect.top, 1);
1
0
0
0
Henri Verbeet : wined3d: Do not use "lockedRect" unless the surface is locked in flush_to_framebuffer_drawpixels().
by Alexandre Julliard
02 Nov '10
02 Nov '10
Module: wine Branch: master Commit: 3f0d16c5bf9094897857c3366979b2b4a513aaa2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3f0d16c5bf9094897857c3366…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 2 12:02:48 2010 +0100 wined3d: Do not use "lockedRect" unless the surface is locked in flush_to_framebuffer_drawpixels(). --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 20a656c..5ac4881 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1741,6 +1741,17 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; + RECT rect; + UINT w, h; + + if (This->Flags & SFLAG_LOCKED) + rect = This->lockedRect; + else + SetRect(&rect, 0, 0, This->currentDesc.Width, This->currentDesc.Height); + + mem += rect.top * pitch + rect.left * bpp; + w = rect.right - rect.left; + h = rect.bottom - rect.top; /* Activate the correct context for the render target */ context = context_acquire(device, This); @@ -1762,7 +1773,7 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, context_set_draw_buffer(context, device->offscreenBuffer); } - glRasterPos3i(This->lockedRect.left, This->lockedRect.top, 1); + glRasterPos3i(rect.left, rect.top, 1); checkGLcall("glRasterPos3i"); /* Some drivers(radeon dri, others?) don't like exceptions during @@ -1789,19 +1800,8 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, checkGLcall("glBindBufferARB"); } - /* When the surface is locked we only have to refresh the locked part else we need to update the whole image */ - if(This->Flags & SFLAG_LOCKED) { - glDrawPixels(This->lockedRect.right - This->lockedRect.left, - (This->lockedRect.bottom - This->lockedRect.top)-1, - fmt, type, - mem + bpp * This->lockedRect.left + pitch * This->lockedRect.top); - checkGLcall("glDrawPixels"); - } else { - glDrawPixels(This->currentDesc.Width, - This->currentDesc.Height, - fmt, type, mem); - checkGLcall("glDrawPixels"); - } + glDrawPixels(w, h, fmt, type, mem); + checkGLcall("glDrawPixels"); if(This->Flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0));
1
0
0
0
Henri Verbeet : wined3d: Set an A window proc on non-unicode windows.
by Alexandre Julliard
02 Nov '10
02 Nov '10
Module: wine Branch: master Commit: b66478dfbcc57e2f9cde12c1e0ae34ffcff12714 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b66478dfbcc57e2f9cde12c1e…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 2 12:02:47 2010 +0100 wined3d: Set an A window proc on non-unicode windows. --- dlls/wined3d/device.c | 12 +++++++++--- dlls/wined3d/wined3d_main.c | 26 ++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1416e59..6e78f04 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6916,14 +6916,17 @@ void get_drawable_size_backbuffer(struct wined3d_context *context, UINT *width, *height = swapchain->presentParms.BackBufferHeight; } -LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, +LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { if (device->filter_messages) { TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", window, message, wparam, lparam); - return DefWindowProcW(window, message, wparam, lparam); + if (unicode) + return DefWindowProcW(window, message, wparam, lparam); + else + return DefWindowProcA(window, message, wparam, lparam); } if (message == WM_DESTROY) @@ -6935,5 +6938,8 @@ LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, else ERR("Window %p is not the focus window for device %p.\n", window, device); } - return CallWindowProcW(proc, window, message, wparam, lparam); + if (unicode) + return CallWindowProcW(proc, window, message, wparam, lparam); + else + return CallWindowProcA(proc, window, message, wparam, lparam); } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 26945ef..0932351 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); struct wined3d_wndproc { HWND window; + BOOL unicode; WNDPROC proc; IWineD3DDeviceImpl *device; }; @@ -394,6 +395,7 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam { struct wined3d_wndproc *entry; IWineD3DDeviceImpl *device; + BOOL unicode; WNDPROC proc; wined3d_mutex_lock(); @@ -407,10 +409,11 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam } device = entry->device; + unicode = entry->unicode; proc = entry->proc; wined3d_mutex_unlock(); - return device_process_message(device, window, message, wparam, lparam, proc); + return device_process_message(device, window, unicode, message, wparam, lparam, proc); } BOOL wined3d_register_window(HWND window, IWineD3DDeviceImpl *device) @@ -440,7 +443,14 @@ BOOL wined3d_register_window(HWND window, IWineD3DDeviceImpl *device) entry = &wndproc_table.entries[wndproc_table.count++]; entry->window = window; - entry->proc = (WNDPROC)SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)wined3d_wndproc); + entry->unicode = IsWindowUnicode(window); + /* Set a window proc that matches the window. Some applications (e.g. NoX) + * replace the window proc after we've set ours, and expect to be able to + * call the previous one (ours) directly, without using CallWindowProc(). */ + if (entry->unicode) + entry->proc = (WNDPROC)SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)wined3d_wndproc); + else + entry->proc = (WNDPROC)SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)wined3d_wndproc); entry->device = device; wined3d_mutex_unlock(); @@ -460,8 +470,16 @@ void wined3d_unregister_window(HWND window) struct wined3d_wndproc *entry = &wndproc_table.entries[i]; struct wined3d_wndproc *last = &wndproc_table.entries[--wndproc_table.count]; - if (GetWindowLongPtrW(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) - SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + if (entry->unicode) + { + if (GetWindowLongPtrW(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) + SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + } + else + { + if (GetWindowLongPtrA(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) + SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + } if (entry != last) *entry = *last; wined3d_mutex_unlock(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 18da56a..f710d0a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1769,7 +1769,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, HWND focus_window, DWORD flags, IWineD3DDeviceParent *device_parent) DECLSPEC_HIDDEN; void device_preload_textures(IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; -LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, +LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN; void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN;
1
0
0
0
Henri Verbeet : ddraw: Fix some TRACEs.
by Alexandre Julliard
02 Nov '10
02 Nov '10
Module: wine Branch: master Commit: cb3a133b281c0d869cdc9c90746c008eda55c675 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cb3a133b281c0d869cdc9c907…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 2 12:02:46 2010 +0100 ddraw: Fix some TRACEs. --- dlls/ddraw/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6a12cdf..5d0a8e6 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -853,7 +853,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR IDirectDrawSurfaceImpl *Src = (IDirectDrawSurfaceImpl *)SrcSurface; HRESULT hr; - TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %p, flags %#x, fx %p.\n", + TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(DestRect), SrcSurface, wine_dbgstr_rect(SrcRect), Flags, DDBltFx); /* Check for validity of the flags here. WineD3D Has the software-opengl selection path and would have @@ -919,7 +919,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR static HRESULT WINAPI ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_rect, IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) { - TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %p, flags %#x, fx %p.\n", + TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); return ddraw_surface7_Blt((IDirectDrawSurface7 *)surface_from_surface3(iface), dst_rect,
1
0
0
0
Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard
02 Nov '10
02 Nov '10
Module: wine Branch: master Commit: b990617a952654e8e6350ce6318953cf9ee25fdd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b990617a952654e8e6350ce63…
Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 13:03:16 2010 +0100 Assorted spelling fixes. --- dlls/gameux/gameexplorer.c | 6 +++--- dlls/gameux/gamestatistics.c | 2 +- dlls/gameux/gameux_private.h | 2 +- dlls/gameux/tests/gameexplorer.c | 4 ++-- dlls/kernel32/tests/path.c | 2 +- dlls/msxml3/tests/schema.c | 2 +- dlls/oleaut32/olepropframe.c | 2 +- dlls/urlmon/tests/uri.c | 2 +- dlls/usp10/tests/usp10.c | 4 ++-- dlls/wined3d/directx.c | 6 +++--- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 1715ad9..bddc131 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -381,7 +381,7 @@ static HRESULT GAMEUX_ParseGameDefinition( /******************************************************************************* * GAMEUX_ParseGDFBinary * - * Helper funtion, loads given binary and parses embed GDF if there's any. + * Helper function, loads given binary and parses embed GDF if there's any. * * Parameters: * GameData [I/O] Structure with game's data. Content of field @@ -534,7 +534,7 @@ HRESULT WINAPI GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, hr = GAMEUX_WriteRegistryRecord(&GameData); GAMEUX_uninitGameData(&GameData); - TRACE("returing 0x%08x\n", hr); + TRACE("returning 0x%08x\n", hr); return hr; } /******************************************************************************* @@ -574,7 +574,7 @@ static HRESULT GAMEUX_IsGameKeyExist(GAME_INSTALL_SCOPE installScope, RegCloseKey(hKey); else { - /* if key does not exist or other error occured, do not return the path */ + /* if the key does not exist or another error occurred, do not return the path */ HeapFree(GetProcessHeap(), 0, *lpRegistryPath); *lpRegistryPath = NULL; } diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 0cce059..bedcfd2 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -696,7 +696,7 @@ HRESULT create_IGameStatistics(GameStatisticsImpl** ppStats) (*ppStats)->lpVtbl = &GameStatisticsImplVtbl; (*ppStats)->ref = 1; - TRACE("returing coclass: %p\n", *ppStats); + TRACE("returning coclass: %p\n", *ppStats); return S_OK; } diff --git a/dlls/gameux/gameux_private.h b/dlls/gameux/gameux_private.h index 86532e2..c8923b5 100644 --- a/dlls/gameux/gameux_private.h +++ b/dlls/gameux/gameux_private.h @@ -89,7 +89,7 @@ HRESULT WINAPI GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, /******************************************************************************* * GAMEUX_FindGameInstanceId * - * Helper funtion. Searches for instance identifier of given game in given + * Helper function. Searches for instance identifier of given game in given * installation scope. Implemented in gameexplorer.c * * Parameters: diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index ba22256..e078172 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -414,7 +414,7 @@ static HRESULT _LoadRegistryString(HKEY hRootKey, /******************************************************************************* * _findGameInstanceId * - * Helper funtion. Searches for instance identifier of given game in given + * Helper function. Searches for instance identifier of given game in given * installation scope. * * Parameters: @@ -638,7 +638,7 @@ static void test_install_uninstall_game(void) hr = IGameExplorer2_InstallGame(ge2, sExeName, sExePath, GIS_CURRENT_USER); ok(SUCCEEDED(hr), "IGameExplorer2::InstallGame failed (error 0x%08x)\n", hr); - /* in comparision to AddGame, InstallGame does not return instance ID, + /* in comparison to AddGame, InstallGame does not return instance ID, * so we need to find it manually */ _findGameInstanceId(__LINE__, sExeName, GIS_CURRENT_USER, &guid); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 3d32767..55d62aa 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -361,7 +361,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) } for(unique=0;unique<3;unique++) { - /* Non-existent path */ + /* Nonexistent path */ sprintf(invalid_dir, "%s\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); SetLastError(0xdeadbeef); ok(!GetTempFileNameA(invalid_dir,"tfn",unique,newdir),"GetTempFileNameA should have failed\n"); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index b457f0e..189451e 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -476,7 +476,7 @@ static void test_length(void) ole_expect(IXMLDOMSchemaCollection_get_length(cache, NULL), E_POINTER); - /* MSDN lies; removing a non-existant entry produces no error */ + /* MSDN lies; removing a nonexistent entry produces no error */ ole_check(IXMLDOMSchemaCollection_remove(cache, NULL)); ole_check(IXMLDOMSchemaCollection_remove(cache, _bstr_(xdr_schema1_uri))); diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 4772ba7..011fde1 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -2,7 +2,7 @@ * Copyright 1999 Corel Corporation * Sean Langley * Copyright 2010 Geoffrey Hausheer - * Copyright 2010 Piotr Caban for Codeweavers + * Copyright 2010 Piotr Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index eb5a3f7..cb1ad6f 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3918,7 +3918,7 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, - /* Dot segements aren't removed. */ + /* Dot segments aren't removed. */ { "file://c:\\dir\\../..\\./index.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH |Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 56385c6..06e9289 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1421,7 +1421,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) } } - /* Check beyond the leading boundry of the whole string */ + /* Check beyond the leading boundary of the whole string */ if (rtl[0]) { /* having a leading rtl character seems to confuse usp */ @@ -1445,7 +1445,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) iTrailing); } - /* Check beyond the end boundry of the whole string */ + /* Check beyond the end boundary of the whole string */ if (rtl[String_len-1]) hr = ScriptStringCPtoX(ssa, String_len-1, FALSE, &X); else diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 326c64b..b25e399 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -997,9 +997,9 @@ static const struct driver_version_information driver_version_table[] = { /* ATI * - Radeon HD2x00 (R600) and up supported by current drivers. - * - Radeon 9500 (R300) - X1*00 (R5xx) supported upto Catalyst 9.3 (Linux) and 10.2 (XP/Vista/Win7) - * - Radeon 7xxx (R100) - 9250 (RV250) supported upto Catalyst 6.11 (XP) - * - Rage 128 supported upto XP, latest official build 6.13.3279 dated October 2001 */ + * - Radeon 9500 (R300) - X1*00 (R5xx) supported up to Catalyst 9.3 (Linux) and 10.2 (XP/Vista/Win7) + * - Radeon 7xxx (R100) - 9250 (RV250) supported up to Catalyst 6.11 (XP) + * - Rage 128 supported up to XP, latest official build 6.13.3279 dated October 2001 */ {DRIVER_ATI_RAGE_128PRO, DRIVER_MODEL_NT5X, "ati2dvaa.dll", 13, 3279, 0}, {DRIVER_ATI_R100, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6614}, {DRIVER_ATI_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764},
1
0
0
0
← Newer
1
...
73
74
75
76
77
78
79
...
87
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
Results per page:
10
25
50
100
200