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

André Hentschel : wpcap: Implement pcap_breakloop.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 2789538bd576c1651f3fcdafb709e7aa71217bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2789538bd576c1651f3fcdafb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:55:13 2014 +0200 wpcap: Implement pcap_breakloop. --- 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 ab1de8f..81ff958 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -26,6 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); +void CDECL wine_pcap_breakloop(pcap_t *p) +{ + TRACE("(%p)\n", p); + return pcap_breakloop(p); +} + int CDECL wine_pcap_compile(pcap_t *p, struct bpf_program *program, const char *buf, int optimize, unsigned int mask) { diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index d6116d2..2cdc6cd 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -6,7 +6,7 @@ @ stub eproto_db @ stub getservent @ stub install_bpf_program -@ stub pcap_breakloop +@ cdecl pcap_breakloop(ptr) wine_pcap_breakloop @ stub pcap_close @ cdecl pcap_compile(ptr ptr str long long) wine_pcap_compile @ stub pcap_compile_nopcap

1 0

André Hentschel : wpcap: Implement pcap_loop.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: d45f9144a14d689ea8563c6f9e91ae7b14c37b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45f9144a14d689ea8563c6f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 22:48:14 2014 +0200 wpcap: Implement pcap_loop. --- dlls/wpcap/wpcap.c | 18 ++++++++++++++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b80a4e0..ab1de8f 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -123,6 +123,24 @@ int CDECL wine_pcap_lookupnet(const char *device, unsigned int *netp, unsigned i return pcap_lookupnet(device, netp, maskp, errbuf); } +int CDECL wine_pcap_loop(pcap_t *p, int cnt, + void (CALLBACK *callback)(u_char *, const struct pcap_pkthdr *, const u_char *), + unsigned char *user) +{ + TRACE("(%p %i %p %p)\n", p, cnt, callback, user); + + if (callback) + { + PCAP_HANDLER_CALLBACK *pcb; + pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); + pcb->pfn_cb = callback; + pcb->user_data = user; + return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + } + + return pcap_loop(p, cnt, NULL, user); +} + 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 92b5052..d6116d2 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -39,7 +39,7 @@ @ stub pcap_live_dump_ended @ cdecl pcap_lookupdev(ptr) wine_pcap_lookupdev @ cdecl pcap_lookupnet(str ptr ptr ptr) wine_pcap_lookupnet -@ stub pcap_loop +@ cdecl pcap_loop(ptr long ptr ptr) wine_pcap_loop @ cdecl pcap_major_version(ptr) wine_pcap_major_version @ cdecl pcap_minor_version(ptr) wine_pcap_minor_version @ stub pcap_next

1 0

André Hentschel : wpcap: Trace strings when possible.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: c180d522ae38b0a0ec5b8391bc1058c801594b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c180d522ae38b0a0ec5b8391b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:53:12 2014 +0200 wpcap: Trace strings when possible. --- dlls/wpcap/wpcap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 1a7f280..4eedbd8 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -27,7 +27,7 @@ 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); + TRACE("(%p %p %s %i %u)\n", p, program, debugstr_a(buf), optimize, mask); return pcap_compile(p, program, buf, optimize, mask); } @@ -77,7 +77,7 @@ char* CDECL wine_pcap_lookupdev(char *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); + TRACE("(%s %p %p %p)\n", debugstr_a(device), netp, maskp, errbuf); return pcap_lookupnet(device, netp, maskp, errbuf); } @@ -96,7 +96,7 @@ int CDECL wine_pcap_minor_version(pcap_t *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); + TRACE("(%s %i %i %i %p)\n", debugstr_a(source), snaplen, promisc, to_ms, errbuf); return pcap_open_live(source, snaplen, promisc, to_ms, errbuf); }

1 0

