wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Hans Leidekker : winhttp: Implement IWinHttpRequest::get_Status.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: e11828d2d0bde81ad8f29f41cd1dad2f3b8cb8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11828d2d0bde81ad8f29f41c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:51:47 2011 +0200 winhttp: Implement IWinHttpRequest::get_Status. --- dlls/winhttp/request.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 69c004c..97fe255 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2551,8 +2551,24 @@ static HRESULT WINAPI winhttp_request_get_Status( IWinHttpRequest *iface, LONG *status ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD err, flags, status_code, len = sizeof(status_code), index = 0; + + TRACE("%p, %p\n", request, status); + + if (request->state < REQUEST_STATE_SENT) + { + return HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ); + } + if ((err = request_wait_for_response( request, INFINITE, NULL ))) return HRESULT_FROM_WIN32( err ); + + flags = WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER; + if (!WinHttpQueryHeaders( request->hrequest, flags, NULL, &status_code, &len, &index )) + { + return HRESULT_FROM_WIN32( GetLastError() ); + } + *status = status_code; + return S_OK; } static HRESULT WINAPI winhttp_request_get_StatusText(

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::WaitForResponse.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 5c79f82ae58e9ecbca833a83d484b467990e9737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c79f82ae58e9ecbca833a83d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:51:34 2011 +0200 winhttp: Implement IWinHttpRequest::WaitForResponse. --- dlls/winhttp/request.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4d8b489..69c004c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2517,6 +2517,36 @@ static HRESULT WINAPI winhttp_request_Send( return S_OK; } +static DWORD request_wait_for_response( struct winhttp_request *request, DWORD timeout, VARIANT_BOOL *succeeded ) +{ + DWORD err; + + if (request->state >= REQUEST_STATE_RESPONSE_RECEIVED) return ERROR_SUCCESS; + if (request->state < REQUEST_STATE_SENT) + { + if ((err = wait_for_completion( request, timeout ))) return err; + request->state = REQUEST_STATE_SENT; + } + wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE ); + if (!WinHttpReceiveResponse( request->hrequest, NULL )) + { + return GetLastError(); + } + switch ((err = wait_for_completion( request, timeout ))) + { + case WAIT_OBJECT_0: + if (succeeded) *succeeded = VARIANT_TRUE; + break; + case WAIT_TIMEOUT: + if (succeeded) *succeeded = VARIANT_FALSE; + break; + default: + return err; + } + request->state = REQUEST_STATE_RESPONSE_RECEIVED; + return ERROR_SUCCESS; +} + static HRESULT WINAPI winhttp_request_get_Status( IWinHttpRequest *iface, LONG *status ) @@ -2580,8 +2610,12 @@ static HRESULT WINAPI winhttp_request_WaitForResponse( VARIANT timeout, VARIANT_BOOL *succeeded ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD msecs = (V_I4(&timeout) == -1) ? INFINITE : V_I4(&timeout) * 1000; + + TRACE("%p, %s, %p\n", request, debugstr_variant(&timeout), succeeded); + + return HRESULT_FROM_WIN32( request_wait_for_response( request, msecs, succeeded ) ); } static HRESULT WINAPI winhttp_request_Abort(

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::SetTimeouts.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: d66a0b748b788469d288c97ab97b4024c926a3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66a0b748b788469d288c97ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:51:18 2011 +0200 winhttp: Implement IWinHttpRequest::SetTimeouts. --- dlls/winhttp/request.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index dfe0cb1..4d8b489 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2598,8 +2598,15 @@ static HRESULT WINAPI winhttp_request_SetTimeouts( LONG send_timeout, LONG receive_timeout ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + + TRACE("%p, %d, %d, %d, %d\n", request, resolve_timeout, connect_timeout, send_timeout, receive_timeout); + + request->resolve_timeout = resolve_timeout; + request->connect_timeout = connect_timeout; + request->send_timeout = send_timeout; + request->receive_timeout = receive_timeout; + return S_OK; } static HRESULT WINAPI winhttp_request_SetClientCertificate(

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::Send.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 2e33485c6f5c2169609cc0074252303b78a43ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e33485c6f5c2169609cc0074… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:51:03 2011 +0200 winhttp: Implement IWinHttpRequest::Send. --- dlls/winhttp/request.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2608119..dfe0cb1 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2156,6 +2156,10 @@ struct winhttp_request HINTERNET hrequest; HANDLE wait; HANDLE cancel; + LONG resolve_timeout; + LONG connect_timeout; + LONG send_timeout; + LONG receive_timeout; }; static inline struct winhttp_request *impl_from_IWinHttpRequest( IWinHttpRequest *iface ) @@ -2454,12 +2458,63 @@ static HRESULT WINAPI winhttp_request_GetAllResponseHeaders( return E_NOTIMPL; } +static DWORD wait_for_completion( struct winhttp_request *request, DWORD timeout ) +{ + DWORD err; + HANDLE handles[2]; + + if (!request->wait) return ERROR_SUCCESS; + + handles[0] = request->wait; + handles[1] = request->cancel; + err = WaitForMultipleObjects( 2, handles, FALSE, timeout ); + if (err) WARN("wait failed with error %u\n", err); + return err; +} + +static void CALLBACK wait_status_callback( HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID buffer, DWORD size ) +{ + struct winhttp_request *request = (struct winhttp_request *)context; + SetEvent( request->wait ); +} + +static void wait_set_status_callback( struct winhttp_request *request, DWORD status ) +{ + if (!request->wait) return; + WinHttpSetStatusCallback( request->hrequest, wait_status_callback, status, 0 ); +} + static HRESULT WINAPI winhttp_request_Send( IWinHttpRequest *iface, VARIANT body ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD err; + + TRACE("%p, %s\n", request, debugstr_variant(&body)); + + if (request->state < REQUEST_STATE_OPEN) + { + return HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ); + } + if (request->state >= REQUEST_STATE_SENT) return ERROR_SUCCESS; + + if (!WinHttpSetTimeouts( request->hrequest, + request->resolve_timeout, + request->connect_timeout, + request->send_timeout, + request->receive_timeout )) + { + return HRESULT_FROM_WIN32( GetLastError() ); + } + wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT ); + if (!WinHttpSendRequest( request->hrequest, NULL, 0, NULL, 0, 0, 0 )) + { + return HRESULT_FROM_WIN32( GetLastError() ); + } + if ((err = wait_for_completion( request, INFINITE ))) return err; + request->state = REQUEST_STATE_SENT; + return S_OK; } static HRESULT WINAPI winhttp_request_get_Status( @@ -2602,6 +2657,10 @@ HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) if (!(request = heap_alloc_zero( sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; + request->resolve_timeout = 0; + request->connect_timeout = 60000; + request->send_timeout = 30000; + request->receive_timeout = 30000; *obj = &request->IWinHttpRequest_iface; TRACE("returning iface %p\n", *obj);

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::Open.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 4aeec1b88de11b171fe8746e2a34f20dc9ac4211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aeec1b88de11b171fe8746e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:50:45 2011 +0200 winhttp: Implement IWinHttpRequest::Open. --- dlls/winhttp/request.c | 88 ++++++++++++++++++++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 31 ++++++++++++++ 2 files changed, 116 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c936fdd..2608119 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2137,10 +2137,25 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write return ret; } +enum request_state +{ + REQUEST_STATE_INVALID, + REQUEST_STATE_OPEN, + REQUEST_STATE_SENT, + REQUEST_STATE_RESPONSE_RECEIVED, + REQUEST_STATE_BODY_RECEIVED +}; + struct winhttp_request { IWinHttpRequest IWinHttpRequest_iface; LONG refs; + enum request_state state; + HINTERNET hsession; + HINTERNET hconnect; + HINTERNET hrequest; + HANDLE wait; + HANDLE cancel; }; static inline struct winhttp_request *impl_from_IWinHttpRequest( IWinHttpRequest *iface ) @@ -2163,6 +2178,11 @@ static ULONG WINAPI winhttp_request_Release( if (!refs) { TRACE("destroying %p\n", request); + WinHttpCloseHandle( request->hrequest ); + WinHttpCloseHandle( request->hconnect ); + WinHttpCloseHandle( request->hsession ); + CloseHandle( request->wait ); + CloseHandle( request->cancel ); heap_free( request ); } return refs; @@ -2342,8 +2362,70 @@ static HRESULT WINAPI winhttp_request_Open( BSTR url, VARIANT async ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + HINTERNET hsession = NULL, hconnect = NULL, hrequest; + URL_COMPONENTS uc; + WCHAR *hostname, *path; + DWORD err, flags = 0; + + TRACE("%p, %s, %s, %s\n", request, debugstr_w(method), debugstr_w(url), + debugstr_variant(&async)); + + if (!method) return E_INVALIDARG; + + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.dwHostNameLength = ~0u; + uc.dwUrlPathLength = ~0u; + if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( GetLastError() ); + + if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); + hostname[uc.dwHostNameLength] = 0; + if (!(path = heap_alloc( (uc.dwUrlPathLength + 1) * sizeof(WCHAR) ))) + { + heap_free( hostname ); + return E_OUTOFMEMORY; + } + memcpy( path, uc.lpszUrlPath, uc.dwUrlPathLength * sizeof(WCHAR) ); + path[uc.dwUrlPathLength] = 0; + + if (V_BOOL( &async ) == VARIANT_TRUE) flags |= WINHTTP_FLAG_ASYNC; + if (!(hsession = WinHttpOpen( NULL, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) + { + err = GetLastError(); + goto error; + } + if (!(hconnect = WinHttpConnect( hsession, hostname, uc.nPort, 0 ))) + { + err = GetLastError(); + goto error; + } + if (!(hrequest = WinHttpOpenRequest( hconnect, method, path, NULL, NULL, NULL, 0 ))) + { + err = GetLastError(); + goto error; + } + if (flags & WINHTTP_FLAG_ASYNC) + { + request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); + WinHttpSetOption( hrequest, WINHTTP_OPTION_CONTEXT_VALUE, &request, sizeof(request) ); + } + request->state = REQUEST_STATE_OPEN; + request->hsession = hsession; + request->hconnect = hconnect; + request->hrequest = hrequest; + heap_free( hostname ); + heap_free( path ); + return S_OK; + +error: + WinHttpCloseHandle( hconnect ); + WinHttpCloseHandle( hsession ); + heap_free( hostname ); + heap_free( path ); + return HRESULT_FROM_WIN32( err ); } static HRESULT WINAPI winhttp_request_SetRequestHeader( @@ -2517,7 +2599,7 @@ HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) TRACE("%p, %p\n", unknown, obj); - if (!(request = heap_alloc( sizeof(*request) ))) return E_OUTOFMEMORY; + if (!(request = heap_alloc_zero( sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 7607174..4bac24f 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -240,6 +240,37 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT extern HRESULT WinHttpRequest_create( IUnknown *, void ** ) DECLSPEC_HIDDEN; +static inline const char *debugstr_variant( const VARIANT *v ) +{ + if (!v) return "(null)"; + switch (V_VT(v)) + { + case VT_EMPTY: + return "{VT_EMPTY}"; + case VT_NULL: + return "{VT_NULL}"; + case VT_I4: + return wine_dbg_sprintf( "{VT_I4: %d}", V_I4(v) ); + case VT_R8: + return wine_dbg_sprintf( "{VT_R8: %lf}", V_R8(v) ); + case VT_BSTR: + return wine_dbg_sprintf( "{VT_BSTR: %s}", debugstr_w(V_BSTR(v)) ); + case VT_DISPATCH: + return wine_dbg_sprintf( "{VT_DISPATCH: %p}", V_DISPATCH(v) ); + case VT_BOOL: + return wine_dbg_sprintf( "{VT_BOOL: %x}", V_BOOL(v) ); + case VT_UNKNOWN: + return wine_dbg_sprintf( "{VT_UNKNOWN: %p}", V_UNKNOWN(v) ); + case VT_UINT: + return wine_dbg_sprintf( "{VT_UINT: %u}", V_UINT(v) ); + case VT_BSTR|VT_BYREF: + return wine_dbg_sprintf( "{VT_BSTR|VT_BYREF: ptr %p, data %s}", + V_BSTRREF(v), V_BSTRREF(v) ? debugstr_w( *V_BSTRREF(v) ) : NULL ); + default: + return wine_dbg_sprintf( "{vt %d}", V_VT(v) ); + } +} + static inline void *heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size );

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetMatrixTransposeArray().
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 6865dac3fab56a32f801d4d12af37128d2bca9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6865dac3fab56a32f801d4d12… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jul 21 08:47:47 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetMatrixTransposeArray(). --- dlls/d3dx9_36/effect.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 331f4e6..499682c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2050,10 +2050,45 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposeArray(ID3DXBaseEffec static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposeArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count); + TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); - return E_NOTIMPL; + if (!count) return D3D_OK; + + if (matrix && param && count <= param->element_count) + { + UINT i; + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + D3DXMATRIX m; + + get_matrix(get_parameter_struct(param->member_handles[i]), &m); + D3DXMatrixTranspose(&matrix[i], &m); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposePointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX **matrix, UINT count)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetMatrixArray().
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 75836b4789a3a55267d5f6501a03124305ec5ee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75836b4789a3a55267d5f6501… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jul 21 08:47:43 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetMatrixArray(). --- dlls/d3dx9_36/effect.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 624bd98..331f4e6 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1934,10 +1934,42 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixArray(ID3DXBaseEffect *iface, static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count); + TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); - return E_NOTIMPL; + if (!count) return D3D_OK; + + if (matrix && param && count <= param->element_count) + { + UINT i; + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + get_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i]); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixPointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX **matrix, UINT count)

1 0

Rico Schüller : d3dx9: Fix ID3DXBaseEffect::GetFloat() .
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: e9dc6c34a9f818fa51ec03e389acf7fe07584d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9dc6c34a9f818fa51ec03e38… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jul 21 08:47:38 2011 +0200 d3dx9: Fix ID3DXBaseEffect::GetFloat(). --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0ee28c8..624bd98 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1766,7 +1766,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloat(ID3DXBaseEffect *iface, D3DXH if (f && param && !param->element_count && param->class == D3DXPC_SCALAR) { - f = param->data; + *f = get_float(param->type, (DWORD *)param->data); TRACE("Returning %f\n", *f); return D3D_OK; }

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetMatrixTranspose().
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 6a2be190cd145ebdaa7f1d791b6eabf7ba7b9be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a2be190cd145ebdaa7f1d791… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jul 21 08:47:30 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetMatrixTranspose(). --- dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index eeb7894..0ee28c8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1970,10 +1970,40 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTranspose(ID3DXBaseEffect *if static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTranspose(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); + D3DXMATRIX m; - FIXME("iface %p, parameter %p, matrix %p stub\n", This, parameter, matrix); + TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); - return E_NOTIMPL; + if (matrix && param && !param->element_count) + { + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + get_matrix(param, matrix); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + get_matrix(param, &m); + D3DXMatrixTranspose(matrix, &m); + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposeArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix, UINT count)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetVectorArray().
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 2731912c5a002b8da997feca0d04e696418bf906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2731912c5a002b8da997feca0… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jul 21 08:47:17 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetVectorArray(). --- dlls/d3dx9_36/effect.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index fdb5859..eeb7894 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -880,6 +880,14 @@ static inline BOOL get_bool(void *data) return (*(DWORD *)data) ? TRUE : FALSE; } +static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) +{ + vector->x = get_float(param->type, (float *)param->data); + vector->y = param->columns > 1 ? get_float(param->type, (float *)param->data + 1) : 0.0f; + vector->z = param->columns > 2 ? get_float(param->type, (float *)param->data + 2) : 0.0f; + vector->w = param->columns > 3 ? get_float(param->type, (float *)param->data + 3) : 0.0f; +} + static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) { unsigned int i, k; @@ -1833,10 +1841,42 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetVectorArray(ID3DXBaseEffect *iface, static HRESULT WINAPI ID3DXBaseEffectImpl_GetVectorArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, vector %p, count %u stub\n", This, parameter, vector, count); + TRACE("iface %p, parameter %p, vector %p, count %u\n", This, parameter, vector, count); - return E_NOTIMPL; + if (!count) return D3D_OK; + + if (vector && param && count <= param->element_count) + { + UINT i; + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_VECTOR: + for (i = 0; i < count; ++i) + { + get_vector(get_parameter_struct(param->member_handles[i]), &vector[i]); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrix(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix)

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
84
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 July 2011