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

Józef Kucia : wined3d: Implement SM4 sample_c instruction.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: e06180a564c2afc24d20602019f20e629124ac81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06180a564c2afc24d2060201… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 23 13:42:51 2016 +0100 wined3d: Implement SM4 sample_c instruction. 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> --- dlls/wined3d/glsl_shader.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8664172..dd7f3b0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4473,6 +4473,31 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_release_sample_function(ins->ctx, &sample_function); } +static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) +{ + unsigned int resource_idx, sampler_idx, sampler_bind_idx; + struct glsl_src_param coord_param, compare_param; + struct glsl_sample_function sample_function; + DWORD flags = 0; + UINT coord_size; + + if (wined3d_shader_instruction_has_texel_offset(ins)) + flags |= WINED3D_GLSL_SAMPLE_OFFSET; + + resource_idx = ins->src[1].reg.idx[0].offset; + sampler_idx = ins->src[2].reg.idx[0].offset; + + shader_glsl_get_sample_function(ins->ctx, resource_idx, flags, &sample_function); + coord_size = shader_glsl_get_write_mask_size(sample_function.coord_mask); + shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask >> 1, &coord_param); + shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); + sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); + shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, WINED3DSP_NOSWIZZLE, + NULL, NULL, NULL, &ins->texel_offset, "vec%u(%s, %s)", + coord_size, coord_param.param_str, compare_param.param_str); + shader_glsl_release_sample_function(ins->ctx, &sample_function); +} + static void shader_glsl_texcoord(const struct wined3d_shader_instruction *ins) { /* FIXME: Make this work for more than just 2D textures */ @@ -8163,7 +8188,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_B */ shader_glsl_sample, - /* WINED3DSIH_SAMPLE_C */ NULL, + /* WINED3DSIH_SAMPLE_C */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample,

1 0

Nikolay Sivov : xmllite/writer: Fix WriteEndElement()/WriteFullEndElement( ) on ready state.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: e3a6d5932489d1988b0021b88f3c934b7af7e500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a6d5932489d1988b0021b88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 23 13:07:29 2016 +0300 xmllite/writer: Fix WriteEndElement()/WriteFullEndElement() on ready state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 15 ++++++++++++++- dlls/xmllite/writer.c | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index a5d5b31a..ce4e13d 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -91,13 +91,14 @@ todo_wine hr = IXmlWriter_WriteEndElement(writer); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); -todo_wine { hr = IXmlWriter_WriteEntityRef(writer, aW); +todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteFullEndElement(writer); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); +todo_wine { hr = IXmlWriter_WriteName(writer, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); @@ -915,13 +916,25 @@ static void test_WriteRaw(void) static void test_writer_state(void) { IXmlWriter *writer; + IStream *stream; HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + /* initial state */ check_writer_state(writer, E_UNEXPECTED); + /* set output and call 'wrong' method */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteEndElement(writer); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + check_writer_state(writer, WR_E_INVALIDACTION); + + IStream_Release(stream); + IXmlWriter_Release(writer); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 0e55b42..6aa851f 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -788,6 +788,10 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; default: ; } @@ -827,6 +831,18 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) TRACE("%p\n", This); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; + default: + ; + } + element = pop_element(This); if (!element) return WR_E_INVALIDACTION;

1 0

Nikolay Sivov : oleaut32/tests: Fix a test crash on some XP SP1 VM.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 1c3127c68d52c431011d1d9ce5213bae5763adf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3127c68d52c431011d1d9ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 23 13:06:37 2016 +0300 oleaut32/tests: Fix a test crash on some XP SP1 VM. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index fcce92e..b795d52 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5710,19 +5710,23 @@ static void test_LoadRegTypeLib(void) hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 7, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); + tl = NULL; hr = LoadRegTypeLib(&LIBID_TestTypelib, 0xffff, 0xffff, LOCALE_NEUTRAL, &tl); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITypeLib_GetLibAttr(tl, &attr); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (tl) + { + hr = ITypeLib_GetLibAttr(tl, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); - ok(attr->lcid == 0, "got %x\n", attr->lcid); - ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); - ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); - ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); + ok(attr->lcid == 0, "got %x\n", attr->lcid); + ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); + ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); + ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); - ITypeLib_ReleaseTLibAttr(tl, attr); - ITypeLib_Release(tl); + ITypeLib_ReleaseTLibAttr(tl, attr); + ITypeLib_Release(tl); + } DeleteFileA("test_actctx_tlb.tlb"); DeleteFileA("test_actctx_tlb2.tlb");