Henri Verbeet : wined3d: Store the amount of video memory as a UINT64.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 7cdaece711e696447b10ea9c0ab00b7ced799165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdaece711e696447b10ea9c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:20 2014 +0200 wined3d: Store the amount of video memory as a UINT64. --- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/directx.c | 28 +++++++++++++++------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 54273cd..b7d02bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1138,11 +1138,12 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device { TRACE("device %p.\n", device); - TRACE("Emulating %d MB, returning %d MB left.\n", - device->adapter->TextureRam / (1024 * 1024), - (device->adapter->TextureRam - device->adapter->UsedTextureRam) / (1024 * 1024)); + TRACE("Emulating 0x%s bytes. 0x%s used, returning 0x%s left.\n", + wine_dbgstr_longlong(device->adapter->vram_bytes), + wine_dbgstr_longlong(device->adapter->vram_bytes_used), + wine_dbgstr_longlong(device->adapter->vram_bytes - device->adapter->vram_bytes_used)); - return device->adapter->TextureRam - device->adapter->UsedTextureRam; + return min(UINT_MAX, device->adapter->vram_bytes - device->adapter->vram_bytes_used); } void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d1eeee8..f1ba7b5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -409,11 +409,13 @@ fail: } /* Adjust the amount of used texture memory */ -unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount) +UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) { - adapter->UsedTextureRam += amount; - TRACE("Adjusted adapter memory by %d to %d.\n", amount, adapter->UsedTextureRam); - return adapter->UsedTextureRam; + adapter->vram_bytes_used += amount; + TRACE("Adjusted used adapter memory by 0x%s to 0x%s.\n", + wine_dbgstr_longlong(amount), + wine_dbgstr_longlong(adapter->vram_bytes_used)); + return adapter->vram_bytes_used; } static void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) @@ -1498,21 +1500,21 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, if ((gpu_desc = get_gpu_description(driver_info->vendor, driver_info->device))) { driver_info->description = gpu_desc->description; - driver_info->vidmem = gpu_desc->vidmem * 1024 * 1024; + driver_info->vram_bytes = (UINT64)gpu_desc->vidmem * 1024 * 1024; driver = gpu_desc->driver; } else { ERR("Card %04x:%04x not found in driver DB.\n", vendor, device); driver_info->description = "Direct3D HAL"; - driver_info->vidmem = WINE_DEFAULT_VIDMEM; + driver_info->vram_bytes = WINE_DEFAULT_VIDMEM; driver = DRIVER_UNKNOWN; } if (wined3d_settings.emulated_textureram) { TRACE("Overriding amount of video memory with %u bytes.\n", wined3d_settings.emulated_textureram); - driver_info->vidmem = wined3d_settings.emulated_textureram; + driver_info->vram_bytes = wined3d_settings.emulated_textureram; } /* Try to obtain driver version information for the current Windows version. This fails in @@ -3401,7 +3403,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); - identifier->video_memory = adapter->TextureRam; + identifier->video_memory = min(~(SIZE_T)0, adapter->vram_bytes); return WINED3D_OK; } @@ -5104,9 +5106,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) return FALSE; } - adapter->TextureRam = adapter->driver_info.vidmem; - adapter->UsedTextureRam = 0; - TRACE("Emulating %u MB of texture ram.\n", adapter->TextureRam / (1024 * 1024)); + adapter->vram_bytes = adapter->driver_info.vram_bytes; + adapter->vram_bytes_used = 0; + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); @@ -5132,9 +5134,9 @@ static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordi adapter->driver_info.name = "Display"; adapter->driver_info.description = "WineD3D DirectDraw Emulation"; if (wined3d_settings.emulated_textureram) - adapter->TextureRam = wined3d_settings.emulated_textureram; + adapter->vram_bytes = wined3d_settings.emulated_textureram; else - adapter->TextureRam = 128 * 1024 * 1024; + adapter->vram_bytes = 128 * 1024 * 1024; initPixelFormatsNoGL(&adapter->gl_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a9d81a5c..ebe0bf8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1634,7 +1634,7 @@ struct wined3d_driver_info enum wined3d_pci_device device; const char *name; const char *description; - unsigned int vidmem; + UINT64 vram_bytes; DWORD version_high; DWORD version_low; }; @@ -1683,8 +1683,8 @@ struct wined3d_adapter WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ unsigned int cfg_count; struct wined3d_pixel_format *cfgs; - unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */ - unsigned int UsedTextureRam; + UINT64 vram_bytes; + UINT64 vram_bytes_used; LUID luid; const struct wined3d_vertex_pipe_ops *vertex_pipe; @@ -1694,7 +1694,7 @@ struct wined3d_adapter }; BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; -unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount) DECLSPEC_HIDDEN; +UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3d9: The "forwardReference" field in struct d3d9_surface is always a texture, if set.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: d1d48d31947f172eb8371345ddeefc8d3847cdb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d48d31947f172eb8371345d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:16 2014 +0200 d3d9: The "forwardReference" field in struct d3d9_surface is always a texture, if set. --- dlls/d3d9/d3d9_private.h | 6 +++--- dlls/d3d9/device.c | 12 +----------- dlls/d3d9/surface.c | 50 ++++++++++++++++++++---------------------------- 3 files changed, 25 insertions(+), 43 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6e64b8e..bde8583 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -216,12 +216,12 @@ struct d3d9_surface struct wined3d_surface *wined3d_surface; IDirect3DDevice9Ex *parent_device; IUnknown *container; - IUnknown *forwardReference; + struct d3d9_texture *texture; BOOL getdc_supported; }; -void surface_init(struct d3d9_surface *surface, struct wined3d_surface *wined3d_surface, - struct d3d9_device *device, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; +void surface_init(struct d3d9_surface *surface, IUnknown *container_parent, + struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) DECLSPEC_HIDDEN; struct d3d9_vertexbuffer diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e6fe631..1117138 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1026,7 +1026,6 @@ static HRESULT d3d9_device_create_surface(struct d3d9_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->IDirect3DDevice9Ex_iface; *surface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*surface); @@ -3461,7 +3460,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 d3d9_device *device = device_from_device_parent(device_parent); struct d3d9_surface *d3d_surface; TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", @@ -3470,17 +3468,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; - IDirect3DDevice9Ex_Release(d3d_surface->parent_device); - d3d_surface->parent_device = NULL; - - IDirect3DSurface9_Release(&d3d_surface->IDirect3DSurface9_iface); - d3d_surface->forwardReference = container_parent; - return D3D_OK; } @@ -3532,7 +3523,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->IDirect3DDevice9Ex_iface; return hr; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index ef5f648..17f2ace 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -55,10 +55,10 @@ static ULONG WINAPI d3d9_surface_AddRef(IDirect3DSurface9 *iface) TRACE("iface %p.\n", iface); - if (surface->forwardReference) + if (surface->texture) { - TRACE("Forwarding to %p.\n", surface->forwardReference); - return IUnknown_AddRef(surface->forwardReference); + TRACE("Forwarding to %p.\n", surface->texture); + return IDirect3DBaseTexture9_AddRef(&surface->texture->IDirect3DBaseTexture9_iface); } refcount = InterlockedIncrement(&surface->resource.refcount); @@ -83,10 +83,10 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface) TRACE("iface %p.\n", iface); - if (surface->forwardReference) + if (surface->texture) { - TRACE("Forwarding to %p.\n", surface->forwardReference); - return IUnknown_Release(surface->forwardReference); + TRACE("Forwarding to %p.\n", surface->texture); + return IDirect3DBaseTexture9_Release(&surface->texture->IDirect3DBaseTexture9_iface); } refcount = InterlockedDecrement(&surface->resource.refcount); @@ -114,22 +114,8 @@ static HRESULT WINAPI d3d9_surface_GetDevice(IDirect3DSurface9 *iface, IDirect3D TRACE("iface %p, device %p.\n", iface, device); - if (surface->forwardReference) - { - IDirect3DResource9 *resource; - HRESULT hr; - - hr = IUnknown_QueryInterface(surface->forwardReference, &IID_IDirect3DResource9, (void **)&resource); - if (SUCCEEDED(hr)) - { - hr = IDirect3DResource9_GetDevice(resource, device); - IDirect3DResource9_Release(resource); - - TRACE("Returning device %p.\n", *device); - } - - return hr; - } + if (surface->texture) + return IDirect3DBaseTexture9_GetDevice(&surface->texture->IDirect3DBaseTexture9_iface, device); *device = (IDirect3DDevice9 *)surface->parent_device; IDirect3DDevice9_AddRef(*device); @@ -355,13 +341,24 @@ static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops = surface_wined3d_object_destroyed, }; -void surface_init(struct d3d9_surface *surface, struct wined3d_surface *wined3d_surface, - struct d3d9_device *device, const struct wined3d_parent_ops **parent_ops) +void surface_init(struct d3d9_surface *surface, IUnknown *container_parent, + struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) { struct wined3d_resource_desc desc; + IDirect3DBaseTexture9 *texture; surface->IDirect3DSurface9_iface.lpVtbl = &d3d9_surface_vtbl; d3d9_resource_init(&surface->resource); + surface->resource.refcount = 0; + surface->wined3d_surface = wined3d_surface; + surface->container = container_parent; + + if (container_parent && SUCCEEDED(IUnknown_QueryInterface(container_parent, + &IID_IDirect3DBaseTexture9, (void **)&texture))) + { + surface->texture = unsafe_impl_from_IDirect3DBaseTexture9(texture); + IDirect3DBaseTexture9_Release(texture); + } wined3d_resource_get_desc(wined3d_surface_get_resource(wined3d_surface), &desc); switch (d3dformat_from_wined3dformat(desc.format)) @@ -380,11 +377,6 @@ void surface_init(struct d3d9_surface *surface, struct wined3d_surface *wined3d_ break; } - wined3d_surface_incref(wined3d_surface); - surface->wined3d_surface = wined3d_surface; - surface->parent_device = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(surface->parent_device); - *parent_ops = &d3d9_surface_wined3d_parent_ops; }

1 0

Nikolay Sivov : dwrite: Implement layout getters derived from text format.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: c8ec6918c74cdda8389ae11e9418e6409b885495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ec6918c74cdda8389ae11e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 15 07:27:30 2014 +0400 dwrite: Implement layout getters derived from text format. --- dlls/dwrite/layout.c | 74 +++++++++++++++++++++++++++++----------------- dlls/dwrite/tests/layout.c | 2 -- 2 files changed, 47 insertions(+), 29 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index aed6652..7a4ac18 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -560,36 +560,36 @@ static HRESULT WINAPI dwritetextlayout_SetLineSpacing(IDWriteTextLayout *iface, static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextlayout_GetTextAlignment(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_TEXT_ALIGNMENT_LEADING; + TRACE("(%p)\n", This); + return This->format.textalignment; } static DWRITE_PARAGRAPH_ALIGNMENT WINAPI dwritetextlayout_GetParagraphAlignment(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_PARAGRAPH_ALIGNMENT_NEAR; + TRACE("(%p)\n", This); + return This->format.paralign; } static DWRITE_WORD_WRAPPING WINAPI dwritetextlayout_GetWordWrapping(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); FIXME("(%p): stub\n", This); - return DWRITE_WORD_WRAPPING_NO_WRAP; + return This->format.wrapping; } static DWRITE_READING_DIRECTION WINAPI dwritetextlayout_GetReadingDirection(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_READING_DIRECTION_LEFT_TO_RIGHT; + TRACE("(%p)\n", This); + return This->format.readingdir; } static DWRITE_FLOW_DIRECTION WINAPI dwritetextlayout_GetFlowDirection(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM; + TRACE("(%p)\n", This); + return This->format.flow; } static FLOAT WINAPI dwritetextlayout_GetIncrementalTabStop(IDWriteTextLayout *iface) @@ -603,65 +603,85 @@ static HRESULT WINAPI dwritetextlayout_GetTrimming(IDWriteTextLayout *iface, DWR IDWriteInlineObject **trimming_sign) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p %p): stub\n", This, options, trimming_sign); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p)\n", This, options, trimming_sign); + + *options = This->format.trimming; + *trimming_sign = This->format.trimmingsign; + if (*trimming_sign) + IDWriteInlineObject_AddRef(*trimming_sign); + return S_OK; } static HRESULT WINAPI dwritetextlayout_GetLineSpacing(IDWriteTextLayout *iface, DWRITE_LINE_SPACING_METHOD *method, FLOAT *spacing, FLOAT *baseline) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p %p %p): stub\n", This, method, spacing, baseline); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %p)\n", This, method, spacing, baseline); + + *method = This->format.spacingmethod; + *spacing = This->format.spacing; + *baseline = This->format.baseline; + return S_OK; } static HRESULT WINAPI dwritetextlayout_GetFontCollection(IDWriteTextLayout *iface, IDWriteFontCollection **collection) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p): stub\n", This, collection); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, collection); + + *collection = This->format.collection; + if (*collection) + IDWriteFontCollection_AddRef(*collection); + return S_OK; } static UINT32 WINAPI dwritetextlayout_GetFontFamilyNameLength(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->format.family_len; } static HRESULT WINAPI dwritetextlayout_GetFontFamilyName(IDWriteTextLayout *iface, WCHAR *name, UINT32 size) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p %u): stub\n", This, name, size); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u)\n", This, name, size); + + if (size <= This->format.family_len) return E_NOT_SUFFICIENT_BUFFER; + strcpyW(name, This->format.family_name); + return S_OK; } static DWRITE_FONT_WEIGHT WINAPI dwritetextlayout_GetFontWeight(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_WEIGHT_NORMAL; + TRACE("(%p)\n", This); + return This->format.weight; } static DWRITE_FONT_STYLE WINAPI dwritetextlayout_GetFontStyle(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_STYLE_NORMAL; + TRACE("(%p)\n", This); + return This->format.style; } static DWRITE_FONT_STRETCH WINAPI dwritetextlayout_GetFontStretch(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_STRETCH_NORMAL; + TRACE("(%p)\n", This); + return This->format.stretch; } static FLOAT WINAPI dwritetextlayout_GetFontSize(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return 0.0; + TRACE("(%p)\n", This); + return This->format.size; } static UINT32 WINAPI dwritetextlayout_GetLocaleNameLength(IDWriteTextLayout *iface) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 236c34b..019a8f7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -558,7 +558,6 @@ static void test_fontweight(void) ok(hr == S_OK, "got 0x%08x\n", hr); weight = IDWriteTextFormat_GetFontWeight(fmt2); -todo_wine ok(weight == DWRITE_FONT_WEIGHT_BOLD, "got %u\n", weight); range.startPosition = 0; @@ -568,7 +567,6 @@ todo_wine /* IDWriteTextFormat methods output doesn't reflect layout changes */ weight = IDWriteTextFormat_GetFontWeight(fmt2); -todo_wine ok(weight == DWRITE_FONT_WEIGHT_BOLD, "got %u\n", weight); range.length = 0;

