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

Shuai Meng : vbscript: Implemented Int.
by Alexandre Julliard Aug. 15, 2014

Aug. 15, 2014

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

Vincent Povirk : mscoree: Implement corruntimehost_Start.
by Alexandre Julliard Aug. 15, 2014

Aug. 15, 2014

Module: wine Branch: master Commit: fb2f1f2b64ae3b975e973b6e161c6acbc64eb144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2f1f2b64ae3b975e973b6e1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 13 14:09:43 2014 -0500 mscoree: Implement corruntimehost_Start. --- dlls/mscoree/corruntimehost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b0a8b9d..5b7e833 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -378,8 +378,12 @@ static HRESULT WINAPI corruntimehost_GetConfiguration( static HRESULT WINAPI corruntimehost_Start( ICorRuntimeHost* iface) { - FIXME("stub %p\n", iface); - return S_OK; + RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); + MonoDomain *dummy; + + TRACE("%p\n", This); + + return RuntimeHost_GetDefaultDomain(This, &dummy); } static HRESULT WINAPI corruntimehost_Stop(

1 0

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

Aug. 15, 2014

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

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

Aug. 15, 2014

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

André Hentschel : wpcap: Implement pcap_lookupdev.
by Alexandre Julliard Aug. 15, 2014

Aug. 15, 2014

Module: wine Branch: master Commit: 29cdb71d9870f6aa1aff6c97cdbfcf042d7101a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cdb71d9870f6aa1aff6c97c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 12 00:32:52 2014 +0200 wpcap: Implement pcap_lookupdev. --- 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 791a04d..5705ea6 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -61,6 +61,12 @@ const char* CDECL wine_pcap_lib_version(void) return ret; } +char* CDECL wine_pcap_lookupdev(char *errbuf) +{ + TRACE("(%p)\n", errbuf); + return pcap_lookupdev(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 7e4ae86..460fbd9 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -37,7 +37,7 @@ @ stub pcap_list_datalinks @ stub pcap_live_dump @ stub pcap_live_dump_ended -@ stub pcap_lookupdev +@ cdecl pcap_lookupdev(str) wine_pcap_lookupdev @ stub pcap_lookupnet @ stub pcap_loop @ cdecl pcap_major_version(ptr) wine_pcap_major_version

1 0

André Hentschel : wpcap: Implement pcap_geterr.
by Alexandre Julliard Aug. 15, 2014

Aug. 15, 2014

Module: wine Branch: master Commit: efb1d1d8492eb2eaef02a63481fe24f23e910c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb1d1d8492eb2eaef02a6348… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 12 00:28:59 2014 +0200 wpcap: Implement pcap_geterr. --- 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 b3ce425..a83c4d5 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -42,6 +42,12 @@ void CDECL wine_pcap_freealldevs(pcap_if_t *alldevs) pcap_freealldevs(alldevs); } +char* CDECL wine_pcap_geterr(pcap_t *p) +{ + TRACE("(%p)\n", p); + return pcap_geterr(p); +} + const char* CDECL wine_pcap_lib_version(void) { const char* ret = pcap_lib_version(); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index ad90d1f..91f4c8f 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -29,7 +29,7 @@ @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs @ stub pcap_freecode @ stub pcap_get_airpcap_handle -@ stub pcap_geterr +@ cdecl pcap_geterr(ptr) wine_pcap_geterr @ stub pcap_getevent @ stub pcap_getnonblock @ stub pcap_is_swapped

1 0

André Hentschel : wpcap: Implement pcap_open_live.
by Alexandre Julliard Aug. 15, 2014

Aug. 15, 2014

Module: wine Branch: master Commit: 8738eb31dea5a6db143eb6246dc0c64e6fad5469 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8738eb31dea5a6db143eb6246… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 12 00:29:46 2014 +0200 wpcap: Implement pcap_open_live. --- 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 a83c4d5..3639de4 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -66,3 +66,10 @@ int CDECL wine_pcap_minor_version(pcap_t *p) TRACE("(%p)\n", p); return pcap_minor_version(p); } + +pcap_t* CDECL wine_pcap_open_live(const char *source, int snaplen, int promisc, int to_ms, + char *errbuf) +{ + TRACE("(%p %i %i %i %p)\n", source, snaplen, promisc, to_ms, errbuf); + return pcap_open_live(source, snaplen, promisc, to_ms, errbuf); +} diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 91f4c8f..2a87fba 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -49,7 +49,7 @@ @ stub pcap_offline_read @ stub pcap_open @ stub pcap_open_dead -@ stub pcap_open_live +@ cdecl pcap_open_live(str long long long str) wine_pcap_open_live @ stub pcap_open_offline @ stub pcap_parsesrcstr @ stub pcap_perror

1 0

André Hentschel : wpcap: Implement pcap_stats.
by Alexandre Julliard Aug. 15, 2014

Aug. 15, 2014

Module: wine Branch: master Commit: 5d0e67855d73c45e244ac9ea1b8bd6a0613b946a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0e67855d73c45e244ac9ea1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 12 00:30:47 2014 +0200 wpcap: Implement pcap_stats. --- 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 3639de4..0393ad1 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -73,3 +73,9 @@ pcap_t* CDECL wine_pcap_open_live(const char *source, int snaplen, int promisc, TRACE("(%p %i %i %i %p)\n", source, snaplen, promisc, to_ms, errbuf); return pcap_open_live(source, snaplen, promisc, to_ms, errbuf); } + +int CDECL wine_pcap_stats(pcap_t *p, struct pcap_stat *ps) +{ + TRACE("(%p %p)\n", p, ps); + return pcap_stats(p, ps); +} diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 2a87fba..5186276 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -72,7 +72,7 @@ @ stub pcap_setsampling @ stub pcap_setuserbuffer @ stub pcap_snapshot -@ stub pcap_stats +@ cdecl pcap_stats(ptr ptr) wine_pcap_stats @ stub pcap_stats_ex @ stub pcap_strerror @ stub wsockinit

1 0

Thomas Faber : advapi32/tests: Fix a buffer overflow when calling GetEventLogInformation.
by Alexandre Julliard Aug. 15, 2014

Aug. 15, 2014

Module: wine Branch: master Commit: d6cc12d13904e83f508a3a807cfc328ba93bdffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6cc12d13904e83f508a3a807… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Aug 11 20:01:53 2014 +0200 advapi32/tests: Fix a buffer overflow when calling GetEventLogInformation. --- dlls/advapi32/tests/eventlog.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index a3fe44b..1e48348 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -130,7 +130,8 @@ static void test_info(void) HANDLE handle; BOOL ret; DWORD needed; - EVENTLOG_FULL_INFORMATION efi; + BYTE buffer[2 * sizeof(EVENTLOG_FULL_INFORMATION)]; + EVENTLOG_FULL_INFORMATION *efi = (void *)buffer; if (!pGetEventLogInformation) { @@ -161,26 +162,26 @@ static void test_info(void) ok(GetLastError() == RPC_X_NULL_REF_POINTER, "Expected RPC_X_NULL_REF_POINTER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, (LPVOID)&efi, 0, NULL); + ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, efi, 0, NULL); ok(!ret, "Expected failure\n"); ok(GetLastError() == RPC_X_NULL_REF_POINTER, "Expected RPC_X_NULL_REF_POINTER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); needed = 0xdeadbeef; - efi.dwFull = 0xdeadbeef; - ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, (LPVOID)&efi, 0, &needed); + efi->dwFull = 0xdeadbeef; + ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, efi, 0, &needed); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(needed == sizeof(EVENTLOG_FULL_INFORMATION), "Expected sizeof(EVENTLOG_FULL_INFORMATION), got %d\n", needed); - ok(efi.dwFull == 0xdeadbeef, "Expected no change to the dwFull member\n"); + ok(efi->dwFull == 0xdeadbeef, "Expected no change to the dwFull member\n"); /* Not that we care, but on success last error is set to ERROR_IO_PENDING */ - efi.dwFull = 0xdeadbeef; - needed *= 2; - ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, (LPVOID)&efi, needed, &needed); + efi->dwFull = 0xdeadbeef; + needed = sizeof(buffer); + ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, efi, needed, &needed); ok(ret, "Expected success\n"); ok(needed == sizeof(EVENTLOG_FULL_INFORMATION), "Expected sizeof(EVENTLOG_FULL_INFORMATION), got %d\n", needed); - ok(efi.dwFull == 0 || efi.dwFull == 1, "Expected 0 (not full) or 1 (full), got %d\n", efi.dwFull); + ok(efi->dwFull == 0 || efi->dwFull == 1, "Expected 0 (not full) or 1 (full), got %d\n", efi->dwFull); CloseEventLog(handle); }

1 0

André Hentschel : wpcap: Implement pcap_datalink.
by Alexandre Julliard Aug. 15, 2014

Aug. 15, 2014

Module: wine Branch: master Commit: fa229c205dcc3e554cd498867e80dfb601fd420c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa229c205dcc3e554cd498867… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 12 00:32:05 2014 +0200 wpcap: Implement pcap_datalink. --- 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 304cc2b..791a04d 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -24,6 +24,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); +int CDECL wine_pcap_datalink(pcap_t *p) +{ + TRACE("(%p)\n", p); + return pcap_datalink(p); +} + int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) { int ret; diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 4c9d5af..7e4ae86 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -11,7 +11,7 @@ @ stub pcap_compile @ stub pcap_compile_nopcap @ stub pcap_createsrcstr -@ stub pcap_datalink +@ cdecl pcap_datalink(ptr) wine_pcap_datalink @ stub pcap_datalink_name_to_val @ stub pcap_datalink_val_to_description @ stub pcap_datalink_val_to_name

1 0