July 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : winhttp: Implement IWinHttpRequest::Abort.
by Alexandre Julliard July 21, 2011

July 21, 2011

Module: wine Branch: master Commit: f4c2317adc44626cefab8d97ba4cc955f29a42a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c2317adc44626cefab8d97b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:52:30 2011 +0200 winhttp: Implement IWinHttpRequest::Abort. --- dlls/winhttp/request.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index cec3344..5d10410 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2770,8 +2770,28 @@ static HRESULT WINAPI winhttp_request_WaitForResponse( static HRESULT WINAPI winhttp_request_Abort( IWinHttpRequest *iface ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + + TRACE("%p\n", request); + + SetEvent( request->cancel ); + WinHttpCloseHandle( request->hrequest ); + WinHttpCloseHandle( request->hconnect ); + WinHttpCloseHandle( request->hsession ); + CloseHandle( request->wait ); + CloseHandle( request->cancel ); + heap_free( request->buffer ); + request->state = REQUEST_STATE_INVALID; + request->hrequest = NULL; + request->hconnect = NULL; + request->hsession = NULL; + request->wait = NULL; + request->cancel = NULL; + request->buffer = NULL; + request->ptr = NULL; + request->bytes_available = 0; + request->bytes_read = 0; + return S_OK; } static HRESULT WINAPI winhttp_request_SetTimeouts(

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::WaitForResponse.
by Alexandre Julliard July 21, 2011

July 21, 2011

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

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetMatrixArray().
by Alexandre Julliard July 21, 2011

July 21, 2011

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 July 21, 2011

July 21, 2011

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

Hans Leidekker : winhttp: Implement IWinHttpRequest::SetTimeouts.
by Alexandre Julliard July 21, 2011

July 21, 2011

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::Open.
by Alexandre Julliard July 21, 2011

July 21, 2011

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

Alexandre Julliard : gdi32: Pass the full bitblt_coords structure to the Get/PutImage entry points.
by Alexandre Julliard July 21, 2011

July 21, 2011

Module: wine Branch: master Commit: 73dc9833b700fe07f9dee1adfe4a18c7771054f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73dc9833b700fe07f9dee1adf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 21 11:17:13 2011 +0200 gdi32: Pass the full bitblt_coords structure to the Get/PutImage entry points. --- dlls/gdi32/bitblt.c | 13 ++++------ dlls/gdi32/dib.c | 20 +++++++++------- dlls/gdi32/driver.c | 5 ++- dlls/winex11.drv/bitblt.c | 55 ++++++++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 4 +- include/wine/gdi_driver.h | 6 ++-- 6 files changed, 56 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73dc9833b700fe07f9dee…

1 0

Alexandre Julliard : gdi32: Allow the PutImage entry point to optionally support stretching.
by Alexandre Julliard July 21, 2011

July 21, 2011

Module: wine Branch: master Commit: 97c30bdd6c335b51ac0a72a0ceaf2348afe9151e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c30bdd6c335b51ac0a72a0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 17:28:19 2011 +0200 gdi32: Allow the PutImage entry point to optionally support stretching. --- dlls/gdi32/bitblt.c | 48 ++++++++++++++++++++++++-------------------- dlls/winex11.drv/bitblt.c | 1 + 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 2d81ad5..48a70bd 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -167,10 +167,10 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; DWORD err; - struct gdi_image_bits src_bits, dst_bits; + struct gdi_image_bits bits; BITMAP bm; HBITMAP hbm; - LPVOID bits; + LPVOID ptr; INT lines; /* make sure we have a real implementation for StretchDIBits */ @@ -191,36 +191,31 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, src_info->bmiHeader.biClrUsed = 0; src_info->bmiHeader.biClrImportant = 0; - if (!(bits = HeapAlloc(GetProcessHeap(), 0, bm.bmHeight * bm.bmWidth * 4))) + if (!(ptr = HeapAlloc(GetProcessHeap(), 0, bm.bmHeight * bm.bmWidth * 4))) return FALSE; /* Select out the src bitmap before calling GetDIBits */ hbm = SelectObject( src_dev->hdc, GetStockObject(DEFAULT_BITMAP) ); - lines = GetDIBits( src_dev->hdc, hbm, 0, bm.bmHeight, bits, src_info, DIB_RGB_COLORS ); + lines = GetDIBits( src_dev->hdc, hbm, 0, bm.bmHeight, ptr, src_info, DIB_RGB_COLORS ); SelectObject( src_dev->hdc, hbm ); if (lines) lines = StretchDIBits( dst_dev->hdc, dst->log_x, dst->log_y, dst->log_width, dst->log_height, src->x, bm.bmHeight - src->height - src->y, src->width, src->height, - bits, src_info, DIB_RGB_COLORS, rop ); - HeapFree( GetProcessHeap(), 0, bits ); + ptr, src_info, DIB_RGB_COLORS, rop ); + HeapFree( GetProcessHeap(), 0, ptr ); return (lines == src->height); try_get_image: if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); - err = src_dev->funcs->pGetImage( src_dev, 0, src_info, &src_bits, src ); + err = src_dev->funcs->pGetImage( src_dev, 0, src_info, &bits, src ); release_dc_ptr( dc_src ); if (err) return FALSE; dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage ); - - if ((src->width != dst->width) || (src->height != dst->height)) - FIXME( "should stretch %dx%d -> %dx%d\n", - src->width, src->height, dst->width, dst->height ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); - err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &src_bits, src, dst, rop ); + err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &bits, src, dst, rop ); if (err == ERROR_BAD_FORMAT) { /* 1-bpp source without a color table uses the destination DC colors */ @@ -252,23 +247,32 @@ try_get_image: } dst_info->bmiHeader.biWidth = src->visrect.right - src->visrect.left; - dst_bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); - if (dst_bits.ptr) + if ((ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) { - dst_bits.is_copy = TRUE; - dst_bits.offset = 0; - dst_bits.free = free_heap_bits; - if (!(err = convert_bitmapinfo( src_info, src_bits.ptr, &src->visrect, dst_info, dst_bits.ptr ))) + err = convert_bitmapinfo( src_info, bits.ptr, &src->visrect, dst_info, ptr ); + if (bits.free) bits.free( &bits ); + bits.ptr = ptr; + bits.is_copy = TRUE; + bits.offset = 0; + bits.free = free_heap_bits; + if (!err) { /* get rid of the fake 1-bpp table */ if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; - err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &dst_bits, src, dst, rop ); + err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &bits, src, dst, rop ); } - if (dst_bits.free) dst_bits.free( &dst_bits ); } else err = ERROR_OUTOFMEMORY; } - if (src_bits.free) src_bits.free( &src_bits ); + + if (err == ERROR_TRANSFORM_NOT_SUPPORTED && + ((src->width != dst->width) || (src->height != dst->height))) + { + FIXME( "should stretch %dx%d -> %dx%d\n", + src->width, src->height, dst->width, dst->height ); + } + + if (bits.free) bits.free( &bits ); return !err; } diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 015a3e0..5699911 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1898,6 +1898,7 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str /* FIXME: could try to handle 1-bpp using XCopyPlane */ if (!matching_color_info( dev, color_shifts, info )) goto update_format; if (!bits) return ERROR_SUCCESS; /* just querying the format */ + if ((src->width != dst->width) || (src->height != dst->height)) return ERROR_TRANSFORM_NOT_SUPPORTED; wine_tsx11_lock(); image = XCreateImage( gdi_display, visual, depth, ZPixmap, 0, NULL,

1 0

Alexandre Julliard : gdi32: Get rid of the offset in the gdi_image_bits structure now that we are passing the full rectangles .
by Alexandre Julliard July 21, 2011

July 21, 2011

Module: wine Branch: master Commit: 7dc8f48ef87b2f8124b6a0fe1badb9c8a33e5da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc8f48ef87b2f8124b6a0fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 21 12:03:30 2011 +0200 gdi32: Get rid of the offset in the gdi_image_bits structure now that we are passing the full rectangles. --- dlls/gdi32/bitblt.c | 1 - dlls/winex11.drv/bitblt.c | 5 +---- include/wine/gdi_driver.h | 11 +++++------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 48a70bd..a1dcc7a 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -253,7 +253,6 @@ try_get_image: if (bits.free) bits.free( &bits ); bits.ptr = ptr; bits.is_copy = TRUE; - bits.offset = 0; bits.free = free_heap_bits; if (!err) { diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 5699911..62a10cc 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1761,7 +1761,6 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, info->bmiHeader.biSizeImage = height * width_bytes; if (!(dst_bits->ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) return ERROR_OUTOFMEMORY; - dst_bits->offset = src_bits->offset; dst_bits->is_copy = TRUE; dst_bits->free = free_heap_bits; } @@ -1769,7 +1768,6 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, { /* swap bits in place */ dst_bits->ptr = src; - dst_bits->offset = src_bits->offset; dst_bits->is_copy = src_bits->is_copy; dst_bits->free = NULL; if (!need_byteswap && zeropad_mask == ~0u && !mapping) return ERROR_SUCCESS; /* nothing to do */ @@ -2029,8 +2027,7 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, FIXME( "depth %u bpp %u not supported yet\n", depth, format->bits_per_pixel ); return ERROR_BAD_FORMAT; } - src_bits.offset = src->visrect.left & (align - 1); - x = src->visrect.left - src_bits.offset; + x = src->visrect.left & ~(align - 1); y = src->visrect.top; width = src->visrect.right - x; height = src->visrect.bottom - src->visrect.top; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index b4166bf..c02ce9b 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -46,11 +46,10 @@ struct bitblt_coords struct gdi_image_bits { - void *ptr; /* pointer to the bits */ - unsigned int offset; /* x offset of first requested pixel */ - BOOL is_copy; /* whether this is a copy of the bits that can be modified */ - void (*free)(struct gdi_image_bits *); /* callback for freeing the bits */ - void *param; /* extra parameter for callback private use */ + void *ptr; /* pointer to the bits */ + BOOL is_copy; /* whether this is a copy of the bits that can be modified */ + void (*free)(struct gdi_image_bits *); /* callback for freeing the bits */ + void *param; /* extra parameter for callback private use */ }; struct gdi_dc_funcs @@ -192,7 +191,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 5 +#define WINE_GDI_DRIVER_VERSION 6 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetVectorArray().
by Alexandre Julliard July 21, 2011

July 21, 2011

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