1 0

Piotr Caban : msvcrt: Update previous exception stored in cxx_frame_info after frames unwinding.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 97567074a5c221a1fc1db221b3e74015b7d43e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97567074a5c221a1fc1db221b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 23 10:44:08 2016 +0100 msvcrt: Update previous exception stored in cxx_frame_info after frames unwinding. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 3debece..dd807c4 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -412,6 +412,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame struct catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; DWORD save_esp = ((DWORD*)frame)[-1]; + thread_data_t *data; for (i = 0; i < descr->tryblock_count; i++) { @@ -452,7 +453,10 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 ); cxx_local_unwind( frame, descr, tryblock->start_level ); frame->trylevel = tryblock->end_level + 1; - msvcrt_get_thread_data()->exc_record = rec; + + data = msvcrt_get_thread_data(); + nested_frame.frame_info.rec = data->exc_record; + data->exc_record = rec; /* call the catch block */ TRACE( "calling catch block %p addr %p ebp %p\n",

1 0

Austin English : dwmapi: Add DwmSetPresentParameters stub.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: a717598b75b81f776e3fe51372651046cd24f955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a717598b75b81f776e3fe5137… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 28 17:45:17 2016 -0600 dwmapi: Add DwmSetPresentParameters stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ include/dwmapi.h | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 531f279..6adbcb9 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -39,7 +39,7 @@ @ stub DwmQueryThumbnailSourceSize @ stdcall DwmRegisterThumbnail(long long ptr) @ stub DwmSetDxFrameDuration -@ stub DwmSetPresentParameters +@ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) @ stdcall DwmUnregisterThumbnail(long) @ stdcall DwmUpdateThumbnailProperties(ptr ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index a776cfe..155d7d3 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -259,3 +259,12 @@ HRESULT WINAPI DwmUpdateThumbnailProperties(HTHUMBNAIL thumbnail, const DWM_THUM FIXME("(%p, %p) stub\n", thumbnail, props); return E_NOTIMPL; } + +/********************************************************************** + * DwmSetPresentParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params) +{ + FIXME("(%p %p) stub\n", hwnd, params); + return S_OK; +}; diff --git a/include/dwmapi.h b/include/dwmapi.h index 035c831..f5191e1 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -37,6 +37,12 @@ typedef HTHUMBNAIL *PHTHUMBNAIL; typedef ULONGLONG DWM_FRAME_COUNT; typedef ULONGLONG QPC_TIME; +typedef enum _DWM_SOURCE_FRAME_SAMPLING { + DWM_SOURCE_FRAME_SAMPLING_POINT, + DWM_SOURCE_FRAME_SAMPLING_COVERAGE, + DWM_SOURCE_FRAME_SAMPLING_LAST +} DWM_SOURCE_FRAME_SAMPLING; + typedef struct _UNSIGNED_RATIO { UINT32 uiNumerator; UINT32 uiDenominator; @@ -117,6 +123,17 @@ typedef struct _DWM_THUMBNAIL_PROPERTIES BOOL fSourceClientAreaOnly; } DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES; +typedef struct _DWM_PRESENT_PARAMETERS { + UINT32 cbSize; + BOOL fQueue; + DWM_FRAME_COUNT cRefreshStart; + UINT cBuffer; + BOOL fUseSourceRate; + UNSIGNED_RATIO rateSource; + UINT cRefreshesPerFrame; + DWM_SOURCE_FRAME_SAMPLING eSampling; +} DWM_PRESENT_PARAMETERS; + #include <poppack.h> DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); @@ -129,6 +146,7 @@ DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); DWMAPI DwmInvalidateIconicBitmaps(HWND); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); +DWMAPI DwmSetPresentParameters(HWND, DWM_PRESENT_PARAMETERS *); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); DWMAPI DwmUpdateThumbnailProperties(HTHUMBNAIL, const DWM_THUMBNAIL_PROPERTIES *);

1 0

Austin English : mgmtapi: Add SnmpMgrTrapListen stub.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 157a647c4606f7bfb8816234a0f9d00de2c34dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157a647c4606f7bfb8816234a… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 22 17:42:45 2016 -0500 mgmtapi: Add SnmpMgrTrapListen stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mgmtapi/mgmtapi.c | 7 +++++++ dlls/mgmtapi/mgmtapi.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mgmtapi/mgmtapi.c b/dlls/mgmtapi/mgmtapi.c index fd6cdf9..06c540a 100644 --- a/dlls/mgmtapi/mgmtapi.c +++ b/dlls/mgmtapi/mgmtapi.c @@ -37,3 +37,10 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +BOOL WINAPI SnmpMgrTrapListen(HANDLE *available) +{ + FIXME("stub: %p\n", available); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/mgmtapi/mgmtapi.spec b/dlls/mgmtapi/mgmtapi.spec index a052d73..e675e2d 100644 --- a/dlls/mgmtapi/mgmtapi.spec +++ b/dlls/mgmtapi/mgmtapi.spec @@ -6,4 +6,4 @@ @ stub SnmpMgrOpen @ stub SnmpMgrRequest @ stub SnmpMgrStrToOid -@ stub SnmpMgrTrapListen +@ stdcall SnmpMgrTrapListen(ptr)

1 0

Józef Kucia : d3d11/tests: Add test for ClearRenderTargetView().
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 369a48c646190b3e3a491091737c75c266e06af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369a48c646190b3e3a4910917… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 23 13:42:50 2016 +0100 d3d11/tests: Add test for ClearRenderTargetView(). 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> --- dlls/d3d11/tests/d3d11.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4953675..9348aff 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -265,6 +265,27 @@ static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) return NULL; } +static BOOL is_warp_device(ID3D11Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + HRESULT hr; + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to query IDXGIDevice interface, hr %#x.\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(SUCCEEDED(hr), "Failed to get adapter desc, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + return !adapter_desc.SubSysId && !adapter_desc.Revision + && ((!adapter_desc.VendorId && !adapter_desc.DeviceId) + || (adapter_desc.VendorId == 0x1414 && adapter_desc.DeviceId == 0x008c)); +} + static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window, BOOL windowed) { IDXGISwapChain *swapchain; @@ -5277,6 +5298,100 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_clear_render_target_view(void) +{ + static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; + static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + + ID3D11Texture2D *texture, *srgb_texture; + struct d3d11_test_context test_context; + ID3D11RenderTargetView *rtv, *srgb_rtv; + D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11Device *device; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)srgb_texture, NULL, &srgb_rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, color); + check_texture_color(test_context.backbuffer, expected_color, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); + check_texture_color(texture, expected_color, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + check_texture_color(srgb_texture, expected_srgb_color, 1); + + ID3D11RenderTargetView_Release(srgb_rtv); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(srgb_texture); + ID3D11Texture2D_Release(texture); + + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &srgb_rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); + check_texture_color(texture, expected_color, 1); + + if (!is_warp_device(device)) + { + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + todo_wine check_texture_color(texture, expected_srgb_color, 1); + } + else + { + win_skip("Skipping broken test on WARP.\n"); + } + + + ID3D11RenderTargetView_Release(srgb_rtv); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_clear_depth_stencil_view(void) { D3D11_TEXTURE2D_DESC texture_desc; @@ -5760,6 +5875,7 @@ START_TEST(d3d11) test_resource_map(); test_multisample_init(); test_check_multisample_quality_levels(); + test_clear_render_target_view(); test_clear_depth_stencil_view(); test_draw_depth_only(); test_cb_relative_addressing();

1 0

Józef Kucia : d3d10core/tests: Add test for ClearRenderTargetView().
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: ceed14231b825024055fb1e29f330a2604496374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceed14231b825024055fb1e29… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 23 13:42:49 2016 +0100 d3d10core/tests: Add test for ClearRenderTargetView(). 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> --- dlls/d3d10core/tests/device.c | 113 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4c41d25..ba6f22e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -228,6 +228,27 @@ static ID3D10Device *create_device(void) return NULL; } +static BOOL is_warp_device(ID3D10Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + HRESULT hr; + + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to query IDXGIDevice interface, hr %#x.\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(SUCCEEDED(hr), "Failed to get adapter desc, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + return !adapter_desc.SubSysId && !adapter_desc.Revision + && ((!adapter_desc.VendorId && !adapter_desc.DeviceId) + || (adapter_desc.VendorId == 0x1414 && adapter_desc.DeviceId == 0x008c)); +} + #define SWAPCHAIN_FLAG_SHADER_INPUT 0x1 struct swapchain_desc @@ -5858,6 +5879,97 @@ static void test_swapchain_flip(void) DestroyWindow(window); } +static void test_clear_render_target_view(void) +{ + static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; + static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + + struct d3d10core_test_context test_context; + ID3D10Texture2D *texture, *srgb_texture; + ID3D10RenderTargetView *rtv, *srgb_rtv; + D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Device *device; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)srgb_texture, NULL, &srgb_rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, color); + check_texture_color(test_context.backbuffer, expected_color, 1); + + ID3D10Device_ClearRenderTargetView(device, rtv, color); + check_texture_color(texture, expected_color, 1); + + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); + check_texture_color(srgb_texture, expected_srgb_color, 1); + + ID3D10RenderTargetView_Release(srgb_rtv); + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(srgb_texture); + ID3D10Texture2D_Release(texture); + + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &srgb_rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, rtv, color); + check_texture_color(texture, expected_color, 1); + + if (!is_warp_device(device)) + { + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); + todo_wine check_texture_color(texture, expected_srgb_color, 1); + } + else + { + win_skip("sRGB clears are broken on WARP.\n"); + } + + ID3D10RenderTargetView_Release(srgb_rtv); + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_clear_depth_stencil_view(void) { D3D10_TEXTURE2D_DESC texture_desc; @@ -6135,6 +6247,7 @@ START_TEST(device) test_check_multisample_quality_levels(); test_cb_relative_addressing(); test_swapchain_flip(); + test_clear_render_target_view(); test_clear_depth_stencil_view(); test_draw_depth_only(); }

1 0

Nikolay Sivov : xmllite/writer: Fix initial state handling in WriteEndDocument().
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 86a7dd99e003c2dc96b4b37d43620ca79771039b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a7dd99e003c2dc96b4b37d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 23 13:07:27 2016 +0300 xmllite/writer: Fix initial state handling in WriteEndDocument(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 7 +++++-- dlls/xmllite/writer.c | 13 +++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 2015109..e6ffbeb 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -104,7 +104,7 @@ todo_wine { hr = IXmlWriter_WriteNmToken(writer, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); - +} /* FIXME: add WriteNode */ /* FIXME: add WriteNodeShallow */ @@ -112,12 +112,14 @@ todo_wine { ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); +todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteRaw(writer, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteRawChars(writer, aW, 1); +todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); @@ -127,8 +129,9 @@ todo_wine { ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteString(writer, aW); +todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); -} + /* FIXME: add WriteSurrogateCharEntity */ /* FIXME: add WriteWhitespace */ } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index dac7f04..90e965f 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -754,28 +754,21 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr static HRESULT WINAPI xmlwriter_WriteEndDocument(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - HRESULT hr = S_OK; TRACE("%p\n", This); switch (This->state) { case XmlWriterState_Initial: - hr = E_UNEXPECTED; - break; + return E_UNEXPECTED; case XmlWriterState_Ready: case XmlWriterState_DocClosed: - hr = WR_E_INVALIDACTION; - break; + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; default: ; } - if (FAILED(hr)) { - This->state = XmlWriterState_DocClosed; - return hr; - } - /* empty element stack */ while (IXmlWriter_WriteEndElement(iface) == S_OK) ;

1 0

Józef Kucia : wined3d: Use dcl_sampler to determine if shadow sampler is needed.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 510c8e39838e4ceef1a66b42e7e58484bf4ac143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=510c8e39838e4ceef1a66b42e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 23 13:42:53 2016 +0100 wined3d: Use dcl_sampler to determine if shadow sampler is needed. 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> --- dlls/wined3d/glsl_shader.c | 58 +++++++++++++++++++++++++----------------- dlls/wined3d/shader.c | 10 ++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 46 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=510c8e39838e4ceef1a66…

1 0