August 2014 - Wine-commits - list.winehq.org

Shuai Meng : vbscript: Implemented Fix.
by Alexandre Julliard 15 Aug '14

15 Aug '14

Module: wine Branch: master Commit: a3fe7269e2f2df1727260d66336d46752b5811b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3fe7269e2f2df1727260d663… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Thu Aug 14 22:46:51 2014 +0800 vbscript: Implemented Fix. --- dlls/vbscript/global.c | 19 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 25 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 933ec08..2b67f4e 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1277,8 +1277,23 @@ static HRESULT Global_Abs(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Fix(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + VARIANT dst; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = VarFix(arg, &dst); + if(FAILED(hres)) + return hres; + + if (res) + *res = dst; + else + VariantClear(&dst); + + return S_OK; } static HRESULT Global_Int(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c52422f..27cf3e0 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -993,4 +993,29 @@ Call ok(getVT(ScriptEngineMajorVersion) = "VT_I4", "getVT(ScriptEngineMajorVersi Call ok(getVT(ScriptEngineMinorVersion) = "VT_I4", "getVT(ScriptEngineMinorVersion) = " & getVT(ScriptEngineMinorVersion)) +Call ok(Fix(Empty) = 0, "Fix(Empty) = " & Fix(Empty)) +Call ok(getVT(Fix(Empty)) = "VT_I2", "getVT(Fix(Empty)) = " & getVT(Fix(Empty))) +Call ok(Fix(CCur(-0.99)) = 0, "Fix(CCur(-0.99)) = " & Fix(CCur(-0.99))) +Call ok(getVT(Fix(CCur(-0.99))) = "VT_CY", "getVT(Fix(CCur(-0.99))) = " & getVT(Fix(CCur(-0.99)))) +Call ok(Fix(1.99) = 1, "Fix(1.99) = " & Fix(1.99)) +Call ok(getVT(Fix(1.99)) = "VT_R8", "getVT(Fix(1.99)) = " & getVT(Fix(1.99))) +Call ok(Fix(-1.99) = -1, "Fix(-1.99) = " & Fix(-1.99)) +Call ok(getVT(Fix(-1.99)) = "VT_R8", "getVT(Fix(-1.99)) = " & getVT(Fix(-1.99))) +If isEnglishLang Then + Call ok(Fix("1.99") = 1, "Fix(""1.99"") = " & Fix("1.99")) + Call ok(getVT(Fix("1.99")) = "VT_R8", "getVT(Fix(""1.99"")) = " & getVT(Fix("1.99"))) + Call ok(Fix("-1.99") = -1, "Fix(""-1.99"") = " & Fix("-1.99")) + Call ok(getVT(Fix("-1.99")) = "VT_R8", "getVT(Fix(""-1.99"")) = " & getVT(Fix("-1.99"))) +End If +Call ok(Fix(True) = -1, "Fix(True) = " & Fix(True)) +Call ok(getVT(Fix(True)) = "VT_I2", "getVT(Fix(True)) = " & getVT(Fix(True))) +Call ok(Fix(False) = 0, "Fix(False) = " & Fix(False)) +Call ok(getVT(Fix(False)) = "VT_I2", "getVT(Fix(False)) = " & getVT(Fix(False))) +MyObject.myval = 2.5 +Call ok(Fix(MyObject) = 2, "Fix(MyObject) = " & Fix(MyObject)) +Call ok(getVT(Fix(MyObject)) = "VT_R8", "getVT(Fix(MyObject)) = " & getVT(Fix(MyObject))) +MyObject.myval = -2.5 +Call ok(Fix(MyObject) = -2, "Fix(MyObject) = " & Fix(MyObject)) +Call ok(getVT(Fix(MyObject)) = "VT_R8", "getVT(Fix(MyObject)) = " & getVT(Fix(MyObject))) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented Int.
by Alexandre Julliard 15 Aug '14

15 Aug '14

Module: wine Branch: master Commit: 622191f7bcdb409f9aafa257e3f5cf6e326e7744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=622191f7bcdb409f9aafa257e… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Thu Aug 14 22:47:30 2014 +0800 vbscript: Implemented Int. --- dlls/vbscript/global.c | 19 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 25 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 2b67f4e..98be6c1 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1298,8 +1298,23 @@ static HRESULT Global_Fix(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Int(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + VARIANT dst; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = VarInt(arg, &dst); + if(FAILED(hres)) + return hres; + + if (res) + *res = dst; + else + VariantClear(&dst); + + return S_OK; } static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 27cf3e0..4f5800d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1018,4 +1018,29 @@ MyObject.myval = -2.5 Call ok(Fix(MyObject) = -2, "Fix(MyObject) = " & Fix(MyObject)) Call ok(getVT(Fix(MyObject)) = "VT_R8", "getVT(Fix(MyObject)) = " & getVT(Fix(MyObject))) +Call ok(Int(Empty) = 0, "Int(Empty) = " & Int(Empty)) +Call ok(getVT(Int(Empty)) = "VT_I2", "getVT(Int(Empty)) = " & getVT(Int(Empty))) +Call ok(Int(CCur(-0.99)) = -1, "Int(CCur(-0.99)) = " & Int(CCur(-0.99))) +Call ok(getVT(Int(CCur(-0.99))) = "VT_CY", "getVT(Int(CCur(-0.99))) = " & getVT(Int(CCur(-0.99)))) +Call ok(Int(1.99) = 1, "Int(1.99) = " & Int(1.99)) +Call ok(getVT(Int(1.99)) = "VT_R8", "getVT(Int(1.99)) = " & getVT(Int(1.99))) +Call ok(Int(-1.99) = -2, "Int(-1.99) = " & Int(-1.99)) +Call ok(getVT(Int(-1.99)) = "VT_R8", "getVT(Int(-1.99)) = " & getVT(Int(-1.99))) +If isEnglishLang Then + Call ok(Int("1.99") = 1, "Int(""1.99"") = " & Int("1.99")) + Call ok(getVT(Int("1.99")) = "VT_R8", "getVT(Int(""1.99"")) = " & getVT(Int("1.99"))) + Call ok(Int("-1.99") = -2, "Int(""-1.99"") = " & Int("-1.99")) + Call ok(getVT(Int("-1.99")) = "VT_R8", "getVT(Int(""-1.99"")) = " & getVT(Int("-1.99"))) +End If +Call ok(Int(True) = -1, "Int(True) = " & Int(True)) +Call ok(getVT(Int(True)) = "VT_I2", "getVT(Int(True)) = " & getVT(Int(True))) +Call ok(Int(False) = 0, "Int(False) = " & Int(False)) +Call ok(getVT(Int(False)) = "VT_I2", "getVT(Int(False)) = " & getVT(Int(False))) +MyObject.myval = 2.5 +Call ok(Int(MyObject) = 2, "Int(MyObject) = " & Int(MyObject)) +Call ok(getVT(Int(MyObject)) = "VT_R8", "getVT(Int(MyObject)) = " & getVT(Int(MyObject))) +MyObject.myval = -2.5 +Call ok(Int(MyObject) = -3, "Int(MyObject) = " & Int(MyObject)) +Call ok(getVT(Int(MyObject)) = "VT_R8", "getVT(Int(MyObject)) = " & getVT(Int(MyObject))) + Call reportSuccess()

1 0

André Hentschel : wpcap: Implement pcap_lookupnet.
by Alexandre Julliard 15 Aug '14

15 Aug '14

Module: wine Branch: master Commit: 53912aed735ea74e1ca8a5e90401e9fead692df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53912aed735ea74e1ca8a5e90… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 12 00:33:14 2014 +0200 wpcap: Implement pcap_lookupnet. --- dlls/wpcap/wpcap.c | 7 +++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 5705ea6..c1ff2e8 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -67,6 +67,13 @@ char* CDECL wine_pcap_lookupdev(char *errbuf) return pcap_lookupdev(errbuf); } +int CDECL wine_pcap_lookupnet(const char *device, unsigned int *netp, unsigned int *maskp, + char *errbuf) +{ + TRACE("(%p %p %p %p)\n", device, netp, maskp, errbuf); + return pcap_lookupnet(device, netp, maskp, errbuf); +} + int CDECL wine_pcap_major_version(pcap_t *p) { TRACE("(%p)\n", p); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 460fbd9..3337554 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -38,7 +38,7 @@ @ stub pcap_live_dump @ stub pcap_live_dump_ended @ cdecl pcap_lookupdev(str) wine_pcap_lookupdev -@ stub pcap_lookupnet +@ cdecl pcap_lookupnet(str ptr ptr str) wine_pcap_lookupnet @ stub pcap_loop @ cdecl pcap_major_version(ptr) wine_pcap_major_version @ cdecl pcap_minor_version(ptr) wine_pcap_minor_version

1 0

André Hentschel : wpcap: Implement pcap_compile.
by Alexandre Julliard 15 Aug '14

15 Aug '14

Module: wine Branch: master Commit: 297a69a4b5020a7c1cbd72db9a2fcd295c7afab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=297a69a4b5020a7c1cbd72db9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 12 00:34:45 2014 +0200 wpcap: Implement pcap_compile. --- dlls/wpcap/wpcap.c | 7 +++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index c1ff2e8..3ddc3c4 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -24,6 +24,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); +int CDECL wine_pcap_compile(pcap_t *p, struct bpf_program *program, const char *buf, int optimize, + unsigned int mask) +{ + TRACE("(%p)\n", p); + return pcap_compile(p, program, buf, optimize, mask); +} + int CDECL wine_pcap_datalink(pcap_t *p) { TRACE("(%p)\n", p); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 3337554..e52562a 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -8,7 +8,7 @@ @ stub install_bpf_program @ stub pcap_breakloop @ stub pcap_close -@ stub pcap_compile +@ cdecl pcap_compile(ptr ptr str long long) wine_pcap_compile @ stub pcap_compile_nopcap @ stub pcap_createsrcstr @ cdecl pcap_datalink(ptr) wine_pcap_datalink

1 0

André Hentschel : wpcap: Implement pcap_setfilter.
by Alexandre Julliard 15 Aug '14

15 Aug '14

Module: wine Branch: master Commit: 1ed9760bdf6c787b0700e9c56070b16dc48ded8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed9760bdf6c787b0700e9c56… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 12 00:35:45 2014 +0200 wpcap: Implement pcap_setfilter. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 3ddc3c4..1a7f280 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -106,6 +106,12 @@ int CDECL wine_pcap_setbuff(pcap_t * p, int dim) return 0; } +int CDECL wine_pcap_setfilter(pcap_t *p, struct bpf_program *fp) +{ + TRACE("(%p %p)\n", p, fp); + return pcap_setfilter(p, fp); +} + int CDECL wine_pcap_stats(pcap_t *p, struct pcap_stat *ps) { TRACE("(%p %p)\n", p, ps); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index e52562a..75a5bfd 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -65,7 +65,7 @@ @ stub pcap_sendqueue_transmit @ stub pcap_set_datalink @ cdecl pcap_setbuff(ptr long) wine_pcap_setbuff -@ stub pcap_setfilter +@ cdecl pcap_setfilter(ptr ptr) wine_pcap_setfilter @ stub pcap_setmintocopy @ stub pcap_setmode @ stub pcap_setnonblock

1 0

Henri Verbeet : d3d8: Return E_OUTOFMEMORY on HeapAlloc() failure in device_parent_surface_created().
by Alexandre Julliard 15 Aug '14

15 Aug '14

Module: wine Branch: master Commit: ca95dd2c828bd592c922706d3d923d4c28b91fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca95dd2c828bd592c922706d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 12 11:11:00 2014 +0200 d3d8: Return E_OUTOFMEMORY on HeapAlloc() failure in device_parent_surface_created(). --- dlls/d3d8/device.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index fd4cd3c..ee9d555 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2947,10 +2947,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent device_parent, container_parent, surface, parent, parent_ops); if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) - { - FIXME("Failed to allocate surface memory.\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } + return E_OUTOFMEMORY; surface_init(d3d_surface, surface, device, parent_ops); *parent = d3d_surface;

1 0

Henri Verbeet : d3d9: Return E_OUTOFMEMORY on HeapAlloc() failure in device_parent_surface_created().
by Alexandre Julliard 15 Aug '14

15 Aug '14

Module: wine Branch: master Commit: ff694bf47df62af165a456e0e3a545d20af102e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff694bf47df62af165a456e0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 12 11:11:01 2014 +0200 d3d9: Return E_OUTOFMEMORY on HeapAlloc() failure in device_parent_surface_created(). --- dlls/d3d9/device.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d9aba20..2f5d5ad 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3468,10 +3468,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent device_parent, container_parent, surface, parent, parent_ops); if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) - { - FIXME("Failed to allocate surface memory.\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } + return E_OUTOFMEMORY; surface_init(d3d_surface, surface, device, parent_ops); *parent = d3d_surface;

1 0

Henri Verbeet : d3d8: Volumes are always part of a texture.
by Alexandre Julliard 15 Aug '14

15 Aug '14

Module: wine Branch: master Commit: 515c1acf29f503c4366e964c1099f42945017841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=515c1acf29f503c4366e964c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 12 11:11:02 2014 +0200 d3d8: Volumes are always part of a texture. --- dlls/d3d8/d3d8_private.h | 7 ++--- dlls/d3d8/device.c | 7 +---- dlls/d3d8/volume.c | 81 +++++++----------------------------------------- 3 files changed, 15 insertions(+), 80 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 0961503..27394ea 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -205,12 +205,11 @@ struct d3d8_volume IDirect3DVolume8 IDirect3DVolume8_iface; struct d3d8_resource resource; struct wined3d_volume *wined3d_volume; - IUnknown *container; - IUnknown *forwardReference; + struct d3d8_texture *texture; }; -void volume_init(struct d3d8_volume *volume, struct wined3d_volume *wined3d_volume, - const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; +void volume_init(struct d3d8_volume *volume, struct d3d8_texture *texture, + struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d8_swapchain { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ee9d555..2ee2094 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2975,15 +2975,10 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) return E_OUTOFMEMORY; - volume_init(d3d_volume, volume, parent_ops); + volume_init(d3d_volume, container_parent, volume, parent_ops); *parent = d3d_volume; TRACE("Created volume %p.\n", d3d_volume); - d3d_volume->container = container_parent; - - IDirect3DVolume8_Release(&d3d_volume->IDirect3DVolume8_iface); - d3d_volume->forwardReference = container_parent; - return D3D_OK; } diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index add35ad..d116b16 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -51,29 +51,9 @@ static ULONG WINAPI d3d8_volume_AddRef(IDirect3DVolume8 *iface) struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); TRACE("iface %p.\n", iface); + TRACE("Forwarding to %p.\n", volume->texture); - if (volume->forwardReference) - { - /* Forward to the containerParent */ - TRACE("Forwarding to %p,\n", volume->forwardReference); - return IUnknown_AddRef(volume->forwardReference); - } - else - { - /* No container, handle our own refcounting */ - ULONG ref = InterlockedIncrement(&volume->resource.refcount); - - TRACE("%p increasing refcount to %u.\n", iface, ref); - - if (ref == 1) - { - wined3d_mutex_lock(); - wined3d_volume_incref(volume->wined3d_volume); - wined3d_mutex_unlock(); - } - - return ref; - } + return IDirect3DBaseTexture8_AddRef(&volume->texture->IDirect3DBaseTexture8_iface); } static ULONG WINAPI d3d8_volume_Release(IDirect3DVolume8 *iface) @@ -81,49 +61,18 @@ static ULONG WINAPI d3d8_volume_Release(IDirect3DVolume8 *iface) struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); TRACE("iface %p.\n", iface); + TRACE("Forwarding to %p.\n", volume->texture); - if (volume->forwardReference) - { - /* Forward to the containerParent */ - TRACE("Forwarding to %p.\n", volume->forwardReference); - return IUnknown_Release(volume->forwardReference); - } - else - { - /* No container, handle our own refcounting */ - ULONG ref = InterlockedDecrement(&volume->resource.refcount); - - TRACE("%p decreasing refcount to %u.\n", iface, ref); - - if (!ref) - { - wined3d_mutex_lock(); - wined3d_volume_decref(volume->wined3d_volume); - wined3d_mutex_unlock(); - } - - return ref; - } + return IDirect3DBaseTexture8_Release(&volume->texture->IDirect3DBaseTexture8_iface); } static HRESULT WINAPI d3d8_volume_GetDevice(IDirect3DVolume8 *iface, IDirect3DDevice8 **device) { struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); - IDirect3DResource8 *resource; - HRESULT hr; TRACE("iface %p, device %p.\n", iface, device); - hr = IUnknown_QueryInterface(volume->forwardReference, &IID_IDirect3DResource8, (void **)&resource); - if (SUCCEEDED(hr)) - { - hr = IDirect3DResource8_GetDevice(resource, device); - IDirect3DResource8_Release(resource); - - TRACE("Returning device %p.\n", *device); - } - - return hr; + return IDirect3DBaseTexture8_GetDevice(&volume->texture->IDirect3DBaseTexture8_iface, device); } static HRESULT WINAPI d3d8_volume_SetPrivateData(IDirect3DVolume8 *iface, REFGUID guid, @@ -157,19 +106,10 @@ static HRESULT WINAPI d3d8_volume_FreePrivateData(IDirect3DVolume8 *iface, REFGU static HRESULT WINAPI d3d8_volume_GetContainer(IDirect3DVolume8 *iface, REFIID riid, void **container) { struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); - HRESULT res; - - TRACE("iface %p, riid %s, container %p.\n", - iface, debugstr_guid(riid), container); - - if (!volume->container) - return E_NOINTERFACE; - - res = IUnknown_QueryInterface(volume->container, riid, container); - TRACE("Returning %p.\n", *container); + TRACE("iface %p, riid %s, container %p.\n", iface, debugstr_guid(riid), container); - return res; + return IDirect3DBaseTexture8_QueryInterface(&volume->texture->IDirect3DBaseTexture8_iface, riid, container); } static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DESC *desc) @@ -261,13 +201,14 @@ static const struct wined3d_parent_ops d3d8_volume_wined3d_parent_ops = volume_wined3d_object_destroyed, }; -void volume_init(struct d3d8_volume *volume, struct wined3d_volume *wined3d_volume, - const struct wined3d_parent_ops **parent_ops) +void volume_init(struct d3d8_volume *volume, struct d3d8_texture *texture, + struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) { volume->IDirect3DVolume8_iface.lpVtbl = &d3d8_volume_vtbl; d3d8_resource_init(&volume->resource); - wined3d_volume_incref(wined3d_volume); + volume->resource.refcount = 0; volume->wined3d_volume = wined3d_volume; + volume->texture = texture; *parent_ops = &d3d8_volume_wined3d_parent_ops; }

