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
October 2009
----- 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
3 participants
1207 discussions
Start a n
N
ew thread
Rico Schüller : d3d10: Implement ID3D10EffectVariable: :GetMemberBySemantic().
by Alexandre Julliard
01 Oct '09
01 Oct '09
Module: wine Branch: master Commit: 7b520e1f31bd8b509f8431803c5938983152207c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7b520e1f31bd8b509f8431803…
Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 1 11:55:50 2009 +0200 d3d10: Implement ID3D10EffectVariable::GetMemberBySemantic(). --- dlls/d3d10/effect.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3ae448f..a167a11 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2030,9 +2030,34 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_Get static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberBySemantic( ID3D10EffectVariable *iface, LPCSTR semantic) { - FIXME("iface %p, semantic %s stub!\n", iface, debugstr_a(semantic)); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + unsigned int i; - return NULL; + TRACE("iface %p, semantic %s.\n", iface, debugstr_a(semantic)); + + if (!semantic) + { + WARN("Invalid semantic specified\n"); + return (ID3D10EffectVariable *)&null_variable; + } + + for (i = 0; i < This->type->member_count; ++i) + { + struct d3d10_effect_variable *m = &This->members[i]; + + if (m->semantic) + { + if (!strcmp(m->semantic, semantic)) + { + TRACE("Returning member %p\n", m); + return (ID3D10EffectVariable *)m; + } + } + } + + WARN("Invalid semantic specified\n"); + + return (ID3D10EffectVariable *)&null_variable; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetElement(
1
0
0
0
Rico Schüller : d3d10: Implement ID3D10EffectVariable: :GetMemberByName().
by Alexandre Julliard
01 Oct '09
01 Oct '09
Module: wine Branch: master Commit: 9fdd548d2e7b2c2e6880b4c1a4085c1b534555ea URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9fdd548d2e7b2c2e6880b4c1a…
Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 1 11:55:33 2009 +0200 d3d10: Implement ID3D10EffectVariable::GetMemberByName(). --- dlls/d3d10/effect.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index b203baa..3ae448f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1997,9 +1997,34 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_Get static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberByName( ID3D10EffectVariable *iface, LPCSTR name) { - FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + unsigned int i; - return NULL; + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid name specified\n"); + return (ID3D10EffectVariable *)&null_variable; + } + + for (i = 0; i < This->type->member_count; ++i) + { + struct d3d10_effect_variable *m = &This->members[i]; + + if (m->name) + { + if (!strcmp(m->name, name)) + { + TRACE("Returning member %p\n", m); + return (ID3D10EffectVariable *)m; + } + } + } + + WARN("Invalid name specified\n"); + + return (ID3D10EffectVariable *)&null_variable; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberBySemantic(
1
0
0
0
Rico Schüller : d3d10: Implement ID3D10EffectVariable: :GetMemberByIndex().
by Alexandre Julliard
01 Oct '09
01 Oct '09
Module: wine Branch: master Commit: 263e29e61e48c8db9ccacb6fc0db3609b64cf59a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=263e29e61e48c8db9ccacb6fc…
Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 1 11:55:29 2009 +0200 d3d10: Implement ID3D10EffectVariable::GetMemberByIndex(). --- dlls/d3d10/effect.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6a04e4a..b203baa 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1976,9 +1976,22 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_Get static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberByIndex( ID3D10EffectVariable *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + struct d3d10_effect_variable *m; - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->type->member_count) + { + WARN("Invalid index specified\n"); + return (ID3D10EffectVariable *)&null_variable; + } + + m = &This->members[index]; + + TRACE("Returning member %p, %s\n", m, debugstr_a(m->name)); + + return (ID3D10EffectVariable *)m; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberByName(
1
0
0
0
Rico Schüller : d3d10: Implement ID3D10EffectType:: GetMemberTypeBySemantic().
by Alexandre Julliard
01 Oct '09
01 Oct '09
Module: wine Branch: master Commit: 6bb92fe109f63cee42ae4627c96a4bace403d9c6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6bb92fe109f63cee42ae4627c…
Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 1 11:55:16 2009 +0200 d3d10: Implement ID3D10EffectType::GetMemberTypeBySemantic(). --- dlls/d3d10/effect.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2c7d1f3..6a04e4a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3338,9 +3338,34 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTypeBySemantic(ID3D10EffectType *iface, LPCSTR semantic) { - FIXME("iface %p, semantic %s stub!\n", iface, debugstr_a(semantic)); + struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + unsigned int i; - return NULL; + TRACE("iface %p, semantic %s\n", iface, debugstr_a(semantic)); + + if (!semantic) + { + WARN("Invalid semantic specified\n"); + return (ID3D10EffectType *)&null_type; + } + + for (i = 0; i < This->member_count; ++i) + { + struct d3d10_effect_type_member *typem = &This->members[i]; + + if (typem->semantic) + { + if (!strcmp(typem->semantic, semantic)) + { + TRACE("Returning type %p.\n", typem->type); + return (ID3D10EffectType *)typem->type; + } + } + } + + WARN("Invalid semantic specified\n"); + + return (ID3D10EffectType *)&null_type; } static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberName(ID3D10EffectType *iface, UINT index)
1
0
0
0
Rico Schüller : d3d10: Implement ID3D10EffectType:: GetMemberTypeByName().
by Alexandre Julliard
01 Oct '09
01 Oct '09
Module: wine Branch: master Commit: 57707fd2772d9db5da7ff1795035cc64a647c747 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=57707fd2772d9db5da7ff1795…
Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 1 11:54:51 2009 +0200 d3d10: Implement ID3D10EffectType::GetMemberTypeByName(). --- dlls/d3d10/effect.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9927c83..2c7d1f3 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3305,9 +3305,34 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTypeByName(ID3D10EffectType *iface, LPCSTR name) { - FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); + struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + unsigned int i; - return NULL; + TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid name specified\n"); + return (ID3D10EffectType *)&null_type; + } + + for (i = 0; i < This->member_count; ++i) + { + struct d3d10_effect_type_member *typem = &This->members[i]; + + if (typem->name) + { + if (!strcmp(typem->name, name)) + { + TRACE("Returning type %p.\n", typem->type); + return (ID3D10EffectType *)typem->type; + } + } + } + + WARN("Invalid name specified\n"); + + return (ID3D10EffectType *)&null_type; } static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTypeBySemantic(ID3D10EffectType *iface,
1
0
0
0
Rico Schüller : d3d10: Implement ID3D10EffectType:: GetMemberTypeByIndex().
by Alexandre Julliard
01 Oct '09
01 Oct '09
Module: wine Branch: master Commit: 78b41be88263913a28f5853ee673a851d57cc9f5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=78b41be88263913a28f5853ee…
Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 1 11:54:33 2009 +0200 d3d10: Implement ID3D10EffectType::GetMemberTypeByIndex(). --- dlls/d3d10/effect.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6a69077..9927c83 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3284,9 +3284,22 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_type_GetDesc(ID3D10EffectType *ifa static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTypeByIndex(ID3D10EffectType *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + struct d3d10_effect_type *t; - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->member_count) + { + WARN("Invalid index specified\n"); + return (ID3D10EffectType *)&null_type; + } + + t = (&This->members[index])->type; + + TRACE("Returning member %p, %s\n", t, debugstr_a(t->name)); + + return (ID3D10EffectType *)t; } static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTypeByName(ID3D10EffectType *iface,
1
0
0
0
Rico Schüller : d3d10: Add null_type.
by Alexandre Julliard
01 Oct '09
01 Oct '09
Module: wine Branch: master Commit: abe3737066bcc7f271ef279cffe46abe3c582ff7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=abe3737066bcc7f271ef279cf…
Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 1 11:53:57 2009 +0200 d3d10: Add null_type. --- dlls/d3d10/effect.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9c654a4..6a69077 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -57,16 +57,22 @@ static struct d3d10_effect_technique null_technique = {&d3d10_effect_technique_vtbl, NULL, NULL, 0, 0, NULL, NULL}; static struct d3d10_effect_pass null_pass = {&d3d10_effect_pass_vtbl, NULL, NULL, 0, 0, 0, NULL, NULL}; +static struct d3d10_effect_type null_type = + {&d3d10_effect_type_vtbl, 0, {NULL, NULL, 0}, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL}; static struct d3d10_effect_variable null_local_buffer = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, + NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL}; static struct d3d10_effect_variable null_variable = - {&d3d10_effect_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL}; + {&d3d10_effect_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL}; static struct d3d10_effect_variable null_scalar_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl, + NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL}; static struct d3d10_effect_variable null_vector_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl, + NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL}; static struct d3d10_effect_variable null_matrix_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, + NULL, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL}; static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, const char *data, DWORD offset); @@ -3249,7 +3255,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_type_GetDesc(ID3D10EffectType *ifa TRACE("iface %p, desc %p\n", iface, desc); - if (!desc) return E_INVALIDARG; + if (This == &null_type) + { + WARN("Null type specified\n"); + return E_FAIL; + } + + if (!desc) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } desc->TypeName = This->name; desc->Class = This->type_class;
1
0
0
0
Rico Schüller : d3d10: Improve ID3D10EffectType:: GetMemberName().
by Alexandre Julliard
01 Oct '09
01 Oct '09
Module: wine Branch: master Commit: ffa72d73050ef3e69488da92c7c04c03ee9e0357 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ffa72d73050ef3e69488da92c…
Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 1 11:53:53 2009 +0200 d3d10: Improve ID3D10EffectType::GetMemberName(). --- dlls/d3d10/effect.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2fd8978..9c654a4 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3292,12 +3292,21 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberName(ID3D10EffectType *iface, UINT index) { struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + struct d3d10_effect_type_member *typem; TRACE("iface %p, index %u\n", iface, index); - if(index >= This->member_count) return NULL; + if (index >= This->member_count) + { + WARN("Invalid index specified\n"); + return NULL; + } + + typem = &This->members[index]; + + TRACE("Returning name %s\n", debugstr_a(typem->name)); - return This->members[index].name; + return typem->name; } static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberSemantic(ID3D10EffectType *iface, UINT index)
1
0
0
0
Rico Schüller : d3d10: Implement ID3D10EffectType:: GetMemberSemantic().
by Alexandre Julliard
01 Oct '09
01 Oct '09
Module: wine Branch: master Commit: 73b5e3ddada3b785fdef93bdfdc17264196d72d3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=73b5e3ddada3b785fdef93bdf…
Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 1 11:53:34 2009 +0200 d3d10: Implement ID3D10EffectType::GetMemberSemantic(). --- dlls/d3d10/effect.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 41e43f2..2fd8978 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3302,9 +3302,22 @@ static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberName(ID3D10EffectType static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberSemantic(ID3D10EffectType *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + struct d3d10_effect_type_member *typem; - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->member_count) + { + WARN("Invalid index specified\n"); + return NULL; + } + + typem = &This->members[index]; + + TRACE("Returning semantic %s\n", debugstr_a(typem->semantic)); + + return typem->semantic; } static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl =
1
0
0
0
Juan Lang : wininet: Protect OpenSSL initialization with critical section.
by Alexandre Julliard
01 Oct '09
01 Oct '09
Module: wine Branch: master Commit: a001ed7686e223407d3aac7d25f5d2d4ec224e28 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a001ed7686e223407d3aac7d2…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 30 09:02:49 2009 -0700 wininet: Protect OpenSSL initialization with critical section. --- dlls/wininet/netconnection.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 2e97017..d54e3ac 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -98,6 +98,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #include <openssl/err.h> +static CRITICAL_SECTION init_ssl_cs; +static CRITICAL_SECTION_DEBUG init_ssl_cs_debug = +{ + 0, 0, &init_ssl_cs, + { &init_ssl_cs_debug.ProcessLocksList, + &init_ssl_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": init_ssl_cs") } +}; +static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; + static void *OpenSSL_ssl_handle; static void *OpenSSL_crypto_handle; @@ -142,14 +152,19 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) { #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) TRACE("using SSL connection\n"); + EnterCriticalSection(&init_ssl_cs); if (OpenSSL_ssl_handle) /* already initialized everything */ + { + LeaveCriticalSection(&init_ssl_cs); return TRUE; + } OpenSSL_ssl_handle = wine_dlopen(SONAME_LIBSSL, RTLD_NOW, NULL, 0); if (!OpenSSL_ssl_handle) { ERR("trying to use a SSL connection, but couldn't load %s. Expect trouble.\n", SONAME_LIBSSL); INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); + LeaveCriticalSection(&init_ssl_cs); return FALSE; } OpenSSL_crypto_handle = wine_dlopen(SONAME_LIBCRYPTO, RTLD_NOW, NULL, 0); @@ -158,6 +173,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) ERR("trying to use a SSL connection, but couldn't load %s. Expect trouble.\n", SONAME_LIBCRYPTO); INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); + LeaveCriticalSection(&init_ssl_cs); return FALSE; } @@ -168,6 +184,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) { \ ERR("failed to load symbol %s\n", #x); \ INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); \ + LeaveCriticalSection(&init_ssl_cs); \ return FALSE; \ } @@ -196,6 +213,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) { \ ERR("failed to load symbol %s\n", #x); \ INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); \ + LeaveCriticalSection(&init_ssl_cs); \ return FALSE; \ } DYNCRYPTO(BIO_new_fp); @@ -215,8 +233,10 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string(pERR_get_error(), 0)); INTERNET_SetLastError(ERROR_OUTOFMEMORY); + LeaveCriticalSection(&init_ssl_cs); return FALSE; } + LeaveCriticalSection(&init_ssl_cs); #else FIXME("can't use SSL, not compiled in.\n"); INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR);
1
0
0
0
← Newer
1
...
114
115
116
117
118
119
120
121
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
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
Results per page:
10
25
50
100
200