wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Dmitry Timoshkov : mshtml: Add IHTMLEditServices stub implementation.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 3662980f41be2be3e5ae59062e5445edbe240270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3662980f41be2be3e5ae59062… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 13 14:41:30 2015 +0800 mshtml: Add IHTMLEditServices stub implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 + dlls/mshtml/main.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/service.c | 137 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 4 ++ 5 files changed, 145 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2b660df..8e53b8b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4761,6 +4761,8 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) IOleDocumentView_SetInPlaceSite(&This->basedoc.IOleDocumentView_iface, NULL); if(This->undomgr) IOleUndoManager_Release(This->undomgr); + if(This->editsvcs) + IHTMLEditServices_Release(This->editsvcs); if(This->tooltips_hwnd) DestroyWindow(This->tooltips_hwnd); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8938f01e..0b6f6ac 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -554,6 +554,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHlinkTarget); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); + X(IID_IHTMLEditServices); X(IID_IHTMLFramesCollection2); X(IID_IHTMLPrivateWindow); X(IID_IHtmlLoadOptions); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 55375d4..c32824e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -602,6 +602,7 @@ struct HTMLDocumentObj { DOCHOSTUIINFO hostinfo; IOleUndoManager *undomgr; + IHTMLEditServices *editsvcs; HWND hwnd; HWND tooltips_hwnd; diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 8b2a6b7..d344293 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -205,6 +205,131 @@ static IOleUndoManager *create_undomgr(void) return &ret->IOleUndoManager_iface; } +typedef struct { + IHTMLEditServices IHTMLEditServices_iface; + LONG ref; +} editsvcs; + +static inline editsvcs *impl_from_IHTMLEditServices(IHTMLEditServices *iface) +{ + return CONTAINING_RECORD(iface, editsvcs, IHTMLEditServices_iface); +} + +static HRESULT WINAPI editsvcs_QueryInterface(IHTMLEditServices *iface, REFIID riid, void **ppv) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = &This->IHTMLEditServices_iface; + } else if(IsEqualGUID(riid, &IID_IHTMLEditServices)) { + *ppv = &This->IHTMLEditServices_iface; + } else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI editsvcs_AddRef(IHTMLEditServices *iface) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI editsvcs_Release(IHTMLEditServices *iface) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI editsvcs_AddDesigner(IHTMLEditServices *iface, + IHTMLEditDesigner *pIDesigner) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p)\n", This, pIDesigner); + return E_NOTIMPL; +} + +static HRESULT WINAPI editsvcs_RemoveDesigner(IHTMLEditServices *iface, + IHTMLEditDesigner *pIDesigner) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p)\n", This, pIDesigner); + return E_NOTIMPL; +} + +static HRESULT WINAPI editsvcs_GetSelectionServices(IHTMLEditServices *iface, + IMarkupContainer *pIContainer, ISelectionServices **ppSelSvc) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pIContainer, ppSelSvc); + return E_NOTIMPL; +} + +static HRESULT WINAPI editsvcs_MoveToSelectionAnchor(IHTMLEditServices *iface, + IMarkupPointer *pIStartAnchor) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p)\n", This, pIStartAnchor); + return E_NOTIMPL; +} + +static HRESULT WINAPI editsvcs_MoveToSelectionEnd(IHTMLEditServices *iface, + IMarkupPointer *pIEndAnchor) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p)\n", This, pIEndAnchor); + return E_NOTIMPL; +} + +static HRESULT WINAPI editsvcs_SelectRange(IHTMLEditServices *iface, + IMarkupPointer *pStart, IMarkupPointer *pEnd, SELECTION_TYPE eType) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p,%p,%#x)\n", This, pStart, pEnd, eType); + return E_NOTIMPL; +} + +static const IHTMLEditServicesVtbl editsvcsVtbl = { + editsvcs_QueryInterface, + editsvcs_AddRef, + editsvcs_Release, + editsvcs_AddDesigner, + editsvcs_RemoveDesigner, + editsvcs_GetSelectionServices, + editsvcs_MoveToSelectionAnchor, + editsvcs_MoveToSelectionEnd, + editsvcs_SelectRange, +}; + +static IHTMLEditServices *create_editsvcs(void) +{ + editsvcs *ret = heap_alloc(sizeof(*ret)); + + if (ret) { + ret->IHTMLEditServices_iface.lpVtbl = &editsvcsVtbl; + ret->ref = 1; + return &ret->IHTMLEditServices_iface; + } + + return NULL; +} + /********************************************************** * IServiceProvider implementation */ @@ -264,6 +389,18 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return IWindowForBindingUI_QueryInterface(&This->doc_obj->IWindowForBindingUI_iface, riid, ppv); } + if(IsEqualGUID(&SID_SHTMLEditServices, guidService)) { + TRACE("SID_SHTMLEditServices\n"); + + if(!This->doc_obj->editsvcs) + This->doc_obj->editsvcs = create_editsvcs(); + + if (!This->doc_obj->editsvcs) + return E_OUTOFMEMORY; + + return IHTMLEditServices_QueryInterface(This->doc_obj->editsvcs, riid, ppv); + } + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); if(This->doc_obj->client) { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 899cd73..bdb3eb2 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -8498,8 +8498,12 @@ static void test_ServiceProvider(void) hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "got 0x%08x\n", hres); ok(iface_cmp((IUnknown*)doc, unk), "got wrong pointer\n"); + IUnknown_Release(unk); + hres = IServiceProvider_QueryService(provider, &SID_SHTMLEditServices, &IID_IHTMLEditServices, (void**)&unk); + ok(hres == S_OK, "QueryService(HTMLEditServices) failed: %08x\n", hres); IUnknown_Release(unk); + IServiceProvider_Release(provider); release_document(doc); }