1 0

Henri Verbeet : d3d9: Volumes are always part of a texture.
by Alexandre Julliard 15 Aug '14

15 Aug '14

Module: wine Branch: master Commit: c5e8115ee2a74434396e503bcbd85906940c9ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e8115ee2a74434396e503bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 12 11:11:03 2014 +0200 d3d9: Volumes are always part of a texture. --- dlls/d3d9/d3d9_private.h | 7 +++-- dlls/d3d9/device.c | 7 +---- dlls/d3d9/volume.c | 70 +++++++----------------------------------------- 3 files changed, 14 insertions(+), 70 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 8c685e4..6e64b8e 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -192,12 +192,11 @@ struct d3d9_volume IDirect3DVolume9 IDirect3DVolume9_iface; struct d3d9_resource resource; struct wined3d_volume *wined3d_volume; - IUnknown *container; - IUnknown *forwardReference; + struct d3d9_texture *texture; }; -void volume_init(struct d3d9_volume *volume, struct wined3d_volume *wined3d_volume, - const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; +void volume_init(struct d3d9_volume *volume, struct d3d9_texture *texture, + struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_swapchain { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2f5d5ad..e6fe631 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3496,15 +3496,10 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) return E_OUTOFMEMORY; - volume_init(d3d_volume, volume, parent_ops); + volume_init(d3d_volume, container_parent, volume, parent_ops); *parent = d3d_volume; TRACE("Created volume %p.\n", d3d_volume); - d3d_volume->container = container_parent; - - IDirect3DVolume9_Release(&d3d_volume->IDirect3DVolume9_iface); - d3d_volume->forwardReference = container_parent; - return D3D_OK; } diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 30a977c..4b22f20 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -50,73 +50,30 @@ static HRESULT WINAPI d3d9_volume_QueryInterface(IDirect3DVolume9 *iface, REFIID static ULONG WINAPI d3d9_volume_AddRef(IDirect3DVolume9 *iface) { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); - ULONG refcount; TRACE("iface %p.\n", iface); + TRACE("Forwarding to %p.\n", volume->texture); - if (volume->forwardReference) - { - TRACE("Forwarding to %p.\n", volume->forwardReference); - return IUnknown_AddRef(volume->forwardReference); - } - - refcount = InterlockedIncrement(&volume->resource.refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); - - if (refcount == 1) - { - wined3d_mutex_lock(); - wined3d_volume_incref(volume->wined3d_volume); - wined3d_mutex_unlock(); - } - - return refcount; + return IDirect3DBaseTexture9_AddRef(&volume->texture->IDirect3DBaseTexture9_iface); } static ULONG WINAPI d3d9_volume_Release(IDirect3DVolume9 *iface) { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); - ULONG refcount; TRACE("iface %p.\n", iface); + TRACE("Forwarding to %p.\n", volume->texture); - if (volume->forwardReference) - { - TRACE("Forwarding to %p.\n", volume->forwardReference); - return IUnknown_Release(volume->forwardReference); - } - - refcount = InterlockedDecrement(&volume->resource.refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); - - if (!refcount) - { - wined3d_mutex_lock(); - wined3d_volume_decref(volume->wined3d_volume); - wined3d_mutex_unlock(); - } - - return refcount; + return IDirect3DBaseTexture9_Release(&volume->texture->IDirect3DBaseTexture9_iface); } static HRESULT WINAPI d3d9_volume_GetDevice(IDirect3DVolume9 *iface, IDirect3DDevice9 **device) { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); - IDirect3DResource9 *resource; - HRESULT hr; TRACE("iface %p, device %p.\n", iface, device); - hr = IUnknown_QueryInterface(volume->forwardReference, &IID_IDirect3DResource9, (void **)&resource); - if (SUCCEEDED(hr)) - { - hr = IDirect3DResource9_GetDevice(resource, device); - IDirect3DResource9_Release(resource); - - TRACE("Returning device %p.\n", *device); - } - - return hr; + return IDirect3DBaseTexture9_GetDevice(&volume->texture->IDirect3DBaseTexture9_iface, device); } static HRESULT WINAPI d3d9_volume_SetPrivateData(IDirect3DVolume9 *iface, REFGUID guid, @@ -150,18 +107,10 @@ static HRESULT WINAPI d3d9_volume_FreePrivateData(IDirect3DVolume9 *iface, REFGU static HRESULT WINAPI d3d9_volume_GetContainer(IDirect3DVolume9 *iface, REFIID riid, void **container) { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); - HRESULT hr; TRACE("iface %p, riid %s, container %p.\n", iface, debugstr_guid(riid), container); - if (!volume->container) - return E_NOINTERFACE; - - hr = IUnknown_QueryInterface(volume->container, riid, container); - - TRACE("Returning %p,\n", *container); - - return hr; + return IDirect3DBaseTexture9_QueryInterface(&volume->texture->IDirect3DBaseTexture9_iface, riid, container); } static HRESULT WINAPI d3d9_volume_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DESC *desc) @@ -252,13 +201,14 @@ static const struct wined3d_parent_ops d3d9_volume_wined3d_parent_ops = volume_wined3d_object_destroyed, }; -void volume_init(struct d3d9_volume *volume, struct wined3d_volume *wined3d_volume, - const struct wined3d_parent_ops **parent_ops) +void volume_init(struct d3d9_volume *volume, struct d3d9_texture *texture, + struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) { volume->IDirect3DVolume9_iface.lpVtbl = &d3d9_volume_vtbl; d3d9_resource_init(&volume->resource); - wined3d_volume_incref(wined3d_volume); + volume->resource.refcount = 0; volume->wined3d_volume = wined3d_volume; + volume->texture = texture; *parent_ops = &d3d9_volume_wined3d_parent_ops; }

