October 2015 - Wine-Commits

Józef Kucia : d3d11: Rename d3d10_sampler_state to d3d_sampler_state.
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: 4270030c8b10e0cf20ae0158a0e32238ff335a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4270030c8b10e0cf20ae0158a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:13:31 2015 +0200 d3d11: Rename d3d10_sampler_state to d3d_sampler_state. 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/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 28 ++++++++++++++-------------- dlls/d3d11/state.c | 22 +++++++++++----------- 3 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4270030c8b10e0cf20ae0…

1 0

Michael Stefaniuc : comctl32/tests: IDI_APPLICATION is already an INTRESOURCE (PVS-Studio).
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: 88531272ce276a9183baa0f33cbb366d3752a081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88531272ce276a9183baa0f33… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:32:36 2015 +0200 comctl32/tests: IDI_APPLICATION is already an INTRESOURCE (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index ffd0dca..9a4b902 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -267,7 +267,7 @@ static void test_LoadIconWithScaleDown(void) /* invalid arguments */ icon = (HICON)0x1234; - hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), 0x100, &icon); + hr = pLoadIconMetric(NULL, (LPWSTR)IDI_APPLICATION, 0x100, &icon); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", hr); ok(icon == NULL, "Expected NULL, got %p\n", icon); @@ -302,7 +302,7 @@ static void test_LoadIconWithScaleDown(void) "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr); /* load icon using predefined identifier */ - hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_SMALL, &icon); + hr = pLoadIconMetric(NULL, (LPWSTR)IDI_APPLICATION, LIM_SMALL, &icon); ok(hr == S_OK, "Expected S_OK, got %x\n", hr); res = GetIconInfo(icon, &info); ok(res, "Failed to get icon info, error %u\n", GetLastError()); @@ -312,7 +312,7 @@ static void test_LoadIconWithScaleDown(void) ok(bmp.bmHeight == GetSystemMetrics(SM_CYSMICON), "Wrong icon height %d\n", bmp.bmHeight); DestroyIcon(icon); - hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_LARGE, &icon); + hr = pLoadIconMetric(NULL, (LPWSTR)IDI_APPLICATION, LIM_LARGE, &icon); ok(hr == S_OK, "Expected S_OK, got %x\n", hr); res = GetIconInfo(icon, &info); ok(res, "Failed to get icon info, error %u\n", GetLastError()); @@ -322,7 +322,7 @@ static void test_LoadIconWithScaleDown(void) ok(bmp.bmHeight == GetSystemMetrics(SM_CYICON), "Wrong icon height %d\n", bmp.bmHeight); DestroyIcon(icon); - hr = pLoadIconWithScaleDown(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), 42, 42, &icon); + hr = pLoadIconWithScaleDown(NULL, (LPWSTR)IDI_APPLICATION, 42, 42, &icon); ok(hr == S_OK, "Expected S_OK, got %x\n", hr); res = GetIconInfo(icon, &info); ok(res, "Failed to get icon info, error %u\n", GetLastError());

1 0

