February 2016 - Wine-Commits

Nikolay Sivov : comctl32/trackbar: Update thumb immediately on key press.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 8e52af656a08aed4d8a11f78a783a9deeac11389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e52af656a08aed4d8a11f78a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 18 19:43:57 2016 +1100 comctl32/trackbar: Update thumb immediately on key press. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 88ea4c520b9c4a810bf88b7053d36f7151272943) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 9 ++++++++- dlls/comctl32/trackbar.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7c04d15..adb1b12 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -672,7 +672,14 @@ static void test_position(void) r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); ok(r == 30, "got %d\n", r); SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); - ok(rect.left != rect2.left, "got %d\n", rect.left); + ok(rect.left != rect2.left, "got %d, expected %d\n", rect2.left, rect.left); + + /* now move it with keys */ + SendMessageA(hWndTrackbar, WM_KEYDOWN, VK_END, 0); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 100, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + ok(rect.left != rect2.left, "got %d, expected %d\n", rect.left, rect2.left); DestroyWindow(hWndTrackbar); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c0f58db..87d955c 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1821,7 +1821,7 @@ TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr, INT nVirtKey) } if (pos != infoPtr->lPos) { - infoPtr->flags |=TB_THUMBPOSCHANGED; + TRACKBAR_UpdateThumb (infoPtr); TRACKBAR_InvalidateThumbMove (infoPtr, pos, infoPtr->lPos); }

1 0

Piotr Caban : msvcrt: Fix modff signature.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 96fcbfdd1580e15adaceaadac6b9322c4d71d1cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=96fcbfdd1580e15adaceaadac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 17:01:02 2016 +0100 msvcrt: Fix modff signature. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0806b06f2ba7a690661d6ae417270bdbc7370953) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2459bf5..557bcec 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -331,7 +331,7 @@ float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) /********************************************************************* * modff (MSVCRT.@) */ -double CDECL MSVCRT_modff( float x, float *iptr ) +float CDECL MSVCRT_modff( float x, float *iptr ) { return modff( x, iptr ); }

1 0

