April 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 4.6
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: website Branch: master Commit: d79de0dd2e6205d6b521fdc44f2909bc224887e7 URL: https://source.winehq.org/git/website.git/?a=commit;h=d79de0dd2e6205d6b521f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:12:02 2019 +0200 Wine release 4.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019041201.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/news/en/2019041201.xml b/news/en/2019041201.xml new file mode 100644 index 0000000..788afba --- /dev/null +++ b/news/en/2019041201.xml @@ -0,0 +1,20 @@ +<news> +<date>April 12, 2019</date> +<title>Wine 4.6 Released</title> +<body> + The Wine development release 4.6 is now available. + <a href="{$root}/announce/4.6">What's new</a> in this release: +<ul> + <li>Beginnings of a Vulkan backend for WineD3D.</li> + <li>Support for loading Mono libraries from a shared location.</li> + <li>Libwine.dll no longer needed when using Wine DLLs on Windows.</li> + <li>Regression tests compiled directly to PE format.</li> + <li>Support for the Split Button Common Control.</li> + <li>Complex structs support in the typelib marshaller.</li> + <li>Video capture ported to Video4Linux version 2.</li> + <li>Initial version of the Debug Engine DLL.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.6.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Paul Gofman : xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start().
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: a5b22c86b4d46fa8443cc2bee8b91d237eb8996b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5b22c86b4d46fa8443cc2be… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 11 11:30:50 2019 +0300 xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start(). It is tested that EBX register is not preserved by IXAudio2VoiceCallback_OnVoiceProcessingPassStart callback in League of Legends. It doesn't lead to crash in the present xaudio, while it might still be a potential issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46870 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 18306a1..cbbedc4 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -41,7 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #if XAUDIO2_VER != 0 && defined(__i386__) -/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi. */ +/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi; + * League of Legends uses a callback which corrupts %ebx. */ #define IXAudio2VoiceCallback_OnVoiceProcessingPassStart(a, b) call_on_voice_processing_pass_start(a, b) extern void call_on_voice_processing_pass_start(IXAudio2VoiceCallback *This, UINT32 BytesRequired); __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, @@ -54,13 +55,17 @@ __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") - "subl $8,%esp\n\t" + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") + "subl $4,%esp\n\t" "pushl 12(%ebp)\n\t" /* BytesRequired */ "pushl 8(%ebp)\n\t" /* This */ "movl 8(%ebp),%eax\n\t" "movl 0(%eax),%eax\n\t" "call *0(%eax)\n\t" /* This->lpVtbl->OnVoiceProcessingPassStart */ - "leal -8(%ebp),%esp\n\t" + "leal -12(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") "popl %edi\n\t" __ASM_CFI(".cfi_same_value %edi\n\t") "popl %esi\n\t"

1 0

