wine-devel February 2019

wine-devel@winehq.org

73 participants
737 discussions

[PATCH 1/8] server: Introduce kernel_object struct for generic association between server and kernel objects.
by Jacek Caban 04 Mar '19

04 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch series implements a way for ntoskrnl to reflect server objects in its address space. The mapping as well as life time management is done on server side, which informs client when it's safe its client side struct. Client side has a way to notify server that it needs to keep a reference, providing a way to hold server reference. Client may also get a handle from its object and use it to perform an implementation using already existing mechanisms. The last patch of this series uses then new infrastructure to implement event object. It's pretty straightforward. I have patches for more object as well moving existing device_file and device objects to use the new infrastructure in a queue. server/device.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- server/object.c | 2 ++ server/object.h | 2 ++ 3 files changed, 47 insertions(+), 3 deletions(-)

1 1

Attn Packagers: Dependency addition for XAudio2 support
by Ethan Lee 03 Mar '19

03 Mar '19

The new XAudio2 implementation that was just merged into master adds a new dependency, called FAudio. The source is available here: https://github.com/FNA-XNA/FAudio <https://github.com/FNA-XNA/FAudio> The README goes into detail, but the short version: It's a C99 library that builds with CMake and depends only on SDL2 (ideally 2.0.9). There are special build options available but the default is recommended for general use. One minor note for distributions with CMake versions older than 3.1.3 _and_ a compiler that defaults to pre-C99: You will need to set CMAKE_C_FLAGS="-std=c99" manually. If you have CMake 3.1.3+ _or_ a compiler that defaults to C99+, no extra flags should be necessary. XAudio2 is used by a large percentage of games made after the release of the Xbox 360, and Wine's built-in implementation is especially important because of bugs that ship in the official DirectX redistributable version for 64-bit: https://bugs.winehq.org/show_bug.cgi?id=38668#c58 <https://bugs.winehq.org/show_bug.cgi?id=38668#c58> Thanks everyone! -Ethan

5 6

[PATCH 1/6] d3d9: Release system memory wined3d buffer only after the draw buffer is destroyed.
by Matteo Bruni 01 Mar '19

01 Mar '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/buffer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index dcd7e287264..43321b3202b 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -59,9 +59,10 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -81,9 +82,10 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -270,6 +272,9 @@ static const IDirect3DVertexBuffer9Vtbl d3d9_vertexbuffer_vtbl = static void STDMETHODCALLTYPE d3d9_vertexbuffer_wined3d_object_destroyed(void *parent) { struct d3d9_vertexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d9_resource_cleanup(&buffer->resource); heap_free(buffer); } @@ -387,9 +392,10 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -409,9 +415,10 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -596,6 +603,9 @@ static const IDirect3DIndexBuffer9Vtbl d3d9_indexbuffer_vtbl = static void STDMETHODCALLTYPE d3d9_indexbuffer_wined3d_object_destroyed(void *parent) { struct d3d9_indexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d9_resource_cleanup(&buffer->resource); heap_free(buffer); } -- 2.19.2

5 17

[PATCH 1/2] user32/combo: Add more tests for listbox_size
by Fabian Maurer 01 Mar '19

01 Mar '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/combo.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 0d3b1b170f..12e4ed5862 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -692,18 +692,21 @@ static void test_listbox_size(DWORD style) {2, 41, TRUE}, {2, 42, FALSE}, {2, 50, FALSE}, - {2, 60}, - {2, 80}, - {2, 89}, - {2, 90}, - {2, 100}, + {2, 60, FALSE}, + {2, 80, FALSE}, + {2, 89, FALSE}, + {2, 90, FALSE}, + {2, 100, FALSE}, + {3, 73, TRUE}, {10, 24, FALSE}, + {10, 40, TRUE}, {10, 41, TRUE}, {10, 42, FALSE}, {10, 50, FALSE}, {10, 60, FALSE}, {10, 80, FALSE}, + {10, 88, FALSE}, {10, 89, TRUE}, {10, 90, FALSE}, {10, 100, FALSE}, -- 2.20.1

