wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Andrew Nguyen : ws2_32/tests: Avoid casting a WSAAccept function pointer parameter in test_accept.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: e9e0df23b83093cddfb62b3e37affd48c85b7cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e0df23b83093cddfb62b3e3… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 3 07:36:54 2011 -0500 ws2_32/tests: Avoid casting a WSAAccept function pointer parameter in test_accept. --- dlls/ws2_32/socket.c | 4 ++-- dlls/ws2_32/tests/sock.c | 2 +- include/winsock2.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 40151f1..e1a32fb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5825,7 +5825,7 @@ INT WINAPI WSCDeinstallProvider(LPGUID lpProviderId, LPINT lpErrno) * WSAAccept (WS2_32.26) */ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, - LPCONDITIONPROC lpfnCondition, DWORD dwCallbackData) + LPCONDITIONPROC lpfnCondition, DWORD_PTR dwCallbackData) { int ret = 0, size = 0; @@ -5835,7 +5835,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, SOCKET cs; SOCKADDR src_addr, dst_addr; - TRACE("Socket %04lx, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %d\n", + TRACE("Socket %04lx, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %ld\n", s, addr, addrlen, lpfnCondition, dwCallbackData); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 87cd308..7853a8c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2467,7 +2467,7 @@ static void test_accept(void) ret = connect(connector, (struct sockaddr*)&address, sizeof(address)); ok(ret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - accepted = WSAAccept(server_socket, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); + accepted = WSAAccept(server_socket, NULL, NULL, AlwaysDeferConditionFunc, 0); ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); accepted = accept(server_socket, NULL, 0); diff --git a/include/winsock2.h b/include/winsock2.h index c346473..5e1f489 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -401,7 +401,7 @@ typedef int (CALLBACK *LPCONDITIONPROC) LPWSABUF lpCalleeId, LPWSABUF lpCalleeData, GROUP *g, - DWORD dwCallbackData + DWORD_PTR dwCallbackData ); typedef void (CALLBACK *LPWSAOVERLAPPED_COMPLETION_ROUTINE) @@ -604,7 +604,7 @@ typedef SOCKET (WINAPI *LPFN_SOCKET)(int,int,int); * "Winsock2 Function Typedefs" section below. */ #if WS_API_PROTOTYPES -SOCKET WINAPI WSAAccept(SOCKET,struct WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD); +SOCKET WINAPI WSAAccept(SOCKET,struct WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD_PTR); INT WINAPI WSAAddressToStringA(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOA,LPSTR,LPDWORD); INT WINAPI WSAAddressToStringW(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD); #define WSAAddressToString WINELIB_NAME_AW(WSAAddressToString) @@ -678,7 +678,7 @@ DWORD WINAPI WSAWaitForMultipleEvents(DWORD,const WSAEVENT*,BOOL,DWORD,BOOL); * "Winsock2 Prototypes" section above. */ #if WS_API_TYPEDEFS -typedef SOCKET (WINAPI *LPFN_WSAACCEPT)(SOCKET,WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD); +typedef SOCKET (WINAPI *LPFN_WSAACCEPT)(SOCKET,WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD_PTR); typedef INT (WINAPI *LPFN_WSAADRESSTOSTRINGA)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOA,LPSTR,LPDWORD); typedef INT (WINAPI *LPFN_WSAADRESSTOSTRINGW)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD); #define LPFN_WSAADDRESSTOSTRING WINELIB_NAME_AW(LPFN_WSAADDRESSTOSTRING)

1 0

Vincent Povirk : ole32: Avoid opening source storage in IStorage::CopyTo.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: c72ecb1de654cd3653ca0699fa2e9a8eee347038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c72ecb1de654cd3653ca0699f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 2 14:34:53 2011 -0500 ole32: Avoid opening source storage in IStorage::CopyTo. --- dlls/ole32/storage32.c | 279 +++++++++++++++++++++++------------------ dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 157 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c72ecb1de654cd3653ca0…

1 0

Louis Lenders : crypt32: Add stub for PFXVerifyPassword.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: e11e1841f3c58e87d5c77d246c2a86b0e946fd70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11e1841f3c58e87d5c77d246… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jun 3 13:50:38 2011 +0200 crypt32: Add stub for PFXVerifyPassword. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/decode.c | 7 +++++++ include/wincrypt.h | 2 ++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 45ec666..66d831b 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -225,6 +225,7 @@ @ stdcall PFXExportCertStoreEx(ptr ptr ptr ptr long) @ stdcall PFXImportCertStore(ptr ptr long) @ stdcall PFXIsPFXBlob(ptr) +@ stdcall PFXVerifyPassword(ptr wstr long) @ stub RegCreateHKCUKeyExU @ stub RegCreateKeyExU @ stub RegDeleteValueU diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index cd9a2a1..649ca55 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6112,3 +6112,10 @@ HCERTSTORE WINAPI PFXImportCertStore(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, FIXME_(crypt)("(%p, %p, %08x): stub\n", pPFX, szPassword, dwFlags); return NULL; } + +BOOL WINAPI PFXVerifyPassword(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, + DWORD dwFlags) +{ + FIXME_(crypt)("(%p, %p, %08x): stub\n", pPFX, szPassword, dwFlags); + return FALSE; +} diff --git a/include/wincrypt.h b/include/wincrypt.h index 7a2e5b3..2f41360 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4496,6 +4496,8 @@ BOOL WINAPI PFXExportCertStoreEx(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, void *pvReserved, DWORD dwFlags); BOOL WINAPI PFXExportCertStore(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, DWORD dwFlags); +BOOL WINAPI PFXVerifyPassword(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, + DWORD dwFlags); /* cryptnet.dll functions */ BOOL WINAPI CryptCancelAsyncRetrieval(HCRYPTASYNC hAsyncRetrieval);

1 0

Jacek Caban : urlmon: Avoid accessing an uninitialized variable (valgrind).
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 8ebf950b8fb2753c4587dc22f58cc84b814cbee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebf950b8fb2753c4587dc22f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 11:40:33 2011 +0200 urlmon: Avoid accessing an uninitialized variable (valgrind). --- dlls/urlmon/sec_mgr.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 7b4bb35..e1763fc 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -256,18 +256,24 @@ static BOOL get_zone_for_scheme(HKEY key, LPCWSTR schema, DWORD *zone) /* See if the key contains a value for the scheme first. */ res = RegQueryValueExW(key, schema, NULL, &type, (BYTE*)zone, &size); - if(type != REG_DWORD) + if(res == ERROR_SUCCESS) { + if(type == REG_DWORD) + return TRUE; WARN("Unexpected value type %d for value %s, expected REG_DWORD\n", type, debugstr_w(schema)); + } + + /* Try to get the zone for the wildcard scheme. */ + size = sizeof(DWORD); + res = RegQueryValueExW(key, wildcardW, NULL, &type, (BYTE*)zone, &size); + if(res != ERROR_SUCCESS) + return FALSE; - if(res != ERROR_SUCCESS || type != REG_DWORD) { - /* Try to get the zone for the wildcard scheme. */ - size = sizeof(DWORD); - res = RegQueryValueExW(key, wildcardW, NULL, &type, (BYTE*)zone, &size); - if(type != REG_DWORD) - WARN("Unexpected value type %d for value %s, expected REG_DWORD\n", type, debugstr_w(wildcardW)); + if(type != REG_DWORD) { + WARN("Unexpected value type %d for value %s, expected REG_DWORD\n", type, debugstr_w(wildcardW)); + return FALSE; } - return res == ERROR_SUCCESS && type == REG_DWORD; + return TRUE; } /********************************************************************

1 0

Jacek Caban : urlmon: Avoid accessing an uninitialized variable (valgrind).
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: e21c5282e0c629dd99284b097ad4085067279ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21c5282e0c629dd99284b097… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 11:40:23 2011 +0200 urlmon: Avoid accessing an uninitialized variable (valgrind). Also a bit of code clean up. --- dlls/urlmon/internet.c | 41 ++++++++++++++++++----------------------- 1 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 3832c52..c09bace 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -549,39 +549,34 @@ static HRESULT set_internet_feature(INTERNETFEATURELIST feature, DWORD flags, BO static BOOL get_feature_from_reg(HKEY feature_control, LPCWSTR feature_name, LPCWSTR process_name, BOOL *enabled) { - BOOL ret = FALSE; + DWORD type, value, size; HKEY feature; DWORD res; static const WCHAR wildcardW[] = {'*',0}; res = RegOpenKeyW(feature_control, feature_name, &feature); - if(res == ERROR_SUCCESS) { - DWORD type, value, size; + if(res != ERROR_SUCCESS) + return FALSE; + size = sizeof(DWORD); + res = RegQueryValueExW(feature, process_name, NULL, &type, (BYTE*)&value, &size); + if(res != ERROR_SUCCESS || type != REG_DWORD) { size = sizeof(DWORD); - res = RegQueryValueExW(feature, process_name, NULL, &type, (BYTE*)&value, &size); - if(type != REG_DWORD) - WARN("Unexpected registry value type %d (expected REG_DWORD) for %s\n", type, debugstr_w(process_name)); - - if(res == ERROR_SUCCESS && type == REG_DWORD) { - *enabled = value == 1; - ret = TRUE; - } else { - size = sizeof(DWORD); - res = RegQueryValueExW(feature, wildcardW, NULL, &type, (BYTE*)&value, &size); - if(type != REG_DWORD) - WARN("Unexpected registry value type %d (expected REG_DWORD) for %s\n", type, debugstr_w(wildcardW)); - - if(res == ERROR_SUCCESS && type == REG_DWORD) { - *enabled = value == 1; - ret = TRUE; - } - } - RegCloseKey(feature); + res = RegQueryValueExW(feature, wildcardW, NULL, &type, (BYTE*)&value, &size); + } + + RegCloseKey(feature); + if(res != ERROR_SUCCESS) + return FALSE; + + if(type != REG_DWORD) { + WARN("Unexpected registry value type %d (expected REG_DWORD) for %s\n", type, debugstr_w(wildcardW)); + return FALSE; } - return ret; + *enabled = value == 1; + return TRUE; } /* Assumes 'process_features_cs' is held. */

1 0

Jacek Caban : urlmon: Initialize PROTOCOLDATA structure before passing it to Switch.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 21f74fc1bb6c8606d2ac31bcb0a8285a8f85be71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f74fc1bb6c8606d2ac31bcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 11:40:05 2011 +0200 urlmon: Initialize PROTOCOLDATA structure before passing it to Switch. --- dlls/urlmon/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index eb4d316..8766b1d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -434,7 +434,7 @@ static ULONG WINAPI Protocol_Release(IInternetProtocol *iface) static void test_switch_fail(void) { IInternetProtocolSink *binding_sink; - PROTOCOLDATA protocoldata; + PROTOCOLDATA protocoldata = {0}; HRESULT hres; static BOOL tested_switch_fail; @@ -455,7 +455,7 @@ static void test_switch_fail(void) static DWORD WINAPI thread_proc(PVOID arg) { - PROTOCOLDATA protocoldata; + PROTOCOLDATA protocoldata = {0}; HRESULT hres; if(!no_callback) {

1 0

Michael Stefaniuc : d3d10: COM cleanup for the ID3D10ShaderReflection iface .
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: c69bb92463493ce5d9058a7f33e161d63ee523fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69bb92463493ce5d9058a7f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 3 11:18:36 2011 +0200 d3d10: COM cleanup for the ID3D10ShaderReflection iface. --- dlls/d3d10/d3d10_main.c | 4 ++-- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/shader.c | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index f153ed3..9076b0a 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -276,10 +276,10 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad return E_OUTOFMEMORY; } - object->vtbl = &d3d10_shader_reflection_vtbl; + object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; object->refcount = 1; - *reflector = (ID3D10ShaderReflection *)object; + *reflector = &object->ID3D10ShaderReflection_iface; TRACE("Created ID3D10ShaderReflection %p\n", object); diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 1df4611..df525ca 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -217,7 +217,7 @@ struct d3d10_effect extern const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl DECLSPEC_HIDDEN; struct d3d10_shader_reflection { - const struct ID3D10ShaderReflectionVtbl *vtbl; + ID3D10ShaderReflection ID3D10ShaderReflection_iface; LONG refcount; }; diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index 29d7897..499da12 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -27,6 +27,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); /* IUnknown methods */ +static inline struct d3d10_shader_reflection *impl_from_ID3D10ShaderReflection(ID3D10ShaderReflection *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_shader_reflection, ID3D10ShaderReflection_iface); +} + static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_QueryInterface(ID3D10ShaderReflection *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); @@ -47,7 +52,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_QueryInterface(ID3D10Sh static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflection *iface) { - struct d3d10_shader_reflection *This = (struct d3d10_shader_reflection *)iface; + struct d3d10_shader_reflection *This = impl_from_ID3D10ShaderReflection(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -57,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflec static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderReflection *iface) { - struct d3d10_shader_reflection *This = (struct d3d10_shader_reflection *)iface; + struct d3d10_shader_reflection *This = impl_from_ID3D10ShaderReflection(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount);

1 0

Michael Stefaniuc : d3d10: COM cleanup for the ID3D10Effect iface.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 9635f8b6efc45b051079434a9e91974bdf7dffa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9635f8b6efc45b051079434a9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 3 11:15:47 2011 +0200 d3d10: COM cleanup for the ID3D10Effect iface. --- dlls/d3d10/d3d10_main.c | 6 +++--- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 27 ++++++++++++++++----------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 2c07bb3..f153ed3 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -222,7 +222,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl return E_OUTOFMEMORY; } - object->vtbl = &d3d10_effect_vtbl; + object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; object->refcount = 1; ID3D10Device_AddRef(device); object->device = device; @@ -231,11 +231,11 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl if (FAILED(hr)) { ERR("Failed to parse effect\n"); - IUnknown_Release((IUnknown *)object); + IUnknown_Release(&object->ID3D10Effect_iface); return hr; } - *effect = (ID3D10Effect *)object; + *effect = &object->ID3D10Effect_iface; TRACE("Created ID3D10Effect %p\n", object); diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 7758dbe..1df4611 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -180,7 +180,7 @@ struct d3d10_effect_anonymous_shader extern const struct ID3D10EffectVtbl d3d10_effect_vtbl DECLSPEC_HIDDEN; struct d3d10_effect { - const struct ID3D10EffectVtbl *vtbl; + ID3D10Effect ID3D10Effect_iface; LONG refcount; ID3D10Device *device; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a258a99..542489c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -897,7 +897,7 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr enum d3d10_effect_object_operation operation; HRESULT hr; struct d3d10_effect *effect = o->pass->technique->effect; - ID3D10Effect *e = (ID3D10Effect *)effect; + ID3D10Effect *e = &effect->ID3D10Effect_iface; read_dword(ptr, &o->type); TRACE("Effect object is of type %#x.\n", o->type); @@ -1885,6 +1885,11 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) /* IUnknown methods */ +static inline struct d3d10_effect *impl_from_ID3D10Effect(ID3D10Effect *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect, ID3D10Effect_iface); +} + static HRESULT STDMETHODCALLTYPE d3d10_effect_QueryInterface(ID3D10Effect *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); @@ -1905,7 +1910,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_QueryInterface(ID3D10Effect *iface static ULONG STDMETHODCALLTYPE d3d10_effect_AddRef(ID3D10Effect *iface) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -1915,7 +1920,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_AddRef(ID3D10Effect *iface) static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -1990,7 +1995,7 @@ static BOOL STDMETHODCALLTYPE d3d10_effect_IsPool(ID3D10Effect *iface) static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDevice(ID3D10Effect *iface, ID3D10Device **device) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); TRACE("iface %p, device %p\n", iface, device); @@ -2010,7 +2015,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDesc(ID3D10Effect *iface, D3D10 static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByIndex(ID3D10Effect *iface, UINT index) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); struct d3d10_effect_variable *l; TRACE("iface %p, index %u\n", iface, index); @@ -2031,7 +2036,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByName(ID3D10Effect *iface, LPCSTR name) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -2054,7 +2059,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByIndex(ID3D10Effect *iface, UINT index) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, index %u\n", iface, index); @@ -2088,7 +2093,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByName(ID3D10Effect *iface, LPCSTR name) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -2135,7 +2140,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableBySemantic(ID3D10Effect *iface, LPCSTR semantic) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, semantic %s\n", iface, debugstr_a(semantic)); @@ -2182,7 +2187,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByIndex(ID3D10Effect *iface, UINT index) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); struct d3d10_effect_technique *t; TRACE("iface %p, index %u\n", iface, index); @@ -2203,7 +2208,7 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByName(ID3D10Effect *iface, LPCSTR name) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name));