Zebediah Figura : qcap/tests: Add more tests for querying smart tee pin information.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: a770ebe3ad4a4d5ae0a12f06d5e4a96c126ef8f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a770ebe3ad4a4d5ae0a12f06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:55 2019 -0500 qcap/tests: Add more tests for querying smart tee pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 143 ++++++++++++++++++++++++++++----------- 1 file changed, 104 insertions(+), 39 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index f931d0b..79d296d 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -266,6 +266,109 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter = create_smart_tee(); + PIN_DIRECTION dir; + PIN_INFO info; + ULONG count; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, capture_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, capture_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, capture_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, preview_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, preview_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, preview_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -1885,7 +1988,6 @@ static void test_smart_tee_filter(void) int pinNumber = 0; IMemInputPin *memInputPin = NULL; IEnumMediaTypes *enumMediaTypes = NULL; - ULONG nPin = 0; hr = CoCreateInstance(&CLSID_SmartTee, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&smartTeeFilter); @@ -1908,55 +2010,24 @@ static void test_smart_tee_filter(void) while (IEnumPins_Next(enumPins, 1, &pin, NULL) == S_OK) { - LPWSTR id = NULL; - PIN_INFO pinInfo; - memset(&pinInfo, 0, sizeof(pinInfo)); - hr = IPin_QueryPinInfo(pin, &pinInfo); - ok(SUCCEEDED(hr), "QueryPinInfo failed, hr=0x%08x\n", hr); - if (FAILED(hr)) - goto endwhile; - - ok(pinInfo.pFilter == smartTeeFilter, "pin's filter isn't the filter owning the pin\n"); if (pinNumber == 0) { - static const WCHAR wszInput[] = {'I','n','p','u','t',0}; - ok(pinInfo.dir == PINDIR_INPUT, "pin 0 isn't an input pin\n"); - ok(!lstrcmpW(pinInfo.achName, wszInput), "pin 0 is called %s, not 'Input'\n", wine_dbgstr_w(pinInfo.achName)); - hr = IPin_QueryId(pin, &id); - ok(SUCCEEDED(hr), "IPin_QueryId() failed with 0x%08x\n", hr); - ok(!lstrcmpW(id, wszInput), "pin 0's id is %s, not 'Input'\n", wine_dbgstr_w(id)); inputPin = pin; IPin_AddRef(inputPin); } else if (pinNumber == 1) { - static const WCHAR wszCapture[] = {'C','a','p','t','u','r','e',0}; - ok(pinInfo.dir == PINDIR_OUTPUT, "pin 1 isn't an output pin\n"); - ok(!lstrcmpW(pinInfo.achName, wszCapture), "pin 1 is called %s, not 'Capture'\n", wine_dbgstr_w(pinInfo.achName)); - hr = IPin_QueryId(pin, &id); - ok(SUCCEEDED(hr), "IPin_QueryId() failed with 0x%08x\n", hr); - ok(!lstrcmpW(id, wszCapture), "pin 1's id is %s, not 'Capture'\n", wine_dbgstr_w(id)); capturePin = pin; IPin_AddRef(capturePin); } else if (pinNumber == 2) { - static const WCHAR wszPreview[] = {'P','r','e','v','i','e','w',0}; - ok(pinInfo.dir == PINDIR_OUTPUT, "pin 2 isn't an output pin\n"); - ok(!lstrcmpW(pinInfo.achName, wszPreview), "pin 2 is called %s, not 'Preview'\n", wine_dbgstr_w(pinInfo.achName)); - hr = IPin_QueryId(pin, &id); - ok(SUCCEEDED(hr), "IPin_QueryId() failed with 0x%08x\n", hr); - ok(!lstrcmpW(id, wszPreview), "pin 2's id is %s, not 'Preview'\n", wine_dbgstr_w(id)); previewPin = pin; IPin_AddRef(previewPin); } else ok(0, "pin %d isn't supposed to exist\n", pinNumber); - endwhile: - if (pinInfo.pFilter) - IBaseFilter_Release(pinInfo.pFilter); - CoTaskMemFree(id); IPin_Release(pin); pinNumber++; } @@ -2010,13 +2081,6 @@ static void test_smart_tee_filter(void) hr = IPin_EnumMediaTypes(previewPin, &enumMediaTypes); ok(hr == VFW_E_NOT_CONNECTED, "IPin_EnumMediaTypes() failed, hr=0x%08x\n", hr); - hr = IPin_QueryInternalConnections(inputPin, NULL, &nPin); - ok(hr == E_NOTIMPL, "IPin_QueryInternalConnections() returned hr=0x%08x\n", hr); - hr = IPin_QueryInternalConnections(capturePin, NULL, &nPin); - ok(hr == E_NOTIMPL, "IPin_QueryInternalConnections() returned hr=0x%08x\n", hr); - hr = IPin_QueryInternalConnections(previewPin, NULL, &nPin); - ok(hr == E_NOTIMPL, "IPin_QueryInternalConnections() returned hr=0x%08x\n", hr); - test_smart_tee_filter_in_graph(smartTeeFilter, inputPin, capturePin, previewPin); end: @@ -2261,6 +2325,7 @@ START_TEST(smartteefilter) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Henri Verbeet : wined3d: Explicitly create the implicit swapchain.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: b15685355c45c0fffb4f0dc5518c8c6ee0f595c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b15685355c45c0fffb4f0dc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:47 2019 +0430 wined3d: Explicitly create the implicit swapchain. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 28 ----------- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 59 +++++++++-------------- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 75 ++++++++++++------------------ dlls/ddraw/ddraw.c | 97 ++++++++++++++++---------------------- dlls/dxgi/device.c | 74 ++++++++++++++--------------- dlls/dxgi/dxgi_private.h | 1 + dlls/wined3d/device.c | 103 ++++++++++++++++++++--------------------- dlls/wined3d/swapchain.c | 21 ++++++++- dlls/wined3d/wined3d.spec | 2 - dlls/wined3d/wined3d_private.h | 3 ++ include/wine/wined3d.h | 5 +- include/wine/winedxgi.idl | 5 -- 14 files changed, 201 insertions(+), 276 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b15685355c45c0fffb4f…