Józef Kucia : d3d9: Implement d3d9_device_CreateDepthStencilSurfaceEx().
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: bedeba0f33593072612224fa03338f3cba72130c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bedeba0f33593072612224fa0… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Jan 7 16:22:45 2016 +0100 d3d9: Implement d3d9_device_CreateDepthStencilSurfaceEx(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 89c6a755c4c752558b8d3bf3ba3883d8d3ab4cbd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/device.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 16b27e5..2e4042b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3352,16 +3352,28 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) { - FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u,\n" - "discard %#x, surface %p, shared_handle %p, usage %#x stub!\n", + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + DWORD flags = WINED3D_SURFACE_MAPPABLE; + + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " + "discard %#x, surface %p, shared_handle %p, usage %#x.\n", iface, width, height, format, multisample_type, multisample_quality, discard, surface, shared_handle, usage); - *surface = NULL; + if (usage & D3DUSAGE_DEPTHSTENCIL) + { + WARN("Invalid usage %#x.\n", usage); + return D3DERR_INVALIDCALL; + } + if (shared_handle) FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); - return E_NOTIMPL; + if (discard) + flags |= WINED3D_SURFACE_DISCARD; + + return d3d9_device_create_surface(device, width, height, format, flags, surface, + D3DUSAGE_DEPTHSTENCIL | usage, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex *iface,

1 0

Hans Leidekker : dnsapi: Add a stub implementation of DnsFlushResolverCacheEntry_A/UTF8/W.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: af417a5584c419f1fc35af61d6420174f1b16657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af417a5584c419f1fc35af61d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:05:30 2015 +0100 dnsapi: Add a stub implementation of DnsFlushResolverCacheEntry_A/UTF8/W. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e10c48143aadc9fbec7677847d3d9eab66bf441f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dnsapi/dnsapi.spec | 6 +++--- dlls/dnsapi/main.c | 32 ++++++++++++++++++++++++++++++++ dlls/dnsapi/tests/name.c | 21 +++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 4f6f1c8..de0ed1d 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -32,9 +32,9 @@ @ stdcall DnsExtractRecordsFromMessage_W(ptr long ptr) @ stub DnsFindAuthoritativeZone @ stdcall DnsFlushResolverCache() -@ stub DnsFlushResolverCacheEntry_A -@ stub DnsFlushResolverCacheEntry_UTF8 -@ stub DnsFlushResolverCacheEntry_W +@ stdcall DnsFlushResolverCacheEntry_A(str) +@ stdcall DnsFlushResolverCacheEntry_UTF8(str) +@ stdcall DnsFlushResolverCacheEntry_W(wstr) @ stdcall DnsFree(ptr long) @ stub DnsFreeAdapterInformation @ stub DnsFreeNetworkInformation diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index d4f716a..93528a2 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -93,6 +93,38 @@ VOID WINAPI DnsFlushResolverCache(void) FIXME(": stub\n"); } +/****************************************************************************** + * DnsFlushResolverCacheEntry_A [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_A( PCSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_a(entry) ); + if (!entry) return FALSE; + return TRUE; +} + +/****************************************************************************** + * DnsFlushResolverCacheEntry_UTF8 [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_UTF8( PCSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_a(entry) ); + if (!entry) return FALSE; + return TRUE; +} + +/****************************************************************************** + * DnsFlushResolverCacheEntry_W [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_W( PCWSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_w(entry) ); + if (!entry) return FALSE; + return TRUE; +} /****************************************************************************** * DnsReleaseContextHandle [DNSAPI.@] diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index fba6955..3e54355 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -27,6 +27,8 @@ #include "wine/test.h" +BOOL WINAPI DnsFlushResolverCacheEntry_A(PCSTR); + static const struct { LPCSTR name; @@ -202,8 +204,27 @@ static void test_DnsNameCompare_A( void ) ok( DnsNameCompare_A( a_dot_b, b_dot_a_dot ) == FALSE, "succeeded unexpectedly\n" ); } +static void test_DnsFlushResolverCacheEntry_A(void) +{ + BOOL ret; + DWORD err; + + SetLastError( 0xdeadbeef ); + ret = DnsFlushResolverCacheEntry_A( NULL ); + err = GetLastError(); + ok( !ret, "got %d\n", ret ); + ok( err == 0xdeadbeef, "got %u\n", err ); + + ret = DnsFlushResolverCacheEntry_A( "localhost" ); + ok( ret, "got %d\n", ret ); + + ret = DnsFlushResolverCacheEntry_A( "nxdomain.test.winehq.org" ); + ok( ret, "got %d\n", ret ); +} + START_TEST(name) { test_DnsValidateName_A(); test_DnsNameCompare_A(); + test_DnsFlushResolverCacheEntry_A(); }

1 0

Sebastian Lackner : ntdll: Check ContextFlags before restoring registers on x86_64.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 404223077e01c8796c9bf0fdf7b410e4dd606425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404223077e01c8796c9bf0fdf… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 2 04:40:46 2016 +0100 ntdll: Check ContextFlags before restoring registers on x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 897ac569c84d9be42e0b4bbd718a3eb05663e4d9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 524de68..0c64541 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1800,11 +1800,12 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, "ret" ); /*********************************************************************** - * set_cpu_context + * set_full_cpu_context * * Set the new CPU context. */ -__ASM_GLOBAL_FUNC( set_cpu_context, +extern void set_full_cpu_context( const CONTEXT *context ); +__ASM_GLOBAL_FUNC( set_full_cpu_context, "subq $40,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 40\n\t") "ldmxcsr 0x34(%rdi)\n\t" /* context->MxCsr */ @@ -1852,6 +1853,25 @@ __ASM_GLOBAL_FUNC( set_cpu_context, "movq 0xb0(%rdi),%rdi\n\t" /* context->Rdi */ "iretq" ); + +/*********************************************************************** + * set_cpu_context + * + * Set the new CPU context. Used by NtSetContextThread. + */ +void set_cpu_context( const CONTEXT *context ) +{ + DWORD flags = context->ContextFlags & ~CONTEXT_AMD64; + if (flags & CONTEXT_FULL) + { + if (!(flags & CONTEXT_CONTROL)) + FIXME( "setting partial context (%x) not supported\n", flags ); + else + set_full_cpu_context( context ); + } +} + + /*********************************************************************** * copy_context *

1 0

Tag wine-1.8.1 : Alexandre Julliard : Release 1.8.1
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: refs/tags/wine-1.8.1 Tag: 3bf7f95de211184b2f773d727dbf09002d916f58 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3bf7f95de211184b2f773d727dbf… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 22:37:54 2016 +0900 Release 1.8.1

1 0

Michael Stefaniuc : Release 1.8.1
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 84cae8c3ea2614fce65d5d499159de9d530444ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=84cae8c3ea2614fce65d5d499… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 2 16:06:26 2016 +0100 Release 1.8.1 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 504 +++++++++++--------------------------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 102 insertions(+), 424 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84cae8c3ea2614fce65d5…

1 0

Nikolay Sivov : comctl32/trackbar: Update thumb immediately on TBM_SETPOS.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 5b23a4396411d29371f7b84968407a01ab92c5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b23a4396411d29371f7b8496… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 9 23:45:20 2016 +0300 comctl32/trackbar: Update thumb immediately on TBM_SETPOS. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a65ddbf153b8865e0565bf210e637bf2b0053196) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/trackbar.c | 7 ++++-- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index e496572..7c04d15 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -32,6 +32,16 @@ static const DWORD defaultstyle = WS_VISIBLE | TBS_TOOLTIPS | TBS_ENABLESELRANGE | TBS_FIXEDLENGTH | TBS_AUTOTICKS; static HWND hWndParent; +static LRESULT WINAPI trackbar_no_wmpaint_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (message == WM_PAINT) + return 0; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; static const struct message empty_seq[] = { @@ -465,6 +475,15 @@ static HWND create_trackbar(DWORD style, HWND parent){ return hWndTrack; } +static HWND create_trackbar2(DWORD style, HWND parent) +{ + RECT rect; + GetClientRect(parent, &rect); + return CreateWindowA(TRACKBAR_CLASSA, "Trackbar Control", style, + rect.right, rect.bottom, 100, 50, + parent, NULL, GetModuleHandleA(NULL), NULL); +} + /* test functions for setters, getters, and sequences */ static void test_trackbar_buddy(void) @@ -595,6 +614,8 @@ static void test_page_size(void) static void test_position(void) { HWND hWndTrackbar; + RECT rect, rect2; + WNDPROC oldproc; int r; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); @@ -626,6 +647,34 @@ static void test_position(void) ok_sequence(sequences, PARENT_SEQ_INDEX, parent_position_test_seq, "parent position test sequence", TRUE); DestroyWindow(hWndTrackbar); + + hWndTrackbar = create_trackbar2(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + /* subclassing procedure blocks WM_PAINT */ + oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); + SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); + + memset(&rect, 0, sizeof(rect)); + memset(&rect2, 0, sizeof(rect2)); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + + /* without repaint */ + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 25); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 25, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(rect.left == rect2.left, "got %d\n", rect.left); + + /* with repaint */ + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 30); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 30, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(rect.left != rect2.left, "got %d\n", rect.left); + + DestroyWindow(hWndTrackbar); } static void test_range(void) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 6d092a3..c0f58db 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1229,9 +1229,12 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->flags |= TB_THUMBPOSCHANGED; - if (fPosition && oldPos != lPosition) TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + if (fPosition && oldPos != lPosition) + { + TRACKBAR_UpdateThumb(infoPtr); + TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + } return 0; }

