March 2020 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : wbemdisp: Use pointer moniker instead of custom moniker implementation.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 05dd8212388e395b95c2f84583742bc79daeca63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05dd8212388e395b95c2f845… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 9 10:58:37 2020 +0800 wbemdisp: Use pointer moniker instead of custom moniker implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/main.c | 246 +---------------------------------------- dlls/wbemdisp/tests/wbemdisp.c | 15 +++ 2 files changed, 17 insertions(+), 244 deletions(-) diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index b921e490fa..b3ee4de30c 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -36,248 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); static HINSTANCE instance; -struct moniker -{ - IMoniker IMoniker_iface; - LONG refs; - IUnknown *obj; -}; - -static inline struct moniker *impl_from_IMoniker( - IMoniker *iface ) -{ - return CONTAINING_RECORD( iface, struct moniker, IMoniker_iface ); -} - -static ULONG WINAPI moniker_AddRef( - IMoniker *iface ) -{ - struct moniker *moniker = impl_from_IMoniker( iface ); - return InterlockedIncrement( &moniker->refs ); -} - -static ULONG WINAPI moniker_Release( - IMoniker *iface ) -{ - struct moniker *moniker = impl_from_IMoniker( iface ); - LONG refs = InterlockedDecrement( &moniker->refs ); - if (!refs) - { - TRACE( "destroying %p\n", moniker ); - IUnknown_Release( moniker->obj ); - heap_free( moniker ); - } - return refs; -} - -static HRESULT WINAPI moniker_QueryInterface( - IMoniker *iface, REFIID riid, void **ppvObject ) -{ - struct moniker *moniker = impl_from_IMoniker( iface ); - - TRACE( "%p, %s, %p\n", moniker, debugstr_guid( riid ), ppvObject ); - - if (IsEqualGUID( riid, &IID_IMoniker ) || - IsEqualGUID( riid, &IID_IUnknown )) - { - *ppvObject = iface; - } - else - { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); - return E_NOINTERFACE; - } - IMoniker_AddRef( iface ); - return S_OK; -} - -static HRESULT WINAPI moniker_GetClassID( - IMoniker *iface, CLSID *pClassID ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_IsDirty( - IMoniker *iface ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_Load( - IMoniker *iface, IStream *pStm ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_Save( - IMoniker *iface, IStream *pStm, BOOL fClearDirty ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_GetSizeMax( - IMoniker *iface, ULARGE_INTEGER *pcbSize ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_BindToObject( - IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riidResult, void **ppvResult ) -{ - struct moniker *moniker = impl_from_IMoniker( iface ); - - TRACE( "%p, %p, %p, %s, %p\n", iface, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult ); - return IUnknown_QueryInterface( moniker->obj, riidResult, ppvResult ); -} - -static HRESULT WINAPI moniker_BindToStorage( - IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, void **ppvObj ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_Reduce( - IMoniker *iface, IBindCtx *pbc, DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_ComposeWith( - IMoniker *iface, IMoniker *pmkRight, BOOL fOnlyIfNotGeneric, IMoniker **ppmkComposite ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_Enum( - IMoniker *iface, BOOL fForward, IEnumMoniker **ppenumMoniker ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_IsEqual( - IMoniker *iface, IMoniker *pmkOtherMoniker ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_Hash( - IMoniker *iface, DWORD *pdwHash ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_IsRunning( - IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, IMoniker *pmkNewlyRunning ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_GetTimeOfLastChange( - IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, FILETIME *pFileTime ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_Inverse( - IMoniker *iface, IMoniker **ppmk ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_CommonPrefixWith( - IMoniker *iface, IMoniker *pmkOther, IMoniker **ppmkPrefix ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_RelativePathTo( - IMoniker *iface, IMoniker *pmkOther, IMoniker **ppmkRelPath ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_GetDisplayName( - IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_ParseDisplayName( - IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR pszDisplayName, ULONG *pchEaten, - IMoniker **ppmkOut ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static HRESULT WINAPI moniker_IsSystemMoniker( - IMoniker *iface, DWORD *pdwMksys ) -{ - FIXME( "\n" ); - return E_NOTIMPL; -} - -static const IMonikerVtbl moniker_vtbl = -{ - moniker_QueryInterface, - moniker_AddRef, - moniker_Release, - moniker_GetClassID, - moniker_IsDirty, - moniker_Load, - moniker_Save, - moniker_GetSizeMax, - moniker_BindToObject, - moniker_BindToStorage, - moniker_Reduce, - moniker_ComposeWith, - moniker_Enum, - moniker_IsEqual, - moniker_Hash, - moniker_IsRunning, - moniker_GetTimeOfLastChange, - moniker_Inverse, - moniker_CommonPrefixWith, - moniker_RelativePathTo, - moniker_GetDisplayName, - moniker_ParseDisplayName, - moniker_IsSystemMoniker -}; - -static HRESULT Moniker_create( IUnknown *unk, IMoniker **obj ) -{ - struct moniker *moniker; - - TRACE( "%p, %p\n", unk, obj ); - - if (!(moniker = heap_alloc( sizeof(*moniker) ))) return E_OUTOFMEMORY; - moniker->IMoniker_iface.lpVtbl = &moniker_vtbl; - moniker->refs = 1; - moniker->obj = unk; - IUnknown_AddRef( moniker->obj ); - - *obj = &moniker->IMoniker_iface; - TRACE( "returning iface %p\n", *obj ); - return S_OK; -} - static HRESULT WINAPI WinMGMTS_QueryInterface(IParseDisplayName *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { @@ -401,12 +159,12 @@ static HRESULT WINAPI WinMGMTS_ParseDisplayName(IParseDisplayName *iface, IBindC hr = ISWbemLocator_ConnectServer( locator, server, namespace, NULL, NULL, NULL, NULL, 0, NULL, &services ); if (hr != S_OK) goto done; - if (!relative || !*relative) Moniker_create( (IUnknown *)services, ppmkOut ); + if (!relative || !*relative) CreatePointerMoniker( (IUnknown *)services, ppmkOut ); else { hr = ISWbemServices_Get( services, relative, 0, NULL, &obj ); if (hr != S_OK) goto done; - hr = Moniker_create( (IUnknown *)obj, ppmkOut ); + hr = CreatePointerMoniker( (IUnknown *)obj, ppmkOut ); } done: diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 57baf848cc..2bca6f9da6 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -28,6 +28,7 @@ DEFINE_GUID(CLSID_WINMGMTS,0x172bddf8,0xceea,0x11d1,0x8b,0x05,0x00,0x60,0x08,0x06,0xd9,0xb6); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_OLEGUID(CLSID_PointerMoniker,0x306,0,0); static const LCID english = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); @@ -73,6 +74,7 @@ static void test_ParseDisplayName(void) BSTR str; ULONG i, eaten, count; HRESULT hr; + CLSID clsid; hr = CoCreateInstance( &CLSID_WINMGMTS, NULL, CLSCTX_INPROC_SERVER, &IID_IParseDisplayName, (void **)&displayname ); if (hr != S_OK) @@ -95,6 +97,10 @@ static void test_ParseDisplayName(void) ok( eaten == tests[i].eaten, "%u: got %u\n", i, eaten ); if (moniker) { + hr = IMoniker_GetClassID( moniker, &clsid ); + ok( hr == S_OK, "%u: got %x\n", i, hr ); + ok( IsEqualCLSID( &clsid, &CLSID_PointerMoniker ), "%u: got %s\n", i, wine_dbgstr_guid( &clsid ) ); + obj = NULL; hr = IMoniker_BindToObject( moniker, ctx, NULL, tests[i].iid, (void **)&obj ); ok( hr == S_OK, "%u: got %x\n", i, hr ); @@ -114,6 +120,10 @@ static void test_ParseDisplayName(void) { ISWbemServices *services = NULL; + hr = IMoniker_GetClassID( moniker, &clsid ); + ok( hr == S_OK, "%u: got %x\n", i, hr ); + ok( IsEqualCLSID( &clsid, &CLSID_PointerMoniker ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + hr = IMoniker_BindToObject( moniker, ctx, NULL, &IID_IUnknown, (void **)&services ); ok( hr == S_OK, "got %x\n", hr ); if (services) @@ -259,6 +269,11 @@ static void test_ParseDisplayName(void) if (moniker) { ISWbemObject *sobj = NULL; + + hr = IMoniker_GetClassID( moniker, &clsid ); + ok( hr == S_OK, "%u: got %x\n", i, hr ); + ok( IsEqualCLSID( &clsid, &CLSID_PointerMoniker ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + hr = IMoniker_BindToObject( moniker, ctx, NULL, &IID_ISWbemObject, (void **)&sobj ); ok( hr == S_OK, "got %x\n",hr ); if (sobj)

1 0

Piotr Caban : msvcrt: Optimize _strnicmp_l implementation.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 471425c16d66af6421a43c2ea8b54bbc2dccc0be URL: https://source.winehq.org/git/wine.git/?a=commit;h=471425c16d66af6421a43c2e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 9 13:54:29 2020 +0100 msvcrt: Optimize _strnicmp_l implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48723 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e091ef5f46..8183feacc0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2310,6 +2310,7 @@ int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, MSVCRT_size_t count, MSVCRT__locale_t locale) { + MSVCRT_pthreadlocinfo locinfo; int c1, c2; if(s1==NULL || s2==NULL) @@ -2318,9 +2319,26 @@ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, if(!count) return 0; + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) + { + do { + if ((c1 = *s1++) >= 'A' && c1 <= 'Z') + c1 -= 'A' - 'a'; + if ((c2 = *s2++) >= 'A' && c2 <= 'Z') + c2 -= 'A' - 'a'; + }while(--count && c1 && c1==c2); + + return c1-c2; + } + do { - c1 = MSVCRT__tolower_l(*s1++, locale); - c2 = MSVCRT__tolower_l(*s2++, locale); + c1 = MSVCRT__tolower_l((unsigned char)*s1++, locale); + c2 = MSVCRT__tolower_l((unsigned char)*s2++, locale); }while(--count && c1 && c1==c2); return c1-c2;

1 0

Zebediah Figura : wined3d: Move the scissor test state to wined3d_rasterizer_state.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: a6009fa21ff3703ac32983f873e915098ccf033f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6009fa21ff3703ac32983f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 6 22:18:35 2020 -0600 wined3d: Move the scissor test state to wined3d_rasterizer_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- dlls/d3d11/state.c | 1 + dlls/wined3d/context.c | 5 ++--- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 11 +++++------ dlls/wined3d/surface.c | 4 ++-- include/wine/wined3d.h | 1 + 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 59e3ab25af..82292662e4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -936,7 +936,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); - 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); wined3d_mutex_unlock(); @@ -946,7 +945,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); desc = &rasterizer_state_impl->desc; - 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); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index c1aaa094e0..7402ff8ce8 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1083,6 +1083,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; wined3d_desc.scale_bias = desc->SlopeScaledDepthBias; wined3d_desc.depth_clip = desc->DepthClipEnable; + wined3d_desc.scissor = desc->ScissorEnable; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 28e0d262a5..f4a5189ba1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3150,11 +3150,10 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, gl_info->gl_ops.gl.p_glDisable(GL_BLEND); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); + gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); context_invalidate_state(context, STATE_RASTERIZER); gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_STENCILENABLE)); - gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE)); if (gl_info->supported[ARB_POINT_SPRITE]) { gl_info->gl_ops.gl.p_glDisable(GL_POINT_SPRITE_ARB); @@ -3428,7 +3427,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, checkGLcall("setting up state for clear"); context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); - context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE)); + context_invalidate_state(&context_gl->c, STATE_RASTERIZER); context_invalidate_state(&context_gl->c, STATE_SCISSORRECT); return TRUE; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ac518cae04..dbdf5f2ec2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -614,7 +614,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->rt_count = rt_count; op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); - if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) + if (state->rasterizer_state && state->rasterizer_state->desc.scissor) IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rects[0]); op->color = *color; op->depth = depth; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 50a0a740bf..13b3348c04 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3602,6 +3602,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_CULLMODE: case WINED3D_RS_SLOPESCALEDEPTHBIAS: case WINED3D_RS_DEPTHBIAS: + case WINED3D_RS_SCISSORTESTENABLE: set_rasterizer_state = TRUE; break; @@ -3631,6 +3632,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, bias.d = state->rs[WINED3D_RS_SLOPESCALEDEPTHBIAS]; desc.scale_bias = bias.f; desc.depth_clip = TRUE; + desc.scissor = state->rs[WINED3D_RS_SCISSORTESTENABLE]; if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4d5455e19b..53daca8d52 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1721,11 +1721,9 @@ static void state_line_antialias(struct wined3d_context *context, const struct w } } -static void state_scissor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void scissor(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - - if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) + if (r && r->desc.scissor) { gl_info->gl_ops.gl.p_glEnable(GL_SCISSOR_TEST); checkGLcall("glEnable(GL_SCISSOR_TEST)"); @@ -4335,6 +4333,7 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta fillmode(r, gl_info); cullmode(r, gl_info); depth_clip(r, gl_info); + scissor(r, gl_info); } static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4351,6 +4350,7 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ fillmode(r, gl_info); cullmode(r, gl_info); depth_clip(r, gl_info); + scissor(r, gl_info); } static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4660,7 +4660,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), state_colorwrite }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop }, WINED3D_GL_BLEND_EQUATION }, { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop_w }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), state_scissor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), state_colorwrite1 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), state_colorwrite2 }, EXT_DRAW_BUFFERS2 }, @@ -5432,7 +5431,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 61, 127}, {149, 150}, {169, 169}, - {175, 175}, + {174, 175}, {177, 177}, {193, 193}, {195, 197}, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c0f28099cf..d8dc379c1a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -131,7 +131,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct } gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE)); + context_invalidate_state(context, STATE_RASTERIZER); gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, gl_mask, GL_NEAREST); @@ -267,7 +267,7 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co context_invalidate_state(context, STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3)); gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE)); + context_invalidate_state(context, STATE_RASTERIZER); gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, GL_COLOR_BUFFER_BIT, gl_filter); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 85d7885f49..211e9d37d0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2040,6 +2040,7 @@ struct wined3d_rasterizer_state_desc float depth_bias_clamp; float scale_bias; BOOL depth_clip; + BOOL scissor; }; struct wined3d_sampler_desc