1 0

Henri Verbeet : wined3d: Get rid of wined3d_device_init_gdi().
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: b599e8e3a04cc80bd09647fd784eac70dc2e411d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b599e8e3a04cc80bd09647fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:44 2019 +0430 wined3d: Get rid of wined3d_device_init_gdi(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 13 +++---- dlls/wined3d/device.c | 87 ++++++++++++++++------------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 34 insertions(+), 68 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8467fbf..f4aabf4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -569,6 +569,9 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, TRACE("ddraw %p.\n", ddraw); + if (ddraw->flags & DDRAW_NO3D) + return wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc); + if (!window || window == GetDesktopWindow()) { window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "Hidden D3D Window", @@ -594,8 +597,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ ddraw->flags |= DDRAW_D3D_INITIALIZED; - hr = wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc))) { ddraw->flags &= ~DDRAW_D3D_INITIALIZED; return hr; @@ -638,12 +640,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win swapchain_desc.windowed = windowed; swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; - if (!(ddraw->flags & DDRAW_NO3D)) - hr = ddraw_attach_d3d_device(ddraw, &swapchain_desc); - else - hr = wined3d_device_init_gdi(ddraw->wined3d_device, &swapchain_desc); - - if (FAILED(hr)) + if (FAILED(hr = ddraw_attach_d3d_device(ddraw, &swapchain_desc))) { ERR("Failed to create swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1d870c0..1424ed4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1079,8 +1079,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; - if (device->wined3d->flags & WINED3D_NO3D) - return WINED3DERR_INVALIDCALL; memset(device->fb.render_targets, 0, sizeof(device->fb.render_targets)); @@ -1120,26 +1118,40 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, } device->swapchains[0] = swapchain; - if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) - goto err_out; - device_init_swapchain_state(device, swapchain); + if (device->wined3d->flags & WINED3D_NO3D) + { + if (!(device->blitter = wined3d_cpu_blitter_create())) + { + ERR("Failed to create CPU blitter.\n"); + heap_free(device->swapchains); + device->swapchain_count = 0; + goto err_out; + } + } + else + { + if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) + goto err_out; + device_init_swapchain_state(device, swapchain); - device->contexts[0]->last_was_rhw = 0; + device->contexts[0]->last_was_rhw = 0; - TRACE("All defaults now set up.\n"); + TRACE("All defaults now set up.\n"); - /* Clear the screen */ - if (device->back_buffer_view) - clear_flags |= WINED3DCLEAR_TARGET; - if (swapchain_desc->enable_auto_depth_stencil) - clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; - if (clear_flags) - wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); + /* Clear the screen */ + if (device->back_buffer_view) + clear_flags |= WINED3DCLEAR_TARGET; + if (swapchain_desc->enable_auto_depth_stencil) + clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; + if (clear_flags) + wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); - device->d3d_initialized = TRUE; + device->d3d_initialized = TRUE; + + if (wined3d_settings.logo) + device_load_logo(device, wined3d_settings.logo); + } - if (wined3d_settings.logo) - device_load_logo(device, wined3d_settings.logo); return WINED3D_OK; err_out: @@ -1153,47 +1165,6 @@ err_out: return hr; } -HRESULT CDECL wined3d_device_init_gdi(struct wined3d_device *device, - struct wined3d_swapchain_desc *swapchain_desc) -{ - struct wined3d_swapchain *swapchain = NULL; - HRESULT hr; - - TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); - - /* Setup the implicit swapchain */ - TRACE("Creating implicit swapchain\n"); - hr = device->device_parent->ops->create_swapchain(device->device_parent, - swapchain_desc, &swapchain); - if (FAILED(hr)) - { - WARN("Failed to create implicit swapchain\n"); - goto err_out; - } - - device->swapchain_count = 1; - if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) - { - ERR("Out of memory!\n"); - goto err_out; - } - device->swapchains[0] = swapchain; - - if (!(device->blitter = wined3d_cpu_blitter_create())) - { - ERR("Failed to create CPU blitter.\n"); - heap_free(device->swapchains); - device->swapchain_count = 0; - goto err_out; - } - - return WINED3D_OK; - -err_out: - wined3d_swapchain_decref(swapchain); - return hr; -} - static void device_free_sampler(struct wine_rb_entry *entry, void *context) { struct wined3d_sampler *sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 75b9fe1..1422c65 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -121,7 +121,6 @@ @ cdecl wined3d_device_get_wined3d(ptr) @ cdecl wined3d_device_incref(ptr) @ cdecl wined3d_device_init_3d(ptr ptr) -@ cdecl wined3d_device_init_gdi(ptr ptr) @ cdecl wined3d_device_multiply_transform(ptr long ptr) @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 51fb7e6..e943e0d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2364,7 +2364,6 @@ struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wine struct wined3d * __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); -HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); void __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device,

1 0

Nikolay Sivov : dbgeng: Update stub to IDebugSymbols3.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: cb32c035d900b0f7641c54a9c0577a8ff1893abb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb32c035d900b0f7641c54a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 12 18:01:29 2019 +0300 dbgeng: Update stub to IDebugSymbols3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 795 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 733 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb32c035d900b0f7641c…

1 0

Alexandre Julliard : configure: Set wine_makedep variable outside of the cache check.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: c19da578f59b8dda5274f6bf3e982cf4a7c2b181 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19da578f59b8dda5274f6bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 16:22:15 2019 +0200 configure: Set wine_makedep variable outside of the cache check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 33 +++++++++++++++++---------------- configure.ac | 29 ++++++++++++++--------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/configure b/configure index 5733ea7..529c2df 100755 --- a/configure +++ b/configure @@ -5711,25 +5711,26 @@ else wine_cv_toolsdir="$with_wine64" fi fi - if test -z "$wine_cv_toolsdir"; then - wine_makedep=tools/makedep - wine_cv_toolsdir="\$(top_builddir)" - elif test -d "$wine_cv_toolsdir/tools/winebuild"; then - wine_makedep=$wine_cv_toolsdir/tools/makedep - case "$wine_cv_toolsdir" in - /*) ;; - *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; - esac - enable_tools=${enable_tools:-no} - test -f "$wine_makedep" || as_fn_error $? "the Wine tools have not yet been built in $wine_cv_toolsdir" "$LINENO" 5 - else - as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 - fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_toolsdir" >&5 $as_echo "$wine_cv_toolsdir" >&6; } -TOOLSDIR=$wine_cv_toolsdir - +if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep + TOOLSDIR="\$(top_builddir)" + +elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep + case "$wine_cv_toolsdir" in + /*) TOOLSDIR=$wine_cv_toolsdir + ;; + *) TOOLSDIR="\$(top_builddir)/$wine_cv_toolsdir" + ;; + esac + enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || as_fn_error $? "the Wine tools have not yet been built in $wine_cv_toolsdir" "$LINENO" 5 +else + as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 +fi if test -n "$host_alias" -a "$host_alias" != "$build_alias" then TARGETFLAGS="-b $host_alias $TARGETFLAGS" diff --git a/configure.ac b/configure.ac index 4dbb7f4..02e7e9e 100644 --- a/configure.ac +++ b/configure.ac @@ -243,22 +243,21 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, elif test -n "$with_wine64"; then wine_cv_toolsdir="$with_wine64" fi - fi - if test -z "$wine_cv_toolsdir"; then - wine_makedep=tools/makedep - wine_cv_toolsdir="\$(top_builddir)" - elif test -d "$wine_cv_toolsdir/tools/winebuild"; then - wine_makedep=$wine_cv_toolsdir/tools/makedep - case "$wine_cv_toolsdir" in - /*) ;; - *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; - esac - enable_tools=${enable_tools:-no} - test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir]) - else - AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) fi]) -AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) +if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep + AC_SUBST(TOOLSDIR,"\$(top_builddir)") +elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep + case "$wine_cv_toolsdir" in + /*) AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) ;; + *) AC_SUBST(TOOLSDIR,"\$(top_builddir)/$wine_cv_toolsdir") ;; + esac + enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir]) +else + AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) +fi if test -n "$host_alias" -a "$host_alias" != "$build_alias" then AC_SUBST(TARGETFLAGS,"-b $host_alias $TARGETFLAGS")

1 0

Zebediah Figura : qcap/tests: Add some tests for smart tee filter interfaces.
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: c6f95af31dc59eac1f1f5bcbe0b23d78ba825fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f95af31dc59eac1f1f5bcb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:52 2019 -0500 qcap/tests: Add some tests for smart tee filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 0c79ea7..5bcb82d 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -24,6 +24,57 @@ static HANDLE event; +static IBaseFilter *create_smart_tee(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_SmartTee, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_smart_tee(); + ULONG ref; + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got unexpected refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -2016,6 +2067,8 @@ START_TEST(smartteefilter) event = CreateEventW(NULL, FALSE, FALSE, NULL); + test_interfaces(); + test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Henri Verbeet : wined3d: Get rid of wined3d_device_uninit_gdi().
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: master Commit: 15d52fec683bf79c37b37b82498d127c09cf1ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=15d52fec683bf79c37b37b82… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:45 2019 +0430 wined3d: Get rid of wined3d_device_uninit_gdi(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 27 ++++++--------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f4aabf4..cb7c12a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -400,7 +400,7 @@ static void ddraw_destroy_swapchain(struct ddraw *ddraw) } else { - wined3d_device_uninit_gdi(ddraw->wined3d_device); + wined3d_device_uninit_3d(ddraw->wined3d_device); } ddraw_set_swapchain_window(ddraw, NULL); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1424ed4..a0c44b5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1174,11 +1174,12 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { + BOOL no3d = device->wined3d->flags & WINED3D_NO3D; unsigned int i; TRACE("device %p.\n", device); - if (!device->d3d_initialized) + if (!device->d3d_initialized && !no3d) return WINED3DERR_INVALIDCALL; wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); @@ -1192,7 +1193,10 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); - wined3d_device_delete_opengl_contexts(device); + if (no3d) + device->blitter->ops->blitter_destroy(device->blitter, NULL); + else + wined3d_device_delete_opengl_contexts(device); if (device->fb.depth_stencil) { @@ -1239,25 +1243,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) return WINED3D_OK; } -HRESULT CDECL wined3d_device_uninit_gdi(struct wined3d_device *device) -{ - unsigned int i; - - device->blitter->ops->blitter_destroy(device->blitter, NULL); - - for (i = 0; i < device->swapchain_count; ++i) - { - TRACE("Releasing the implicit swapchain %u.\n", i); - if (wined3d_swapchain_decref(device->swapchains[i])) - FIXME("Something's still holding the implicit swapchain.\n"); - } - - heap_free(device->swapchains); - device->swapchains = NULL; - device->swapchain_count = 0; - return WINED3D_OK; -} - /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw * from SetCooperativeLevel if DDSCL_MULTITHREADED is specified, and by d3d8/9 from * CreateDevice if D3DCREATE_MULTITHREADED is passed. diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1422c65..704e19d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -189,7 +189,6 @@ @ cdecl wined3d_device_setup_fullscreen_window(ptr ptr long long) @ cdecl wined3d_device_show_cursor(ptr long) @ cdecl wined3d_device_uninit_3d(ptr) -@ cdecl wined3d_device_uninit_gdi(ptr) @ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long long) @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e943e0d..8a29ef6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2481,7 +2481,6 @@ void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT i void __cdecl wined3d_device_setup_fullscreen_window(struct wined3d_device *device, HWND window, UINT w, UINT h); BOOL __cdecl wined3d_device_show_cursor(struct wined3d_device *device, BOOL show); HRESULT __cdecl wined3d_device_uninit_3d(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_uninit_gdi(struct wined3d_device *device); void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags);

1 0

Tag wine-4.6 : Alexandre Julliard : Release 4.6
by Alexandre Julliard April 12, 2019

April 12, 2019

Module: wine Branch: refs/tags/wine-4.6 Tag: f646bc60caba909f6916809c24e6637f0a1ee61a URL: https://source.winehq.org/git/wine.git/?a=tag;h=f646bc60caba909f6916809c24e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:10:12 2019 +0200 Release 4.6

1 0