1 0

Michael Stefaniuc : d3d10: COM cleanup for the ID3D10EffectTechnique iface.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: f7214ada84d6fc2bb316d966c9661de0e0440bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7214ada84d6fc2bb316d966c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 3 11:14:35 2011 +0200 d3d10: COM cleanup for the ID3D10EffectTechnique iface. --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 33 ++++++++++++++++++++------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 1216ac4..7758dbe 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -160,7 +160,7 @@ struct d3d10_effect_pass /* ID3D10EffectTechnique */ struct d3d10_effect_technique { - const struct ID3D10EffectTechniqueVtbl *vtbl; + ID3D10EffectTechnique ID3D10EffectTechnique_iface; struct d3d10_effect *effect; char *name; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3d532fd..a258a99 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -58,7 +58,7 @@ static const struct ID3D10EffectSamplerVariableVtbl d3d10_effect_sampler_variabl static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl; /* null objects - needed for invalid calls */ -static struct d3d10_effect_technique null_technique = {&d3d10_effect_technique_vtbl}; +static struct d3d10_effect_technique null_technique = {{&d3d10_effect_technique_vtbl}}; static struct d3d10_effect_pass null_pass = {{&d3d10_effect_pass_vtbl}}; static struct d3d10_effect_type null_type = {{&d3d10_effect_type_vtbl}}; static struct d3d10_effect_variable null_local_buffer = {(const ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, @@ -1618,7 +1618,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d { struct d3d10_effect_technique *t = &e->techniques[i]; - t->vtbl = &d3d10_effect_technique_vtbl; + t->ID3D10EffectTechnique_iface.lpVtbl = &d3d10_effect_technique_vtbl; t->effect = e; hr = parse_fx10_technique(t, &ptr, data); @@ -2190,14 +2190,14 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu if (index >= This->technique_count) { WARN("Invalid index specified\n"); - return (ID3D10EffectTechnique *)&null_technique; + return &null_technique.ID3D10EffectTechnique_iface; } t = &This->techniques[index]; TRACE("Returning technique %p, %s.\n", t, debugstr_a(t->name)); - return (ID3D10EffectTechnique *)t; + return &t->ID3D10EffectTechnique_iface; } static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByName(ID3D10Effect *iface, @@ -2211,7 +2211,7 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu if (!name) { WARN("Invalid name specified\n"); - return (ID3D10EffectTechnique *)&null_technique; + return &null_technique.ID3D10EffectTechnique_iface; } for (i = 0; i < This->technique_count; ++i) @@ -2220,13 +2220,13 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu if (!strcmp(t->name, name)) { TRACE("Returning technique %p\n", t); - return (ID3D10EffectTechnique *)t; + return &t->ID3D10EffectTechnique_iface; } } WARN("Invalid name specified\n"); - return (ID3D10EffectTechnique *)&null_technique; + return &null_technique.ID3D10EffectTechnique_iface; } static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) @@ -2267,17 +2267,24 @@ const struct ID3D10EffectVtbl d3d10_effect_vtbl = /* ID3D10EffectTechnique methods */ +static inline struct d3d10_effect_technique *impl_from_ID3D10EffectTechnique(ID3D10EffectTechnique *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_technique, ID3D10EffectTechnique_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_technique_IsValid(ID3D10EffectTechnique *iface) { + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); + TRACE("iface %p\n", iface); - return (struct d3d10_effect_technique *)iface != &null_technique; + return This != &null_technique; } static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_GetDesc(ID3D10EffectTechnique *iface, D3D10_TECHNIQUE_DESC *desc) { - struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); TRACE("iface %p, desc %p\n", iface, desc); @@ -2303,7 +2310,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_GetDesc(ID3D10EffectTech static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByIndex( ID3D10EffectTechnique *iface, UINT index) { - struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); struct d3d10_effect_variable *a; TRACE("iface %p, index %u\n", iface, index); @@ -2324,7 +2331,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_Ge static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByName( ID3D10EffectTechnique *iface, LPCSTR name) { - struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -2347,7 +2354,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_Ge static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByIndex(ID3D10EffectTechnique *iface, UINT index) { - struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); struct d3d10_effect_pass *p; TRACE("iface %p, index %u\n", iface, index); @@ -2368,7 +2375,7 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByName(ID3D10EffectTechnique *iface, LPCSTR name) { - struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name));

1 0

Michael Stefaniuc : d3d10: COM cleanup for the ID3D10EffectPass iface.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: c412353a0593880dbf63f3735ffe924b67874d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c412353a0593880dbf63f3735… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 3 11:13:06 2011 +0200 d3d10: COM cleanup for the ID3D10EffectPass iface. --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 38 +++++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 5cf1a24..1216ac4 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -146,7 +146,7 @@ struct d3d10_effect_variable /* ID3D10EffectPass */ struct d3d10_effect_pass { - const struct ID3D10EffectPassVtbl *vtbl; + ID3D10EffectPass ID3D10EffectPass_iface; struct d3d10_effect_technique *technique; char *name; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 81384af..3d532fd 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -59,7 +59,7 @@ static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl; /* null objects - needed for invalid calls */ static struct d3d10_effect_technique null_technique = {&d3d10_effect_technique_vtbl}; -static struct d3d10_effect_pass null_pass = {&d3d10_effect_pass_vtbl}; +static struct d3d10_effect_pass null_pass = {{&d3d10_effect_pass_vtbl}}; static struct d3d10_effect_type null_type = {{&d3d10_effect_type_vtbl}}; static struct d3d10_effect_variable null_local_buffer = {(const ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, &null_local_buffer, &null_type}; @@ -1128,7 +1128,7 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char { struct d3d10_effect_pass *p = &t->passes[i]; - p->vtbl = &d3d10_effect_pass_vtbl; + p->ID3D10EffectPass_iface.lpVtbl = &d3d10_effect_pass_vtbl; p->technique = t; hr = parse_fx10_pass(p, ptr, data); @@ -2355,14 +2355,14 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas if (index >= This->pass_count) { WARN("Invalid index specified\n"); - return (ID3D10EffectPass *)&null_pass; + return &null_pass.ID3D10EffectPass_iface; } p = &This->passes[index]; TRACE("Returning pass %p, %s.\n", p, debugstr_a(p->name)); - return (ID3D10EffectPass *)p; + return &p->ID3D10EffectPass_iface; } static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByName(ID3D10EffectTechnique *iface, @@ -2381,13 +2381,13 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas if (!strcmp(p->name, name)) { TRACE("Returning pass %p\n", p); - return (ID3D10EffectPass *)p; + return &p->ID3D10EffectPass_iface; } } WARN("Invalid name specified\n"); - return (ID3D10EffectPass *)&null_pass; + return &null_pass.ID3D10EffectPass_iface; } static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_ComputeStateBlockMask(ID3D10EffectTechnique *iface, @@ -2412,16 +2412,24 @@ static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl = /* ID3D10EffectPass methods */ +static inline struct d3d10_effect_pass *impl_from_ID3D10EffectPass(ID3D10EffectPass *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_pass, ID3D10EffectPass_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_pass_IsValid(ID3D10EffectPass *iface) { + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); + TRACE("iface %p\n", iface); - return (struct d3d10_effect_pass *)iface != &null_pass; + return This != &null_pass; } -static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *iface, D3D10_PASS_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *iface, + D3D10_PASS_DESC *desc) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); unsigned int i; FIXME("iface %p, desc %p partial stub!\n", iface, desc); @@ -2459,7 +2467,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetVertexShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); unsigned int i; TRACE("iface %p, desc %p\n", iface, desc); @@ -2498,7 +2506,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetVertexShaderDesc(ID3D10Eff static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetGeometryShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); unsigned int i; TRACE("iface %p, desc %p\n", iface, desc); @@ -2537,7 +2545,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetGeometryShaderDesc(ID3D10E static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetPixelShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); unsigned int i; TRACE("iface %p, desc %p\n", iface, desc); @@ -2576,7 +2584,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetPixelShaderDesc(ID3D10Effe static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByIndex(ID3D10EffectPass *iface, UINT index) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); struct d3d10_effect_variable *a; TRACE("iface %p, index %u\n", iface, index); @@ -2597,7 +2605,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnno static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByName(ID3D10EffectPass *iface, LPCSTR name) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -2619,7 +2627,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnno static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); HRESULT hr = S_OK; unsigned int i;

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011