wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Alexandre Julliard : user32: Use kernel32 functions for character types and case conversions.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 11fcc61b6df0f3b33e85e56910a171c114ed5e50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11fcc61b6df0f3b33e85e5691… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 20:40:57 2016 +0900 user32: Use kernel32 functions for character types and case conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/lstr.c | 62 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index a7e885a..a56e21c 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -31,11 +31,11 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winuser.h" #include "winerror.h" #include "wine/exception.h" -#include "wine/unicode.h" /*********************************************************************** @@ -175,7 +175,7 @@ BOOL WINAPI CharToOemBuffW( LPCWSTR s, LPSTR d, DWORD len ) */ BOOL WINAPI CharToOemW( LPCWSTR s, LPSTR d ) { - return CharToOemBuffW( s, d, strlenW( s ) + 1 ); + return CharToOemBuffW( s, d, lstrlenW( s ) + 1 ); } @@ -280,20 +280,38 @@ LPSTR WINAPI CharUpperA(LPSTR str) /*********************************************************************** * CharLowerW (USER32.@) */ -LPWSTR WINAPI CharLowerW(LPWSTR x) +LPWSTR WINAPI CharLowerW( LPWSTR str ) { - if (!IS_INTRESOURCE(x)) return strlwrW(x); - else return (LPWSTR)((UINT_PTR)tolowerW(LOWORD(x))); + if (!IS_INTRESOURCE( str )) + { + CharLowerBuffW( str, lstrlenW( str )); + return str; + } + else + { + WCHAR ch = LOWORD( str ); + CharLowerBuffW( &ch, 1 ); + return (LPWSTR)(UINT_PTR)ch; + } } /*********************************************************************** * CharUpperW (USER32.@) */ -LPWSTR WINAPI CharUpperW(LPWSTR x) +LPWSTR WINAPI CharUpperW( LPWSTR str ) { - if (!IS_INTRESOURCE(x)) return struprW(x); - else return (LPWSTR)((UINT_PTR)toupperW(LOWORD(x))); + if (!IS_INTRESOURCE( str )) + { + CharUpperBuffW( str, lstrlenW( str )); + return str; + } + else + { + WCHAR ch = LOWORD( str ); + CharUpperBuffW( &ch, 1 ); + return (LPWSTR)(UINT_PTR)ch; + } } @@ -327,10 +345,8 @@ DWORD WINAPI CharLowerBuffA( LPSTR str, DWORD len ) */ DWORD WINAPI CharLowerBuffW( LPWSTR str, DWORD len ) { - DWORD ret = len; if (!str) return 0; /* YES */ - for (; len; len--, str++) *str = tolowerW(*str); - return ret; + return LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, str, len, str, len ); } @@ -364,10 +380,8 @@ DWORD WINAPI CharUpperBuffA( LPSTR str, DWORD len ) */ DWORD WINAPI CharUpperBuffW( LPWSTR str, DWORD len ) { - DWORD ret = len; if (!str) return 0; /* YES */ - for (; len; len--, str++) *str = toupperW(*str); - return ret; + return LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_UPPERCASE, str, len, str, len ); } @@ -386,9 +400,10 @@ BOOL WINAPI IsCharLowerA(CHAR x) /*********************************************************************** * IsCharLowerW (USER32.@) */ -BOOL WINAPI IsCharLowerW(WCHAR x) +BOOL WINAPI IsCharLowerW( WCHAR ch ) { - return (get_char_typeW(x) & C1_LOWER) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & C1_LOWER); } @@ -407,9 +422,10 @@ BOOL WINAPI IsCharUpperA(CHAR x) /*********************************************************************** * IsCharUpperW (USER32.@) */ -BOOL WINAPI IsCharUpperW(WCHAR x) +BOOL WINAPI IsCharUpperW( WCHAR ch ) { - return (get_char_typeW(x) & C1_UPPER) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & C1_UPPER); } @@ -428,9 +444,10 @@ BOOL WINAPI IsCharAlphaNumericA(CHAR x) /*********************************************************************** * IsCharAlphaNumericW (USER32.@) */ -BOOL WINAPI IsCharAlphaNumericW(WCHAR x) +BOOL WINAPI IsCharAlphaNumericW( WCHAR ch ) { - return (get_char_typeW(x) & (C1_ALPHA|C1_DIGIT)) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & (C1_ALPHA|C1_DIGIT)); } @@ -449,7 +466,8 @@ BOOL WINAPI IsCharAlphaA(CHAR x) /*********************************************************************** * IsCharAlphaW (USER32.@) */ -BOOL WINAPI IsCharAlphaW(WCHAR x) +BOOL WINAPI IsCharAlphaW( WCHAR ch ) { - return (get_char_typeW(x) & C1_ALPHA) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & C1_ALPHA); }