3 7

[PATCH] vbscript: Move variable declaration outside of for.
by Alistair Leslie-Hughes 01 Mar '19

01 Mar '19

This stops a compile error under gcc 4.8.4. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/vbscript/tests/run.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 49066ce..6be6c7f 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -828,8 +828,9 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { "resume", DISPID_TESTOBJ_KEYWORD, NULL }, { "goto", DISPID_TESTOBJ_KEYWORD, NULL }, }; + int i; - for (int i = 0; i < ARRAY_SIZE(dispids); i++) { + for (i = 0; i < ARRAY_SIZE(dispids); i++) { if(!stricmp_wa(bstrName, dispids[i].name)) { dispid_t *d = &dispids[i]; if(d->expect) { -- 1.9.1

3 2

[PATCH] wpcap: Fix compilation with recent pcap/pcap.h versions.
by Dmitry Timoshkov 01 Mar '19

01 Mar '19

Recent libpcap versions have added inclusion of pcap/socket.h to pcap.h that includes sys/socket.h and other system .h files that lead to conflicts with winsock2.h. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wpcap/wpcap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index e7908cd038..f163235138 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -24,6 +24,7 @@ #undef SOCKET #undef INVALID_SOCKET +#define USE_WS_PREFIX #include "winsock2.h" #include "windef.h" #include "winbase.h" -- 2.20.1

2 1

[PATCH] msacm32: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return MMSYSERR_NOMEM if pad is NULL. dlls/msacm32/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index e0c5fdd90e..2d7862cb73 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -600,7 +600,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe return MMSYSERR_NOERROR; gotError: WARN("failed: ret = %08x\n", ret); - if (pad && !pad->hDrvr) + if (!pad->hDrvr) HeapFree(MSACM_hHeap, 0, pad); return ret; } -- 2.20.1

2 1

[PATCH] mshtml: Open pages in the native browser in HlinkTarget_Navigate().
by Zebediah Figura 01 Mar '19

01 Mar '19

This matches native Windows behaviour as well, as demonstrated by running the interactive hlink:hlink tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44423 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mshtml/persist.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index b82750a85e..0607306586 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -30,6 +30,7 @@ #include "shlguid.h" #include "idispids.h" #include "mimeole.h" +#include "shellapi.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -1187,8 +1188,19 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if(pwzJumpLocation) FIXME("JumpLocation not supported\n"); - if(!This->doc_obj->client) - return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); + if(!This->doc_obj->client) { + static const WCHAR szOpen[] = {'o','p','e','n',0}; + HRESULT hres; + BSTR uri; + + hres = IUri_GetAbsoluteUri(This->window->uri, &uri); + if (FAILED(hres)) + return hres; + + ShellExecuteW(NULL, szOpen, uri, NULL, NULL, SW_SHOW); + SysFreeString(uri); + return S_OK; + } return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); } -- 2.20.1

2 1

[PATCH] urlmon: Remove useless casts to self
by Michael Stefaniuc 01 Mar '19

01 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 2759f3d226..61917518c0 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -45,7 +45,7 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) void *ret; HRESULT hres; - hres = IBindStatusCallback_QueryInterface(This->callback, riid, (void**)&ret); + hres = IBindStatusCallback_QueryInterface(This->callback, riid, &ret); if(FAILED(hres) && This->serv_prov) hres = IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 11e6ecee90..cc1ba81606 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -434,7 +434,7 @@ HRESULT FileProtocol_Construct(IUnknown *outer, LPVOID *ppobj) ret->file = INVALID_HANDLE_VALUE; ret->priority = 0; ret->ref = 1; - ret->outer = outer ? outer : (IUnknown*)&ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_outer; *ppobj = &ret->IUnknown_outer; return S_OK; -- 2.20.1

2 1

[PATCH v2] po: Update German translation.
by Isira Seneviratne 01 Mar '19

01 Mar '19

2 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2019