1 0

Zebediah Figura : d3d10core/tests: Add a test for color masks.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 3b043c1fdf8aabefd50a68c07ce9aa15294b1d7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b043c1fdf8aabefd50a68c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 6 22:18:37 2020 -0600 d3d10core/tests: Add a test for color masks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 113 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index d291c881e3..3c3438aa37 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18064,6 +18064,118 @@ static void test_desktop_window(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_color_mask(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtvs[8]; + ID3D10BlendState *blend_state; + struct resource_readback rb; + D3D10_BLEND_DESC blend_desc; + ID3D10Texture2D *rts[8]; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int i; + DWORD color; + HRESULT hr; + + static const DWORD expected_colors[] = + {0xff000080, 0xff0080ff, 0xff8000ff, 0x80808080, 0x800000ff, 0xff008080, 0x800080ff, 0xff0000ff}; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out float4 t0 : SV_Target0, out float4 t1 : SV_Target1, + out float4 t2 : SV_Target2, out float4 t3 : SV_Target3, + out float4 t4 : SV_Target4, out float4 t5 : SV_Target5, + out float4 t6 : SV_Target6, out float4 t7 : SV_Target7) + { + t0 = t1 = t2 = t3 = t4 = t5 = t6 = t7 = float4(0.5f, 0.5f, 0.5f, 0.5f); + } +#endif + 0x43425844, 0x7b1ab233, 0xdbe32d3b, 0x77084cc5, 0xe874d2b5, 0x00000001, 0x000002b0, 0x00000003, + 0x0000002c, 0x00000060, 0x0000013c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x000000d4, 0x00000008, 0x00000008, 0x000000c8, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x000000c8, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x000000c8, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x000000c8, 0x00000003, + 0x00000000, 0x00000003, 0x00000003, 0x0000000f, 0x000000c8, 0x00000004, 0x00000000, 0x00000003, + 0x00000004, 0x0000000f, 0x000000c8, 0x00000005, 0x00000000, 0x00000003, 0x00000005, 0x0000000f, + 0x000000c8, 0x00000006, 0x00000000, 0x00000003, 0x00000006, 0x0000000f, 0x000000c8, 0x00000007, + 0x00000000, 0x00000003, 0x00000007, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, + 0x0000016c, 0x00000040, 0x0000005b, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, + 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, 0x00000003, 0x03000065, + 0x001020f2, 0x00000004, 0x03000065, 0x001020f2, 0x00000005, 0x03000065, 0x001020f2, 0x00000006, + 0x03000065, 0x001020f2, 0x00000007, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000004, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000005, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000006, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000007, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, + }; + + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + memset(&blend_desc, 0, sizeof(blend_desc)); + blend_desc.RenderTargetWriteMask[0] = D3D10_COLOR_WRITE_ENABLE_RED; + blend_desc.RenderTargetWriteMask[1] = D3D10_COLOR_WRITE_ENABLE_GREEN; + blend_desc.RenderTargetWriteMask[2] = D3D10_COLOR_WRITE_ENABLE_BLUE; + blend_desc.RenderTargetWriteMask[3] = D3D10_COLOR_WRITE_ENABLE_ALL; + blend_desc.RenderTargetWriteMask[4] = D3D10_COLOR_WRITE_ENABLE_ALPHA; + blend_desc.RenderTargetWriteMask[5] = D3D10_COLOR_WRITE_ENABLE_RED | D3D10_COLOR_WRITE_ENABLE_GREEN; + blend_desc.RenderTargetWriteMask[6] = D3D10_COLOR_WRITE_ENABLE_GREEN | D3D10_COLOR_WRITE_ENABLE_ALPHA; + blend_desc.RenderTargetWriteMask[7] = 0; + + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + + for (i = 0; i < 8; ++i) + { + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &rts[i]); + ok(hr == S_OK, "Failed to create texture %u, hr %#x.\n", i, hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)rts[i], NULL, &rtvs[i]); + ok(hr == S_OK, "Failed to create rendertarget view %u, hr %#x.\n", i, hr); + } + + ID3D10Device_OMSetRenderTargets(device, 8, rtvs, NULL); + + for (i = 0; i < 8; ++i) + ID3D10Device_ClearRenderTargetView(device, rtvs[i], red); + draw_quad(&test_context); + + for (i = 0; i < 8; ++i) + { + get_texture_readback(rts[i], 0, &rb); + color = get_readback_color(&rb, 320, 240); + todo_wine_if (i >= 4) + ok(color == expected_colors[i], "%u: Got unexpected color 0x%08x.\n", i, color); + release_resource_readback(&rb); + + ID3D10Texture2D_Release(rts[i]); + ID3D10RenderTargetView_Release(rtvs[i]); + } + + ID3D10BlendState_Release(blend_state); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -18182,6 +18294,7 @@ START_TEST(d3d10core) queue_test(test_staging_buffers); queue_test(test_render_a8); queue_test(test_desktop_window); + queue_test(test_color_mask); run_queued_tests();

1 0

Francois Gouget : dsound: Move make_fir to the dsound directory.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 75a5107c965019361bac5fbe7245ee38e5450878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75a5107c965019361bac5fbe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 9 01:30:22 2020 +0100 dsound: Move make_fir to the dsound directory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- {tools => dlls/dsound}/make_fir | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/make_fir b/dlls/dsound/make_fir similarity index 98% rename from tools/make_fir rename to dlls/dsound/make_fir index 97c5583d16..0fd26aaf7f 100755 --- a/tools/make_fir +++ b/dlls/dsound/make_fir @@ -136,8 +136,7 @@ foreach my $testfreq(@testfreqs) { # Now actually print the FIR to a C header file -chdir ".." if -f "./make_fir"; -open FILE, ">dlls/dsound/fir.h"; +open FILE, ">", "fir.h"; select FILE; print "/* generated by tools/make_fir; DO NOT EDIT! */\n";

1 0

Zebediah Figura : ntdll/tests: Test renaming a file to the same name.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 42b7bf06920daa65ed3c22d5ffdcf9c7776343a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42b7bf06920daa65ed3c22d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 20:47:14 2020 -0600 ntdll/tests: Test renaming a file to the same name. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 28a3e12334..e71f887c2b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2106,6 +2106,30 @@ static void test_file_rename_information(void) HeapFree( GetProcessHeap(), 0, fri ); delete_object( oldpath ); delete_object( newpath ); + + /* oldpath == newpath */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + pRtlDosPathNameToNtPathName_U( oldpath, &name_str, NULL, NULL ); + fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fri->ReplaceIfExists = FALSE; + fri->RootDirectory = NULL; + fri->FileNameLength = name_str.Length; + memcpy( fri->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); + todo_wine ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); + todo_wine ok( res == STATUS_SUCCESS, "got status %x\n", res ); + ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fri ); + delete_object( oldpath ); } static void test_file_link_information(void)

