September 2014 - Wine-commits

Hao Peng : svchost: Add LOAD_WITH_ALTERED_SEARCH_PATH flag when loading the dll.
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: 0af8e8123824e551b2eec27e5a6898b2c21939c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0af8e8123824e551b2eec27e5… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Wed Sep 17 17:39:40 2014 +0800 svchost: Add LOAD_WITH_ALTERED_SEARCH_PATH flag when loading the dll. --- programs/svchost/svchost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/svchost/svchost.c b/programs/svchost/svchost.c index 8713b4a..7045104 100644 --- a/programs/svchost/svchost.c +++ b/programs/svchost/svchost.c @@ -204,7 +204,7 @@ static BOOL AddServiceElem(LPWSTR service_name, RegCloseKey(service_hkey); /* Load the DLL and obtain a pointer to ServiceMain entry point */ - library = LoadLibraryW(dll_name_long); + library = LoadLibraryExW(dll_name_long, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (!library) { WINE_ERR("failed to load library %s, err=%u\n",

1 0

Eric Kohl : advapi32/tests: Fix typos in test_LsaLookupNames2.
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: b23ed0bc172ea39d0f0a54da8edc5cced14d9738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23ed0bc172ea39d0f0a54da8… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Tue Sep 16 21:02:48 2014 +0200 advapi32/tests: Fix typos in test_LsaLookupNames2. --- dlls/advapi32/tests/lsa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 843ab8b..1a0d211 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -339,8 +339,8 @@ static void test_LsaLookupNames2(void) status = pLsaLookupNames2(handle, 0, 3, name, &domains, &sids); ok(status == STATUS_SOME_NOT_MAPPED, "expected STATUS_SOME_NOT_MAPPED, got %x)\n", status); ok(sids[0].Use == SidTypeWellKnownGroup, "expected SidTypeWellKnownGroup, got %u\n", sids[0].Use); - ok(sids[1].Use == SidTypeUnknown, "expected SidTypeUnknown, got %u\n", sids[0].Use); - ok(sids[2].Use == SidTypeWellKnownGroup, "expected SidTypeWellKnownGroup, got %u\n", sids[0].Use); + ok(sids[1].Use == SidTypeUnknown, "expected SidTypeUnknown, got %u\n", sids[1].Use); + ok(sids[2].Use == SidTypeWellKnownGroup, "expected SidTypeWellKnownGroup, got %u\n", sids[2].Use); ok(sids[0].DomainIndex == 0, "expected 0, got %u\n", sids[0].DomainIndex); ok(domains->Entries == 1, "expected 1, got %u\n", domains->Entries); pLsaFreeMemory(sids);

1 0

André Hentschel : winedbg: Respect TMPDIR environment variable.
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: 613d1715a4f7663f7f160d82602c88ce2b032205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613d1715a4f7663f7f160d826… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 16 21:25:06 2014 +0200 winedbg: Respect TMPDIR environment variable. --- programs/winedbg/gdbproxy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0865f44..d7596a0 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2342,11 +2342,13 @@ static BOOL gdb_exec(const char* wine_path, unsigned port, unsigned flags) { char buf[MAX_PATH]; int fd; - const char* gdb_path; + const char *gdb_path, *tmp_path; FILE* f; if (!(gdb_path = getenv("WINE_GDB"))) gdb_path = "gdb"; - strcpy(buf,"/tmp/winegdb.XXXXXX"); + if (!(tmp_path = getenv("TMPDIR"))) tmp_path = "/tmp"; + strcpy(buf, tmp_path); + strcat(buf, "/winegdb.XXXXXX"); fd = mkstemps(buf, 0); if (fd == -1) return FALSE; if ((f = fdopen(fd, "w+")) == NULL) return FALSE;

1 0

Alistair Leslie-Hughes : hnetcfg: Allow NetFwOpenPort to be created.
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: fe802040f60a5c81ca587d67fe8c58dddcfdab36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe802040f60a5c81ca587d67f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 17 15:11:06 2014 +1000 hnetcfg: Allow NetFwOpenPort to be created. --- dlls/hnetcfg/hnetcfg.c | 5 +++++ dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/port.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index f508dea..809b540 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -112,6 +112,7 @@ static const struct IClassFactoryVtbl hnetcfg_cf_vtbl = static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; +static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -142,6 +143,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &fw_app_cf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_NetFwOpenPort )) + { + cf = &fw_openport_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 05b0aee..273c97b 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -34,4 +34,5 @@ HRESULT NetFwProfile_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwAuthorizedApplication_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT NetFwOpenPort_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index b81456f..9c3babc 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -321,7 +321,7 @@ static const struct INetFwOpenPortVtbl fw_port_vtbl = fw_port_get_BuiltIn }; -static HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) { fw_port *fp;

1 0

Alistair Leslie-Hughes : hnetcfg: Add typeinfo support to INetFwOpenPort.
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: ab7a707136997453de5a7ed87828899c4ba0b0cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7a707136997453de5a7ed87… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 17 15:59:35 2014 +1000 hnetcfg: Add typeinfo support to INetFwOpenPort. --- dlls/hnetcfg/apps.c | 1 + dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/port.c | 36 ++++++++++++++++++++++++++++-------- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 7fd6b55..dded141 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -108,6 +108,7 @@ static REFIID tid_id[] = &IID_INetFwAuthorizedApplication, &IID_INetFwAuthorizedApplications, &IID_INetFwMgr, + &IID_INetFwOpenPort, &IID_INetFwPolicy, &IID_INetFwProfile }; diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 273c97b..1045347 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -21,6 +21,7 @@ enum type_id INetFwAuthorizedApplication_tid, INetFwAuthorizedApplications_tid, INetFwMgr_tid, + INetFwOpenPort_tid, INetFwPolicy_tid, INetFwProfile_tid, last_tid diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 9c3babc..8468d30 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -95,8 +95,9 @@ static HRESULT WINAPI fw_port_GetTypeInfoCount( { fw_port *This = impl_from_INetFwOpenPort( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_port_GetTypeInfo( @@ -107,8 +108,8 @@ static HRESULT WINAPI fw_port_GetTypeInfo( { fw_port *This = impl_from_INetFwOpenPort( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwOpenPort_tid, ppTInfo ); } static HRESULT WINAPI fw_port_GetIDsOfNames( @@ -120,9 +121,18 @@ static HRESULT WINAPI fw_port_GetIDsOfNames( DISPID *rgDispId ) { fw_port *This = impl_from_INetFwOpenPort( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwOpenPort_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_port_Invoke( @@ -137,10 +147,20 @@ static HRESULT WINAPI fw_port_Invoke( UINT *puArgErr ) { fw_port *This = impl_from_INetFwOpenPort( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwOpenPort_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwOpenPort_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_port_get_Name(

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_VSGetShaderResources().
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: 482e5f589b9d67e92d3ad3e2923ad7306dc67f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=482e5f589b9d67e92d3ad3e29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 17 10:40:27 2014 +0200 d3d10core: Implement d3d10_device_VSGetShaderResources(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 14 ++++++++++++++ dlls/wined3d/view.c | 7 +++++++ dlls/wined3d/wined3d.spec | 2 ++ include/wine/wined3d.h | 3 +++ 5 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 89c0bba..201dca3 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -881,8 +881,27 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetPrimitiveTopology(ID3D10Device1 static void STDMETHODCALLTYPE d3d10_device_VSGetShaderResources(ID3D10Device1 *iface, UINT start_slot, UINT view_count, ID3D10ShaderResourceView **views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + for (i = 0; i < view_count; ++i) + { + struct wined3d_shader_resource_view *wined3d_view; + struct d3d10_shader_resource_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_vs_resource_view(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_shader_resource_view_get_parent(wined3d_view); + views[i] = &view_impl->ID3D10ShaderResourceView_iface; + ID3D10ShaderResourceView_AddRef(views[i]); + } } static void STDMETHODCALLTYPE d3d10_device_VSGetSamplers(ID3D10Device1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index be5c461..aaded97 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2172,6 +2172,20 @@ void CDECL wined3d_device_set_vs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_VERTEX, idx, view); } +struct wined3d_shader_resource_view * CDECL wined3d_device_get_vs_resource_view(const struct wined3d_device *device, + UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_SHADER_RESOURCE_VIEWS) + { + WARN("Invalid view index %u.\n", idx); + return NULL; + } + + return device->state.shader_resource_view[WINED3D_SHADER_TYPE_VERTEX][idx]; +} + static void wined3d_device_set_sampler(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, struct wined3d_sampler *sampler) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 26575e2..1f8db54 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -183,6 +183,13 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v return refcount; } +void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view) +{ + TRACE("view %p.\n", view); + + return view->parent; +} + HRESULT CDECL wined3d_shader_resource_view_create(void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2437aac..7edc82c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -94,6 +94,7 @@ @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) +@ cdecl wined3d_device_get_vs_resource_view(ptr long) @ cdecl wined3d_device_get_vs_sampler(ptr long) @ cdecl wined3d_device_incref(ptr) @ cdecl wined3d_device_init_3d(ptr ptr) @@ -202,6 +203,7 @@ @ cdecl wined3d_shader_resource_view_create(ptr ptr ptr) @ cdecl wined3d_shader_resource_view_decref(ptr) +@ cdecl wined3d_shader_resource_view_get_parent(ptr) @ cdecl wined3d_shader_resource_view_incref(ptr) @ cdecl wined3d_stateblock_apply(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e66faef..907ead3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2184,6 +2184,8 @@ HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *devi UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); +struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_view(const struct wined3d_device *device, + UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); @@ -2415,6 +2417,7 @@ HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader * HRESULT __cdecl wined3d_shader_resource_view_create(void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view); ULONG __cdecl wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view); +void * __cdecl wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view); ULONG __cdecl wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view); void __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSSetShaderResources().
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: 9c3266fe1d146bb1ba6ff71da732cf3d7f53d83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c3266fe1d146bb1ba6ff71da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 17 10:40:28 2014 +0200 d3d10core: Implement d3d10_device_GSSetShaderResources(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 201dca3..47f85a7 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -380,8 +380,19 @@ static void STDMETHODCALLTYPE d3d10_device_SetPredication(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_GSSetShaderResources(ID3D10Device1 *iface, UINT start_slot, UINT view_count, ID3D10ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + for (i = 0; i < view_count; ++i) + { + struct d3d10_shader_resource_view *view = unsafe_impl_from_ID3D10ShaderResourceView(views[i]); + + wined3d_device_set_gs_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_GSSetSamplers(ID3D10Device1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aaded97..f6c1462 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2639,6 +2639,14 @@ struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_devi return device->state.cb[WINED3D_SHADER_TYPE_GEOMETRY][idx]; } +void CDECL wined3d_device_set_gs_resource_view(struct wined3d_device *device, + UINT idx, struct wined3d_shader_resource_view *view) +{ + TRACE("device %p, idx %u, view %p.\n", device, idx, view); + + wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_GEOMETRY, idx, view); +} + void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) { TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7edc82c..a6c1e70 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -115,6 +115,7 @@ @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) @ cdecl wined3d_device_set_gs_cb(ptr long ptr) +@ cdecl wined3d_device_set_gs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_gs_sampler(ptr long ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long) @ cdecl wined3d_device_set_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 907ead3..b58423d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2218,6 +2218,8 @@ void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_set_gs_resource_view(struct wined3d_device *device, + UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSGetShaderResources().
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: 354a6d4e2c9b5089c97f8064700c0c2d7572f928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=354a6d4e2c9b5089c97f80647… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 17 10:40:29 2014 +0200 d3d10core: Implement d3d10_device_GSGetShaderResources(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 47f85a7..639e220 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -950,8 +950,27 @@ static void STDMETHODCALLTYPE d3d10_device_GetPredication(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_GSGetShaderResources(ID3D10Device1 *iface, UINT start_slot, UINT view_count, ID3D10ShaderResourceView **views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + for (i = 0; i < view_count; ++i) + { + struct wined3d_shader_resource_view *wined3d_view; + struct d3d10_shader_resource_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_gs_resource_view(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_shader_resource_view_get_parent(wined3d_view); + views[i] = &view_impl->ID3D10ShaderResourceView_iface; + ID3D10ShaderResourceView_AddRef(views[i]); + } } static void STDMETHODCALLTYPE d3d10_device_GSGetSamplers(ID3D10Device1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f6c1462..5f9e2fa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2647,6 +2647,20 @@ void CDECL wined3d_device_set_gs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_GEOMETRY, idx, view); } +struct wined3d_shader_resource_view * CDECL wined3d_device_get_gs_resource_view(const struct wined3d_device *device, + UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_SHADER_RESOURCE_VIEWS) + { + WARN("Invalid view index %u.\n", idx); + return NULL; + } + + return device->state.shader_resource_view[WINED3D_SHADER_TYPE_GEOMETRY][idx]; +} + void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) { TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a6c1e70..d3ac07a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -59,6 +59,7 @@ @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_cb(ptr long) +@ cdecl wined3d_device_get_gs_resource_view(ptr long) @ cdecl wined3d_device_get_gs_sampler(ptr long) @ cdecl wined3d_device_get_index_buffer(ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b58423d..842f6f6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2131,6 +2131,8 @@ void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx); +struct wined3d_shader_resource_view * __cdecl wined3d_device_get_gs_resource_view(const struct wined3d_device *device, + UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_PSSetShaderResources().
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: 8080212f4343869f72d6bd6fa1030fed92c297de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8080212f4343869f72d6bd6fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 17 10:40:30 2014 +0200 d3d10core: Implement d3d10_device_PSSetShaderResources(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 639e220..b69ca4d 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -143,8 +143,19 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetConstantBuffers(ID3D10Device1 *i static void STDMETHODCALLTYPE d3d10_device_PSSetShaderResources(ID3D10Device1 *iface, UINT start_slot, UINT view_count, ID3D10ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + for (i = 0; i < view_count; ++i) + { + struct d3d10_shader_resource_view *view = unsafe_impl_from_ID3D10ShaderResourceView(views[i]); + + wined3d_device_set_ps_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_PSSetShader(ID3D10Device1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5f9e2fa..9b749ba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2432,6 +2432,14 @@ struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_devi return device->state.cb[WINED3D_SHADER_TYPE_PIXEL][idx]; } +void CDECL wined3d_device_set_ps_resource_view(struct wined3d_device *device, + UINT idx, struct wined3d_shader_resource_view *view) +{ + TRACE("device %p, idx %u, view %p.\n", device, idx, view); + + wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_PIXEL, idx, view); +} + void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) { TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d3ac07a..af3acfa 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -130,6 +130,7 @@ @ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_ps_consts_f(ptr long ptr long) @ cdecl wined3d_device_set_ps_consts_i(ptr long ptr long) +@ cdecl wined3d_device_set_ps_resource_view(ptr long ptr) @ cdecl wined3d_device_set_ps_sampler(ptr long ptr) @ cdecl wined3d_device_set_render_state(ptr long long) @ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 842f6f6..99919e2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2241,6 +2241,8 @@ HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, UINT start_register, const float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device, UINT start_register, const int *constants, UINT vector4i_count); +void __cdecl wined3d_device_set_ps_resource_view(struct wined3d_device *device, + UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_PSGetShaderResources().
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: f06a57f678f232c4d58559edad50944067006962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f06a57f678f232c4d58559eda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 17 10:40:31 2014 +0200 d3d10core: Implement d3d10_device_PSGetShaderResources(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index b69ca4d..f8c9d37 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -678,8 +678,27 @@ static void STDMETHODCALLTYPE d3d10_device_VSGetConstantBuffers(ID3D10Device1 *i static void STDMETHODCALLTYPE d3d10_device_PSGetShaderResources(ID3D10Device1 *iface, UINT start_slot, UINT view_count, ID3D10ShaderResourceView **views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + for (i = 0; i < view_count; ++i) + { + struct wined3d_shader_resource_view *wined3d_view; + struct d3d10_shader_resource_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_ps_resource_view(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_shader_resource_view_get_parent(wined3d_view); + views[i] = &view_impl->ID3D10ShaderResourceView_iface; + ID3D10ShaderResourceView_AddRef(views[i]); + } } static void STDMETHODCALLTYPE d3d10_device_PSGetShader(ID3D10Device1 *iface, ID3D10PixelShader **shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b749ba..b9a0954 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2440,6 +2440,20 @@ void CDECL wined3d_device_set_ps_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_PIXEL, idx, view); } +struct wined3d_shader_resource_view * CDECL wined3d_device_get_ps_resource_view(const struct wined3d_device *device, + UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_SHADER_RESOURCE_VIEWS) + { + WARN("Invalid view index %u.\n", idx); + return NULL; + } + + return device->state.shader_resource_view[WINED3D_SHADER_TYPE_PIXEL][idx]; +} + void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) { TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index af3acfa..e064d1a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -72,6 +72,7 @@ @ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_ps_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) +@ cdecl wined3d_device_get_ps_resource_view(ptr long) @ cdecl wined3d_device_get_ps_sampler(ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) @ cdecl wined3d_device_get_render_state(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 99919e2..741e503 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2151,6 +2151,8 @@ HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *devi UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); +struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_view(const struct wined3d_device *device, + UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_raster_status *raster_status);

1 0