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

Nikolay Sivov : ole32/tests: A test to show data cache QI problems.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: a411ef99fcee102dfb1a5426af2f9f6697643a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a411ef99fcee102dfb1a5426a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 10:33:31 2016 +0300 ole32/tests: A test to show data cache QI problems. 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/tests/ole2.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 2167f66..d58105c 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1505,13 +1505,11 @@ static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void static ULONG WINAPI Unknown_AddRef(IUnknown *iface) { - ok(0, "unexpected AddRef\n"); return 2; } static ULONG WINAPI Unknown_Release(IUnknown *iface) { - ok(0, "unexpected Release\n"); return 1; } @@ -1528,7 +1526,9 @@ static void test_data_cache(void) { HRESULT hr; IOleCache2 *pOleCache; + IOleCache *olecache; IStorage *pStorage; + IUnknown *unk; IPersistStorage *pPS; IViewObject *pViewObject; IOleCacheControl *pOleCacheControl; @@ -1601,9 +1601,32 @@ static void test_data_cache(void) todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&pOleCache); + hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IOleCache, (void**)&olecache); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache2, (void**)&pOleCache); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(unk != (IUnknown*)olecache, "got %p, expected %p\n", olecache, unk); + ok(unk != (IUnknown*)pOleCache, "got %p, expected %p\n", pOleCache, unk); + IOleCache2_Release(pOleCache); + IOleCache_Release(olecache); + IUnknown_Release(unk); + + hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache, (void**)&olecache); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache2, (void**)&pOleCache); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(unk == (IUnknown*)olecache, "got %p, expected %p\n", olecache, unk); + ok(unk == (IUnknown*)pOleCache, "got %p, expected %p\n", pOleCache, unk); +} IOleCache2_Release(pOleCache); + IOleCache_Release(olecache); + IUnknown_Release(unk); /* Test with new data */

1 0

Nikolay Sivov : avifil32: Use matching buffer length for dest string ( Coverity).
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 94c1c8e504edb82cd112c71fc6427991713685c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c1c8e504edb82cd112c71fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 12:26:57 2016 +0300 avifil32: Use matching buffer length for dest string (Coverity). Reported issue is about potential overflow when copying to fixed size buffer from larger source buffer Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 7232450..0715d58 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1036,14 +1036,16 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) return AVIERR_ERROR; } for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)/sizeof(szFileExt[0])) == ERROR_SUCCESS;n++) { + WCHAR clsidW[40]; + /* get CLSID to extension */ - size = sizeof(szValue); - if (RegQueryValueW(hKey, szFileExt, szValue, &size) != ERROR_SUCCESS) + size = sizeof(clsidW); + if (RegQueryValueW(hKey, szFileExt, clsidW, &size) != ERROR_SUCCESS) break; /* search if the CLSID is already known */ for (i = 1; i <= count; i++) { - if (lstrcmpW(lp[i].szClsid, szValue) == 0) + if (lstrcmpW(lp[i].szClsid, clsidW) == 0) break; /* a new one */ } @@ -1058,7 +1060,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) break; } - lstrcpyW(lp[i].szClsid, szValue); + lstrcpyW(lp[i].szClsid, clsidW); count++; }

1 0

Nikolay Sivov : ole32: Implement CoGetCurrentLogicalThreadId().
by Alexandre Julliard 11 Mar '16

11 Mar '16

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

Nikolay Sivov : ole32: Implement IComThreadingInfo:: GetCurrentLogicalThreadId().
by Alexandre Julliard 11 Mar '16

11 Mar '16

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

Huw Davies : riched20: \pard resets the reading direction.
by Alexandre Julliard 11 Mar '16

11 Mar '16

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