1 0

Zebediah Figura : kernel32/tests: Add more tests for MoveFile[Ex]().
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 2eacc45de3b296cd27c0ed4f617d9ec01e496c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eacc45de3b296cd27c0ed4f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 20:47:13 2020 -0600 kernel32/tests: Add more tests for MoveFile[Ex](). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1f70433787..ad0c694f41 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5591,6 +5591,99 @@ static void test_hard_link(void) SetCurrentDirectoryA( cwd ); } +static void test_move_file(void) +{ + char cwd[MAX_PATH], temp_dir[MAX_PATH]; + HANDLE file; + BOOL ret; + + GetCurrentDirectoryA( sizeof(cwd), cwd ); + GetTempPathA( sizeof(temp_dir), temp_dir ); + SetCurrentDirectoryA( temp_dir ); + + ret = CreateDirectoryA( "winetest_dir1", NULL ); + ok(ret, "failed to create directory, error %u\n", GetLastError()); + ret = CreateDirectoryA( "winetest_dir2", NULL ); + ok(ret, "failed to create directory, error %u\n", GetLastError()); + create_file( "winetest_file1" ); + create_file( "winetest_file2" ); + + ret = MoveFileA( "winetest_file1", "winetest_file3" ); + ok(ret, "failed to move file, error %u\n", GetLastError()); + ret = GetFileAttributesA( "winetest_file1" ); + ok(ret == INVALID_FILE_ATTRIBUTES, "got %#x\n", ret); + ret = GetFileAttributesA( "winetest_file3" ); + ok(ret != INVALID_FILE_ATTRIBUTES, "got %#x\n", ret); + + SetLastError(0xdeadbeef); + ret = MoveFileA( "winetest_file3", "winetest_file2" ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = MoveFileA( "winetest_file1", "winetest_file4" ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + ret = MoveFileA( "winetest_dir1", "winetest_dir3" ); + ok(ret, "failed to move file, error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = MoveFileA( "winetest_dir3", "winetest_dir2" ); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + + file = CreateFileA( "winetest_file3", DELETE, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok(file != INVALID_HANDLE_VALUE, "failed to open file, error %u\n", GetLastError()); + ret = MoveFileA( "winetest_file3", "winetest_file1" ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "got error %u\n", GetLastError()); + CloseHandle( file ); + + file = CreateFileA( "winetest_file3", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok(file != INVALID_HANDLE_VALUE, "failed to open file, error %u\n", GetLastError()); + ret = MoveFileA( "winetest_file3", "winetest_file1" ); + ok(ret, "failed to move file, error %u\n", GetLastError()); + ret = GetFileAttributesA( "winetest_file1" ); + ok(ret != INVALID_FILE_ATTRIBUTES, "got %#x\n", ret); + ret = GetFileAttributesA( "winetest_file3" ); + ok(ret == INVALID_FILE_ATTRIBUTES, "got %#x\n", ret); + CloseHandle( file ); + + ret = MoveFileExA( "winetest_file1", "winetest_file2", MOVEFILE_REPLACE_EXISTING ); + ok(ret, "failed to move file, error %u\n", GetLastError()); + + file = CreateFileA( "winetest_file1", GENERIC_ALL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, CREATE_NEW, 0, 0 ); + ok(file != INVALID_HANDLE_VALUE, "failed to open file, error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = MoveFileExA( "winetest_file2", "winetest_file1", MOVEFILE_REPLACE_EXISTING ); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + CloseHandle( file ); + + SetLastError(0xdeadbeef); + ret = MoveFileExA( "winetest_file2", "winetest_dir2", MOVEFILE_REPLACE_EXISTING ); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = MoveFileExA( "winetest_dir3", "winetest_dir2", MOVEFILE_REPLACE_EXISTING ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + + ret = MoveFileExA( "winetest_dir2", "winetest_file2", MOVEFILE_REPLACE_EXISTING ); + ok(ret, "failed to move file, error %u\n", GetLastError()); + + ret = RemoveDirectoryA( "winetest_dir3" ); + ok(ret, "failed to remove directory, error %u\n", GetLastError()); + ret = RemoveDirectoryA( "winetest_file2" ); + ok(ret, "failed to remove directory, error %u\n", GetLastError()); + ret = DeleteFileA( "winetest_file1" ); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + SetCurrentDirectoryA( cwd ); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5666,4 +5759,5 @@ START_TEST(file) test_SetFileTime(); test_ReOpenFile(); test_hard_link(); + test_move_file(); }

1 0

Zebediah Figura : wined3d: Explicitly zero the whole wined3d_rasterizer_state_desc structure in wined3d_device_apply_stateblock().
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: ae6fdbea39e6c51c97049da24ee072ca8f3f3060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae6fdbea39e6c51c97049da2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 6 22:18:33 2020 -0600 wined3d: Explicitly zero the whole wined3d_rasterizer_state_desc structure in wined3d_device_apply_stateblock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 407dd20469..7e727242f4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3622,10 +3622,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, float f; } bias; + memset(&desc, 0, sizeof(desc)); desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; desc.cull_mode = state->rs[WINED3D_RS_CULLMODE]; - desc.front_ccw = FALSE; - desc.depth_bias_clamp = 0.0f; bias.d = state->rs[WINED3D_RS_SLOPESCALEDEPTHBIAS]; desc.scale_bias = bias.f; desc.depth_clip = TRUE;

1 0

Zebediah Figura : d3d11/tests: Add a test for color masks.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: 495a95c38e4febf16feec0c7768cf5dfa15515e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=495a95c38e4febf16feec0c7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 6 22:18:38 2020 -0600 d3d11/tests: Add a test for color masks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f378ae52ec..4254f11bdd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29716,6 +29716,140 @@ static void test_sample_attached_rtv(void) release_test_context(&test_context); } +static void test_color_mask(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11RenderTargetView *rtvs[8]; + ID3D11BlendState *blend_state; + ID3D11DeviceContext *context; + struct resource_readback rb; + D3D11_BLEND_DESC blend_desc; + ID3D11Texture2D *rts[8]; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i; + DWORD color; + HRESULT hr; + + static const DWORD expected_colors[] = + {0xff000080, 0xff0080ff, 0xff8000ff, 0x80808080, 0x800000ff, 0xff008080, 0x800080ff, 0xff0000ff}; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out float4 t0 : SV_Target0, out float4 t1 : SV_Target1, + out float4 t2 : SV_Target2, out float4 t3 : SV_Target3, + out float4 t4 : SV_Target4, out float4 t5 : SV_Target5, + out float4 t6 : SV_Target6, out float4 t7 : SV_Target7) + { + t0 = t1 = t2 = t3 = t4 = t5 = t6 = t7 = float4(0.5f, 0.5f, 0.5f, 0.5f); + } +#endif + 0x43425844, 0x7b1ab233, 0xdbe32d3b, 0x77084cc5, 0xe874d2b5, 0x00000001, 0x000002b0, 0x00000003, + 0x0000002c, 0x00000060, 0x0000013c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x000000d4, 0x00000008, 0x00000008, 0x000000c8, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x000000c8, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x000000c8, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x000000c8, 0x00000003, + 0x00000000, 0x00000003, 0x00000003, 0x0000000f, 0x000000c8, 0x00000004, 0x00000000, 0x00000003, + 0x00000004, 0x0000000f, 0x000000c8, 0x00000005, 0x00000000, 0x00000003, 0x00000005, 0x0000000f, + 0x000000c8, 0x00000006, 0x00000000, 0x00000003, 0x00000006, 0x0000000f, 0x000000c8, 0x00000007, + 0x00000000, 0x00000003, 0x00000007, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, + 0x0000016c, 0x00000040, 0x0000005b, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, + 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, 0x00000003, 0x03000065, + 0x001020f2, 0x00000004, 0x03000065, 0x001020f2, 0x00000005, 0x03000065, 0x001020f2, 0x00000006, + 0x03000065, 0x001020f2, 0x00000007, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000004, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000005, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000006, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000007, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, + }; + + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + memset(&blend_desc, 0, sizeof(blend_desc)); + blend_desc.IndependentBlendEnable = TRUE; + blend_desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_RED; + blend_desc.RenderTarget[1].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_GREEN; + blend_desc.RenderTarget[2].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_BLUE; + blend_desc.RenderTarget[3].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; + blend_desc.RenderTarget[4].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALPHA; + blend_desc.RenderTarget[5].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN; + blend_desc.RenderTarget[6].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_GREEN | D3D11_COLOR_WRITE_ENABLE_ALPHA; + blend_desc.RenderTarget[7].RenderTargetWriteMask = 0; + + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetBlendState(context, blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11BlendState_Release(blend_state); + + for (i = 0; i < 8; ++i) + { + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rts[i]); + ok(hr == S_OK, "Failed to create texture %u, hr %#x.\n", i, hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rts[i], NULL, &rtvs[i]); + ok(hr == S_OK, "Failed to create rendertarget view %u, hr %#x.\n", i, hr); + } + + ID3D11DeviceContext_OMSetRenderTargets(context, 8, rtvs, NULL); + + for (i = 0; i < 8; ++i) + ID3D11DeviceContext_ClearRenderTargetView(context, rtvs[i], red); + draw_quad(&test_context); + + for (i = 0; i < 8; ++i) + { + get_texture_readback(rts[i], 0, &rb); + color = get_readback_color(&rb, 320, 240, 0); + todo_wine_if (i >= 4) + ok(color == expected_colors[i], "%u: Got unexpected color 0x%08x.\n", i, color); + release_resource_readback(&rb); + } + + blend_desc.IndependentBlendEnable = FALSE; + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetBlendState(context, blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11BlendState_Release(blend_state); + + for (i = 0; i < 8; ++i) + ID3D11DeviceContext_ClearRenderTargetView(context, rtvs[i], red); + draw_quad(&test_context); + + for (i = 0; i < 8; ++i) + { + get_texture_readback(rts[i], 0, &rb); + color = get_readback_color(&rb, 320, 240, 0); + todo_wine_if (i >= 4) + ok(color == expected_colors[0], "%u: Got unexpected color 0x%08x.\n", i, color); + release_resource_readback(&rb); + + ID3D11Texture2D_Release(rts[i]); + ID3D11RenderTargetView_Release(rtvs[i]); + } + + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -29876,6 +30010,7 @@ START_TEST(d3d11) queue_test(test_standard_pattern); queue_test(test_desktop_window); queue_test(test_sample_attached_rtv); + queue_test(test_color_mask); run_queued_tests(); }

1 0

Zebediah Figura : include: Use public field names for FILE_RENAME_INFORMATION.
by Alexandre Julliard March 9, 2020

March 9, 2020

Module: wine Branch: master Commit: b2b4d1b0ec0b5ea333b819d4c2df6325fd02fb32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2b4d1b0ec0b5ea333b819d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 20:47:12 2020 -0600 include: Use public field names for FILE_RENAME_INFORMATION. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 4 +-- dlls/ntdll/tests/file.c | 68 ++++++++++++++++++++++++------------------------- include/winternl.h | 4 +-- 3 files changed, 38 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2b4d1b0ec0b5ea333b8…

1 0