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

Nikolay Sivov : ole32: Implement IComThreadingInfo:: GetCurrentLogicalThreadId().
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 5b7c9ecd09a4dadf45011b32b6846f44cb9e92fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7c9ecd09a4dadf45011b32b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 12:51:34 2016 +0300 ole32: Implement IComThreadingInfo::GetCurrentLogicalThreadId(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/tests/compobj.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 91f11f6..a7fe650 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4739,8 +4739,8 @@ static HRESULT WINAPI Context_CTI_GetCurrentThreadType(IComThreadingInfo *iface, static HRESULT WINAPI Context_CTI_GetCurrentLogicalThreadId(IComThreadingInfo *iface, GUID *logical_thread_id) { - FIXME("(%p): stub\n", logical_thread_id); - return E_NOTIMPL; + TRACE("(%p)\n", logical_thread_id); + return CoGetCurrentLogicalThreadId(logical_thread_id); } static HRESULT WINAPI Context_CTI_SetCurrentLogicalThreadId(IComThreadingInfo *iface, REFGUID logical_thread_id) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 0f562a2..d684e33 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1782,6 +1782,7 @@ static void test_CoGetObjectContext(void) struct info info; HANDLE thread; DWORD tid, exitcode; + GUID id, id2; if (!pCoGetObjectContext) { @@ -1810,6 +1811,17 @@ static void test_CoGetObjectContext(void) pComThreadingInfo = NULL; hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + + hr = IComThreadingInfo_GetCurrentLogicalThreadId(pComThreadingInfo, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + id = id2 = GUID_NULL; + hr = IComThreadingInfo_GetCurrentLogicalThreadId(pComThreadingInfo, &id); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoGetCurrentLogicalThreadId(&id2); + ok(IsEqualGUID(&id, &id2), "got %s, expected %s\n", wine_dbgstr_guid(&id), wine_dbgstr_guid(&id2)); + IComThreadingInfo_Release(pComThreadingInfo); SetEvent(info.stop);

1 0

Nikolay Sivov : ole32: Implement CoGetCurrentLogicalThreadId().
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 1105acd26a822b3b82f5c4ff550438cbe1da84ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1105acd26a822b3b82f5c4ff5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 12:51:33 2016 +0300 ole32: Implement CoGetCurrentLogicalThreadId(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 14 ++++++++++++++ dlls/ole32/ole2stubs.c | 9 --------- dlls/ole32/tests/compobj.c | 15 +++++++++++++++ include/objbase.h | 1 + 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index de7438c..91f11f6 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3850,6 +3850,20 @@ DWORD WINAPI CoGetCurrentProcess(void) return GetCurrentProcessId(); } +/*********************************************************************** + * CoGetCurrentLogicalThreadId [OLE32.@] + */ +HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id) +{ + TRACE("(%p)\n", id); + + if (!id) + return E_INVALIDARG; + + *id = COM_CurrentCausalityId(); + return S_OK; +} + /****************************************************************************** * CoRegisterMessageFilter [OLE32.@] * diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 1f8b9f8..90862d0 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -83,12 +83,3 @@ HRESULT WINAPI CoGetCallerTID(LPDWORD lpdwTID) FIXME("stub!\n"); return E_NOTIMPL; } - -/*********************************************************************** - * CoGetCurrentLogicalThreadId [OLE32.@] - */ -HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *pguid) -{ - FIXME(": stub\n"); - return E_NOTIMPL; -} diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 183d8a0..0f562a2 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3093,6 +3093,20 @@ static void test_IMallocSpy(void) ok(hr == CO_E_OBJNOTREG, "got 0x%08x\n", hr); } +static void test_CoGetCurrentLogicalThreadId(void) +{ + HRESULT hr; + GUID id; + + hr = CoGetCurrentLogicalThreadId(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + id = GUID_NULL; + hr = CoGetCurrentLogicalThreadId(&id); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!IsEqualGUID(&id, &GUID_NULL), "got null id\n"); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -3161,4 +3175,5 @@ START_TEST(compobj) test_OleRegGetUserType(); test_CoGetApartmentType(); test_IMallocSpy(); + test_CoGetCurrentLogicalThreadId(); } diff --git a/include/objbase.h b/include/objbase.h index 02656d1..43f3357 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -285,6 +285,7 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved); HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit); void WINAPI CoUninitialize(void); DWORD WINAPI CoGetCurrentProcess(void); +HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id); HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier); HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree);

