September 2014 - Wine-Commits

Henri Verbeet : d3d10core/tests: Add a basic scissoring test.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: d276bde09c4a80e093db0f6e6234f9e81bba61fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d276bde09c4a80e093db0f6e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 1 14:11:02 2014 +0200 d3d10core/tests: Add a basic scissoring test. --- dlls/d3d10core/tests/Makefile.in | 2 +- dlls/d3d10core/tests/device.c | 285 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d276bde09c4a80e093db0…

1 0

Henri Verbeet : d3d10core: Set wined3d state in d3d10_device_RSSetState().
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 1cccd02428752bdc7eb27644fe51b825c26e5e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cccd02428752bdc7eb27644f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 1 12:42:56 2014 +0200 d3d10core: Set wined3d state in d3d10_device_RSSetState(). At some point we'll probably want to switch to using state objects inside wined3d, although that would require some changes to the other users of wined3d as well. --- dlls/d3d10core/device.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bb5265b..157638b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -475,10 +475,36 @@ static void STDMETHODCALLTYPE d3d10_device_DrawAuto(ID3D10Device1 *iface) static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device1 *iface, ID3D10RasterizerState *rasterizer_state) { struct d3d10_device *device = impl_from_ID3D10Device(iface); + const D3D10_RASTERIZER_DESC *desc; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); - device->rasterizer_state = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state); + if (!(device->rasterizer_state = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state))) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_CCW); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE); + return; + } + + desc = &device->rasterizer_state->desc; + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); + /* glFrontFace() */ + if (desc->FrontCounterClockwise) + FIXME("Ignoring FrontCounterClockwise %#x.\n", desc->FrontCounterClockwise); + /* OpenGL style depth bias. */ + if (desc->DepthBias || desc->SlopeScaledDepthBias) + FIXME("Ignoring depth bias.\n"); + /* GL_DEPTH_CLAMP */ + if (!desc->DepthClipEnable) + FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); + wined3d_device_set_render_state(device->wined3d_device, + WINED3D_RS_ANTIALIASEDLINEENABLE, desc->AntialiasedLineEnable); } static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device1 *iface,

1 0

Francois Gouget : mshtml/tests: Avoid an http -> https redirection.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 6d4275c9648fbd9dd44cc99744b6f8fa5e383779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4275c9648fbd9dd44cc9974… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 12:24:41 2014 +0200 mshtml/tests: Avoid an http -> https redirection. --- dlls/mshtml/tests/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 2f99699..7360024 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1844,7 +1844,7 @@ static void test_imgload(IHTMLDocument2 *doc) ok(V_DISPATCH(&v) == (IDispatch*)&img_onerror_obj, "V_DISPATCH(onerror) != onerrorFunc\n"); VariantClear(&v); - str = a2bstr("http://www.winehq.org/images/winehq_logo_text.png"); + str = a2bstr("https://www.winehq.org/images/winehq_logo_text.png"); hres = IHTMLImgElement_put_src(img, str); ok(hres == S_OK, "put_src failed: %08x\n", hres); SysFreeString(str);

1 0