1 0

Nikolay Sivov : advapi32/tests: Simplify conditional expression ( PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 076f50ee6cd024a4c4f7095d0d1567888cbca7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076f50ee6cd024a4c4f7095d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 13:44:43 2015 +0300 advapi32/tests: Simplify conditional expression (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a5c98df..b171a81 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1686,7 +1686,7 @@ static void test_sid_str(PSID * sid) DWORD acc_size = MAX_PATH; DWORD dom_size = MAX_PATH; ret = LookupAccountSidA (NULL, sid, account, &acc_size, domain, &dom_size, &use); - ok(ret || (!ret && (GetLastError() == ERROR_NONE_MAPPED)), + ok(ret || GetLastError() == ERROR_NONE_MAPPED, "LookupAccountSid(%s) failed: %d\n", str_sid, GetLastError()); if (ret) trace(" %s %s\\%s %d\n", str_sid, domain, account, use);

1 0

Nikolay Sivov : oledlg: Simplify conditional expression (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: bd957b6db613f7fdaaa9d1054aab2855da85cd18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd957b6db613f7fdaaa9d1054… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 13:40:34 2015 +0300 oledlg: Simplify conditional expression (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/oledlg_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 2730562..87df968 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -183,7 +183,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); /* no object, or object without enumeration support */ - if (!object || (object && !enumverbs)) { + if (!object || !enumverbs) { InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_STRING|MF_GRAYED, idmin, resstrW); return FALSE; }

1 0

Nikolay Sivov : regsvr32: Simplify conditional expression (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 6de871c01b8366dca952b351d0e8b656ba8db45e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de871c01b8366dca952b351d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 13:35:39 2015 +0300 regsvr32: Simplify conditional expression (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 03d45fa..6338bae 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -296,7 +296,7 @@ int wmain(int argc, WCHAR* argv[]) continue; } - if (!CallInstall || (CallInstall && CallRegister)) + if (!CallInstall || CallRegister) { if(Unregister) res = UnregisterDll(DllName);

1 0

Austin English : kernel32: Add a stub for CancelSynchronousIo.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: a26a6b877d64effe947b29854d1c3492a5c27e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26a6b877d64effe947b29854… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 12 10:29:27 2015 -0500 kernel32: Add a stub for CancelSynchronousIo. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-io-l1-1-1.spec | 2 +- dlls/kernel32/file.c | 19 +++++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- include/winbase.h | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec index e05728e..73aae1a 100644 --- a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec +++ b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec @@ -1,6 +1,6 @@ @ stdcall CancelIo(long) kernel32.CancelIo @ stdcall CancelIoEx(long ptr) kernel32.CancelIoEx -@ stub CancelSynchronousIo +@ stdcall CancelSynchronousIo(long) kernel32.CancelSynchronousIo @ stdcall CreateIoCompletionPort(long long long long) kernel32.CreateIoCompletionPort @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) kernel32.DeviceIoControl @ stdcall GetOverlappedResult(long ptr ptr long) kernel32.GetOverlappedResult diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index e43829e..ee43b10 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -686,6 +686,25 @@ BOOL WINAPI CancelIo(HANDLE handle) } /*********************************************************************** + * CancelSynchronousIo (KERNEL32.@) + * + * Marks pending synchronous I/O operations issued by the specified thread as cancelled + * + * PARAMS + * handle [I] handle to the thread whose I/O operations should be cancelled + * + * RETURNS + * Success: TRUE. + * Failure: FALSE, check GetLastError(). + */ +BOOL WINAPI CancelSynchronousIo(HANDLE thread) +{ + FIXME("(%p): stub\n", thread); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * _hread (KERNEL32.@) */ LONG WINAPI _hread( HFILE hFile, LPVOID buffer, LONG count) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e0cb154..dfc305b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -210,7 +210,7 @@ @ stub CancelDeviceWakeupRequest @ stdcall CancelIo(long) @ stdcall CancelIoEx(long ptr) -# @ stub CancelSynchronousIo +@ stdcall CancelSynchronousIo(long) # @ stub CancelThreadpoolIo @ stdcall CancelTimerQueueTimer(ptr ptr) @ stdcall CancelWaitableTimer(long) diff --git a/include/winbase.h b/include/winbase.h index dd320c2..25bc593 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1694,6 +1694,7 @@ WINBASEAPI BOOL WINAPI CallNamedPipeW(LPCWSTR,LPVOID,DWORD,LPVOID,DWORD,L #define CallNamedPipe WINELIB_NAME_AW(CallNamedPipe) WINBASEAPI BOOL WINAPI CancelIo(HANDLE); WINBASEAPI BOOL WINAPI CancelIoEx(HANDLE,LPOVERLAPPED); +WINBASEAPI BOOL WINAPI CancelSynchronousIo(HANDLE); WINBASEAPI BOOL WINAPI CancelTimerQueueTimer(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI CancelWaitableTimer(HANDLE); WINBASEAPI BOOL WINAPI CheckNameLegalDOS8Dot3A(const char*,char*,DWORD,BOOL*,BOOL*);

1 0

Józef Kucia : dxgi/tests: Add test for IDXGIAdapter:: CheckInterfaceSupport().
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: ce63546e028176358566865f5332bee74dadf604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce63546e028176358566865f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:44:33 2015 +0200 dxgi/tests: Add test for IDXGIAdapter::CheckInterfaceSupport(). 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/dxgi/tests/device.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 008da26..ea4e7b3 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -170,6 +170,60 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_check_interface_support(void) +{ + LARGE_INTEGER driver_version; + IDXGIAdapter *adapter; + IDXGIDevice *device; + IUnknown *iface; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, &driver_version); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + trace("UMD version: %u.%u.%u.%u.\n", + HIWORD(U(driver_version).HighPart), LOWORD(U(driver_version).HighPart), + HIWORD(U(driver_version).LowPart), LOWORD(U(driver_version).LowPart)); + + hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface); + if (SUCCEEDED(hr)) + { + IUnknown_Release(iface); + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device1, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device1, &driver_version); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + else + { + win_skip("D3D10.1 is not supported.\n"); + } + + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D11Device, NULL); + ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#x.\n", hr); + driver_version.HighPart = driver_version.LowPart = 0xdeadbeef; + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D11Device, &driver_version); + ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#x.\n", hr); + ok(driver_version.HighPart == 0xdeadbeef, "Got unexpected driver version %#x.\n", driver_version.HighPart); + ok(driver_version.LowPart == 0xdeadbeef, "Got unexpected driver version %#x.\n", driver_version.LowPart); + + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_surface(void) { DXGI_SURFACE_DESC desc; @@ -1215,6 +1269,7 @@ START_TEST(device) ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); test_adapter_desc(); + test_check_interface_support(); test_device_interfaces(); test_create_surface(); test_parents();

1 0

Józef Kucia : dxgi: Partially implement dxgi_adapter_CheckInterfaceSupport().
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 895c5f8234813d2b445376aa73e1fc93b5061b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=895c5f8234813d2b445376aa7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:44:32 2015 +0200 dxgi: Partially implement dxgi_adapter_CheckInterfaceSupport(). 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/dxgi/adapter.c | 34 ++++++++++++++++++++++++++++++++-- dlls/dxgi/device.c | 12 +++--------- dlls/dxgi/dxgi_private.h | 4 +++- dlls/dxgi/utils.c | 23 +++++++++++++++++++++++ 4 files changed, 61 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 9a74935..3e58fd2 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -200,9 +200,39 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IDXGIAdapter1 *iface, DXGI static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter1 *iface, REFGUID guid, LARGE_INTEGER *umd_version) { - FIXME("iface %p, guid %s, umd_version %p stub!\n", iface, debugstr_guid(guid), umd_version); + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); + struct wined3d_adapter_identifier adapter_id; + HRESULT hr; + + TRACE("iface %p, guid %s, umd_version %p.\n", iface, debugstr_guid(guid), umd_version); + + /* This method works only for D3D10 interfaces. */ + if (!(IsEqualGUID(guid, &IID_ID3D10Device) + || IsEqualGUID(guid, &IID_ID3D10Device1))) + { + WARN("Returning DXGI_ERROR_UNSUPPORTED for %s.\n", debugstr_guid(guid)); + return DXGI_ERROR_UNSUPPORTED; + } - return E_NOTIMPL; + if (FAILED(hr = dxgi_check_d3d10_support(adapter->parent, adapter))) + return DXGI_ERROR_UNSUPPORTED; + + if (umd_version) + { + adapter_id.driver_size = 0; + adapter_id.description_size = 0; + adapter_id.device_name_size = 0; + + wined3d_mutex_lock(); + hr = wined3d_get_adapter_identifier(adapter->parent->wined3d, adapter->ordinal, 0, &adapter_id); + wined3d_mutex_unlock(); + if (FAILED(hr)) + return hr; + + *umd_version = adapter_id.driver_version; + } + + return S_OK; } static const struct IDXGIAdapter1Vtbl dxgi_adapter_vtbl = diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index ecb9d91..b7a6aa0 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -23,7 +23,6 @@ #include "dxgi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxgi); -WINE_DECLARE_DEBUG_CHANNEL(winediag); static inline struct dxgi_device *impl_from_IWineDXGIDevice(IWineDXGIDevice *iface) { @@ -352,7 +351,6 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l struct dxgi_factory *dxgi_factory; void *layer_base; HRESULT hr; - WINED3DCAPS caps; if (!(dxgi_factory = unsafe_impl_from_IDXGIFactory1((IDXGIFactory1 *)factory))) { @@ -394,20 +392,16 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l wined3d_device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); IWineDXGIDeviceParent_Release(dxgi_device_parent); - FIXME("Ignoring adapter type.\n"); - - hr = wined3d_get_device_caps(dxgi_factory->wined3d, dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); - if (FAILED(hr) || caps.VertexShaderVersion < 4 || caps.PixelShaderVersion < 4) + if (FAILED(hr = dxgi_check_d3d10_support(dxgi_factory, dxgi_adapter))) { - FIXME_(winediag)("Direct3D 10 is not supported on this GPU with the current shader backend.\n"); - if (SUCCEEDED(hr)) - hr = E_FAIL; IUnknown_Release(device->child_layer); wined3d_private_store_cleanup(&device->private_store); wined3d_mutex_unlock(); return hr; } + FIXME("Ignoring adapter type.\n"); + hr = wined3d_device_create(dxgi_factory->wined3d, dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, wined3d_device_parent, &device->wined3d_device); if (FAILED(hr)) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 035af74..c1c178d 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -30,7 +30,7 @@ #include "objbase.h" #include "winnls.h" -#include "dxgi.h" +#include "d3d10_1.h" #ifdef DXGI_INIT_GUID #include "initguid.h" #endif @@ -168,4 +168,6 @@ struct dxgi_surface HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer, struct wined3d_resource *wined3d_resource) DECLSPEC_HIDDEN; +HRESULT dxgi_check_d3d10_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter) DECLSPEC_HIDDEN; + #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index de3ef77..92a049f 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -23,6 +23,7 @@ #include "dxgi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINE_DXGI_TO_STR(x) case x: return #x @@ -432,3 +433,25 @@ HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, return hr; } + +HRESULT dxgi_check_d3d10_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter) +{ + WINED3DCAPS caps; + HRESULT hr; + + FIXME("Ignoring adapter type.\n"); + + wined3d_mutex_lock(); + hr = wined3d_get_device_caps(factory->wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); + if (FAILED(hr) || caps.VertexShaderVersion < 4 || caps.PixelShaderVersion < 4) + { + FIXME_(winediag)("Direct3D 10 is not supported on this GPU with the current shader backend.\n"); + if (SUCCEEDED(hr)) + hr = E_FAIL; + wined3d_mutex_unlock(); + return hr; + } + wined3d_mutex_unlock(); + + return S_OK; +}

1 0

Józef Kucia : d3d11/tests: Port test_create_sampler_state() from d3d10core.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 1275375ef8e45e79aecbaba0e543fc1737ed8718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1275375ef8e45e79aecbaba0e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:13:36 2015 +0200 d3d11/tests: Port test_create_sampler_state() from d3d10core. 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 | 179 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1275375ef8e45e79aecba…

1 0

Józef Kucia : d3d10core/tests: Test conversion from D3D10_SAMPLER_DESC to D3D11_SAMPLER_DESC.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 4c9fd0286f7d898204bd50dc9d3b5be492214053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c9fd0286f7d898204bd50dc9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:13:35 2015 +0200 d3d10core/tests: Test conversion from D3D10_SAMPLER_DESC to D3D11_SAMPLER_DESC. 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 | 173 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 157 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c9fd0286f7d898204bd5…

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateSamplerState().
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 48b13fe2bcf3fd6149923a10732cb57716d0d134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b13fe2bcf3fd6149923a107… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:13:34 2015 +0200 d3d11: Implement d3d11_device_CreateSamplerState(). 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/device.c | 88 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f649d6b..8a7a794 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1442,9 +1442,55 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device *iface, const D3D11_SAMPLER_DESC *desc, ID3D11SamplerState **sampler_state) { - FIXME("iface %p, desc %p, sampler_state %p stub!\n", iface, desc, sampler_state); + struct d3d_device *device = impl_from_ID3D11Device(iface); + D3D11_SAMPLER_DESC normalized_desc; + struct d3d_sampler_state *object; + struct wine_rb_entry *entry; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); + + if (!desc) + return E_INVALIDARG; + + normalized_desc = *desc; + if (!D3D11_DECODE_IS_ANISOTROPIC_FILTER(normalized_desc.Filter)) + normalized_desc.MaxAnisotropy = 0; + if (!D3D11_DECODE_IS_COMPARISON_FILTER(normalized_desc.Filter)) + normalized_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; + if (normalized_desc.AddressU != D3D11_TEXTURE_ADDRESS_BORDER + && normalized_desc.AddressV != D3D11_TEXTURE_ADDRESS_BORDER + && normalized_desc.AddressW != D3D11_TEXTURE_ADDRESS_BORDER) + memset(&normalized_desc.BorderColor, 0, sizeof(normalized_desc.BorderColor)); + + wined3d_mutex_lock(); + if ((entry = wine_rb_get(&device->sampler_states, &normalized_desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_sampler_state, entry); + + TRACE("Returning existing sampler state %p.\n", object); + *sampler_state = &object->ID3D11SamplerState_iface; + ID3D11SamplerState_AddRef(*sampler_state); + wined3d_mutex_unlock(); + + return S_OK; + } + wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_sampler_state_init(object, device, &normalized_desc))) + { + WARN("Failed to initialize sampler state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created sampler state %p.\n", object); + *sampler_state = &object->ID3D11SamplerState_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device *iface, @@ -3540,44 +3586,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device1 * const D3D10_SAMPLER_DESC *desc, ID3D10SamplerState **sampler_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d_sampler_state *object; - struct wine_rb_entry *entry; + ID3D11SamplerState *d3d11_sampler_state; HRESULT hr; TRACE("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); - if (!desc) - return E_INVALIDARG; - - wined3d_mutex_lock(); - if ((entry = wine_rb_get(&device->sampler_states, desc))) - { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d_sampler_state, entry); - - TRACE("Returning existing sampler state %p.\n", object); - *sampler_state = &object->ID3D10SamplerState_iface; - ID3D10SamplerState_AddRef(*sampler_state); - wined3d_mutex_unlock(); - - return S_OK; - } - wined3d_mutex_unlock(); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_sampler_state_init(object, device, (const D3D11_SAMPLER_DESC *)desc))) - { - WARN("Failed to initialize sampler state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d11_device_CreateSamplerState(&device->ID3D11Device_iface, + (const D3D11_SAMPLER_DESC *)desc, &d3d11_sampler_state))) return hr; - } - TRACE("Created sampler state %p.\n", object); - *sampler_state = &object->ID3D10SamplerState_iface; - - return S_OK; + hr = ID3D11SamplerState_QueryInterface(d3d11_sampler_state, &IID_ID3D10SamplerState, (void **)sampler_state); + ID3D11SamplerState_Release(d3d11_sampler_state); + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface,

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015