1 0

Hans Leidekker : webservices: Keep track of prefix bindings.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: cceb19d0b2026c602ba16361581fafd34bd723ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=cceb19d0b2026c602ba163615… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 9 14:16:32 2016 +0100 webservices: Keep track of prefix bindings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 139 ++++++++++++++++++++++++++++++--- dlls/webservices/tests/reader.c | 128 +++++++++++++++++++++++++++++- dlls/webservices/webservices_private.h | 5 ++ 3 files changed, 257 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cceb19d0b2026c602ba16…

1 0

Andrew Eikum : mmdevapi: Implement Set/GetMute.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 620cfe7e79c3bbe7c85bf93b3eeb52d357534ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620cfe7e79c3bbe7c85bf93b3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 9 12:41:28 2016 -0600 mmdevapi: Implement Set/GetMute. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/audiovolume.c | 21 +++++++++++++++++---- dlls/mmdevapi/tests/render.c | 7 +++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 742823c..76f9f4e 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -44,6 +44,7 @@ typedef struct AEVImpl { IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface; LONG ref; float master_vol; + BOOL mute; } AEVImpl; static inline AEVImpl *impl_from_IAudioEndpointVolumeEx(IAudioEndpointVolumeEx *iface) @@ -197,18 +198,30 @@ static HRESULT WINAPI AEV_GetChannelVolumeLevelScalar(IAudioEndpointVolumeEx *if static HRESULT WINAPI AEV_SetMute(IAudioEndpointVolumeEx *iface, BOOL mute, const GUID *ctx) { + AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); + HRESULT ret; + TRACE("(%p)->(%u,%s)\n", iface, mute, debugstr_guid(ctx)); - FIXME("stub\n"); - return E_NOTIMPL; + + ret = This->mute == mute ? S_FALSE : S_OK; + + This->mute = mute; + + return ret; } static HRESULT WINAPI AEV_GetMute(IAudioEndpointVolumeEx *iface, BOOL *mute) { + AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); + TRACE("(%p)->(%p)\n", iface, mute); + if (!mute) return E_POINTER; - FIXME("stub\n"); - return E_NOTIMPL; + + *mute = This->mute; + + return S_OK; } static HRESULT WINAPI AEV_GetVolumeStepInfo(IAudioEndpointVolumeEx *iface, UINT *stepsize, UINT *stepcount) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 1e8a5f1..9d2853c 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -2248,6 +2248,7 @@ static void test_endpointvolume(void) HRESULT hr; IAudioEndpointVolume *aev; float mindb, maxdb, increment, volume; + BOOL mute; hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, CLSCTX_INPROC_SERVER, NULL, (void**)&aev); @@ -2271,6 +2272,12 @@ static void test_endpointvolume(void) hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, volume, NULL); ok(hr == S_OK, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + hr = IAudioEndpointVolume_GetMute(aev, &mute); + ok(hr == S_OK, "GetMute failed: %08x\n", hr); + + hr = IAudioEndpointVolume_SetMute(aev, mute, NULL); + ok(hr == S_OK || hr == S_FALSE, "SetMute failed: %08x\n", hr); + IAudioEndpointVolume_Release(aev); }

1 0