1 0

Iván Matellanes : msvcirt: Avoid superfluous comparison in some compilers.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 885273414601caf68bea4415604f02d1f7aca0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=885273414601caf68bea44156… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Mar 28 11:19:08 2016 +0100 msvcirt: Avoid superfluous comparison in some compilers. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 09f488a..19c26fd 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1383,7 +1383,7 @@ streampos __thiscall strstreambuf_seekoff(strstreambuf *this, streamoff offset, TRACE("(%p %d %d %d)\n", this, offset, dir, mode); - if (dir < SEEKDIR_beg || dir > SEEKDIR_end || !(mode & (OPENMODE_in|OPENMODE_out))) + if ((unsigned int)dir > SEEKDIR_end || !(mode & (OPENMODE_in|OPENMODE_out))) return EOF; /* read buffer */ if (mode & OPENMODE_in) {

1 0

Nikolay Sivov : dxgi: Update to IDXGISurface1.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: b537beb60fbdb0cb38363bd64dab8cfc1d222658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b537beb60fbdb0cb38363bd64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 09:36:59 2016 +0300 dxgi: Update to IDXGISurface1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/surface.c | 73 ++++++++++++++++++++++++++++++------------------ dlls/dxgi/tests/device.c | 6 ++++ 4 files changed, 54 insertions(+), 29 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 1caf63b..a10bb01 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -304,7 +304,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa } TRACE("Created IDXGISurface %p\n", object); - *surface = outer ? &object->IUnknown_iface : (IUnknown *)&object->IDXGISurface_iface; + *surface = outer ? &object->IUnknown_iface : (IUnknown *)&object->IDXGISurface1_iface; return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 7fc1e63..86d8608 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -165,7 +165,7 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device /* IDXGISurface */ struct dxgi_surface { - IDXGISurface IDXGISurface_iface; + IDXGISurface1 IDXGISurface1_iface; IUnknown IUnknown_iface; IUnknown *outer_unknown; LONG refcount; diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 4ce9130..ba95758 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -37,13 +37,14 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_inner_QueryInterface(IUnknown *ifa TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IDXGISurface) + if (IsEqualGUID(riid, &IID_IDXGISurface1) + || IsEqualGUID(riid, &IID_IDXGISurface) || IsEqualGUID(riid, &IID_IDXGIDeviceSubObject) || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IUnknown)) { - IDXGISurface_AddRef(&surface->IDXGISurface_iface); - *out = &surface->IDXGISurface_iface; + IDXGISurface1_AddRef(&surface->IDXGISurface1_iface); + *out = &surface->IDXGISurface1_iface; return S_OK; } @@ -79,70 +80,70 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) return refcount; } -static inline struct dxgi_surface *impl_from_IDXGISurface(IDXGISurface *iface) +static inline struct dxgi_surface *impl_from_IDXGISurface1(IDXGISurface1 *iface) { - return CONTAINING_RECORD(iface, struct dxgi_surface, IDXGISurface_iface); + return CONTAINING_RECORD(iface, struct dxgi_surface, IDXGISurface1_iface); } /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface *iface, REFIID riid, +static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface1 *iface, REFIID riid, void **object) { - struct dxgi_surface *This = impl_from_IDXGISurface(iface); + struct dxgi_surface *This = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); return IUnknown_QueryInterface(This->outer_unknown, riid, object); } -static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface *iface) +static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface1 *iface) { - struct dxgi_surface *This = impl_from_IDXGISurface(iface); + struct dxgi_surface *This = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); return IUnknown_AddRef(This->outer_unknown); } -static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface *iface) +static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface1 *iface) { - struct dxgi_surface *This = impl_from_IDXGISurface(iface); + struct dxgi_surface *This = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); return IUnknown_Release(This->outer_unknown); } /* IDXGIObject methods */ -static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateData(IDXGISurface *iface, +static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateData(IDXGISurface1 *iface, REFGUID guid, UINT data_size, const void *data) { - struct dxgi_surface *surface = impl_from_IDXGISurface(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); return dxgi_set_private_data(&surface->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateDataInterface(IDXGISurface *iface, +static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateDataInterface(IDXGISurface1 *iface, REFGUID guid, const IUnknown *object) { - struct dxgi_surface *surface = impl_from_IDXGISurface(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); return dxgi_set_private_data_interface(&surface->private_store, guid, object); } -static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface *iface, +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface1 *iface, REFGUID guid, UINT *data_size, void *data) { - struct dxgi_surface *surface = impl_from_IDXGISurface(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); return dxgi_get_private_data(&surface->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REFIID riid, void **parent) +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface1 *iface, REFIID riid, void **parent) { - struct dxgi_surface *This = impl_from_IDXGISurface(iface); + struct dxgi_surface *This = impl_from_IDXGISurface1(iface); TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); @@ -151,9 +152,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REF /* IDXGIDeviceSubObject methods */ -static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REFIID riid, void **device) +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface1 *iface, REFIID riid, void **device) { - struct dxgi_surface *This = impl_from_IDXGISurface(iface); + struct dxgi_surface *This = impl_from_IDXGISurface1(iface); TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); @@ -161,9 +162,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REF } /* IDXGISurface methods */ -static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_SURFACE_DESC *desc) +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface1 *iface, DXGI_SURFACE_DESC *desc) { - struct dxgi_surface *surface = impl_from_IDXGISurface(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); struct wined3d_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); @@ -179,21 +180,36 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_ return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) +static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface1 *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) { FIXME("iface %p, mapped_rect %p, flags %#x stub!\n", iface, mapped_rect, flags); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface *iface) +static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface) { FIXME("iface %p stub!\n", iface); return E_NOTIMPL; } -static const struct IDXGISurfaceVtbl dxgi_surface_vtbl = +/* IDXGISurface1 methods */ +static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDC(IDXGISurface1 *iface, BOOL discard, HDC *hdc) +{ + FIXME("iface %p, discard %d, hdc %p stub!\n", iface, discard, hdc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_surface_ReleaseDC(IDXGISurface1 *iface, RECT *dirty_rect) +{ + FIXME("iface %p, rect %p stub!\n", iface, dirty_rect); + + return E_NOTIMPL; +} + +static const struct IDXGISurface1Vtbl dxgi_surface_vtbl = { /* IUnknown methods */ dxgi_surface_QueryInterface, @@ -210,6 +226,9 @@ static const struct IDXGISurfaceVtbl dxgi_surface_vtbl = dxgi_surface_GetDesc, dxgi_surface_Map, dxgi_surface_Unmap, + /* IDXGISurface1 methods */ + dxgi_surface_GetDC, + dxgi_surface_ReleaseDC, }; static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = @@ -223,7 +242,7 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer, struct wined3d_resource *wined3d_resource) { - surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; + surface->IDXGISurface1_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; wined3d_private_store_init(&surface->private_store); diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 7b052d3..1e4022e 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -188,6 +188,7 @@ static void test_create_surface(void) DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; + IUnknown *surface1; IUnknown *texture; ULONG refcount; HRESULT hr; @@ -216,6 +217,11 @@ static void test_create_surface(void) "Surface should implement ID3D11Texture2D.\n"); if (SUCCEEDED(hr)) IUnknown_Release(texture); + hr = IDXGISurface_QueryInterface(surface, &IID_IDXGISurface1, (void **)&surface1); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Surface should implement IDXGISurface1.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(surface1); + IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Nikolay Sivov : d2d1: Don' t use render target pointer directly in bitmap initialization helpers.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 9cc6a6e5d6bc2b6fa3aee456e34a1e584679b80f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc6a6e5d6bc2b6fa3aee456e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 02:21:43 2016 +0300 d2d1: Don't use render target pointer directly in bitmap initialization helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 16 ++++++++-------- dlls/d2d1/d2d1_private.h | 4 ++-- dlls/d2d1/render_target.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 8d22eac..8f430e2 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -238,7 +238,7 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, } } -HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target *render_target, +HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc) { D3D10_SUBRESOURCE_DATA resource_data; @@ -269,14 +269,14 @@ HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, struct d2d_d3d_render_ resource_data.pSysMem = src_data; resource_data.SysMemPitch = pitch; - if (FAILED(hr = ID3D10Device_CreateTexture2D(render_target->device, &texture_desc, + if (FAILED(hr = ID3D10Device_CreateTexture2D(device, &texture_desc, src_data ? &resource_data : NULL, &texture))) { ERR("Failed to create texture, hr %#x.\n", hr); return hr; } - hr = ID3D10Device_CreateShaderResourceView(render_target->device, (ID3D10Resource *)texture, NULL, &view); + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &view); ID3D10Texture2D_Release(texture); if (FAILED(hr)) { @@ -284,13 +284,13 @@ HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, struct d2d_d3d_render_ return hr; } - d2d_bitmap_init(bitmap, render_target->factory, view, size, desc); + d2d_bitmap_init(bitmap, factory, view, size, desc); ID3D10ShaderResourceView_Release(view); return S_OK; } -HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target *render_target, +HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, ID2D1Factory *factory, ID3D10Device *target_device, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc) { if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) @@ -299,12 +299,12 @@ HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, struct d2d_d3d_render_ D2D1_BITMAP_PROPERTIES d; ID3D10Device *device; - if (src_impl->factory != render_target->factory) + if (src_impl->factory != factory) return D2DERR_WRONG_FACTORY; ID3D10ShaderResourceView_GetDevice(src_impl->view, &device); ID3D10Device_Release(device); - if (device != render_target->device) + if (device != target_device) return D2DERR_UNSUPPORTED_OPERATION; if (!desc) @@ -322,7 +322,7 @@ HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, struct d2d_d3d_render_ return D2DERR_UNSUPPORTED_PIXEL_FORMAT; } - d2d_bitmap_init(bitmap, render_target->factory, src_impl->view, src_impl->pixel_size, desc); + d2d_bitmap_init(bitmap, factory, src_impl->view, src_impl->pixel_size, desc); return S_OK; } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 7834e0a..e55c220 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -204,9 +204,9 @@ struct d2d_bitmap float dpi_y; }; -HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target *render_target, +HRESULT d2d_bitmap_init_memory(struct d2d_bitmap *bitmap, ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc) DECLSPEC_HIDDEN; -HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target *render_target, +HRESULT d2d_bitmap_init_shared(struct d2d_bitmap *bitmap, ID2D1Factory *factory, ID3D10Device *device, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc) DECLSPEC_HIDDEN; struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 8353c09..90e064f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -312,7 +312,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderT if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_bitmap_init_memory(object, render_target, size, src_data, pitch, desc))) + if (FAILED(hr = d2d_bitmap_init_memory(object, render_target->factory, render_target->device, size, src_data, pitch, desc))) { WARN("Failed to initialize bitmap, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -444,7 +444,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSharedBitmap(ID2D1R if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_bitmap_init_shared(object, render_target, iid, data, desc))) + if (FAILED(hr = d2d_bitmap_init_shared(object, render_target->factory, render_target->device, iid, data, desc))) { WARN("Failed to initialize bitmap, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Nikolay Sivov : include: Fix ID2D1DCRenderTarget definition.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 37b496d65fe81da59a9b36e7b3ca4e7c0d8614a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b496d65fe81da59a9b36e7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 02:21:41 2016 +0300 include: Fix ID2D1DCRenderTarget definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index d62a498..0e944e1 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1160,7 +1160,7 @@ interface ID2D1DCRenderTarget : ID2D1RenderTarget { HRESULT BindDC( [in] const HDC dc, - [in] const RECT rect + [in] const RECT *rect ); }

1 0

Matteo Bruni : wined3d: Don' t try to set line stippling on core profile contexts.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 73f50876ace489adb03a09970269a3182e2beee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f50876ace489adb03a09970… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 23:03:31 2016 +0200 wined3d: Don't try to set line stippling on core profile contexts. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 70f053b..937df15 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1355,6 +1355,14 @@ static void state_linepattern(struct wined3d_context *context, const struct wine } } +static void state_linepattern_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + static unsigned int once; + + if (!once++) + FIXME("Setting line patterns is not supported in OpenGL core contexts.\n"); +} + static void state_normalize(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -4959,7 +4967,8 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FILLMODE), { STATE_RENDER(WINED3D_RS_FILLMODE), state_fillmode }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, + { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_MONOENABLE), { STATE_RENDER(WINED3D_RS_MONOENABLE), state_monoenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ROP2), { STATE_RENDER(WINED3D_RS_ROP2), state_rop2 }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE },

1 0

Matteo Bruni : wined3d: Disable ARB_point_sprite on core profile contexts.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: f0c321a8e882a92ea14e0229c6aff04b61d62171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c321a8e882a92ea14e0229c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 23:03:30 2016 +0200 wined3d: Disable ARB_point_sprite on core profile contexts. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/glsl_shader.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f14eaaf..c666065 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3611,6 +3611,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD if (gl_version >= MAKEDWORD_VERSION(4, 3)) gl_info->supported[WINED3D_GL_VERSION_4_3] = TRUE; + /* All the points are actually point sprites in core contexts, the APIs from + * ARB_point_sprite are not supported anymore. */ + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + gl_info->supported[ARB_POINT_SPRITE] = FALSE; + if (gl_info->supported[APPLE_FENCE]) { /* GL_NV_fence and GL_APPLE_fence provide the same functionality basically. diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2dd7b29..945714e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8554,6 +8554,15 @@ static void glsl_vertex_pipe_pointscale(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE; } +static void glsl_vertex_pointsprite_core(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + static unsigned int once; + + if (state->gl_primitive_type == GL_POINTS && !state->render_states[WINED3D_RS_POINTSPRITEENABLE] && !once++) + FIXME("Non-point sprite points not supported in core profile.\n"); +} + static void glsl_vertex_pipe_shademode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -8662,7 +8671,8 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = {STATE_RENDER(WINED3D_RS_POINTSIZE), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), {STATE_RENDER(WINED3D_RS_POINTSIZE_MIN), glsl_vertex_pipe_pointsize}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), state_pointsprite }, ARB_POINT_SPRITE }, - {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), state_pointsprite_w }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), state_pointsprite_w }, WINED3D_GL_LEGACY_CONTEXT }, + {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), glsl_vertex_pointsprite_core}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), glsl_vertex_pipe_pointscale}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSCALE_A), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSCALE_B), {STATE_RENDER(WINED3D_RS_POINTSCALEENABLE), NULL }, WINED3D_GL_EXT_NONE }, @@ -9028,6 +9038,7 @@ static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = {STATE_RENDER(WINED3D_RS_FOGCOLOR), {STATE_RENDER(WINED3D_RS_FOGCOLOR), glsl_fragment_pipe_fogparams }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGDENSITY), {STATE_RENDER(WINED3D_RS_FOGDENSITY), glsl_fragment_pipe_fogparams }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), glsl_fragment_pipe_shader }, ARB_POINT_SPRITE }, + {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), glsl_fragment_pipe_shader }, WINED3D_GL_VERSION_2_0}, {STATE_TEXTURESTAGE(0,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(0, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), glsl_fragment_pipe_tex_transform }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(1,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(1, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), glsl_fragment_pipe_tex_transform }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(2,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(2, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), glsl_fragment_pipe_tex_transform }, WINED3D_GL_EXT_NONE },

1 0

Matteo Bruni : wined3d: Don' t set legacy light and texture environment state on core profile contexts.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: ccac958b582d5c5c535d28fcfe0cb1b8a7334037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccac958b582d5c5c535d28fcf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 23:03:29 2016 +0200 wined3d: Don't set legacy light and texture environment state on core profile contexts. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 096cbac..dfeb4fb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1864,21 +1864,18 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, TRACE("Setting up the screen\n"); - gl_info->gl_ops.gl.p_glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE); - checkGLcall("glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);"); - - gl_info->gl_ops.gl.p_glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT); - checkGLcall("glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);"); - - gl_info->gl_ops.gl.p_glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR); - checkGLcall("glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);"); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + gl_info->gl_ops.gl.p_glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE); + checkGLcall("glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment); - checkGLcall("glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment);"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, device->surface_alignment);"); + gl_info->gl_ops.gl.p_glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT); + checkGLcall("glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);"); - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + gl_info->gl_ops.gl.p_glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR); + checkGLcall("glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);"); + } + else { GLuint vao; @@ -1887,6 +1884,11 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, checkGLcall("creating VAO"); } + gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment); + checkGLcall("glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment);"); + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, device->surface_alignment);"); + if (gl_info->supported[ARB_VERTEX_BLEND]) { /* Direct3D always uses n-1 weights for n world matrices and uses

1 0

Matteo Bruni : d3d8/tests: Add a test for color varyings clamping.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: daf549219df2d5d050b389a098a1fe7445d37183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf549219df2d5d050b389a09… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 28 23:03:27 2016 +0200 d3d8/tests: Add a test for color varyings clamping. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 8ba6ccd..580b444 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9176,6 +9176,182 @@ done: DestroyWindow(window); } +static void test_color_clamping(void) +{ + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct vec3 quad[] = + { + {-1.0f, -1.0f, 0.1f}, + {-1.0f, 1.0f, 0.1f}, + { 1.0f, -1.0f, 0.1f}, + { 1.0f, 1.0f, 0.1f}, + }; + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), + D3DVSD_CONST(0, 1), 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c0, 1.0, 1.0, 1.0, 1.0 */ + D3DVSD_END() + }; + static const DWORD vs1_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000002, 0xd00f0000, 0xa0e40000, 0xa0e40000, /* add oD0, c0, c0 */ + 0x00000002, 0xd00f0001, 0xa0e40000, 0xa0e40000, /* add oD1, c0, c0 */ + 0x0000ffff + }; + static const DWORD ps1_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000051, 0xa00f0000, 0x3e800000, 0x3e800000, 0x3e800000, 0x3e800000, /* def c0, 0.25, 0.25, 0.25, 0.25 */ + 0x00000002, 0x800f0000, 0x90e40000, 0x90e40001, /* add r0, v0, v1 */ + 0x00000005, 0x800f0000, 0x80e40000, 0xa0e40000, /* mul r0, r0, c0 */ + 0x0000ffff + }; + static const struct + { + DWORD vs_version; + const DWORD *vs; + DWORD ps_version; + const DWORD *ps; + D3DCOLOR expected, broken; + } + tests[] = + { + {0, NULL, 0, NULL, 0x00404040}, + {0, NULL, D3DPS_VERSION(1, 1), ps1_code, 0x00404040, 0x00808080}, + {D3DVS_VERSION(1, 1), vs1_code, 0, NULL, 0x00404040}, + {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_code, 0x007f7f7f}, + }; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + unsigned int i; + ULONG refcount; + D3DCOLOR color; + D3DCAPS8 caps; + DWORD vs, ps; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0xff404040); + ok(SUCCEEDED(hr), "Failed to set texture factor, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_ADD); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG2, D3DTA_SPECULAR); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_MODULATE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLORARG1, D3DTA_TFACTOR); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLORARG2, D3DTA_CURRENT); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + if (caps.VertexShaderVersion < tests[i].vs_version + || caps.PixelShaderVersion < tests[i].ps_version) + { + skip("Vertex / pixel shader version not supported, skipping test %u.\n", i); + continue; + } + if (tests[i].vs) + { + hr = IDirect3DDevice8_CreateVertexShader(device, decl, tests[i].vs, &vs, 0); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x (case %u).\n", hr, i); + } + else + { + vs = D3DFVF_XYZ; + } + if (tests[i].ps) + { + hr = IDirect3DDevice8_CreatePixelShader(device, tests[i].ps, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x (case %u).\n", hr, i); + } + else + { + ps = 0; + } + + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, tests[i].expected, 1) || broken(color_match(color, tests[i].broken, 1)), + "Got unexpected color 0x%08x, case %u.\n", color, i); + + if (vs != D3DFVF_XYZ) + IDirect3DDevice8_DeleteVertexShader(device, vs); + if (ps) + IDirect3DDevice8_DeletePixelShader(device, ps); + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -9242,4 +9418,5 @@ START_TEST(visual) test_shademode(); test_multisample_init(); test_texture_blending(); + test_color_clamping(); }

1 0

Adam Buchbinder : riched20: Implement ITextRange::ScrollIntoView.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 20323e3f119e95811e773de68ca413447032b0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=20323e3f119e95811e773de68… Author: Adam Buchbinder <abuchbinder(a)google.com> Date: Thu Mar 24 14:35:09 2016 -0700 riched20: Implement ITextRange::ScrollIntoView. This only implements bStart = tomStart, but that seems like the most common use case. Signed-off-by: Adam Buchbinder <abuchbinder(a)google.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 5 ++-- dlls/riched20/editor.h | 1 + dlls/riched20/richole.c | 20 ++++++++++++-- dlls/riched20/tests/richole.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ca50f18..4b0bfcf 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -216,9 +216,8 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) } -static void -ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height) +void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, + int *x, int *y, int *height) { ME_DisplayItem *row; ME_DisplayItem *run = pCursor->pRun; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index a63dea6..e9d1e47 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -192,6 +192,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; +void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) DECLSPEC_HIDDEN; /* context.c */ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index be35521..1013e67 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2428,13 +2428,29 @@ static HRESULT WINAPI ITextRange_fnSetPoint(ITextRange *me, LONG x, LONG y, LONG static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) { ITextRangeImpl *This = impl_from_ITextRange(me); + ME_TextEditor *editor; + ME_Cursor cursor; + int x, y, height; - FIXME("(%p)->(%d): stub\n", This, value); + TRACE("(%p)->(%d)\n", This, value); if (!This->child.reole) return CO_E_RELEASED; - return E_NOTIMPL; + editor = This->child.reole->editor; + + switch (value) + { + case tomStart: + ME_CursorFromCharOfs(editor, This->start, &cursor); + ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + break; + default: + FIXME("bStart value %d not handled\n", value); + return E_NOTIMPL; + } + ME_ScrollAbs(editor, x, y); + return S_OK; } static HRESULT WINAPI ITextRange_fnGetEmbeddedObject(ITextRange *me, IUnknown **ppv) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 7c6c5d5..6da3ce3 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -53,6 +53,7 @@ static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) HWND hwnd = CreateWindowA(lpClassName, NULL, dwStyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); return hwnd; } @@ -761,6 +762,65 @@ static void test_ITextRange_GetChar(void) ITextRange_Release(txtRge); } +/* Helper function for testing ITextRange_ScrollIntoView */ +static void check_range(HWND w, ITextDocument* doc, int first, int lim, + LONG bStart, int expected_nonzero) +{ + SCROLLINFO si; + ITextRange *txtRge = NULL; + HRESULT hres; + + si.cbSize = sizeof(SCROLLINFO); + si.fMask = SIF_POS | SIF_RANGE; + + hres = ITextDocument_Range(doc, first, lim, &txtRge); + ok(hres == S_OK, "got 0x%08x\n", hres); + hres = ITextRange_ScrollIntoView(txtRge, bStart); + ok(hres == S_OK, "got 0x%08x\n", hres); + GetScrollInfo(w, SB_VERT, &si); + if (expected_nonzero) { + ok(si.nPos != 0, + "Scrollbar at 0, should be >0. (TextRange %d-%d, scroll range %d-%d.)\n", + first, lim, si.nMin, si.nMax); + } else { + ok(si.nPos == 0, + "Scrollbar at %d, should be 0. (TextRange %d-%d, scroll range %d-%d.)\n", + si.nPos, first, lim, si.nMin, si.nMax); + } +} + +static void test_ITextRange_ScrollIntoView(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + static const CHAR test_text1[] = "1\n2\n3\n4\n5\n6\n7\n8\n9\n10"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + /* Scroll to the top. */ + check_range(w, txtDoc, 0, 1, tomStart, 0); + + /* Scroll to the bottom. */ + check_range(w, txtDoc, 19, 20, tomStart, 1); + + /* Back up to the top. */ + check_range(w, txtDoc, 0, 1, tomStart, 0); + + /* Large range */ + check_range(w, txtDoc, 0, 20, tomStart, 0); + + hres = ITextDocument_Range(txtDoc, 0, 0, &txtRge); + ok(hres == S_OK, "got 0x%08x\n", hres); + release_interfaces(&w, &reOle, &txtDoc, NULL); + hres = ITextRange_ScrollIntoView(txtRge, tomStart); + ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + ITextRange_Release(txtRge); +} + static void test_ITextSelection_GetChar(void) { HWND w; @@ -3352,6 +3412,7 @@ START_TEST(richole) test_ITextSelection_Collapse(); test_ITextDocument_Range(); test_ITextRange_GetChar(); + test_ITextRange_ScrollIntoView(); test_ITextRange_GetStart_GetEnd(); test_ITextRange_GetDuplicate(); test_ITextRange_Collapse();

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
73
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 March 2016