1 0

Nikolay Sivov : winhttp: Fix return code check (PVS-Studio).
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 8fb0fd77e54024b477be5fd0260bca993252cbf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb0fd77e54024b477be5fd02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 23:12:51 2014 +0400 winhttp: Fix return code check (PVS-Studio). --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f45141b..1f9b4aa 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3352,7 +3352,7 @@ static HRESULT request_send( struct winhttp_request *request ) { sa = V_ARRAY( &data ); if ((hr = SafeArrayAccessData( sa, (void **)&ptr )) != S_OK) return hr; - if ((hr = SafeArrayGetUBound( sa, 1, &size ) != S_OK)) + if ((hr = SafeArrayGetUBound( sa, 1, &size )) != S_OK) { SafeArrayUnaccessData( sa ); return hr;

1 0

Nikolay Sivov : oleaut32/tests: Remove redundant assignment (PVS-Studio).
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 6e9693edd9040d3d7dcade103b9704d72a7ec459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e9693edd9040d3d7dcade103… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 12:56:56 2014 +0400 oleaut32/tests: Remove redundant assignment (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d139b42..5e0d66a 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2158,7 +2158,7 @@ static void test_VarAbs(void) V_VT(&vDst) = VT_EMPTY; hres = pVarAbs(&v,&vDst); - if (ExtraFlags[i] & (VT_ARRAY|VT_ARRAY) || + if (ExtraFlags[i] & VT_ARRAY || (!ExtraFlags[i] && (vt == VT_UNKNOWN || vt == VT_BSTR || vt == VT_DISPATCH || vt == VT_ERROR || vt == VT_RECORD))) {

1 0

Nikolay Sivov : oleaut32: Remove duplicated expression (PVS-Studio).
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 6d3ca3dde47862779580f01a99fdc1ea4c0816f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3ca3dde47862779580f01a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 12:37:16 2014 +0400 oleaut32: Remove duplicated expression (PVS-Studio). --- dlls/oleaut32/variant.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 7e19dcf..a00e16f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3016,7 +3016,6 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LPVARIANT right, LPVARIANT result) else if (leftvt == VT_I4 || rightvt == VT_I4 || leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_INT || rightvt == VT_INT || - leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_R4 || rightvt == VT_R4 || leftvt == VT_R8 || rightvt == VT_R8 || leftvt == VT_CY || rightvt == VT_CY ||

1 0

Nikolay Sivov : secur32/tests: Remove duplicated expression (PVS-Studio).
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 58a4aa59540f1dce0b3cd8598c71e7b64470c083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a4aa59540f1dce0b3cd8598… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 12:42:58 2014 +0400 secur32/tests: Remove duplicated expression (PVS-Studio). --- dlls/secur32/tests/ntlm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 1e865ad..8adbbb4 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1366,9 +1366,8 @@ START_TEST(ntlm) InitFunctionPtrs(); if(pFreeCredentialsHandle && pDeleteSecurityContext && - pDeleteSecurityContext && pAcquireCredentialsHandleA && - pInitializeSecurityContextA && pCompleteAuthToken && - pQuerySecurityPackageInfoA) + pAcquireCredentialsHandleA && pInitializeSecurityContextA && + pCompleteAuthToken && pQuerySecurityPackageInfoA) { if(!testAcquireCredentialsHandle()) goto cleanup;

1 0