Nikolay Sivov : ntdll: NtWaitForMultipleObjects()'s third arguments means 'wait_any', not 'wait_all'.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 7b7d8374a40ddae124cdd089e2eedb32e11b9f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7d8374a40ddae124cdd089e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 1 10:40:42 2014 +0400 ntdll: NtWaitForMultipleObjects()'s third arguments means 'wait_any', not 'wait_all'. --- dlls/kernel32/sync.c | 2 +- dlls/kernel32/tests/sync.c | 28 +++++++++++++++++++++++++--- dlls/ntdll/sync.c | 4 ++-- dlls/ntdll/threadpool.c | 2 +- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 8379c1d..d399b82 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -185,7 +185,7 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, } } - status = NtWaitForMultipleObjects( count, hloc, wait_all, alertable, + status = NtWaitForMultipleObjects( count, hloc, !wait_all, alertable, get_nt_timeout( &time, timeout ) ); if (HIWORD(status)) /* is it an error code? */ diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 2381302..cbe0acb 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <windef.h> #include <winbase.h> +#include <winternl.h> #include "wine/test.h" @@ -55,6 +56,7 @@ static VOID (WINAPI *pReleaseSRWLockExclusive)(PSRWLOCK); static VOID (WINAPI *pReleaseSRWLockShared)(PSRWLOCK); static BOOLEAN (WINAPI *pTryAcquireSRWLockExclusive)(PSRWLOCK); static BOOLEAN (WINAPI *pTryAcquireSRWLockShared)(PSRWLOCK); +static NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); static void test_signalandwait(void) { @@ -1153,15 +1155,32 @@ static void test_WaitForMultipleObjects(void) } /* a manual-reset event remains signaled, an auto-reset event is cleared */ - r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, FALSE, 0); ok( r == WAIT_OBJECT_0, "should signal lowest handle first, got %d\n", r); - r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, FALSE, 0); ok( r == WAIT_OBJECT_0, "should signal handle #0 first, got %d\n", r); ok(ResetEvent(maxevents[0]), "ResetEvent\n"); for (i=1; i<MAXIMUM_WAIT_OBJECTS; i++) { /* the lowest index is checked first and remaining events are untouched */ - r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, FALSE, 0); + ok( r == WAIT_OBJECT_0+i, "should signal handle #%d first, got %d\n", i, r); + } + + /* run same test with Nt* call */ + for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) + SetEvent(maxevents[i]); + + /* a manual-reset event remains signaled, an auto-reset event is cleared */ + r = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); + ok( r == WAIT_OBJECT_0, "should signal lowest handle first, got %d\n", r); + r = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); + ok( r == WAIT_OBJECT_0, "should signal handle #0 first, got %d\n", r); + ok(ResetEvent(maxevents[0]), "ResetEvent\n"); + for (i=1; i<MAXIMUM_WAIT_OBJECTS; i++) + { + /* the lowest index is checked first and remaining events are untouched */ + r = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); ok( r == WAIT_OBJECT_0+i, "should signal handle #%d first, got %d\n", i, r); } @@ -2287,6 +2306,8 @@ static void test_srwlock_example(void) START_TEST(sync) { HMODULE hdll = GetModuleHandleA("kernel32.dll"); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + pChangeTimerQueueTimer = (void*)GetProcAddress(hdll, "ChangeTimerQueueTimer"); pCreateTimerQueue = (void*)GetProcAddress(hdll, "CreateTimerQueue"); pCreateTimerQueueTimer = (void*)GetProcAddress(hdll, "CreateTimerQueueTimer"); @@ -2312,6 +2333,7 @@ START_TEST(sync) pReleaseSRWLockShared = (void *)GetProcAddress(hdll, "ReleaseSRWLockShared"); pTryAcquireSRWLockExclusive = (void *)GetProcAddress(hdll, "TryAcquireSRWLockExclusive"); pTryAcquireSRWLockShared = (void *)GetProcAddress(hdll, "TryAcquireSRWLockShared"); + pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); test_signalandwait(); test_mutex(); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 7c9d5e8..08fab44 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -849,7 +849,7 @@ NTSTATUS WINAPI NtSetTimerResolution(IN ULONG resolution, * NtWaitForMultipleObjects (NTDLL.@) */ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, - BOOLEAN wait_all, BOOLEAN alertable, + BOOLEAN wait_any, BOOLEAN alertable, const LARGE_INTEGER *timeout ) { select_op_t select_op; @@ -858,7 +858,7 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, if (!count || count > MAXIMUM_WAIT_OBJECTS) return STATUS_INVALID_PARAMETER_1; if (alertable) flags |= SELECT_ALERTABLE; - select_op.wait.op = wait_all ? SELECT_WAIT_ALL : SELECT_WAIT; + select_op.wait.op = wait_any ? SELECT_WAIT : SELECT_WAIT_ALL; for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); return server_select( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout ); } diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index f66f6ab..fef26fe 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -322,7 +322,7 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) while (TRUE) { - status = NtWaitForMultipleObjects( 2, handles, FALSE, alertable, + status = NtWaitForMultipleObjects( 2, handles, TRUE, alertable, get_nt_timeout( &timeout, wait_work_item->Milliseconds ) ); if (status == STATUS_WAIT_0 || status == STATUS_TIMEOUT) {

1 0

YongHao Hu : msvcp90: Added complex_float_pow implementation ( fix precision) and tests.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: f02ff7f651c641e52ac5861eac317c4dc320787f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02ff7f651c641e52ac5861ea… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Aug 30 09:34:47 2014 +0800 msvcp90: Added complex_float_pow implementation (fix precision) and tests. --- dlls/msvcp60/msvcp60.spec | 24 +++++++-------- dlls/msvcp70/msvcp70.spec | 12 ++++---- dlls/msvcp71/msvcp71.spec | 12 ++++---- dlls/msvcp80/msvcp80.spec | 12 ++++---- dlls/msvcp90/math.c | 48 ++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++++---- dlls/msvcp90/tests/misc.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 158 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f02ff7f651c641e52ac58…

1 0

Henri Verbeet : d3d10: Implement d3d10_stateblock_Capture().
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 37d628cdc9a17f36c15cc6735041a114e2e96c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d628cdc9a17f36c15cc6735… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 1 12:42:59 2014 +0200 d3d10: Implement d3d10_stateblock_Capture(). --- dlls/d3d10/stateblock.c | 297 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 295 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37d628cdc9a17f36c15cc…

1 0

Henri Verbeet : d3d10core: Properly handle parentless views in d3d10_device_OMGetRenderTargets().
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 204ffe15a6686669f8d3dfee87e0c334c1c3ebd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=204ffe15a6686669f8d3dfee8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 1 12:42:58 2014 +0200 d3d10core: Properly handle parentless views in d3d10_device_OMGetRenderTargets(). --- dlls/d3d10core/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 157638b..425bf74 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -955,13 +955,13 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *ifa for (i = 0; i < view_count; ++i) { - if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i))) + if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i)) + || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) { render_target_views[i] = NULL; continue; } - view_impl = wined3d_rendertarget_view_get_parent(wined3d_view); render_target_views[i] = &view_impl->ID3D10RenderTargetView_iface; ID3D10RenderTargetView_AddRef(render_target_views[i]); } @@ -971,13 +971,13 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *ifa { struct d3d10_depthstencil_view *view_impl; - if (!(wined3d_view = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + if (!(wined3d_view = wined3d_device_get_depth_stencil_view(device->wined3d_device)) + || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) { *depth_stencil_view = NULL; } else { - view_impl = wined3d_rendertarget_view_get_parent(wined3d_view); *depth_stencil_view = &view_impl->ID3D10DepthStencilView_iface; ID3D10DepthStencilView_AddRef(*depth_stencil_view); }

1 0

Qian Hong : riched20: Handle QI failure in ME_GetOLEObjectSize.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 3881adf2440b98fe70dda0556ce1df610cf57742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3881adf2440b98fe70dda0556… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Sep 1 10:00:59 2014 +0800 riched20: Handle QI failure in ME_GetOLEObjectSize. --- dlls/riched20/richole.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 487fcda..b18b648 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1586,7 +1586,12 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) return; } - IOleObject_QueryInterface(run->ole_obj->poleobj, &IID_IDataObject, (void**)&ido); + if (IOleObject_QueryInterface(run->ole_obj->poleobj, &IID_IDataObject, (void**)&ido) != S_OK) + { + FIXME("Query Interface IID_IDataObject failed!\n"); + pSize->cx = pSize->cy = 0; + return; + } fmt.cfFormat = CF_BITMAP; fmt.ptd = NULL; fmt.dwAspect = DVASPECT_CONTENT;

1 0

Francois Gouget : dwrite: Remove a space before a '\n'.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 466f9790de746aa6eee5e774d0e7e626b7df078f URL: http://source.winehq.org/git/wine.git/?a=commit;h=466f9790de746aa6eee5e774d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 12:12:35 2014 +0200 dwrite: Remove a space before a '\n'. --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6c3d162..c835ff4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1515,7 +1515,7 @@ static HRESULT WINAPI localfontfileloader_GetFilePathFromKey(IDWriteLocalFontFil static HRESULT WINAPI localfontfileloader_GetLastWriteTimeFromKey(IDWriteLocalFontFileLoader *iface, void const *key, UINT32 key_size, FILETIME *writetime) { struct dwrite_localfontfileloader *This = impl_from_IDWriteLocalFontFileLoader(iface); - FIXME("(%p)->(%p, %i, %p):stub \n",This, key, key_size, writetime); + FIXME("(%p)->(%p, %i, %p):stub\n",This, key, key_size, writetime); return E_NOTIMPL; }

1 0

Henri Verbeet : wined3d: Allow sRGB read/ write and VTF on WINED3DFMT_R8G8B8A8_UNORM.
by Alexandre Julliard Sept. 2, 2014

Sept. 2, 2014

Module: wine Branch: master Commit: 429d72965d5a0e32059bb2944bc4fd6b2c8d4e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429d72965d5a0e32059bb2944… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 1 12:42:55 2014 +0200 wined3d: Allow sRGB read/write and VTF on WINED3DFMT_R8G8B8A8_UNORM. --- dlls/wined3d/utils.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 68eb735..5db5e94 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -801,10 +801,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_R8G8B8A8_UNORM, GL_RGBA8, GL_RGBA8, 0, + {WINED3DFMT_R8G8B8A8_UNORM, GL_RGBA8, GL_SRGB8_ALPHA8_EXT, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_RENDERTARGET, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE + | WINED3DFMT_FLAG_VTF, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R8G8B8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0,

1 0