1 0

Henri Verbeet : d3d8: The "forwardReference" field in struct d3d8_surface is always a texture, if set.
by Alexandre Julliard 15 Aug '14

15 Aug '14

Module: wine Branch: master Commit: 599f018c81e6ddd21eb0029a45f388f490e78e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599f018c81e6ddd21eb0029a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 12 11:11:04 2014 +0200 d3d8: The "forwardReference" field in struct d3d8_surface is always a texture, if set. --- dlls/d3d8/d3d8_private.h | 12 ++---- dlls/d3d8/device.c | 12 +----- dlls/d3d8/surface.c | 107 ++++++++++++++++++++--------------------------- 3 files changed, 51 insertions(+), 80 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 27394ea..74f96ef 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -228,16 +228,12 @@ struct d3d8_surface struct d3d8_resource resource; struct wined3d_surface *wined3d_surface; IDirect3DDevice8 *parent_device; - - /* The surface container */ - IUnknown *container; - - /* If set forward refcounting to this object */ - IUnknown *forwardReference; + IUnknown *container; + struct d3d8_texture *texture; }; -void surface_init(struct d3d8_surface *surface, struct wined3d_surface *wined3d_surface, - struct d3d8_device *device, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; +void surface_init(struct d3d8_surface *surface, IUnknown *container_parent, + struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d8_surface *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) DECLSPEC_HIDDEN; struct d3d8_vertexbuffer diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2ee2094..3ee43f0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -918,7 +918,6 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width sub_resource = wined3d_texture_get_sub_resource(texture, 0); surface_impl = wined3d_resource_get_parent(sub_resource); - surface_impl->forwardReference = NULL; surface_impl->parent_device = &device->IDirect3DDevice8_iface; *surface = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*surface); @@ -2940,7 +2939,6 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops) { - struct d3d8_device *device = device_from_device_parent(device_parent); struct d3d8_surface *d3d_surface; TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", @@ -2949,17 +2947,10 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) return E_OUTOFMEMORY; - surface_init(d3d_surface, surface, device, parent_ops); + surface_init(d3d_surface, container_parent, surface, parent_ops); *parent = d3d_surface; TRACE("Created surface %p.\n", d3d_surface); - d3d_surface->container = container_parent; - IDirect3DDevice8_Release(d3d_surface->parent_device); - d3d_surface->parent_device = NULL; - - IDirect3DSurface8_Release(&d3d_surface->IDirect3DSurface8_iface); - d3d_surface->forwardReference = container_parent; - return D3D_OK; } @@ -3008,7 +2999,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic wined3d_texture_decref(texture); d3d_surface = wined3d_surface_get_parent(*surface); - d3d_surface->forwardReference = NULL; d3d_surface->parent_device = &device->IDirect3DDevice8_iface; return hr; diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 9768946..d20d791 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -50,69 +50,60 @@ static HRESULT WINAPI d3d8_surface_QueryInterface(IDirect3DSurface8 *iface, REFI static ULONG WINAPI d3d8_surface_AddRef(IDirect3DSurface8 *iface) { struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); + ULONG refcount; TRACE("iface %p.\n", iface); - if (surface->forwardReference) + if (surface->texture) { - /* Forward refcounting */ - TRACE("Forwarding to %p.\n", surface->forwardReference); - return IUnknown_AddRef(surface->forwardReference); + TRACE("Forwarding to %p.\n", surface->texture); + return IDirect3DBaseTexture8_AddRef(&surface->texture->IDirect3DBaseTexture8_iface); } - else - { - /* No container, handle our own refcounting */ - ULONG ref = InterlockedIncrement(&surface->resource.refcount); - TRACE("%p increasing refcount to %u.\n", iface, ref); + refcount = InterlockedIncrement(&surface->resource.refcount); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - if (ref == 1) - { - if (surface->parent_device) - IDirect3DDevice8_AddRef(surface->parent_device); - wined3d_mutex_lock(); - wined3d_surface_incref(surface->wined3d_surface); - wined3d_mutex_unlock(); - } - - return ref; + if (refcount == 1) + { + if (surface->parent_device) + IDirect3DDevice8_AddRef(surface->parent_device); + wined3d_mutex_lock(); + wined3d_surface_incref(surface->wined3d_surface); + wined3d_mutex_unlock(); } + + return refcount; } static ULONG WINAPI d3d8_surface_Release(IDirect3DSurface8 *iface) { struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); + ULONG refcount; TRACE("iface %p.\n", iface); - if (surface->forwardReference) + if (surface->texture) { - /* Forward refcounting */ - TRACE("Forwarding to %p.\n", surface->forwardReference); - return IUnknown_Release(surface->forwardReference); + TRACE("Forwarding to %p.\n", surface->texture); + return IDirect3DBaseTexture8_Release(&surface->texture->IDirect3DBaseTexture8_iface); } - else - { - /* No container, handle our own refcounting */ - ULONG ref = InterlockedDecrement(&surface->resource.refcount); - TRACE("%p decreasing refcount to %u.\n", iface, ref); + refcount = InterlockedDecrement(&surface->resource.refcount); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!ref) - { - IDirect3DDevice8 *parent_device = surface->parent_device; + if (!refcount) + { + IDirect3DDevice8 *parent_device = surface->parent_device; - /* Implicit surfaces are destroyed with the device, not if refcount reaches 0. */ - wined3d_mutex_lock(); - wined3d_surface_decref(surface->wined3d_surface); - wined3d_mutex_unlock(); + wined3d_mutex_lock(); + wined3d_surface_decref(surface->wined3d_surface); + wined3d_mutex_unlock(); - if (parent_device) - IDirect3DDevice8_Release(parent_device); - } - - return ref; + if (parent_device) + IDirect3DDevice8_Release(parent_device); } + + return refcount; } static HRESULT WINAPI d3d8_surface_GetDevice(IDirect3DSurface8 *iface, IDirect3DDevice8 **device) @@ -121,22 +112,8 @@ static HRESULT WINAPI d3d8_surface_GetDevice(IDirect3DSurface8 *iface, IDirect3D TRACE("iface %p, device %p.\n", iface, device); - if (surface->forwardReference) - { - IDirect3DResource8 *resource; - HRESULT hr; - - hr = IUnknown_QueryInterface(surface->forwardReference, &IID_IDirect3DResource8, (void **)&resource); - if (SUCCEEDED(hr)) - { - hr = IDirect3DResource8_GetDevice(resource, device); - IDirect3DResource8_Release(resource); - - TRACE("Returning device %p.\n", *device); - } - - return hr; - } + if (surface->texture) + return IDirect3DBaseTexture8_GetDevice(&surface->texture->IDirect3DBaseTexture8_iface, device); *device = surface->parent_device; IDirect3DDevice8_AddRef(*device); @@ -311,15 +288,23 @@ static const struct wined3d_parent_ops d3d8_surface_wined3d_parent_ops = surface_wined3d_object_destroyed, }; -void surface_init(struct d3d8_surface *surface, struct wined3d_surface *wined3d_surface, - struct d3d8_device *device, const struct wined3d_parent_ops **parent_ops) +void surface_init(struct d3d8_surface *surface, IUnknown *container_parent, + struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) { + IDirect3DBaseTexture8 *texture; + surface->IDirect3DSurface8_iface.lpVtbl = &d3d8_surface_vtbl; d3d8_resource_init(&surface->resource); - wined3d_surface_incref(wined3d_surface); + surface->resource.refcount = 0; surface->wined3d_surface = wined3d_surface; - surface->parent_device = &device->IDirect3DDevice8_iface; - IDirect3DDevice8_AddRef(surface->parent_device); + surface->container = container_parent; + + if (container_parent && SUCCEEDED(IUnknown_QueryInterface(container_parent, + &IID_IDirect3DBaseTexture8, (void **)&texture))) + { + surface->texture = unsafe_impl_from_IDirect3DBaseTexture8(texture); + IDirect3DBaseTexture8_Release(texture); + } *parent_ops = &d3d8_surface_wined3d_parent_ops; }

1 0