October 2009 - Wine-Commits

Rico Schüller : d3d10: Add null_type.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

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

Rico Schüller : d3d10: Implement ID3D10EffectType:: GetMemberSemantic().
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

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

Rico Schüller : d3d10: Improve ID3D10EffectType:: GetMemberName().
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

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

Rico Schüller : d3d10: Implement ID3D10EffectType:: GetMemberTypeByName().
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

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

Rico Schüller : d3d10: Implement ID3D10EffectType:: GetMemberTypeBySemantic().
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

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

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :GetMemberByIndex().
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

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

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :GetMemberBySemantic().
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

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

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :GetMemberByName().
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

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

Rico Schüller : d3d10: Implement ID3D10EffectType:: GetMemberTypeByIndex().
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

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

Juan Lang : wininet: Protect OpenSSL initialization with critical section.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

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