Huw Davies : riched20: Set the base embedding level for RTL paragraphs.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: a2c57a2a8aafb9211323a4b4a40d5e9d6af53f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c57a2a8aafb9211323a4b4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 11:59:42 2016 +0000 riched20: Set the base embedding level for RTL paragraphs. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e8575fdb..49a62ce 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -746,6 +746,11 @@ static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) assert( p->type == diParagraph ); + if (para->pFmt->dwMask & PFM_RTLPARA && para->pFmt->wEffects & PFE_RTLPARA) + state.uBidiLevel = 1; + + TRACE( "Base embedding level %d\n", state.uBidiLevel ); + while (1) { hr = ScriptItemize( para->text->szData, para->text->nLen, items_passed, &control,

1 0

Matteo Bruni : dxgi: Add feature level support.
by Alexandre Julliard 11 Mar '16

11 Mar '16

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

Matteo Bruni : d3d11: Implement device_GetFeatureLevel().
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 1e77bb01db6ae8c79125de90c983696e5e301e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e77bb01db6ae8c79125de90c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:20 2016 +0100 d3d11: Implement device_GetFeatureLevel(). 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/d3d10_1/tests/d3d10_1.c | 4 ++-- dlls/d3d11/d3d11_main.c | 4 ++++ dlls/d3d11/d3d11_private.h | 2 ++ dlls/d3d11/device.c | 12 ++++++++---- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index f67896e..7eba447 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -82,7 +82,7 @@ static void test_create_device(void) } feature_level = ID3D10Device1_GetFeatureLevel(device); - ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + todo_wine ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); ID3D10Device1_Release(device); @@ -165,7 +165,7 @@ static void test_create_device(void) ok(!refcount, "Swapchain has %u references left.\n", refcount); feature_level = ID3D10Device1_GetFeatureLevel(device); - ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + todo_wine ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); refcount = ID3D10Device1_Release(device); diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index afc161f..e3ef209 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -104,6 +104,8 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba static void WINAPI layer_set_feature_level(enum dxgi_device_layer_id id, void *device, D3D_FEATURE_LEVEL feature_level) { + struct d3d_device *d3d_device = device; + TRACE("id %#x, device %p, feature_level %u.\n", id, device, feature_level); if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE) @@ -111,6 +113,8 @@ static void WINAPI layer_set_feature_level(enum dxgi_device_layer_id id, void *d WARN("Unknown layer id %#x.\n", id); return; } + + d3d_device->feature_level = feature_level; } HRESULT WINAPI D3D11CoreRegisterLayers(void) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index a501a13..072afb4 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -394,6 +394,8 @@ struct d3d_device IUnknown *outer_unk; LONG refcount; + D3D_FEATURE_LEVEL feature_level; + struct d3d11_immediate_context immediate_context; struct wined3d_device_parent device_parent; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8b7d2f8..6ec154f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2536,9 +2536,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Devi static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11Device *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = impl_from_ID3D11Device(iface); + + TRACE("iface %p.\n", iface); - return D3D_FEATURE_LEVEL_10_0; + return device->feature_level; } static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device *iface) @@ -4557,9 +4559,11 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device1 *ifac static D3D10_FEATURE_LEVEL1 STDMETHODCALLTYPE d3d10_device_GetFeatureLevel(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p.\n", iface); - return D3D10_FEATURE_LEVEL_10_1; + return device->feature_level; } static const struct ID3D10Device1Vtbl d3d10_device1_vtbl =

1 0

Matteo Bruni : d3d11: Only accept shader versions supported by the feature level of the device.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: ca3963b674433703816de861495af913c9579886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3963b674433703816de8614… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:21 2016 +0100 d3d11: Only accept shader versions supported by the feature level of the device. 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/shader.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 0e277fc..06e4b8c 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -361,6 +361,27 @@ static const struct wined3d_parent_ops d3d_vertex_shader_wined3d_parent_ops = d3d_vertex_shader_wined3d_object_destroyed, }; +static unsigned int d3d_sm_from_feature_level(D3D_FEATURE_LEVEL feature_level) +{ + switch (feature_level) + { + case D3D_FEATURE_LEVEL_11_1: + case D3D_FEATURE_LEVEL_11_0: + return 5; + case D3D_FEATURE_LEVEL_10_1: + case D3D_FEATURE_LEVEL_10_0: + return 4; + case D3D_FEATURE_LEVEL_9_3: + return 3; + case D3D_FEATURE_LEVEL_9_2: + case D3D_FEATURE_LEVEL_9_1: + return 2; + default: + ERR("Unexpected feature_level %#x.\n", feature_level); + } + return 0; +} + static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) { @@ -389,7 +410,7 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d desc.byte_code = shader_info.shader_code; desc.input_signature = &input_signature; desc.output_signature = &output_signature; - desc.max_version = 4; + desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_vs(device->wined3d_device, &desc, shader, &d3d_vertex_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -708,7 +729,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, stru desc.byte_code = shader_info.shader_code; desc.input_signature = &input_signature; desc.output_signature = &output_signature; - desc.max_version = 4; + desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_gs(device->wined3d_device, &desc, shader, &d3d_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -1034,7 +1055,7 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d desc.byte_code = shader_info.shader_code; desc.input_signature = &input_signature; desc.output_signature = &output_signature; - desc.max_version = 4; + desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_ps(device->wined3d_device, &desc, shader, &d3d_pixel_shader_wined3d_parent_ops, &shader->wined3d_shader);

1 0

Matteo Bruni : d3d11: Pass the requested feature levels to dxgi.
by Alexandre Julliard 11 Mar '16

11 Mar '16

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