Andrew Eikum : mmdevapi: Implement Set/GetMasterVolumeLevel.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 982d005da56c5c6f771987c6f724018daa5735ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=982d005da56c5c6f771987c6f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 9 12:41:25 2016 -0600 mmdevapi: Implement Set/GetMasterVolumeLevel. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/audiovolume.c | 21 +++++++++++++++++---- dlls/mmdevapi/tests/render.c | 11 ++++++++++- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index a49d2e9..742823c 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); typedef struct AEVImpl { IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface; LONG ref; + float master_vol; } AEVImpl; static inline AEVImpl *impl_from_IAudioEndpointVolumeEx(IAudioEndpointVolumeEx *iface) @@ -120,9 +121,16 @@ static HRESULT WINAPI AEV_GetChannelCount(IAudioEndpointVolumeEx *iface, UINT *c static HRESULT WINAPI AEV_SetMasterVolumeLevel(IAudioEndpointVolumeEx *iface, float leveldb, const GUID *ctx) { + AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); + TRACE("(%p)->(%f,%s)\n", iface, leveldb, debugstr_guid(ctx)); - FIXME("stub\n"); - return E_NOTIMPL; + + if(leveldb < -100.f || leveldb > 0.f) + return E_INVALIDARG; + + This->master_vol = leveldb; + + return S_OK; } static HRESULT WINAPI AEV_SetMasterVolumeLevelScalar(IAudioEndpointVolumeEx *iface, float level, const GUID *ctx) @@ -134,11 +142,16 @@ static HRESULT WINAPI AEV_SetMasterVolumeLevelScalar(IAudioEndpointVolumeEx *ifa static HRESULT WINAPI AEV_GetMasterVolumeLevel(IAudioEndpointVolumeEx *iface, float *leveldb) { + AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); + TRACE("(%p)->(%p)\n", iface, leveldb); + if (!leveldb) return E_POINTER; - FIXME("stub\n"); - return E_NOTIMPL; + + *leveldb = This->master_vol; + + return S_OK; } static HRESULT WINAPI AEV_GetMasterVolumeLevelScalar(IAudioEndpointVolumeEx *iface, float *level) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 1476adc..1e8a5f1 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -2247,7 +2247,7 @@ static void test_endpointvolume(void) { HRESULT hr; IAudioEndpointVolume *aev; - float mindb, maxdb, increment; + float mindb, maxdb, increment, volume; hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, CLSCTX_INPROC_SERVER, NULL, (void**)&aev); @@ -2262,6 +2262,15 @@ static void test_endpointvolume(void) ok(hr == S_OK, "GetVolumeRange failed: 0x%08x\n", hr); trace("got range: [%f,%f]/%f\n", mindb, maxdb, increment); + hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, mindb - increment, NULL); + ok(hr == E_INVALIDARG, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetMasterVolumeLevel(aev, &volume); + ok(hr == S_OK, "GetMasterVolumeLevel failed: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, volume, NULL); + ok(hr == S_OK, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + IAudioEndpointVolume_Release(aev); }

1 0

Henri Verbeet : wined3d: Use ARB_map_buffer_range in wined3d_surface_map() when available.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: a59f70d29ceeb42139f1c93b54a2e59f56e928c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59f70d29ceeb42139f1c93b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:57 2016 +0100 wined3d: Use ARB_map_buffer_range in wined3d_surface_map() when available. Like in wined3d_volume_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 13aae6d..f15d62a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2207,7 +2207,20 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ case WINED3D_LOCATION_BUFFER: GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object)); - base_memory = GL_EXTCALL(glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_READ_WRITE)); + + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + GLbitfield map_flags = wined3d_resource_gl_map_flags(flags); + map_flags &= ~GL_MAP_FLUSH_EXPLICIT_BIT; + base_memory = GL_EXTCALL(glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, + 0, surface->resource.size, map_flags)); + } + else + { + GLenum access = wined3d_resource_gl_legacy_map_flags(flags); + base_memory = GL_EXTCALL(glMapBuffer(GL_PIXEL_UNPACK_BUFFER, access)); + } + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); checkGLcall("map PBO"); break;

1 0