Michael Stefaniuc : comctl32/tests: WC_DIALOG is already an INTATOM ( PVS-Studio).
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: a16a27075138e84cd8ebac640930e89b8928a98a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16a27075138e84cd8ebac640… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:31:43 2015 +0200 comctl32/tests: WC_DIALOG is already an INTATOM (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 9a422f1..6594298 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -300,7 +300,7 @@ static LRESULT CALLBACK hook_proc( int code, WPARAM wp, LPARAM lp ) CBT_CREATEWNDW *c = (CBT_CREATEWNDW *)lp; /* The first dialog created will be the parent dialog */ - if (!done && c->lpcs->lpszClass == MAKEINTRESOURCEW(WC_DIALOG)) + if (!done && c->lpcs->lpszClass == (LPWSTR)WC_DIALOG) { old_nav_dialog_proc = (WNDPROC)SetWindowLongPtrW( (HWND)wp, GWLP_WNDPROC, (LONG_PTR)new_nav_dialog_proc ); done = TRUE;

1 0

Michael Stefaniuc : dplayx: Avoid shadowing a variable used in loop control (PVS-Studio).
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: 9f6bf52ff181b5682ce757c58e03c9fa1b8b90ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6bf52ff181b5682ce757c58… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:31:26 2015 +0200 dplayx: Avoid shadowing a variable used in loop control (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplobby.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 2b4b554..2cf342f 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -762,8 +762,6 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 DWORD dwAtIndex; LPCSTR atKey = "Address Types"; LPCSTR guidDataSubKey = "Guid"; - FILETIME filetime; - TRACE(" this time through: %s\n", subKeyName );

1 0

Dmitry Timoshkov : mshtml: Add IHTMLEditServices stub implementation.
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

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

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

Oct. 13, 2015

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 : dxgi/tests: Add test for IDXGIAdapter:: CheckInterfaceSupport().
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

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

Michael Stefaniuc : hidclass.sys: Fix a misplaced closing bracket ( PVS-Studio).
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: 428925eeeea23366ce6346d473c47fdd7a6302d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428925eeeea23366ce6346d47… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:28:11 2015 +0200 hidclass.sys: Fix a misplaced closing bracket (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index ac9b047..13ac99b 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -964,7 +964,7 @@ WINE_HIDP_PREPARSED_DATA* build_PreparseData( if (feature_features[i]->caps.ReportID != wine_report->reportID) { wine_report->dwSize += (sizeof(WINE_HID_ELEMENT) * wine_report->elementCount); - wine_report = (WINE_HID_REPORT*)((BYTE*)wine_report)+wine_report->dwSize; + wine_report = (WINE_HID_REPORT*)((BYTE*)wine_report+wine_report->dwSize); new_report(wine_report, feature_features[i]); data->dwFeatureReportCount++; bitLength = max(bitOffset, bitLength);

1 0

Józef Kucia : d3d11: Rename d3d10_wined3d_device_parent_ops to d3d_wined3d_device_parent_ops.
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: 1d8aa72650b160f52104aa54b9fe8828e950ce3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8aa72650b160f52104aa54b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:13:30 2015 +0200 d3d11: Rename d3d10_wined3d_device_parent_ops to d3d_wined3d_device_parent_ops. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index db67f74..89b5d06 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4084,7 +4084,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent return S_OK; } -static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = +static const struct wined3d_device_parent_ops d3d_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, @@ -4182,7 +4182,7 @@ HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl; device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl; device->IWineDXGIDeviceParent_iface.lpVtbl = &d3d_dxgi_device_parent_vtbl; - device->device_parent.ops = &d3d10_wined3d_device_parent_ops; + device->device_parent.ops = &d3d_wined3d_device_parent_ops; device->refcount = 1; /* COM aggregation always takes place */ device->outer_unk = outer_unknown;

1 0

Nikolay Sivov : d3drm: Avoid HRESULT codes for BOOL retval methods ( PVS-Studio).
by Alexandre Julliard Oct. 13, 2015

Oct. 13, 2015

Module: wine Branch: master Commit: 175e68fe053fa7c74c8cf8b35ed1de49f13af6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=175e68fe053fa7c74c8cf8b35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 22:25:29 2015 +0300 d3drm: Avoid HRESULT codes for BOOL retval methods (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/viewport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 498b764..58de085 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -307,7 +307,7 @@ static BOOL WINAPI d3drm_viewport1_GetUniformScaling(IDirect3DRMViewport *iface) { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static LONG WINAPI d3drm_viewport1_GetX(IDirect3DRMViewport *iface) @@ -672,7 +672,7 @@ static BOOL WINAPI d3drm_viewport2_GetUniformScaling(IDirect3DRMViewport2 *iface { FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + return FALSE; } static LONG WINAPI d3drm_viewport2_GetX(IDirect3DRMViewport2 *iface)

1 0