1 0

Henri Verbeet : wined3d: Set WINED3D_BUFFER_DOUBLEBUFFER for managed buffers as well.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: f76b3ece6364b4616a5e2986b94db4de2ed3907e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76b3ece6364b4616a5e2986b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 15:04:55 2016 +0100 wined3d: Set WINED3D_BUFFER_DOUBLEBUFFER for managed buffers as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e6e0c2278359340594da7451654ef7c50d175e7c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/device.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/buffer.c | 2 +- 3 files changed, 156 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index daf45b7..8b20d19 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5577,6 +5577,82 @@ static void test_swvp_buffer(void) DestroyWindow(window); } +static void test_managed_buffer(void) +{ + static const unsigned int vertex_count = 1024; + IDirect3DVertexBuffer8 *buffer; + D3DVERTEXBUFFER_DESC desc; + IDirect3DDevice8 *device; + struct vec3 *ptr, *ptr2; + IDirect3D8 *d3d8; + unsigned int i; + UINT refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d8, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, vertex_count * sizeof(*ptr), 0, 0, D3DPOOL_MANAGED, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_GetDesc(buffer, &desc); + ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr); + ok(desc.Pool == D3DPOOL_MANAGED, "Got unexpected pool %#x.\n", desc.Pool); + ok(!desc.Usage, "Got unexpected usage %#x.\n", desc.Usage); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, vertex_count * sizeof(*ptr), (BYTE **)&ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + for (i = 0; i < vertex_count; ++i) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*ptr)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + 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); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, vertex_count * sizeof(*ptr2), (BYTE **)&ptr2, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + ok(ptr2 == ptr, "Got unexpected ptr2 %p, expected %p.\n", ptr2, ptr); + for (i = 0; i < vertex_count; ++i) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Got unexpected vertex %u {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n", + i, ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + static void test_npot_textures(void) { IDirect3DDevice8 *device = NULL; @@ -7530,6 +7606,7 @@ START_TEST(device) test_surface_blocks(); test_set_palette(); test_swvp_buffer(); + test_managed_buffer(); test_npot_textures(); test_volume_locking(); test_update_volumetexture(); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 6cdb225..16723df 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -8102,6 +8102,83 @@ static void test_swvp_buffer(void) DestroyWindow(window); } +static void test_managed_buffer(void) +{ + static const unsigned int vertex_count = 1024; + IDirect3DVertexBuffer9 *buffer; + D3DVERTEXBUFFER_DESC desc; + IDirect3DDevice9 *device; + struct vec3 *ptr, *ptr2; + IDirect3D9 *d3d9; + unsigned int i; + UINT refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d9, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateVertexBuffer(device, vertex_count * sizeof(*ptr), + 0, 0, D3DPOOL_MANAGED, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_GetDesc(buffer, &desc); + ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr); + ok(desc.Pool == D3DPOOL_MANAGED, "Got unexpected pool %#x.\n", desc.Pool); + ok(!desc.Usage, "Got unexpected usage %#x.\n", desc.Usage); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, vertex_count * sizeof(*ptr), (void **)&ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + for (i = 0; i < vertex_count; ++i) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*ptr)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, vertex_count * sizeof(*ptr2), (void **)&ptr2, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + ok(ptr2 == ptr, "Got unexpected ptr2 %p, expected %p.\n", ptr2, ptr); + for (i = 0; i < vertex_count; ++i) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Got unexpected vertex %u {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n", + i, ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + static void test_npot_textures(void) { IDirect3DDevice9 *device = NULL; @@ -10446,6 +10523,7 @@ START_TEST(device) test_surface_blocks(); test_set_palette(); test_swvp_buffer(); + test_managed_buffer(); test_npot_textures(); test_vidmem_accounting(); test_volume_locking(); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ba4ed5d..9b7f1c5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1203,7 +1203,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory, buffer); - if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING) + if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING || pool == WINED3D_POOL_MANAGED) { /* SWvp always returns the same pointer in buffer maps and retains data in DISCARD maps. * Keep a system memory copy of the buffer to provide the same behavior to the application.

1 0

Matteo Bruni : wined3d: Regenerate FFP replacement VS on changes to the normal attribute in the vertex declaration.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: b5f96cfaa917202f0ca561965a53caa93af91e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f96cfaa917202f0ca561965… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 14 23:37:53 2015 +0100 wined3d: Regenerate FFP replacement VS on changes to the normal attribute in the vertex declaration. 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> (cherry picked from commit d2d8d8f13e0302c32f63714fdb52d97195f2b335) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 ++++- dlls/wined3d/wined3d_private.h | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6fa9521..973b4a0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8068,6 +8068,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL normal = !!(context->stream_info.use_map & (1u << WINED3D_FFP_NORMAL)); BOOL transformed = context->stream_info.position_transformed; BOOL wasrhw = context->last_was_rhw; unsigned int i; @@ -8093,7 +8094,8 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, /* Because of settings->texcoords, we have to regenerate the vertex * shader on a vdecl change if there aren't enough varyings to just * always output all the texture coordinates. */ - if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info)) + if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info) + || normal != context->last_was_normal) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; if (use_ps(state) @@ -8112,6 +8114,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, } context->last_was_vshader = use_vs(state); + context->last_was_normal = normal; } static void glsl_vertex_pipe_vs(struct wined3d_context *context, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 53ef63e..70857c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1175,6 +1175,7 @@ struct wined3d_context DWORD last_was_rhw : 1; /* true iff last draw_primitive was in xyzrhw mode */ DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; + DWORD last_was_normal : 1; DWORD namedArraysLoaded : 1; DWORD numberedArraysLoaded : 1; DWORD last_was_blit : 1; @@ -1185,17 +1186,17 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD valid : 1; - DWORD use_immediate_mode_draw : 1; DWORD texShaderBumpMap : 8; /* MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max MAX_TEXTURES, 8 */ + DWORD use_immediate_mode_draw : 1; DWORD rebind_fbo : 1; DWORD needs_set : 1; DWORD hdc_is_private : 1; DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ DWORD update_shader_resource_bindings : 1; - DWORD padding : 15; + DWORD padding : 14; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask;

1 0