Matteo Bruni : d3d11/tests: Add a test for the default feature level selection.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 73c32df3834cdd8443af950a87abae5c221b730a URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c32df3834cdd8443af950a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:23 2016 +0100 d3d11/tests: Add a test for the default feature level selection. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f0ae840..321fc2c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -411,6 +411,15 @@ static void draw_quad_(unsigned int line, struct d3d11_test_context *context) static void test_create_device(void) { + static const D3D_FEATURE_LEVEL default_feature_levels[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + D3D_FEATURE_LEVEL_9_3, + D3D_FEATURE_LEVEL_9_2, + D3D_FEATURE_LEVEL_9_1, + }; D3D_FEATURE_LEVEL feature_level, supported_feature_level; DXGI_SWAP_CHAIN_DESC swapchain_desc, obtained_desc; ID3D11DeviceContext *immediate_context; @@ -440,6 +449,13 @@ static void test_create_device(void) ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, default_feature_levels, + sizeof(default_feature_levels) / sizeof(default_feature_levels[0]), D3D11_SDK_VERSION, NULL, + &feature_level, NULL); + ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + feature_level, supported_feature_level); + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, &immediate_context); ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr);

1 0

Matteo Bruni : d3d11: Pass the requested feature levels to dxgi.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: ce32dccee79088fdb64c5b01a96906e033529d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce32dccee79088fdb64c5b01a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:22 2016 +0100 d3d11: Pass the requested feature levels to dxgi. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 19 +++++++++++++++---- dlls/d3d11/tests/d3d11.c | 20 ++++++++++++++------ 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index e3ef209..ebd4808 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -132,7 +132,6 @@ HRESULT WINAPI D3D11CoreRegisterLayers(void) HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, ID3D11Device **device) { - static const D3D_FEATURE_LEVEL level = D3D_FEATURE_LEVEL_10_0; IUnknown *dxgi_device; HMODULE d3d11; HRESULT hr; @@ -140,10 +139,8 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte TRACE("factory %p, adapter %p, flags %#x, feature_levels %p, levels %u, device %p.\n", factory, adapter, flags, feature_levels, levels, device); - FIXME("Ignoring feature levels.\n"); - d3d11 = GetModuleHandleA("d3d11.dll"); - hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, &level, 1, (void **)&dxgi_device); + hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, feature_levels, levels, (void **)&dxgi_device); if (FAILED(hr)) { WARN("Failed to create device, returning %#x.\n", hr); @@ -165,6 +162,15 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) { + static const D3D_FEATURE_LEVEL default_feature_levels[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + D3D_FEATURE_LEVEL_9_3, + D3D_FEATURE_LEVEL_9_2, + D3D_FEATURE_LEVEL_9_1, + }; IDXGIFactory *factory; ID3D11Device *device; HRESULT hr; @@ -262,6 +268,11 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t } } + if (!feature_levels) + { + feature_levels = default_feature_levels; + levels = sizeof(default_feature_levels) / sizeof(default_feature_levels[0]); + } hr = D3D11CoreCreateDevice(factory, adapter, flags, feature_levels, levels, &device); IDXGIAdapter_Release(adapter); IDXGIFactory_Release(factory); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9d6add5..f0ae840 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1977,6 +1977,8 @@ static void test_create_shader(void) for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) { D3D_FEATURE_LEVEL feature_level = d3d11_feature_levels[i]; + BOOL todo = feature_level <= D3D_FEATURE_LEVEL_9_3; + if (!(device = create_device(&feature_level))) { skip("Failed to create device for feature level %#x.\n", feature_level); @@ -1985,16 +1987,22 @@ static void test_create_shader(void) /* level_9 shaders */ hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_0, sizeof(ps_4_0_level_9_0), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_0 shader, hr %#x, feature level %#x.\n", hr, feature_level); - ID3D11PixelShader_Release(ps); + todo_wine_if(todo) + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_0 shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (SUCCEEDED(hr)) + ID3D11PixelShader_Release(ps); hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_1, sizeof(ps_4_0_level_9_1), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_1 shader, hr %#x, feature level %#x.\n", hr, feature_level); - ID3D11PixelShader_Release(ps); + todo_wine_if(todo) + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_1 shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (SUCCEEDED(hr)) + ID3D11PixelShader_Release(ps); hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_3, sizeof(ps_4_0_level_9_3), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_3 shader, hr %#x, feature level %#x.\n", hr, feature_level); - ID3D11PixelShader_Release(ps); + todo_wine_if(todo) + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_3 shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (SUCCEEDED(hr)) + ID3D11PixelShader_Release(ps); /* vertex shader */ hr = ID3D11Device_CreateVertexShader(device, vs_2_0, sizeof(vs_2_0), NULL, &vs);

1 0

Matteo Bruni : dxgi: Add feature level support.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: ffce30bc317f743cf07867201769541fa0550f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffce30bc317f743cf07867201… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:19 2016 +0100 dxgi: Add feature level support. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 17 ++++++++-- dlls/d3d11/d3d11_private.h | 4 ++- dlls/dxgi/adapter.c | 3 +- dlls/dxgi/device.c | 11 +++++-- dlls/dxgi/dxgi.spec | 2 +- dlls/dxgi/dxgi_main.c | 10 +++--- dlls/dxgi/dxgi_private.h | 8 +++-- dlls/dxgi/utils.c | 77 ++++++++++++++++++++++++++++++++++++++++------ 8 files changed, 109 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffce30bc317f743cf0786…

1 0

Huw Davies : riched20: \pard resets the reading direction.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: ac5edd1b6bc6da1a9333be75169863cd36ea4522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5edd1b6bc6da1a9333be751… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 11:59:41 2016 +0000 riched20: \pard resets the reading direction. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 3 ++- dlls/riched20/tests/editor.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7b87dfc..7ac94ca 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -553,7 +553,7 @@ void ME_RTFParAttrHook(RTF_Info *info) info->borderType = RTFBorderParaTop; info->fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS | PFM_OFFSET | PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE | - PFM_STARTINDENT; + PFM_STARTINDENT | PFM_RTLPARA; /* TODO: numbering, shading */ info->fmt.wAlignment = PFA_LEFT; info->fmt.cTabCount = 0; @@ -563,6 +563,7 @@ void ME_RTFParAttrHook(RTF_Info *info) info->fmt.bLineSpacingRule = 0; info->fmt.dySpaceBefore = info->fmt.dySpaceAfter = 0; info->fmt.dyLineSpacing = 0; + info->fmt.wEffects &= ~PFE_RTLPARA; if (!info->editor->bEmulateVersion10) /* v4.1 */ { if (info->tableDef && info->tableDef->tableRowStart && diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 18d080c..c6444ff 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8284,10 +8284,12 @@ static void test_rtf_specials(void) "\\rquote\\ldblquote\\rdblquote\\ltrmark\\rtlmark\\zwj\\zwnj}"; const WCHAR expect_specials[] = {' ',' ',0x2022,0x2018,0x2019,0x201c, 0x201d,0x200e,0x200f,0x200d,0x200c}; + const char *pard = "{\\rtf1 ABC\\rtlpar\\par DEF\\par HIJ\\pard\\par}"; HWND edit = new_richeditW( NULL ); EDITSTREAM es; WCHAR buf[80]; LRESULT result; + PARAFORMAT2 fmt; es.dwCookie = (DWORD_PTR)&specials; es.dwError = 0; @@ -8299,6 +8301,26 @@ static void test_rtf_specials(void) ok( result == sizeof(expect_specials)/sizeof(expect_specials[0]), "got %ld\n", result ); ok( !memcmp( buf, expect_specials, sizeof(expect_specials) ), "got %s\n", wine_dbgstr_w(buf) ); + /* Show that \rtlpar propagates to the second paragraph and is + reset by \pard in the third. */ + es.dwCookie = (DWORD_PTR)&pard; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == 11, "got %ld\n", result ); + + fmt.cbSize = sizeof(fmt); + SendMessageW( edit, EM_SETSEL, 1, 1 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( fmt.wEffects & PFE_RTLPARA, "rtl para not set\n" ); + SendMessageW( edit, EM_SETSEL, 5, 5 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( fmt.wEffects & PFE_RTLPARA, "rtl para not set\n" ); + SendMessageW( edit, EM_SETSEL, 9, 9 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( !(fmt.wEffects & PFE_RTLPARA), "rtl para set\n" ); + DestroyWindow( edit ); }

1 0