- wine-devel - winehq.org

[PATCH 2/4] mshtml: Support argument type conversion for functions with IDispatch arguments.
by Jacek Caban 15 Apr '19

15 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/4] mshtml: Support type conversion in functions with arguments using default values.
by Jacek Caban 15 Apr '19

15 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-)

1 0

Can't cross-compile WineD3D anymore
by dosse91 15 Apr '19

15 Apr '19

Since version 4.6, when the requirement for libwine.dll was removed, I am unable to build Wine. When I try to build dlls/wined3d, it fails saying "No rule to make target '../../libs/port/libwine_port.a', needed by 'wined3d.dll'". The same thing happens when I try to build ddraw, d3d8, etc. What am I doing wrong? Thank you

2 1

[PATCH] riched20: Handle tomEnd in ITextRange::ScrollIntoView.
by Gijs Vermeulen 15 Apr '19

15 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46899 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/riched20/richole.c | 4 ++++ dlls/riched20/tests/richole.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 93003eb281..4b47310a8e 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2485,6 +2485,10 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) ME_CursorFromCharOfs(editor, This->start, &cursor); ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); break; + case tomEnd: + ME_CursorFromCharOfs(editor, This->end, &cursor); + ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + break; default: FIXME("bStart value %d not handled\n", value); return E_NOTIMPL; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d9c7fa1670..40feb76f2b 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -853,15 +853,19 @@ static void test_ITextRange_ScrollIntoView(void) /* Scroll to the top. */ check_range(w, txtDoc, 0, 1, tomStart, 0); + check_range(w, txtDoc, 0, 1, tomEnd, 0); /* Scroll to the bottom. */ check_range(w, txtDoc, 19, 20, tomStart, 1); + check_range(w, txtDoc, 19, 20, tomEnd, 1); /* Back up to the top. */ check_range(w, txtDoc, 0, 1, tomStart, 0); + check_range(w, txtDoc, 0, 1, tomEnd, 0); /* Large range */ check_range(w, txtDoc, 0, 20, tomStart, 0); + check_range(w, txtDoc, 0, 20, tomEnd, 1); hres = ITextDocument_Range(txtDoc, 0, 0, &txtRge); ok(hres == S_OK, "got 0x%08x\n", hres); -- 2.21.0

2 1

[PATCH] mf/tests: Fix test crash on Vista.
by Nikolay Sivov 15 Apr '19

15 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4dfefdd459..80dc990254 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -298,24 +298,16 @@ static void test_topology(void) ok(size == 1, "Unexpected item count.\n"); IMFCollection_Release(collection); + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + hr = IMFTopology_GetOutputNodeCollection(topology, &collection); ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get output node collection, hr %#x.\n", hr); if (SUCCEEDED(hr)) { - ok(!!collection, "Unexpected object pointer.\n"); - hr = IMFCollection_GetElementCount(collection, &size); - ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); - ok(!size, "Unexpected item count.\n"); - IMFCollection_Release(collection); - - hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node); - ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); - hr = IMFTopology_AddNode(topology, node); - ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); - IMFTopologyNode_Release(node); - - hr = IMFTopology_GetOutputNodeCollection(topology, &collection); - ok(hr == S_OK, "Failed to get output node collection, hr %#x.\n", hr); ok(!!collection, "Unexpected object pointer.\n"); hr = IMFCollection_GetElementCount(collection, &size); ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); -- 2.20.1

1 0

[PATCH 4/5] wined3d: Explicitly create the implicit swapchain.
by Henri Verbeet 15 Apr '19

15 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- 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 --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 877775fdd3a..588395b4b6a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -6106,33 +6106,6 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic return S_OK; } -static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent *device_parent, - struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain) -{ - struct d3d_device *device = device_from_wined3d_device_parent(device_parent); - IWineDXGIDevice *wine_device; - HRESULT hr; - - TRACE("device_parent %p, desc %p, swapchain %p.\n", device_parent, desc, swapchain); - - if (FAILED(hr = d3d11_device_QueryInterface(&device->ID3D11Device2_iface, - &IID_IWineDXGIDevice, (void **)&wine_device))) - { - ERR("Device should implement IWineDXGIDevice.\n"); - return E_FAIL; - } - - hr = IWineDXGIDevice_create_swapchain(wine_device, desc, TRUE, swapchain); - IWineDXGIDevice_Release(wine_device); - if (FAILED(hr)) - { - ERR("Failed to create DXGI swapchain, returning %#x\n", hr); - return hr; - } - - return S_OK; -} - static const struct wined3d_device_parent_ops d3d_wined3d_device_parent_ops = { device_parent_wined3d_device_created, @@ -6140,7 +6113,6 @@ static const struct wined3d_device_parent_ops d3d_wined3d_device_parent_ops = device_parent_activate, device_parent_texture_sub_resource_created, device_parent_create_swapchain_texture, - device_parent_create_swapchain, }; static int d3d_sampler_state_compare(const void *key, const struct wine_rb_entry *entry) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 0f861658cf4..1669ff74315 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -131,7 +131,7 @@ struct d3d8_device /* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE, * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ - struct d3d8_swapchain *implicit_swapchain; + struct wined3d_swapchain *implicit_swapchain; }; HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3dce0f60462..974764cdf51 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -594,7 +594,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) if (device->index_buffer) wined3d_buffer_decref(device->index_buffer); - wined3d_device_uninit_3d(device->wined3d_device); + wined3d_swapchain_decref(device->implicit_swapchain); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); heap_free(device->handle_table.entries); @@ -877,6 +877,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_swapchain_desc swapchain_desc; + struct d3d8_swapchain *implicit_swapchain; HRESULT hr; TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); @@ -888,6 +889,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, } if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters)) return D3DERR_INVALIDCALL; + swapchain_desc.flags |= WINED3D_SWAPCHAIN_IMPLICIT; wined3d_mutex_lock(); @@ -909,7 +911,8 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, { device->recording = FALSE; present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; - device->implicit_swapchain->swap_interval + implicit_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchain); + implicit_swapchain->swap_interval = wined3dswapinterval_from_d3d(present_parameters->FullScreen_PresentationInterval); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, @@ -929,6 +932,7 @@ static HRESULT WINAPI d3d8_device_Present(IDirect3DDevice8 *iface, const RECT *s const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + struct d3d8_swapchain *implicit_swapchain; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region); @@ -938,7 +942,8 @@ static HRESULT WINAPI d3d8_device_Present(IDirect3DDevice8 *iface, const RECT *s * shows a framerate on Windows in applications that only call the device * method, like e.g. the dx8 sdk samples. The conclusion is that native * calls the swapchain's public method from the device. */ - return IDirect3DSwapChain8_Present(&device->implicit_swapchain->IDirect3DSwapChain8_iface, + implicit_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchain); + return IDirect3DSwapChain8_Present(&implicit_swapchain->IDirect3DSwapChain8_iface, src_rect, dst_rect, dst_window_override, dirty_region); } @@ -946,7 +951,6 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface8 **backbuffer) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - struct wined3d_swapchain *wined3d_swapchain; struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; @@ -958,8 +962,7 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, /* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); - wined3d_swapchain = device->implicit_swapchain->wined3d_swapchain; - if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(wined3d_swapchain, backbuffer_idx))) + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(device->implicit_swapchain, backbuffer_idx))) { wined3d_mutex_unlock(); *backbuffer = NULL; @@ -1387,7 +1390,7 @@ static HRESULT WINAPI d3d8_device_GetFrontBuffer(IDirect3DDevice8 *iface, IDirec } wined3d_mutex_lock(); - hr = wined3d_swapchain_get_front_buffer_data(device->implicit_swapchain->wined3d_swapchain, + hr = wined3d_swapchain_get_front_buffer_data(device->implicit_swapchain, dst_impl->wined3d_texture, dst_impl->sub_resource_idx); wined3d_mutex_unlock(); @@ -3532,29 +3535,6 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic return hr; } -static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent *device_parent, - struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain) -{ - struct d3d8_device *device = device_from_device_parent(device_parent); - struct d3d8_swapchain *d3d_swapchain; - HRESULT hr; - - TRACE("device_parent %p, desc %p, swapchain %p.\n", device_parent, desc, swapchain); - - if (FAILED(hr = d3d8_swapchain_create(device, desc, WINED3D_SWAP_INTERVAL_DEFAULT, &d3d_swapchain))) - { - WARN("Failed to create swapchain, hr %#x.\n", hr); - *swapchain = NULL; - return hr; - } - - *swapchain = d3d_swapchain->wined3d_swapchain; - wined3d_swapchain_incref(*swapchain); - IDirect3DSwapChain8_Release(&d3d_swapchain->IDirect3DSwapChain8_iface); - - return hr; -} - static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops = { device_parent_wined3d_device_created, @@ -3562,7 +3542,6 @@ static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops = device_parent_activate, device_parent_texture_sub_resource_created, device_parent_create_swapchain_texture, - device_parent_create_swapchain, }; static void setup_fpu(void) @@ -3587,6 +3566,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine { struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain *wined3d_swapchain; + struct d3d8_swapchain *d3d_swapchain; HRESULT hr; static const enum wined3d_feature_level feature_levels[] = @@ -3654,10 +3634,12 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine heap_free(device->handle_table.entries); return D3DERR_INVALIDCALL; } + swapchain_desc.flags |= WINED3D_SWAPCHAIN_IMPLICIT; - if (FAILED(hr = wined3d_device_init_3d(device->wined3d_device, &swapchain_desc))) + if (FAILED(hr = d3d8_swapchain_create(device, &swapchain_desc, + wined3dswapinterval_from_d3d(parameters->FullScreen_PresentationInterval), &d3d_swapchain))) { - WARN("Failed to initialize 3D, hr %#x.\n", hr); + WARN("Failed to create implicit swapchain, hr %#x.\n", hr); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); @@ -3665,6 +3647,10 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } + wined3d_swapchain = d3d_swapchain->wined3d_swapchain; + wined3d_swapchain_incref(wined3d_swapchain); + IDirect3DSwapChain8_Release(&d3d_swapchain->IDirect3DSwapChain8_iface); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); @@ -3681,10 +3667,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine goto err; } - wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0); - device->implicit_swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); - device->implicit_swapchain->swap_interval - = wined3dswapinterval_from_d3d(parameters->FullScreen_PresentationInterval); + device->implicit_swapchain = wined3d_swapchain; device->d3d_parent = &parent->IDirect3D8_iface; IDirect3D8_AddRef(device->d3d_parent); @@ -3693,7 +3676,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine err: wined3d_mutex_lock(); - wined3d_device_uninit_3d(device->wined3d_device); + wined3d_swapchain_decref(wined3d_swapchain); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index b07d72a0662..8ee521b14b0 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -116,7 +116,7 @@ struct d3d9_device unsigned int max_user_clip_planes; UINT implicit_swapchain_count; - struct d3d9_swapchain **implicit_swapchains; + struct wined3d_swapchain **implicit_swapchains; }; HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wined3d *wined3d, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f7f9358913d..999969119e3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -599,9 +599,12 @@ static ULONG WINAPI DECLSPEC_HOTPATCH d3d9_device_Release(IDirect3DDevice9Ex *if if (device->index_buffer) wined3d_buffer_decref(device->index_buffer); + for (i = 0; i < device->implicit_swapchain_count; ++i) + { + wined3d_swapchain_decref(device->implicit_swapchains[i]); + } heap_free(device->implicit_swapchains); - wined3d_device_uninit_3d(device->wined3d_device); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); @@ -838,6 +841,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_GetSwapChain(IDirect3DDevice UINT swapchain_idx, IDirect3DSwapChain9 **swapchain) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct d3d9_swapchain *d3d9_swapchain; HRESULT hr; TRACE("iface %p, swapchain_idx %u, swapchain %p.\n", iface, swapchain_idx, swapchain); @@ -845,7 +849,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_GetSwapChain(IDirect3DDevice wined3d_mutex_lock(); if (swapchain_idx < device->implicit_swapchain_count) { - *swapchain = (IDirect3DSwapChain9 *)&device->implicit_swapchains[swapchain_idx]->IDirect3DSwapChain9Ex_iface; + d3d9_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchains[swapchain_idx]); + *swapchain = (IDirect3DSwapChain9 *)&d3d9_swapchain->IDirect3DSwapChain9Ex_iface; IDirect3DSwapChain9Ex_AddRef(*swapchain); hr = D3D_OK; } @@ -924,15 +929,13 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) static HRESULT d3d9_device_get_swapchains(struct d3d9_device *device) { UINT i, new_swapchain_count = wined3d_device_get_swapchain_count(device->wined3d_device); - struct wined3d_swapchain *wined3d_swapchain; if (!(device->implicit_swapchains = heap_alloc(new_swapchain_count * sizeof(*device->implicit_swapchains)))) return E_OUTOFMEMORY; for (i = 0; i < new_swapchain_count; ++i) { - wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, i); - device->implicit_swapchains[i] = wined3d_swapchain_get_parent(wined3d_swapchain); + device->implicit_swapchains[i] = wined3d_device_get_swapchain(device->wined3d_device, i); } device->implicit_swapchain_count = new_swapchain_count; @@ -946,6 +949,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, struct wined3d_swapchain_desc swapchain_desc; struct wined3d_display_mode wined3d_mode; struct wined3d_rendertarget_view *rtv; + struct d3d9_swapchain *d3d9_swapchain; unsigned int i; HRESULT hr; @@ -966,6 +970,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters, extended)) return D3DERR_INVALIDCALL; + swapchain_desc.flags |= WINED3D_SWAPCHAIN_IMPLICIT; wined3d_mutex_lock(); @@ -1002,9 +1007,10 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, } else { - device->implicit_swapchains[0]->swap_interval + d3d9_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchains[0]); + d3d9_swapchain->swap_interval = wined3dswapinterval_from_d3d(present_parameters->PresentationInterval); - wined3d_swapchain_get_desc(device->implicit_swapchains[0]->wined3d_swapchain, &swapchain_desc); + wined3d_swapchain_get_desc(d3d9_swapchain->wined3d_swapchain, &swapchain_desc); present_parameters->BackBufferWidth = swapchain_desc.backbuffer_width; present_parameters->BackBufferHeight = swapchain_desc.backbuffer_height; present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc.backbuffer_format); @@ -1058,7 +1064,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex * wined3d_mutex_lock(); for (i = 0; i < device->implicit_swapchain_count; ++i) { - swapchain = device->implicit_swapchains[i]; + swapchain = wined3d_swapchain_get_parent(device->implicit_swapchains[i]); if (FAILED(hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, src_rect, dst_rect, dst_window_override, swapchain->swap_interval, 0))) { @@ -1075,6 +1081,7 @@ static HRESULT WINAPI d3d9_device_GetBackBuffer(IDirect3DDevice9Ex *iface, UINT UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct d3d9_swapchain *d3d9_swapchain; HRESULT hr; TRACE("iface %p, swapchain %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", @@ -1093,7 +1100,8 @@ static HRESULT WINAPI d3d9_device_GetBackBuffer(IDirect3DDevice9Ex *iface, UINT return D3DERR_INVALIDCALL; } - hr = IDirect3DSwapChain9Ex_GetBackBuffer(&device->implicit_swapchains[swapchain]->IDirect3DSwapChain9Ex_iface, + d3d9_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchains[swapchain]); + hr = IDirect3DSwapChain9Ex_GetBackBuffer(&d3d9_swapchain->IDirect3DSwapChain9Ex_iface, backbuffer_idx, backbuffer_type, backbuffer); wined3d_mutex_unlock(); @@ -1645,7 +1653,7 @@ static HRESULT WINAPI d3d9_device_GetFrontBufferData(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); if (swapchain < device->implicit_swapchain_count) - hr = wined3d_swapchain_get_front_buffer_data(device->implicit_swapchains[swapchain]->wined3d_swapchain, + hr = wined3d_swapchain_get_front_buffer_data(device->implicit_swapchains[swapchain], dst_impl->wined3d_texture, dst_impl->sub_resource_idx); wined3d_mutex_unlock(); @@ -3953,7 +3961,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_PresentEx(IDirect3DDevice9Ex wined3d_mutex_lock(); for (i = 0; i < device->implicit_swapchain_count; ++i) { - swapchain = device->implicit_swapchains[i]; + swapchain = wined3d_swapchain_get_parent(device->implicit_swapchains[i]); if (FAILED(hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, src_rect, dst_rect, dst_window_override, swapchain->swap_interval, flags))) { @@ -4033,7 +4041,7 @@ static HRESULT WINAPI d3d9_device_CheckDeviceState(IDirect3DDevice9Ex *iface, HW TRACE("iface %p, dst_window %p.\n", iface, dst_window); wined3d_mutex_lock(); - wined3d_swapchain_get_desc(device->implicit_swapchains[0]->wined3d_swapchain, &swapchain_desc); + wined3d_swapchain_get_desc(device->implicit_swapchains[0], &swapchain_desc); wined3d_mutex_unlock(); if (swapchain_desc.windowed) @@ -4397,29 +4405,6 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic return hr; } -static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent *device_parent, - struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain) -{ - struct d3d9_device *device = device_from_device_parent(device_parent); - struct d3d9_swapchain *d3d_swapchain; - HRESULT hr; - - TRACE("device_parent %p, desc %p, swapchain %p\n", device_parent, desc, swapchain); - - if (FAILED(hr = d3d9_swapchain_create(device, desc, WINED3D_SWAP_INTERVAL_DEFAULT, &d3d_swapchain))) - { - WARN("Failed to create swapchain, hr %#x.\n", hr); - *swapchain = NULL; - return hr; - } - - *swapchain = d3d_swapchain->wined3d_swapchain; - wined3d_swapchain_incref(*swapchain); - IDirect3DSwapChain9Ex_Release(&d3d_swapchain->IDirect3DSwapChain9Ex_iface); - - return hr; -} - static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops = { device_parent_wined3d_device_created, @@ -4427,7 +4412,6 @@ static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops = device_parent_activate, device_parent_texture_sub_resource_created, device_parent_create_swapchain_texture, - device_parent_create_swapchain, }; static void setup_fpu(void) @@ -4452,6 +4436,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) { struct wined3d_swapchain_desc *swapchain_desc; + struct d3d9_swapchain *d3d_swapchain; struct wined3d_caps caps; unsigned i, count = 1; HRESULT hr; @@ -4537,11 +4522,13 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } + swapchain_desc[i].flags |= WINED3D_SWAPCHAIN_IMPLICIT; } - if (FAILED(hr = wined3d_device_init_3d(device->wined3d_device, swapchain_desc))) + if (FAILED(hr = d3d9_swapchain_create(device, swapchain_desc, + wined3dswapinterval_from_d3d(parameters->PresentationInterval), &d3d_swapchain))) { - WARN("Failed to initialize 3D, hr %#x.\n", hr); + WARN("Failed to create swapchain, hr %#x.\n", hr); wined3d_device_release_focus_window(device->wined3d_device); heap_free(swapchain_desc); wined3d_device_decref(device->wined3d_device); @@ -4549,22 +4536,20 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } + wined3d_swapchain_incref(d3d_swapchain->wined3d_swapchain); + IDirect3DSwapChain9Ex_Release(&d3d_swapchain->IDirect3DSwapChain9Ex_iface); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil); if (FAILED(hr = d3d9_device_get_swapchains(device))) { - wined3d_device_uninit_3d(device->wined3d_device); + wined3d_swapchain_decref(d3d_swapchain->wined3d_swapchain); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); return E_OUTOFMEMORY; } - for (i = 0; i < device->implicit_swapchain_count; ++i) - { - device->implicit_swapchains[i]->swap_interval - = wined3dswapinterval_from_d3d(parameters[i].PresentationInterval); - } for (i = 0; i < count; ++i) { @@ -4583,7 +4568,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine ERR("Failed to allocate FVF vertex declaration map memory.\n"); wined3d_mutex_lock(); heap_free(device->implicit_swapchains); - wined3d_device_uninit_3d(device->wined3d_device); + wined3d_swapchain_decref(d3d_swapchain->wined3d_swapchain); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b2097726076..b005f10826d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -366,12 +366,10 @@ static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) static void ddraw_destroy_swapchain(struct ddraw *ddraw) { unsigned int i; - HRESULT hr; TRACE("Destroying the swapchain.\n"); wined3d_swapchain_decref(ddraw->wined3d_swapchain); - ddraw->wined3d_swapchain = NULL; for (i = 0; i < ddraw->numConvertedDecls; ++i) { @@ -380,8 +378,8 @@ static void ddraw_destroy_swapchain(struct ddraw *ddraw) heap_free(ddraw->decls); ddraw->numConvertedDecls = 0; - if (FAILED(hr = wined3d_device_uninit_3d(ddraw->wined3d_device))) - ERR("Failed to uninit 3D, hr %#x.\n", hr); + wined3d_swapchain_decref(ddraw->wined3d_swapchain); + ddraw->wined3d_swapchain = NULL; /* Free the d3d window if one was created. */ if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) @@ -551,16 +549,35 @@ static HRESULT ddraw_set_focus_window(struct ddraw *ddraw, HWND window) return DD_OK; } -static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, - struct wined3d_swapchain_desc *swapchain_desc) +static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, + BOOL windowed, struct wined3d_swapchain **wined3d_swapchain) { - HWND window = swapchain_desc->device_window; + struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_display_mode mode; HRESULT hr; TRACE("ddraw %p.\n", ddraw); + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + { + ERR("Failed to get display mode.\n"); + return hr; + } + + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); + swapchain_desc.backbuffer_width = mode.width; + swapchain_desc.backbuffer_height = mode.height; + swapchain_desc.backbuffer_format = mode.format_id; + swapchain_desc.backbuffer_bind_flags = 0; + swapchain_desc.backbuffer_count = 1; + swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + swapchain_desc.device_window = window; + swapchain_desc.windowed = windowed; + swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH | WINED3D_SWAPCHAIN_IMPLICIT; + if (ddraw->flags & DDRAW_NO3D) - return wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc); + return wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, + NULL, &ddraw_null_wined3d_parent_ops, wined3d_swapchain); if (!window || window == GetDesktopWindow()) { @@ -576,7 +593,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, ShowWindow(window, SW_HIDE); /* Just to be sure */ WARN("No window for the Direct3DDevice, created hidden window %p.\n", window); - swapchain_desc->device_window = window; + swapchain_desc.device_window = window; } else { @@ -587,9 +604,12 @@ 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; - if (FAILED(hr = wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc))) + if (FAILED(hr = wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, + NULL, &ddraw_null_wined3d_parent_ops, wined3d_swapchain))) { ddraw->flags &= ~DDRAW_D3D_INITIALIZED; + DestroyWindow(window); + ddraw->d3d_window = NULL; return hr; } @@ -598,7 +618,9 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, { ERR("Error allocating an array for the converted vertex decls.\n"); ddraw->declArraySize = 0; - hr = wined3d_device_uninit_3d(ddraw->wined3d_device); + wined3d_swapchain_decref(*wined3d_swapchain); + DestroyWindow(window); + ddraw->d3d_window = NULL; return E_OUTOFMEMORY; } @@ -609,40 +631,21 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL windowed) { - struct wined3d_swapchain_desc swapchain_desc; - struct wined3d_display_mode mode; - HRESULT hr = WINED3D_OK; + HRESULT hr; - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + if (ddraw->wined3d_swapchain) { - ERR("Failed to get display mode.\n"); - return hr; + ERR("Swapchain already created.\n"); + return E_FAIL; } - memset(&swapchain_desc, 0, sizeof(swapchain_desc)); - swapchain_desc.backbuffer_width = mode.width; - swapchain_desc.backbuffer_height = mode.height; - swapchain_desc.backbuffer_format = mode.format_id; - swapchain_desc.backbuffer_bind_flags = 0; - swapchain_desc.backbuffer_count = 1; - swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; - swapchain_desc.device_window = window; - swapchain_desc.windowed = windowed; - swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; - - if (FAILED(hr = ddraw_attach_d3d_device(ddraw, &swapchain_desc))) + if (FAILED(hr = ddraw_attach_d3d_device(ddraw, window, windowed, &ddraw->wined3d_swapchain))) { ERR("Failed to create swapchain, hr %#x.\n", hr); return hr; } - - if (!(ddraw->wined3d_swapchain = wined3d_device_get_swapchain(ddraw->wined3d_device, 0))) - { - ERR("Failed to get swapchain.\n"); - return DDERR_INVALIDPARAMS; - } - wined3d_swapchain_incref(ddraw->wined3d_swapchain); + ddraw_set_swapchain_window(ddraw, window); if (ddraw->primary && ddraw->primary->palette) @@ -4967,27 +4970,6 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic return hr; } -static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent *device_parent, - struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain) -{ - struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - HRESULT hr; - - TRACE("device_parent %p, desc %p, swapchain %p.\n", device_parent, desc, swapchain); - - if (ddraw->wined3d_swapchain) - { - ERR("Swapchain already created.\n"); - return E_FAIL; - } - - if (FAILED(hr = wined3d_swapchain_create(ddraw->wined3d_device, desc, NULL, - &ddraw_null_wined3d_parent_ops, swapchain))) - WARN("Failed to create swapchain, hr %#x.\n", hr); - - return hr; -} - static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = { device_parent_wined3d_device_created, @@ -4995,7 +4977,6 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = device_parent_activate, device_parent_texture_sub_resource_created, device_parent_create_swapchain_texture, - device_parent_create_swapchain, }; HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type device_type) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index c7d663f953b..d6dd0418c47 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -90,7 +90,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) if (device->child_layer) IUnknown_Release(device->child_layer); wined3d_mutex_lock(); - wined3d_device_uninit_3d(device->wined3d_device); + wined3d_swapchain_decref(device->implicit_swapchain); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); IWineDXGIAdapter_Release(device->adapter); @@ -352,35 +352,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *iface, - struct wined3d_swapchain_desc *desc, BOOL implicit, struct wined3d_swapchain **wined3d_swapchain) -{ - struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); - struct d3d11_swapchain *object; - HRESULT hr; - - TRACE("iface %p, desc %p, wined3d_swapchain %p.\n", - iface, desc, wined3d_swapchain); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - { - ERR("Failed to allocate DXGI swapchain object memory\n"); - return E_OUTOFMEMORY; - } - - if (FAILED(hr = d3d11_swapchain_init(object, device, desc, implicit))) - { - WARN("Failed to initialize swapchain, hr %#x.\n", hr); - heap_free(object); - return hr; - } - - TRACE("Created IDXGISwapChain %p.\n", object); - *wined3d_swapchain = object->wined3d_swapchain; - - return S_OK; -} - static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = { /* IUnknown methods */ @@ -407,7 +378,6 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_EnqueueSetEvent, /* IWineDXGIDevice methods */ dxgi_device_create_surface, - dxgi_device_create_swapchain, }; static inline struct dxgi_device *impl_from_IWineDXGISwapChainFactory(IWineDXGISwapChainFactory *iface) @@ -448,8 +418,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) { struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); - struct wined3d_swapchain *wined3d_swapchain; struct wined3d_swapchain_desc wined3d_desc; + struct d3d11_swapchain *object; HRESULT hr; TRACE("iface %p, factory %p, window %p, desc %p, fullscreen_desc %p, output %p, swapchain %p.\n", @@ -498,16 +468,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; wined3d_desc.auto_restore_display_mode = TRUE; - if (FAILED(hr = dxgi_device_create_swapchain(&device->IWineDXGIDevice_iface, - &wined3d_desc, FALSE, &wined3d_swapchain))) + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + ERR("Failed to allocate swapchain memory.\n"); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = d3d11_swapchain_init(object, device, &wined3d_desc, FALSE))) { - WARN("Failed to create swapchain, hr %#x.\n", hr); + WARN("Failed to initialise swapchain, hr %#x.\n", hr); + heap_free(object); return hr; } - wined3d_mutex_lock(); - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); - wined3d_mutex_unlock(); + TRACE("Created swapchain %p.\n", object); + + *swapchain = &object->IDXGISwapChain1_iface; return S_OK; } @@ -527,6 +503,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l struct wined3d_device_parent *wined3d_device_parent; struct wined3d_swapchain_desc swapchain_desc; IWineDXGIDeviceParent *dxgi_device_parent; + struct d3d11_swapchain *swapchain; struct dxgi_adapter *dxgi_adapter; struct dxgi_factory *dxgi_factory; void *layer_base; @@ -589,15 +566,32 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = dxgi_factory_get_device_window(dxgi_factory); swapchain_desc.windowed = TRUE; - if (FAILED(hr = wined3d_device_init_3d(device->wined3d_device, &swapchain_desc))) + swapchain_desc.flags = WINED3D_SWAPCHAIN_IMPLICIT; + + if (!(swapchain = heap_alloc_zero(sizeof(*swapchain)))) { - ERR("Failed to initialize 3D, hr %#x.\n", hr); + ERR("Failed to allocate swapchain memory.\n"); + wined3d_device_decref(device->wined3d_device); + IUnknown_Release(device->child_layer); + wined3d_private_store_cleanup(&device->private_store); + wined3d_mutex_unlock(); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc, TRUE))) + { + WARN("Failed to initialize swapchain, hr %#x.\n", hr); + heap_free(swapchain); wined3d_device_decref(device->wined3d_device); IUnknown_Release(device->child_layer); wined3d_private_store_cleanup(&device->private_store); wined3d_mutex_unlock(); return hr; } + device->implicit_swapchain = swapchain->wined3d_swapchain; + + TRACE("Created swapchain %p.\n", swapchain); + wined3d_mutex_unlock(); device->adapter = &dxgi_adapter->IWineDXGIAdapter_iface; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 1461e3c3af7..5c5775ca377 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -130,6 +130,7 @@ struct dxgi_device LONG refcount; struct wined3d_private_store private_store; struct wined3d_device *wined3d_device; + struct wined3d_swapchain *implicit_swapchain; IWineDXGIAdapter *adapter; }; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a0c44b5d41c..361ac6b1e36 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -486,6 +486,9 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) { UINT i; + if (device->swapchain_count) + wined3d_device_uninit_3d(device); + wined3d_stateblock_state_cleanup(&device->stateblock_state); wined3d_cs_destroy(device->cs); @@ -1067,30 +1070,19 @@ static HRESULT wined3d_device_create_primary_opengl_context(struct wined3d_devic return WINED3D_OK; } -HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, - struct wined3d_swapchain_desc *swapchain_desc) +HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; - struct wined3d_swapchain *swapchain = NULL; + const struct wined3d_swapchain_desc *swapchain_desc; DWORD clear_flags = 0; HRESULT hr; - TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); + TRACE("device %p, swapchain %p.\n", device, swapchain); if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; - memset(device->fb.render_targets, 0, sizeof(device->fb.render_targets)); - - /* Setup the implicit swapchain. This also initializes a context. */ - TRACE("Creating implicit swapchain.\n"); - if (FAILED(hr = device->device_parent->ops->create_swapchain(device->device_parent, - swapchain_desc, &swapchain))) - { - WARN("Failed to create implicit swapchain.\n"); - goto err_out; - } - + swapchain_desc = &swapchain->desc; if (swapchain_desc->backbuffer_count && swapchain_desc->backbuffer_bind_flags & WINED3D_BIND_RENDER_TARGET) { struct wined3d_resource *back_buffer = &swapchain->back_buffers[0]->resource; @@ -1106,18 +1098,20 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, NULL, &wined3d_null_parent_ops, &device->back_buffer_view))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); - goto err_out; + return hr; } } device->swapchain_count = 1; if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) { - ERR("Out of memory!\n"); + ERR("Failed to allocate swapchain array.\n"); + hr = E_OUTOFMEMORY; goto err_out; } device->swapchains[0] = swapchain; + memset(device->fb.render_targets, 0, sizeof(device->fb.render_targets)); if (device->wined3d->flags & WINED3D_NO3D) { if (!(device->blitter = wined3d_cpu_blitter_create())) @@ -1125,6 +1119,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, ERR("Failed to create CPU blitter.\n"); heap_free(device->swapchains); device->swapchain_count = 0; + hr = E_FAIL; goto err_out; } } @@ -1156,11 +1151,13 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, err_out: heap_free(device->swapchains); + device->swapchains = NULL; device->swapchain_count = 0; if (device->back_buffer_view) + { wined3d_rendertarget_view_decref(device->back_buffer_view); - if (swapchain) - wined3d_swapchain_decref(swapchain); + device->back_buffer_view = NULL; + } return hr; } @@ -1172,24 +1169,42 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) wined3d_sampler_decref(sampler); } -HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) +void wined3d_device_uninit_3d(struct wined3d_device *device) { BOOL no3d = device->wined3d->flags & WINED3D_NO3D; + struct wined3d_rendertarget_view *view; + struct wined3d_texture *texture; unsigned int i; TRACE("device %p.\n", device); if (!device->d3d_initialized && !no3d) - return WINED3DERR_INVALIDCALL; + { + ERR("Called while 3D support was not initialised.\n"); + return; + } wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - if (device->logo_texture) - wined3d_texture_decref(device->logo_texture); - if (device->cursor_texture) - wined3d_texture_decref(device->cursor_texture); + device->swapchain_count = 0; + + if ((texture = device->logo_texture)) + { + device->logo_texture = NULL; + wined3d_texture_decref(texture); + } + + if ((texture = device->cursor_texture)) + { + device->cursor_texture = NULL; + wined3d_texture_decref(texture); + } state_unbind_resources(&device->state); + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) + { + wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); + } wine_rb_clear(&device->samplers, device_free_sampler, NULL); @@ -1198,49 +1213,31 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) else wined3d_device_delete_opengl_contexts(device); - if (device->fb.depth_stencil) + if ((view = device->fb.depth_stencil)) { - struct wined3d_rendertarget_view *view = device->fb.depth_stencil; - TRACE("Releasing depth/stencil view %p.\n", view); device->fb.depth_stencil = NULL; wined3d_rendertarget_view_decref(view); } - if (device->auto_depth_stencil_view) + if ((view = device->auto_depth_stencil_view)) { - struct wined3d_rendertarget_view *view = device->auto_depth_stencil_view; - device->auto_depth_stencil_view = NULL; if (wined3d_rendertarget_view_decref(view)) ERR("Something's still holding the auto depth/stencil view (%p).\n", view); } - for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) - { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); - } - if (device->back_buffer_view) + if ((view = device->back_buffer_view)) { - wined3d_rendertarget_view_decref(device->back_buffer_view); device->back_buffer_view = 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"); + wined3d_rendertarget_view_decref(view); } heap_free(device->swapchains); device->swapchains = NULL; - device->swapchain_count = 0; device->d3d_initialized = FALSE; - - return WINED3D_OK; } /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw @@ -4825,6 +4822,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_resource *resource, *cursor; + struct wined3d_rendertarget_view *view; struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; BOOL backbuffer_resized; @@ -4959,10 +4957,10 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } - if (device->auto_depth_stencil_view) + if ((view = device->auto_depth_stencil_view)) { - wined3d_rendertarget_view_decref(device->auto_depth_stencil_view); device->auto_depth_stencil_view = NULL; + wined3d_rendertarget_view_decref(view); } if (swapchain->desc.enable_auto_depth_stencil) { @@ -5008,10 +5006,10 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_set_depth_stencil_view(device, device->auto_depth_stencil_view); } - if (device->back_buffer_view) + if ((view = device->back_buffer_view)) { - wined3d_rendertarget_view_decref(device->back_buffer_view); device->back_buffer_view = NULL; + wined3d_rendertarget_view_decref(view); } if (swapchain->desc.backbuffer_count && swapchain->desc.backbuffer_bind_flags & WINED3D_BIND_RENDER_TARGET) { @@ -5057,9 +5055,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (wined3d_settings.logo) device_load_logo(device, wined3d_settings.logo); } - else if (device->back_buffer_view) + else if ((view = device->back_buffer_view)) { - struct wined3d_rendertarget_view *view = device->back_buffer_view; struct wined3d_state *state = &device->state; wined3d_device_set_rendertarget_view(device, 0, view, FALSE); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c5060f93fc3..c1429de91b1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -114,9 +114,14 @@ ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) if (!refcount) { + struct wined3d_device *device; + wined3d_mutex_lock(); - wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); + device = swapchain->device; + if (device->swapchain_count && device->swapchains[0] == swapchain) + wined3d_device_uninit_3d(device); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain_cleanup(swapchain); swapchain->parent_ops->wined3d_object_destroyed(swapchain->parent); @@ -1053,6 +1058,20 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win return hr; } + if (desc->flags & WINED3D_SWAPCHAIN_IMPLICIT) + { + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_device_set_implicit_swapchain(device, object))) + { + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + swapchain_cleanup(object); + wined3d_mutex_unlock(); + heap_free(swapchain); + return hr; + } + wined3d_mutex_unlock(); + } + TRACE("Created swapchain %p.\n", object); *swapchain = object; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 704e19db46b..040b9fc4ac1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -120,7 +120,6 @@ @ cdecl wined3d_device_get_vs_sampler(ptr long) @ cdecl wined3d_device_get_wined3d(ptr) @ cdecl wined3d_device_incref(ptr) -@ cdecl wined3d_device_init_3d(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) @@ -188,7 +187,6 @@ @ cdecl wined3d_device_set_vs_sampler(ptr long ptr) @ 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_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/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bfc911ef473..9f63f3d8d62 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3177,6 +3177,9 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; +HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, + struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void wined3d_device_uninit_3d(struct wined3d_device *device) DECLSPEC_HIDDEN; struct wined3d_device_gl { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8a29ef63999..958ade166c0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -902,6 +902,7 @@ enum wined3d_shader_type #define WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE 0x00002000u #define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00004000u #define WINED3D_SWAPCHAIN_GDI_COMPATIBLE 0x00008000u +#define WINED3D_SWAPCHAIN_IMPLICIT 0x00010000u #define WINED3DDP_MAXTEXCOORD 8 @@ -2145,8 +2146,6 @@ struct wined3d_device_parent_ops void **parent, const struct wined3d_parent_ops **parent_ops); HRESULT (__cdecl *create_swapchain_texture)(struct wined3d_device_parent *device_parent, void *parent, const struct wined3d_resource_desc *desc, DWORD texture_flags, struct wined3d_texture **texture); - HRESULT (__cdecl *create_swapchain)(struct wined3d_device_parent *device_parent, - struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain); }; struct wined3d_private_store @@ -2363,7 +2362,6 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_vie struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx); 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); 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, @@ -2480,7 +2478,6 @@ void __cdecl wined3d_device_set_vs_resource_view(struct wined3d_device *device, void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); 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); 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); diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 84440901a9e..610b7c0485c 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -51,11 +51,6 @@ interface IWineDXGIDevice : IDXGIDevice2 [in] IUnknown *outer, [out] void **surface ); - HRESULT create_swapchain( - [in] struct wined3d_swapchain_desc *desc, - [in] BOOL implicit, - [out] struct wined3d_swapchain **wined3d_swapchain - ); } [ -- 2.11.0

5 7

[PATCH] ntoskrnl.exe: Add Ex[p]InterlockedFlushSList.
by Gijs Vermeulen 14 Apr '19

14 Apr '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 3 ++- dlls/ntoskrnl.exe/sync.c | 10 ++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ab952e528b..141c8aa639 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -4,7 +4,7 @@ @ stub ExInitializeRundownProtection @ stub ExInterlockedAddLargeStatistic @ stub ExInterlockedCompareExchange64 -@ stub ExInterlockedFlushSList +@ stdcall -fastcall -arch=i386 ExInterlockedFlushSList(ptr) NTOSKRNL_ExInterlockedFlushSList @ stdcall -fastcall -arch=i386 ExInterlockedPopEntrySList(ptr ptr) NTOSKRNL_ExInterlockedPopEntrySList @ stdcall -fastcall -arch=i386 ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection @@ -27,6 +27,7 @@ @ stub Exfi386InterlockedDecrementLong @ stub Exfi386InterlockedExchangeUlong @ stub Exfi386InterlockedIncrementLong +@ stdcall -arch=win64 ExpInterlockedFlushSList(ptr) RtlInterlockedFlushSList @ stdcall -arch=win64 ExpInterlockedPopEntrySList(ptr) RtlInterlockedPopEntrySList @ stdcall -arch=win64 ExpInterlockedPushEntrySList(ptr ptr) RtlInterlockedPushEntrySList @ stub HalExamineMBR diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index fbe9dbe9da..6976b9ef9f 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -690,6 +690,16 @@ PSLIST_ENTRY WINAPI NTOSKRNL_ExInterlockedPushEntrySList( PSLIST_HEADER list, PS } +/*********************************************************************** + * ExInterlockedFlushSList (NTOSKRNL.EXE.@) + */ +DEFINE_FASTCALL1_WRAPPER( NTOSKRNL_ExInterlockedFlushSList ) +PSLIST_ENTRY WINAPI NTOSKRNL_ExInterlockedFlushSList( PSLIST_HEADER list ) +{ + return RtlInterlockedFlushSList( list ); +} + + /*********************************************************************** * ExAcquireFastMutexUnsafe (NTOSKRNL.EXE.@) */ diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0faf5ecd47..a66a582977 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1528,6 +1528,7 @@ ULONG WINAPI ExGetExclusiveWaiterCount(ERESOURCE*); ULONG WINAPI ExGetSharedWaiterCount(ERESOURCE*); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); +PSLIST_ENTRY WINAPI ExInterlockedFlushSList(PSLIST_HEADER); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); -- 2.21.0

1 0

[PATCH v2 vkd3d 1/4] build: Drop hack for stripping RPC includes from widl-generated headers.
by Józef Kucia 14 Apr '19

14 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> This requires widl from Wine >= 3.20: commit b7402ddbbecdfaa81daa657fbb5d37661f401434 Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 19 15:07:02 2018 +0100 widl: Guard RPC includes with #ifdef _WIN32. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Add ax_compare_version.m4. --- Makefile.am | 6 +- configure.ac | 2 +- m4/ax_compare_version.m4 | 177 +++++++++++++++++++++++++++++++++++++++ m4/widl.m4 | 14 ++++ 4 files changed, 194 insertions(+), 5 deletions(-) create mode 100644 m4/ax_compare_version.m4 create mode 100644 m4/widl.m4 diff --git a/Makefile.am b/Makefile.am index 9ad7b2e3b9a5..2b5bca0871c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,9 +170,7 @@ vkd3d_v_widl_1 = EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL - $(VKD3D_V_WIDL)$(WIDL) -h -o $@.tmp $< - $(AM_V_at)$(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@ - $(AM_V_at)$(RM) $@.tmp + $(VKD3D_V_WIDL)$(WIDL) -h -o $@ $< else @echo "widl is required to generate $@" endif @@ -235,7 +233,7 @@ $(CROSS32_IMPLIBS): %.cross32.a: %.cross32.def $(AM_V_GEN)$(CROSS32_DLLTOOL) -k -m i386 --as-flags=-32 -d $< -l $@ $(CROSS32_EXEFILES): %.cross32.exe: %.c $(CROSS32_IMPLIBS) $(widl_headers) - $(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ + $(AM_V_CCLD)depbase=`echo $@ | $(SED) 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ $(CROSS32_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS32_IMPLIBS) -ldxgi -lgdi32 && \ $(am__mv) $$depbase.Tpo $$depbase.Po else diff --git a/configure.ac b/configure.ac index 029278126b49..28f2ac908733 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_SED AC_PROG_MKDIR_P -AC_CHECK_PROG([WIDL], [widl], [widl], [no]) +VKD3D_PROG_WIDL(3, 20) AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])]) AM_INIT_AUTOMAKE([1.11 foreign silent-rules subdir-objects no-dist-gzip dist-xz -Wall -Werror]) diff --git a/m4/ax_compare_version.m4 b/m4/ax_compare_version.m4 new file mode 100644 index 000000000000..ffb4997e8b14 --- /dev/null +++ b/m4/ax_compare_version.m4 @@ -0,0 +1,177 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan <toolan(a)ele.uri.edu> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 13 + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + AC_REQUIRE([AC_PROG_AWK]) + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/$[[0-9]]*$/Z\1Z/g' \ + -e 's/Z$[[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/$[[0-9]]*$/Z\1Z/g' \ + -e 's/Z$[[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/$.\{$ax_compare_version_len_B\}$.*/\1/"` + B=`echo "$B" | sed "s/$.\{$ax_compare_version_len_A\}$.*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/$\([[0-9]]\{4\}$\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/$\([[0-9]]\{4\}$\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [invalid OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([invalid OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION diff --git a/m4/widl.m4 b/m4/widl.m4 new file mode 100644 index 000000000000..2849356f7c04 --- /dev/null +++ b/m4/widl.m4 @@ -0,0 +1,14 @@ +dnl VKD3D_PROG_WIDL(major, minor) +AC_DEFUN([VKD3D_PROG_WIDL], + +[AC_CHECK_PROG([WIDL], [widl], [widl], [no]) + +AS_IF([test "x$WIDL" != "xno"], +[AC_MSG_CHECKING([checking whether widl version >= $1.$2]) +vkd3d_widl_version=`$WIDL -V | $SED -E '/version/{s/.* version (.*)/\1/;q;}'` + +AX_COMPARE_VERSION([$vkd3d_widl_version], [ge], [$1.$2], + [AC_MSG_RESULT([yes ($vkd3d_widl_version)])], + [AC_MSG_RESULT([no ($vkd3d_widl_version)]) + WIDL=no]) +])]) -- 2.21.0

4 10

[PATCH 1/2] ntdll: Implement NtFilterToken.
by Vijay Kiran Kamuju 14 Apr '19

14 Apr '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ntdll/nt.c | 59 ++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winnt.h | 5 +++ include/winternl.h | 1 + server/process.c | 2 +- server/protocol.def | 10 ++++++ server/security.h | 4 ++- server/token.c | 84 +++++++++++++++++++++++++++++++++++++++++-- 8 files changed, 162 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index f429349698b..8df3543d469 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -178,6 +178,65 @@ NTSTATUS WINAPI NtDuplicateToken( return status; } +/****************************************************************************** + * NtFilterToken [NTDLL.@] + * ZwFilterToken [NTDLL.@] + */ +NTSTATUS WINAPI NtFilterToken( HANDLE token, ULONG flags, TOKEN_GROUPS *disable_sids, + TOKEN_PRIVILEGES *privileges, TOKEN_GROUPS *restrict_sids, + HANDLE *new_token ) +{ + data_size_t privileges_len = 0; + data_size_t sids_len = 0; + SID *sids = NULL; + NTSTATUS status; + + TRACE( "(%p, 0x%08x, %p, %p, %p, %p)\n", token, flags, disable_sids, privileges, + restrict_sids, new_token ); + + if (flags) + FIXME( "flags %x unsupported\n", flags ); + + if (restrict_sids) + FIXME( "support for restricting sids not yet implemented\n" ); + + if (privileges) + privileges_len = privileges->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); + + if (disable_sids) + { + DWORD len, i; + BYTE *tmp; + + for (i = 0; i < disable_sids->GroupCount; i++) + sids_len += RtlLengthSid( disable_sids->Groups[i].Sid ); + + sids = RtlAllocateHeap( GetProcessHeap(), 0, sids_len ); + if (!sids) return STATUS_NO_MEMORY; + + for (i = 0, tmp = (BYTE *)sids; i < disable_sids->GroupCount; i++, tmp += len) + { + len = RtlLengthSid( disable_sids->Groups[i].Sid ); + memcpy( tmp, disable_sids->Groups[i].Sid, len ); + } + } + + SERVER_START_REQ( filter_token ) + { + req->handle = wine_server_obj_handle( token ); + req->flags = flags; + req->privileges_size = privileges_len; + wine_server_add_data( req, privileges->Privileges, privileges_len ); + wine_server_add_data( req, sids, sids_len ); + status = wine_server_call( req ); + if (!status) *new_token = wine_server_ptr_handle( reply->new_handle ); + } + SERVER_END_REQ; + + RtlFreeHeap( GetProcessHeap(), 0, sids ); + return status; +} + /****************************************************************************** * NtOpenProcessToken [NTDLL.@] * ZwOpenProcessToken [NTDLL.@] diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 292b0f6a9f1..d625c3fde9f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -180,7 +180,7 @@ # @ stub NtEnumerateSystemEnvironmentValuesEx @ stdcall NtEnumerateValueKey(long long long ptr long ptr) @ stub NtExtendSection -# @ stub NtFilterToken +@ stdcall NtFilterToken(long long ptr ptr ptr ptr) @ stdcall NtFindAtom(ptr long ptr) @ stdcall NtFlushBuffersFile(long ptr) @ stdcall NtFlushInstructionCache(long ptr long) diff --git a/include/winnt.h b/include/winnt.h index bdcd90a9ddc..88da1496cfa 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4066,6 +4066,11 @@ typedef enum _TOKEN_INFORMATION_CLASS { TOKEN_ADJUST_SESSIONID | \ TOKEN_ADJUST_DEFAULT ) +#define DISABLE_MAX_PRIVILEGE 0x1 +#define SANDBOX_INERT 0x2 +#define LUA_TOKEN 0x4 +#define WRITE_RESTRICTED 0x8 + #ifndef _SECURITY_DEFINED #define _SECURITY_DEFINED diff --git a/include/winternl.h b/include/winternl.h index 2b3fb947b9b..183f6d9d031 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2368,6 +2368,7 @@ NTSYSAPI NTSTATUS WINAPI NtDuplicateToken(HANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES NTSYSAPI NTSTATUS WINAPI NtEnumerateKey(HANDLE,ULONG,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *); NTSYSAPI NTSTATUS WINAPI NtEnumerateValueKey(HANDLE,ULONG,KEY_VALUE_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtExtendSection(HANDLE,PLARGE_INTEGER); +NTSYSAPI NTSTATUS WINAPI NtFilterToken(HANDLE,ULONG,TOKEN_GROUPS*,TOKEN_PRIVILEGES*,TOKEN_GROUPS*,HANDLE*); NTSYSAPI NTSTATUS WINAPI NtFindAtom(const WCHAR*,ULONG,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI NtFlushBuffersFile(HANDLE,IO_STATUS_BLOCK*); NTSYSAPI NTSTATUS WINAPI NtFlushInstructionCache(HANDLE,LPCVOID,SIZE_T); diff --git a/server/process.c b/server/process.c index 473d3b1a27a..e062933766c 100644 --- a/server/process.c +++ b/server/process.c @@ -564,7 +564,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, : alloc_handle_table( process, 0 ); /* Note: for security reasons, starting a new process does not attempt * to use the current impersonation token for the new process */ - process->token = token_duplicate( parent->token, TRUE, 0, NULL ); + process->token = token_duplicate( parent->token, TRUE, 0, NULL, NULL, 0, NULL, 0 ); process->affinity = parent->affinity; } if (!process->handles || !process->token) goto error; diff --git a/server/protocol.def b/server/protocol.def index b6ad514463f..18bfa9bf09a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3388,6 +3388,16 @@ enum caret_state obj_handle_t new_handle; /* duplicated handle */ @END +@REQ(filter_token) + obj_handle_t handle; /* handle to the token to duplicate */ + unsigned int flags; /* flags */ + data_size_t privileges_size; /* size of privileges */ + VARARG(privileges,LUID_AND_ATTRIBUTES,privileges_size); /* privileges to remove from new token */ + VARARG(disable_sids,SID); /* array of groups to remove from new token */ +@REPLY + obj_handle_t new_handle; /* filtered handle */ +@END + @REQ(access_check) obj_handle_t handle; /* handle to the token */ unsigned int desired_access; /* desired access to the object */ diff --git a/server/security.h b/server/security.h index 873bbc6afd6..bc4a8f64daa 100644 --- a/server/security.h +++ b/server/security.h @@ -55,7 +55,9 @@ extern const PSID security_high_label_sid; extern struct token *token_create_admin(void); extern int token_assign_label( struct token *token, PSID label ); extern struct token *token_duplicate( struct token *src_token, unsigned primary, - int impersonation_level, const struct security_descriptor *sd ); + int impersonation_level, const struct security_descriptor *sd, + const LUID_AND_ATTRIBUTES *filter_privileges, unsigned int priv_count, + const SID *filter_groups, unsigned int group_count ); extern int token_check_privileges( struct token *token, int all_required, const LUID_AND_ATTRIBUTES *reqprivs, unsigned int count, LUID_AND_ATTRIBUTES *usedprivs); diff --git a/server/token.c b/server/token.c index 5c35bcc19f6..de76939831e 100644 --- a/server/token.c +++ b/server/token.c @@ -285,6 +285,19 @@ static int acl_is_valid( const ACL *acl, data_size_t size ) return TRUE; } +static unsigned int get_sid_count( const SID *sid, data_size_t size ) +{ + unsigned int count; + + for (count = 0; size >= sizeof(SID) && security_sid_len( sid ) <= size; count++) + { + size -= security_sid_len( sid ); + sid = (const SID *)((char *)sid + security_sid_len( sid )); + } + + return count; +} + /* checks whether all members of a security descriptor fit inside the size * of memory specified */ int sd_is_valid( const struct security_descriptor *sd, data_size_t size ) @@ -626,8 +639,36 @@ static struct token *create_token( unsigned primary, const SID *user, return token; } +static int filter_group( struct group *group, const SID *filter, unsigned int count ) +{ + unsigned int i; + + for (i = 0; i < count; i++) + { + if (security_equal_sid( &group->sid, filter )) return 1; + filter = (const SID *)((char *)filter + security_sid_len( filter )); + } + + return 0; +} + +static int filter_privilege( struct privilege *privilege, const LUID_AND_ATTRIBUTES *filter, unsigned int count ) +{ + unsigned int i; + + for (i = 0; i < count; i++) + { + if (!memcmp( &privilege->luid, &filter[i].Luid, sizeof(LUID) )) + return 1; + } + + return 0; +} + struct token *token_duplicate( struct token *src_token, unsigned primary, - int impersonation_level, const struct security_descriptor *sd ) + int impersonation_level, const struct security_descriptor *sd, + const LUID_AND_ATTRIBUTES *filter_privileges, unsigned int priv_count, + const SID *filter_groups, unsigned int group_count) { const luid_t *modified_id = primary || (impersonation_level == src_token->impersonation_level) ? @@ -663,6 +704,12 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, return NULL; } memcpy( newgroup, group, size ); + if (filter_group( group, filter_groups, group_count )) + { + newgroup->enabled = 0; + newgroup->def = 0; + newgroup->deny_only = 1; + } list_add_tail( &token->groups, &newgroup->entry ); if (src_token->primary_group == &group->sid) { @@ -674,11 +721,14 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, /* copy privileges */ LIST_FOR_EACH_ENTRY( privilege, &src_token->privileges, struct privilege, entry ) + { + if (filter_privilege( privilege, filter_privileges, priv_count )) continue; if (!privilege_add( token, &privilege->luid, privilege->enabled )) { release_object( token ); return NULL; } + } if (sd) default_set_sd( &token->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); @@ -1310,7 +1360,7 @@ DECL_HANDLER(duplicate_token) TOKEN_DUPLICATE, &token_ops ))) { - struct token *token = token_duplicate( src_token, req->primary, req->impersonation_level, sd ); + struct token *token = token_duplicate( src_token, req->primary, req->impersonation_level, sd, NULL, 0, NULL, 0 ); if (token) { reply->new_handle = alloc_handle_no_access_check( current->process, token, req->access, objattr->attributes ); @@ -1320,6 +1370,36 @@ DECL_HANDLER(duplicate_token) } } +/* creates a restricted version of a token */ +DECL_HANDLER(filter_token) +{ + struct token *src_token; + + if ((src_token = (struct token *)get_handle_obj( current->process, req->handle, + TOKEN_DUPLICATE, + &token_ops ))) + { + const LUID_AND_ATTRIBUTES *filter_privileges = get_req_data(); + unsigned int priv_count, group_count; + const SID *filter_groups; + struct token *token; + + priv_count = min( req->privileges_size, get_req_data_size() ) / sizeof(LUID_AND_ATTRIBUTES); + filter_groups = (const SID *)((char *)filter_privileges + priv_count * sizeof(LUID_AND_ATTRIBUTES)); + group_count = get_sid_count( filter_groups, get_req_data_size() - priv_count * sizeof(LUID_AND_ATTRIBUTES) ); + + token = token_duplicate( src_token, src_token->primary, src_token->impersonation_level, NULL, + filter_privileges, priv_count, filter_groups, group_count ); + if (token) + { + unsigned int access = get_handle_access( current->process, req->handle ); + reply->new_handle = alloc_handle_no_access_check( current->process, token, access, 0 ); + release_object( token ); + } + release_object( src_token ); + } +} + /* checks the specified privileges are held by the token */ DECL_HANDLER(check_token_privileges) { -- 2.17.0

1 1

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne 14 Apr '19

14 Apr '19

1 0

Wine staging 4.6 release
by Alistair Leslie-Hughes 14 Apr '19

14 Apr '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.6 (830 patches are applied to wine vanilla) NOTE: FAudio will not be supported until distro's have FAudio library as part of their standard repositories. Upstreamed (Either directly from staging or fixed with a similar patch). * shlwapi: SHMapHandle should not set error when NULL is passed as hShared. * taskmgr: Use system font instead of special bitmap font. * l3codeca.acm: Check input format in MPEG3_StreamOpen. * server: Correctly validate SID length in sd_is_valid. * dinput: Do not wait for hook thread startup in IDirectInput8::Initialize. * d3dx9: Return D3DFMT_A8R8G8B8 in D3DXGetImageInfoFromFileInMemory for 32 bpp BMP with alpha. * d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof when skin information is unavailable. * taskmgr: Use different units depending on memory usage. * dinput: Avoid possible deadlock when CS are acquired in different order. * hid: Implement HidD_FlushQueue. * user32: Implement CWF_CREATE_ONLY flag for CreateWindowStation. * wintrust: Verify image hash in WinVerifyTrust. * ntoskrnl.exe: Implement ExInitializeResourceLite(). * ntoskrnl.exe: Implement ExAcquireResourceExclusiveLite(). * ntoskrnl.exe: Implement ExAcquireResourceSharedLite(). * ntoskrnl.exe: Implement ExAcquireSharedStarveExclusive(). * ntoskrnl.exe: Implement ExAcquireSharedWaitForExclusive(). * ntoskrnl.exe: Implement ExReleaseResourceForThreadLite(). * ntoskrnl.exe: Implement ExReleaseResourceLite(). * ntoskrnl.exe: Implement ExDeleteResourceLite(). * ntoskrnl.exe: Implement ExGetSharedWaiterCount(). * ntoskrnl.exe: Implement ExGetExclusiveWaiterCount(). * ntoskrnl.exe: Implement ExIsResourceAcquiredExclusiveLite(). * ntoskrnl.exe: Implement ExIsResourceAcquiredSharedLite(). * ntoskrnl.exe/tests: Add tests for ERESOURCE functions. * winex11: Implement PK_CHANGE for wintab. * kernel32: Correct ReplaceFileW behaviour. Added: * [33845] kernel32: Correct ReplaceFileW behaviour for warframe * [36692] Many multi-threaded applications have poor performance due to heavy use of synchronization primitives. (esync). * [46948] Allow setting texture without DDSCAPS_TEXTURE for software device. * [46870] League of Legends 8.12+ fails to start a game in Vista+ mode (anticheat engine, SystemExtendedProcessInformation). * [45666] League of Legends 8.15+ fails due to missing implementation of NtQuerySystemInformation(SystemModuleInformationEx) in Windows Vista+ mode. * [46989] dinput: Wheel, Gas, Brake axes inputs aren't recognized. Updated: * httpapi-HttpCreateServerSession * ddraw-Write_Vtable * wintab32-improvements Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] mfc42: add static library
by Jefferson Carpenter 13 Apr '19

13 Apr '19

COPY

1 0

Fwd: TestBot job 50929 results: [PATCH] msxml3: put_output accepts DOMDocument destination
by Jefferson Carpenter 13 Apr '19

13 Apr '19

64-bit msxml3 tests also fail on my pc with a page fault in master. -------- Forwarded Message -------- Subject: TestBot job 50929 results: [PATCH] msxml3: put_output accepts DOMDocument destination Date: Sat, 13 Apr 2019 17:36:17 -0500 From: Marvin <testbot(a)winehq.org> To: jeffersoncarpenter2(a)gmail.com VM Status Failures Command debian9 success 0 debian9 failed 1 You can also see the results at: https://testbot.winehq.org/JobDetails.pl?Key=50929 === debian9 (64 bit WoW report) === msxml3: Unhandled exception: page fault on execute access to 0x0003a8b0 in 64-bit code (0x000000000003a8b0). Report errors: msxml3:domdoc crashed (c0000005)

1 0

[PATCH] ntdll: add DECLSPEC_HOTPATCH to NtQueryDirectoryFile
by Louis Lenders 13 Apr '19

13 Apr '19

https://bugs.winehq.org/show_bug.cgi?id=45703 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b46c2a6736..c99cf3c8a1 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1933,7 +1933,7 @@ static NTSTATUS get_cached_dir_data( HANDLE handle, struct dir_data **data_ret, * NtQueryDirectoryFile [NTDLL.@] * ZwQueryDirectoryFile [NTDLL.@] */ -NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, +NTSTATUS WINAPI DECLSPEC_HOTPATCH NtQueryDirectoryFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_routine, PVOID apc_context, PIO_STATUS_BLOCK io, PVOID buffer, ULONG length, -- 2.20.1

1 0

[PATCH] gdi32: Reformat some strings to improve readability
by Michael Stefaniuc 13 Apr '19

13 Apr '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- No-op as gcc generates the exact same object files. Only gdiobj.c, font.c and freetype.c need "CFLAGS=-O2 -g0 -DNDEBUG" as they use asserts and the line count changes. dlls/gdi32/dc.c | 2 +- dlls/gdi32/driver.c | 12 +-- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 34 +++----- dlls/gdi32/freetype.c | 165 +++++++++++++++---------------------- dlls/gdi32/gdiobj.c | 128 ++++++++++++++-------------- dlls/gdi32/opengl.c | 2 +- dlls/gdi32/region.c | 2 +- 9 files changed, 151 insertions(+), 198 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 8ee8a52d94..159e8436f0 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dc); -static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; +static const WCHAR displayW[] = u"display"; static BOOL DC_DeleteObject( HGDIOBJ handle ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 054d7cf418..7dd025813c 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -125,8 +125,8 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) { HMODULE module; struct graphics_driver *driver, *new_driver; - static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; - static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static const WCHAR displayW[] = u"display"; + static const WCHAR display1W[] = u"\\\\.\\DISPLAY1"; /* display driver is a special case */ if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) return get_display_driver(); @@ -858,10 +858,10 @@ const struct gdi_dc_funcs null_driver = */ BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) { - static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; - static const WCHAR devicesW[] = { 'd','e','v','i','c','e','s',0 }; - static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; - static const WCHAR empty_strW[] = { 0 }; + static const WCHAR displayW[] = u"display"; + static const WCHAR devicesW[] = u"devices"; + static const WCHAR display1W[] = u"\\\\.\\DISPLAY1"; + static const WCHAR empty_strW[] = u""; WCHAR *p; /* display is a special case */ diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index a3360c269a..ff669470d1 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2810,7 +2810,7 @@ typedef struct wmf_in_emf_comment HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, const BYTE *lpbBuffer, HDC hdcRef, const METAFILEPICT *lpmfp) { - static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; + static const WCHAR szDisplayW[] = u"DISPLAY"; HMETAFILE hmf = NULL; HENHMETAFILE ret = NULL; HDC hdc = NULL, hdcdisp = NULL; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 51133705a5..2e47455bdc 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -329,7 +329,7 @@ HDC WINAPI CreateEnhMetaFileW( LPCWSTR description /* [in] optional description */ ) { - static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; + static const WCHAR displayW[] = u"DISPLAY"; HDC ret, ref_dc; DC *dc; EMFDRV_PDEVICE *physDev; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b3d67ff624..14f432f34c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -278,8 +278,7 @@ static DWORD get_key_value( HKEY key, const WCHAR *name, DWORD *value ) static UINT get_subpixel_orientation( HKEY key ) { - static const WCHAR smoothing_orientation[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g', - 'O','r','i','e','n','t','a','t','i','o','n',0}; + static const WCHAR smoothing_orientation[] = u"FontSmoothingOrientation"; DWORD orient; /* FIXME: handle vertical orientations even though Windows doesn't */ @@ -297,8 +296,8 @@ static UINT get_subpixel_orientation( HKEY key ) static UINT get_default_smoothing( HKEY key ) { - static const WCHAR smoothing[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g',0}; - static const WCHAR smoothing_type[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g','T','y','p','e',0}; + static const WCHAR smoothing[] = u"FontSmoothing"; + static const WCHAR smoothing_type[] = u"FontSmoothingType"; DWORD enabled, type; if (get_key_value( key, smoothing, &enabled )) return 0; @@ -635,14 +634,11 @@ static DWORD get_associated_charset_info(void) if (associated_charset == -1) { - static const WCHAR assoc_charset_reg_keyW[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\','F','o','n','t','A','s','s','o','c','\\', - 'A','s','s','o','c','i','a','t','e','d',' ','C','h','a','r','s','e','t','\0'}; - static const WCHAR ansiW[] = {'A','N','S','I','(','0','0',')','\0'}; - static const WCHAR oemW[] = {'O','E','M','(','F','F',')','\0'}; - static const WCHAR symbolW[] = {'S','Y','M','B','O','L','(','0','2',')','\0'}; - static const WCHAR yesW[] = {'Y','E','S','\0'}; + static const WCHAR assoc_charset_reg_keyW[] = u"System\\CurrentControlSet\\Control\\FontAssoc\\Associated Charset"; + static const WCHAR ansiW[] = u"ANSI(00)"; + static const WCHAR oemW[] = u"OEM(FF)"; + static const WCHAR symbolW[] = u"SYMBOL(02)"; + static const WCHAR yesW[] = u"YES"; HKEY hkey; WCHAR dataW[32]; DWORD type, data_len; @@ -731,10 +727,8 @@ static void update_font_code_page( DC *dc, HANDLE font ) static struct font_gamma_ramp *get_font_gamma_ramp( void ) { - static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', - 'D','e','s','k','t','o','p',0 }; - static const WCHAR smoothing_gamma[] = { 'F','o','n','t','S','m','o','o','t','h','i','n','g', - 'G','a','m','m','a',0 }; + static const WCHAR desktopW[] = u"Control Panel\\Desktop"; + static const WCHAR smoothing_gamma[] = u"FontSmoothingGamma"; const DWORD gamma_default = 1400; struct font_gamma_ramp *ramp; DWORD i, gamma; @@ -863,8 +857,7 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle ) */ HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) { - static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', - 'D','e','s','k','t','o','p',0 }; + static const WCHAR desktopW[] = u"Control Panel\\Desktop"; static int orientation = -1, smoothing = -1; LOGFONTW lf; HKEY key; @@ -3810,10 +3803,7 @@ UINT WINAPI GetTextCharset(HDC hdc) LONG WINAPI GdiGetCharDimensions(HDC hdc, LPTEXTMETRICW lptm, LONG *height) { SIZE sz; - static const WCHAR alphabet[] = { - 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q', - 'r','s','t','u','v','w','x','y','z','A','B','C','D','E','F','G','H', - 'I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',0}; + static const WCHAR alphabet[] = u"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; if(lptm && !GetTextMetricsW(hdc, lptm)) return 0; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 333856e325..0ada635fea 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -484,21 +484,13 @@ static inline struct freetype_physdev *get_freetype_dev( PHYSDEV dev ) static const struct gdi_dc_funcs freetype_funcs; -static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\0'}; -static const WCHAR win9x_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'F','o','n','t','s','\0'}; - -static const WCHAR winnt_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'F','o','n','t','s','\0'}; - -static const WCHAR system_fonts_reg_key[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; -static const WCHAR FixedSys_Value[] = {'F','I','X','E','D','F','O','N','.','F','O','N','\0'}; -static const WCHAR System_Value[] = {'F','O','N','T','S','.','F','O','N','\0'}; -static const WCHAR OEMFont_Value[] = {'O','E','M','F','O','N','T','.','F','O','N','\0'}; +static const WCHAR fontsW[] = u"\\fonts"; +static const WCHAR win9x_font_reg_key[] = u"Software\\Microsoft\\Windows\\CurrentVersion\\Fonts"; +static const WCHAR winnt_font_reg_key[] = u"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"; +static const WCHAR system_fonts_reg_key[] = u"Software\\Fonts"; +static const WCHAR FixedSys_Value[] = u"FIXEDFON.FON"; +static const WCHAR System_Value[] = u"FONTS.FON"; +static const WCHAR OEMFont_Value[] = u"OEMFONT.FON"; static const WCHAR * const SystemFontValues[] = { System_Value, @@ -507,29 +499,27 @@ static const WCHAR * const SystemFontValues[] = { NULL }; -static const WCHAR external_fonts_reg_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'F','o','n','t','s','\\','E','x','t','e','r','n','a','l',' ','F','o','n','t','s','\0'}; +static const WCHAR external_fonts_reg_key[] = u"Software\\Wine\\Fonts\\External Fonts"; /* Interesting and well-known (frequently-assumed!) font names */ -static const WCHAR Lucida_Sans_Unicode[] = {'L','u','c','i','d','a',' ','S','a','n','s',' ','U','n','i','c','o','d','e',0}; -static const WCHAR Microsoft_Sans_Serif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0 }; -static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; -static const WCHAR MS_UI_Gothic[] = {'M','S',' ','U','I',' ','G','o','t','h','i','c',0}; -static const WCHAR SimSun[] = {'S','i','m','S','u','n',0}; -static const WCHAR Gulim[] = {'G','u','l','i','m',0}; -static const WCHAR PMingLiU[] = {'P','M','i','n','g','L','i','U',0}; -static const WCHAR Batang[] = {'B','a','t','a','n','g',0}; - -static const WCHAR arial[] = {'A','r','i','a','l',0}; -static const WCHAR bitstream_vera_sans[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',0}; -static const WCHAR bitstream_vera_sans_mono[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',' ','M','o','n','o',0}; -static const WCHAR bitstream_vera_serif[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','e','r','i','f',0}; -static const WCHAR courier_new[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; -static const WCHAR liberation_mono[] = {'L','i','b','e','r','a','t','i','o','n',' ','M','o','n','o',0}; -static const WCHAR liberation_sans[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','a','n','s',0}; -static const WCHAR liberation_serif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; -static const WCHAR times_new_roman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; -static const WCHAR SymbolW[] = {'S','y','m','b','o','l','\0'}; +static const WCHAR Lucida_Sans_Unicode[] = u"Lucida Sans Unicode"; +static const WCHAR Microsoft_Sans_Serif[] = u"Microsoft Sans Serif"; +static const WCHAR Tahoma[] = u"Tahoma"; +static const WCHAR MS_UI_Gothic[] = u"MS UI Gothic"; +static const WCHAR SimSun[] = u"SimSun"; +static const WCHAR Gulim[] = u"Gulim"; +static const WCHAR PMingLiU[] = u"PMingLiU"; +static const WCHAR Batang[] = u"Batang"; +static const WCHAR arial[] = u"Arial"; +static const WCHAR bitstream_vera_sans[] = u"Bitstream Vera Sans"; +static const WCHAR bitstream_vera_sans_mono[] = u"Bitstream Vera Sans Mono"; +static const WCHAR bitstream_vera_serif[] = u"Bitstream Vera Serif"; +static const WCHAR courier_new[] = u"Courier New"; +static const WCHAR liberation_mono[] = u"Liberation Mono"; +static const WCHAR liberation_sans[] = u"Liberation Sans"; +static const WCHAR liberation_serif[] = u"Liberation Serif"; +static const WCHAR times_new_roman[] = u"Times New Roman"; +static const WCHAR SymbolW[] = u"Symbol"; static const WCHAR *default_serif_list[] = { @@ -571,23 +561,22 @@ typedef struct tagFontSubst { } FontSubst; /* Registry font cache key and value names */ -static const WCHAR wine_fonts_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'F','o','n','t','s',0}; -static const WCHAR wine_fonts_cache_key[] = {'C','a','c','h','e',0}; -static const WCHAR english_name_value[] = {'E','n','g','l','i','s','h',' ','N','a','m','e',0}; -static const WCHAR face_index_value[] = {'I','n','d','e','x',0}; -static const WCHAR face_ntmflags_value[] = {'N','t','m','f','l','a','g','s',0}; -static const WCHAR face_version_value[] = {'V','e','r','s','i','o','n',0}; -static const WCHAR face_height_value[] = {'H','e','i','g','h','t',0}; -static const WCHAR face_width_value[] = {'W','i','d','t','h',0}; -static const WCHAR face_size_value[] = {'S','i','z','e',0}; -static const WCHAR face_x_ppem_value[] = {'X','p','p','e','m',0}; -static const WCHAR face_y_ppem_value[] = {'Y','p','p','e','m',0}; -static const WCHAR face_flags_value[] = {'F','l','a','g','s',0}; -static const WCHAR face_internal_leading_value[] = {'I','n','t','e','r','n','a','l',' ','L','e','a','d','i','n','g',0}; -static const WCHAR face_font_sig_value[] = {'F','o','n','t',' ','S','i','g','n','a','t','u','r','e',0}; -static const WCHAR face_file_name_value[] = {'F','i','l','e',' ','N','a','m','e','\0'}; -static const WCHAR face_full_name_value[] = {'F','u','l','l',' ','N','a','m','e','\0'}; +static const WCHAR wine_fonts_key[] = u"Software\\Wine\\Fonts"; +static const WCHAR wine_fonts_cache_key[] = u"Cache"; +static const WCHAR english_name_value[] = u"English Name"; +static const WCHAR face_index_value[] = u"Index"; +static const WCHAR face_ntmflags_value[] = u"Ntmflags"; +static const WCHAR face_version_value[] = u"Version"; +static const WCHAR face_height_value[] = u"Height"; +static const WCHAR face_width_value[] = u"Width"; +static const WCHAR face_size_value[] = u"Size"; +static const WCHAR face_x_ppem_value[] = u"Xppem"; +static const WCHAR face_y_ppem_value[] = u"Yppem"; +static const WCHAR face_flags_value[] = u"Flags"; +static const WCHAR face_internal_leading_value[] = u"Internal Leading"; +static const WCHAR face_font_sig_value[] = u"Font Signature"; +static const WCHAR face_file_name_value[] = u"File Name"; +static const WCHAR face_full_name_value[] = u"Full Name"; struct font_mapping @@ -615,9 +604,9 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION freetype_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_','\0'}; +static const WCHAR font_mutex_nameW[] = u"__WINE_FONT_MUTEX__"; -static const WCHAR szDefaultFallbackLink[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; +static const WCHAR szDefaultFallbackLink[] = u"Microsoft Sans Serif"; static BOOL use_default_fallback = FALSE; static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph, BOOL *vert); @@ -626,10 +615,7 @@ static BOOL get_bitmap_text_metrics(GdiFont *font); static BOOL get_text_metrics(GdiFont *font, LPTEXTMETRICW ptm); static void remove_face_from_cache( Face *face ); -static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','F','o','n','t','L','i','n','k','\\', - 'S','y','s','t','e','m','L','i','n','k',0}; +static const WCHAR system_link[] = u"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontLink\\SystemLink"; /**************************************** * Notes on .fon files @@ -1835,7 +1821,7 @@ static void add_face_to_cache(Face *face) face_key_name = face->StyleName; else { - static const WCHAR fmtW[] = {'%','s','\\','%','d',0}; + static const WCHAR fmtW[] = u"%s\\%d"; face_key_name = HeapAlloc(GetProcessHeap(), 0, (strlenW(face->StyleName) + 10) * sizeof(WCHAR)); sprintfW(face_key_name, fmtW, face->StyleName, face->size.y_ppem); } @@ -1882,7 +1868,7 @@ static void remove_face_from_cache( Face *face ) } else { - static const WCHAR fmtW[] = {'%','s','\\','%','d',0}; + static const WCHAR fmtW[] = u"%s\\%d"; WCHAR *face_key_name = HeapAlloc(GetProcessHeap(), 0, (strlenW(face->StyleName) + 10) * sizeof(WCHAR)); sprintfW(face_key_name, fmtW, face->StyleName, face->size.y_ppem); RegDeleteKeyW( hkey_family, face_key_name ); @@ -2576,9 +2562,9 @@ static void init_system_links(void) WCHAR *entry, *next; SYSTEM_LINKS *font_link, *system_font_link; CHILD_FONT *child_font; - static const WCHAR tahoma_ttf[] = {'t','a','h','o','m','a','.','t','t','f',0}; - static const WCHAR System[] = {'S','y','s','t','e','m',0}; - static const WCHAR MS_Shell_Dlg[] = {'M','S',' ','S','h','e','l','l',' ','D','l','g',0}; + static const WCHAR tahoma_ttf[] = u"tahoma.ttf"; + static const WCHAR System[] = u"System"; + static const WCHAR MS_Shell_Dlg[] = u"MS Shell Dlg"; Face *face; FontSubst *psub; UINT i, j; @@ -3067,7 +3053,7 @@ static BOOL load_font_from_data_dir(LPCWSTR file) static char *get_winfonts_dir_path(LPCWSTR file) { - static const WCHAR slashW[] = {'\\','\0'}; + static const WCHAR slashW[] = u"\\"; WCHAR windowsdir[MAX_PATH]; GetWindowsDirectoryW(windowsdir, ARRAY_SIZE(windowsdir)); @@ -3083,7 +3069,7 @@ static void load_system_fonts(void) WCHAR data[MAX_PATH], windowsdir[MAX_PATH], pathW[MAX_PATH]; const WCHAR * const *value; DWORD dlen, type; - static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; + static const WCHAR fmtW[] = u"%s\\%s"; char *unixname; if(RegOpenKeyW(HKEY_CURRENT_CONFIG, system_fonts_reg_key, &hkey) == ERROR_SUCCESS) { @@ -3123,7 +3109,7 @@ static void update_reg_entries(void) Family *family; Face *face; WCHAR *file, *path; - static const WCHAR TrueType[] = {' ','(','T','r','u','e','T','y','p','e',')','\0'}; + static const WCHAR TrueType[] = u" (TrueType)"; if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, winnt_font_reg_key, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &winnt_key, NULL) != ERROR_SUCCESS) { @@ -3931,35 +3917,15 @@ static void set_multi_value_key(HKEY hkey, const WCHAR *name, const WCHAR *value static void update_font_system_link_info(UINT current_ansi_codepage) { static const WCHAR system_link_simplified_chinese[] = - {'S','I','M','S','U','N','.','T','T','C',',','S','i','m','S','u','n','\0', - 'M','I','N','G','L','I','U','.','T','T','C',',','P','M','i','n','g','L','i','u','\0', - 'M','S','G','O','T','H','I','C','.','T','T','C',',','M','S',' ','U','I',' ','G','o','t','h','i','c','\0', - 'B','A','T','A','N','G','.','T','T','C',',','B','a','t','a','n','g','\0', - '\0'}; + u"SIMSUN.TTC,SimSun\0MINGLIU.TTC,PMingLiu\0MSGOTHIC.TTC,MS UI Gothic\0BATANG.TTC,Batang\0"; static const WCHAR system_link_traditional_chinese[] = - {'M','I','N','G','L','I','U','.','T','T','C',',','P','M','i','n','g','L','i','u','\0', - 'S','I','M','S','U','N','.','T','T','C',',','S','i','m','S','u','n','\0', - 'M','S','G','O','T','H','I','C','.','T','T','C',',','M','S',' ','U','I',' ','G','o','t','h','i','c','\0', - 'B','A','T','A','N','G','.','T','T','C',',','B','a','t','a','n','g','\0', - '\0'}; + u"MINGLIU.TTC,PMingLiu\0SIMSUN.TTC,SimSun\0MSGOTHIC.TTC,MS UI Gothic\0BATANG.TTC,Batang\0"; static const WCHAR system_link_japanese[] = - {'M','S','G','O','T','H','I','C','.','T','T','C',',','M','S',' ','U','I',' ','G','o','t','h','i','c','\0', - 'M','I','N','G','L','I','U','.','T','T','C',',','P','M','i','n','g','L','i','U','\0', - 'S','I','M','S','U','N','.','T','T','C',',','S','i','m','S','u','n','\0', - 'G','U','L','I','M','.','T','T','C',',','G','u','l','i','m','\0', - '\0'}; + u"MSGOTHIC.TTC,MS UI Gothic\0MINGLIU.TTC,PMingLiU\0SIMSUN.TTC,SimSun\0GULIM.TTC,Gulim\0"; static const WCHAR system_link_korean[] = - {'G','U','L','I','M','.','T','T','C',',','G','u','l','i','m','\0', - 'M','S','G','O','T','H','I','C','.','T','T','C',',','M','S',' ','U','I',' ','G','o','t','h','i','c','\0', - 'M','I','N','G','L','I','U','.','T','T','C',',','P','M','i','n','g','L','i','U','\0', - 'S','I','M','S','U','N','.','T','T','C',',','S','i','m','S','u','n','\0', - '\0'}; + u"GULIM.TTC,Gulim\0MSGOTHIC.TTC,MS UI Gothic\0MINGLIU.TTC,PMingLiU\0SIMSUN.TTC,SimSun\0"; static const WCHAR system_link_non_cjk[] = - {'M','S','G','O','T','H','I','C','.','T','T','C',',','M','S',' ','U','I',' ','G','o','t','h','i','c','\0', - 'M','I','N','G','L','I','U','.','T','T','C',',','P','M','i','n','g','L','i','U','\0', - 'S','I','M','S','U','N','.','T','T','C',',','S','i','m','S','u','n','\0', - 'G','U','L','I','M','.','T','T','C',',','G','u','l','i','m','\0', - '\0'}; + u"MSGOTHIC.TTC,MS UI Gothic\0MINGLIU.TTC,PMingLiU\0SIMSUN.TTC,SimSun\0GULIM.TTC,Gulim\0"; HKEY hkey; if (RegCreateKeyW(HKEY_LOCAL_MACHINE, system_link, &hkey) == ERROR_SUCCESS) @@ -3998,7 +3964,7 @@ static void update_font_system_link_info(UINT current_ansi_codepage) static void update_font_info(void) { - static const WCHAR logpixels[] = { 'L','o','g','P','i','x','e','l','s',0 }; + static const WCHAR logpixels[] = u"LogPixels"; char buf[40], cpbuf[40]; DWORD len, type; HKEY hkey = 0; @@ -4199,8 +4165,8 @@ sym_not_found: static void init_font_list(void) { - static const WCHAR dot_fonW[] = {'.','f','o','n','\0'}; - static const WCHAR pathW[] = {'P','a','t','h',0}; + static const WCHAR dot_fonW[] = u".fon"; + static const WCHAR pathW[] = u"Path"; HKEY hkey; DWORD valuelen, datalen, i = 0, type, dlen, vlen; WCHAR windowsdir[MAX_PATH]; @@ -4260,7 +4226,7 @@ static void init_font_list(void) else if(dlen / 2 >= 6 && !strcmpiW(data + dlen / 2 - 5, dot_fonW)) { WCHAR pathW[MAX_PATH]; - static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; + static const WCHAR fmtW[] = u"%s\\%s"; BOOL added = FALSE; sprintfW(pathW, fmtW, windowsdir, data); @@ -4391,9 +4357,8 @@ BOOL WineEngInit(void) if (!RegOpenKeyExW(HKEY_CURRENT_USER, wine_fonts_key, 0, KEY_READ, &hkey)) { - static const WCHAR antialias_fake_bold_or_italic[] = { 'A','n','t','i','a','l','i','a','s','F','a','k','e', - 'B','o','l','d','O','r','I','t','a','l','i','c',0 }; - static const WCHAR true_options[] = { 'y','Y','t','T','1',0 }; + static const WCHAR antialias_fake_bold_or_italic[] = u"AntialiasFakeBoldOrItalic"; + static const WCHAR true_options[] = u"yYtT1"; DWORD type, size; WCHAR buffer[20]; @@ -7934,7 +7899,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, GetSystemDefaultLangID() ); if (!full_nameW) { - static const WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; + static const WCHAR fake_nameW[] = u"fake name"; FIXME("failed to read full_nameW for font %s!\n", wine_dbgstr_w(font->name)); full_nameW = strdupW(fake_nameW); } diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 083a504569..0daa426111 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -128,17 +128,15 @@ static CRITICAL_SECTION gdi_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static const LOGFONTW OEMFixedFont = { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, {'\0'} }; + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, u""}; static const LOGFONTW AnsiFixedFont = { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} }; + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, u"Courier"}; static const LOGFONTW AnsiVarFont = { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'} }; + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, u"MS Sans Serif"}; /****************************************************************************** * @@ -173,308 +171,308 @@ static const struct DefaultFontInfo default_fonts[] = { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { EASTEUROPE_CHARSET, { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, EASTEUROPE_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, EASTEUROPE_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, EASTEUROPE_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, EASTEUROPE_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { RUSSIAN_CHARSET, { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, RUSSIAN_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, RUSSIAN_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, RUSSIAN_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, RUSSIAN_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { GREEK_CHARSET, { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, GREEK_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, GREEK_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, GREEK_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, GREEK_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { TURKISH_CHARSET, { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, TURKISH_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, TURKISH_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, TURKISH_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, TURKISH_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { HEBREW_CHARSET, { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, HEBREW_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, HEBREW_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HEBREW_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HEBREW_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { ARABIC_CHARSET, { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ARABIC_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ARABIC_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ARABIC_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ARABIC_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { BALTIC_CHARSET, { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, BALTIC_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, BALTIC_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, BALTIC_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, BALTIC_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { THAI_CHARSET, { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, THAI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, THAI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, THAI_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, THAI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { SHIFTJIS_CHARSET, { /* System */ 18, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 18, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { GB2312_CHARSET, { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, GB2312_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, GB2312_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, GB2312_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, GB2312_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { HANGEUL_CHARSET, { /* System */ 16, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, HANGEUL_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { CHINESEBIG5_CHARSET, { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, { JOHAB_CHARSET, { /* System */ 16, 7, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, JOHAB_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* Device Default */ 16, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, JOHAB_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','y','s','t','e','m','\0'} + u"System" }, { /* System Fixed */ 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, JOHAB_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, - {'C','o','u','r','i','e','r','\0'} + u"Courier" }, { /* DefaultGuiFont */ -12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, JOHAB_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} + u"MS Shell Dlg" }, }, }; @@ -598,9 +596,9 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) return entry != NULL; } -static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; -static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; -static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; +static const WCHAR dpi_key_name[] = u"Control Panel\\Desktop"; +static const WCHAR def_dpi_key_name[] = u"Software\\Fonts"; +static const WCHAR dpi_value_name[] = u"LogPixels"; /****************************************************************************** * get_reg_dword @@ -653,7 +651,7 @@ DWORD get_system_dpi(void) if (!pGetDpiForSystem) { - static const WCHAR user32W[] = {'u','s','e','r','3','2','.','d','l','l',0}; + static const WCHAR user32W[] = u"user32.dll"; HMODULE user = GetModuleHandleW( user32W ); if (user) pGetDpiForSystem = (void *)GetProcAddress( user, "GetDpiForSystem" ); } diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 578737994a..dd23538b82 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -36,7 +36,7 @@ #include "gdi_private.h" -static const WCHAR opengl32W[] = {'o','p','e','n','g','l','3','2','.','d','l','l',0}; +static const WCHAR opengl32W[] = u"opengl32.dll"; static HMODULE opengl32; static INT (WINAPI *wglChoosePixelFormat)(HDC,const PIXELFORMATDESCRIPTOR *); static INT (WINAPI *wglDescribePixelFormat)(HDC,INT,UINT,PIXELFORMATDESCRIPTOR*); diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index cad6428dc9..b2c3882ad9 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1437,7 +1437,7 @@ INT mirror_region( HRGN dst, HRGN src, INT width ) */ BOOL WINAPI MirrorRgn( HWND hwnd, HRGN hrgn ) { - static const WCHAR user32W[] = {'u','s','e','r','3','2','.','d','l','l',0}; + static const WCHAR user32W[] = u"user32.dll"; static BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); RECT rect; -- 2.20.1

11 20

[PATCH] mscoree: Try skipping c: when searching for support msi.
by Vincent Povirk 13 Apr '19

13 Apr '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- This fixes upgrades from a local runtime install to a shared install. We should give the local install special treatment because installing the support msi will remove any runtime msi that doesn't match. If the other parts of the search path have an outdated version, installing the support msi won't fix that, and they shouldn't because the path contains the version. dlls/mscoree/metahost.c | 6 +- dlls/mscoree/mscoree_main.c | 102 +++++++++++++++++++++------------ dlls/mscoree/mscoree_private.h | 2 +- 3 files changed, 68 insertions(+), 42 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 1b2abd26e4..b268acc449 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -339,7 +339,7 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * return hr; } - if (!get_mono_path(mono_path)) + if (!get_mono_path(mono_path, FALSE)) { ERR("Wine Mono is not installed\n"); return CLR_E_SHIM_RUNTIME; @@ -778,9 +778,9 @@ static BOOL get_mono_path_datadir(LPWSTR path) return ret; } -BOOL get_mono_path(LPWSTR path) +BOOL get_mono_path(LPWSTR path, BOOL skip_local) { - return get_mono_path_local(path) || + return (!skip_local && get_mono_path_local(path)) || get_mono_path_registry(path) || get_mono_path_datadir(path) || get_mono_path_unix(INSTALL_DATADIR "/wine/mono/wine-mono-" WINE_MONO_VERSION, path) || diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6393af8c6c..40577de714 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -717,23 +717,65 @@ static BOOL invoke_appwiz(void) return ret; } -static BOOL install_wine_mono(void) +static BOOL get_support_msi(LPCWSTR mono_path, LPWSTR msi_path) { static const WCHAR support_msi_relative[] = {'\\','s','u','p','p','o','r','t','\\','w','i','n','e','m','o','n','o','-','s','u','p','p','o','r','t','.','m','s','i',0}; + UINT (WINAPI *pMsiOpenPackageW)(LPCWSTR,ULONG*); + UINT (WINAPI *pMsiGetProductPropertyA)(ULONG,LPCSTR,LPSTR,LPDWORD); + UINT (WINAPI *pMsiCloseHandle)(ULONG); + HMODULE hmsi = NULL; + char versionstringbuf[15]; + UINT res; + DWORD buffer_size; + ULONG msiproduct; + BOOL ret=FALSE; + + hmsi = GetModuleHandleA("msi"); + + strcpyW(msi_path, mono_path); + strcatW(msi_path, support_msi_relative); + + pMsiOpenPackageW = (void*)GetProcAddress(hmsi, "MsiOpenPackageW"); + + res = pMsiOpenPackageW(msi_path, &msiproduct); + + if (res == ERROR_SUCCESS) + { + buffer_size = sizeof(versionstringbuf); + + pMsiGetProductPropertyA = (void*)GetProcAddress(hmsi, "MsiGetProductPropertyA"); + + res = pMsiGetProductPropertyA(msiproduct, "ProductVersion", versionstringbuf, &buffer_size); + + pMsiCloseHandle = (void*)GetProcAddress(hmsi, "MsiCloseHandle"); + + pMsiCloseHandle(msiproduct); + } + + if (res == ERROR_SUCCESS) { + TRACE("found support msi version %s at %s\n", versionstringbuf, debugstr_w(msi_path)); + + if (compare_versions(WINE_MONO_VERSION, versionstringbuf) <= 0) + { + ret = TRUE; + } + } + + return ret; +} + +static BOOL install_wine_mono(void) +{ BOOL is_wow64 = FALSE; HMODULE hmsi = NULL; HRESULT initresult = E_FAIL; UINT (WINAPI *pMsiEnumRelatedProductsA)(LPCSTR,DWORD,DWORD,LPSTR); UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); - UINT (WINAPI *pMsiOpenPackageW)(LPCWSTR,ULONG*); - UINT (WINAPI *pMsiGetProductPropertyA)(ULONG,LPCSTR,LPSTR,LPDWORD); - UINT (WINAPI *pMsiCloseHandle)(ULONG); UINT (WINAPI *pMsiInstallProductW)(LPCWSTR,LPCWSTR); char versionstringbuf[15]; char productcodebuf[39]; UINT res; DWORD buffer_size; - ULONG msiproduct; BOOL ret; WCHAR mono_path[MAX_PATH]; WCHAR support_msi_path[MAX_PATH]; @@ -750,7 +792,7 @@ static BOOL install_wine_mono(void) TRACE("searching for mono runtime\n"); - if (!get_mono_path(mono_path)) + if (!get_mono_path(mono_path, FALSE)) { TRACE("mono runtime not found\n"); return invoke_appwiz(); @@ -795,47 +837,31 @@ static BOOL install_wine_mono(void) } } - strcpyW(support_msi_path, mono_path); - strcatW(support_msi_path, support_msi_relative); - initresult = CoInitialize(NULL); - pMsiOpenPackageW = (void*)GetProcAddress(hmsi, "MsiOpenPackageW"); - - res = pMsiOpenPackageW(support_msi_path, &msiproduct); - - if (res == ERROR_SUCCESS) + ret = get_support_msi(mono_path, support_msi_path); + if (!ret) { - buffer_size = sizeof(versionstringbuf); - - pMsiGetProductPropertyA = (void*)GetProcAddress(hmsi, "MsiGetProductPropertyA"); - - res = pMsiGetProductPropertyA(msiproduct, "ProductVersion", versionstringbuf, &buffer_size); - - pMsiCloseHandle = (void*)GetProcAddress(hmsi, "MsiCloseHandle"); - - pMsiCloseHandle(msiproduct); + /* Try looking outside c:\windows\mono */ + ret = (get_mono_path(mono_path, TRUE) && + get_support_msi(mono_path, support_msi_path)); } - if (res == ERROR_SUCCESS) { - TRACE("found support msi version %s at %s\n", versionstringbuf, debugstr_w(support_msi_path)); - - if (compare_versions(WINE_MONO_VERSION, versionstringbuf) <= 0) - { - TRACE("installing support msi\n"); + if (ret) + { + TRACE("installing support msi\n"); - pMsiInstallProductW = (void*)GetProcAddress(hmsi, "MsiInstallProductW"); + pMsiInstallProductW = (void*)GetProcAddress(hmsi, "MsiInstallProductW"); - res = pMsiInstallProductW(support_msi_path, NULL); + res = pMsiInstallProductW(support_msi_path, NULL); - if (res == ERROR_SUCCESS) - { - ret = TRUE; - goto end; - } - else - ERR("MsiInstallProduct failed, err=%i\n", res); + if (res == ERROR_SUCCESS) + { + ret = TRUE; + goto end; } + else + ERR("MsiInstallProduct failed, err=%i\n", res); } ret = invoke_appwiz(); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 43209fd187..3a3631e708 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -108,7 +108,7 @@ extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config IStream *config_stream, DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result) DECLSPEC_HIDDEN; -extern BOOL get_mono_path(LPWSTR path) DECLSPEC_HIDDEN; +extern BOOL get_mono_path(LPWSTR path, BOOL skip_local) DECLSPEC_HIDDEN; extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result) DECLSPEC_HIDDEN; -- 2.17.1

1 0

Re: [PATCH 1/4] shell32/autocomplete: Implement the listbox scrollbar manually
by Gabriel Ivăncescu 13 Apr '19

13 Apr '19

Hi, I think this was rejected too hastily. Sorry if the analysis will be a little verbose, but sometimes it's really hard to convince... I don't think SBS_SIZEBOX is a net gain in code simplicity (on the contrary) if you take the entire patchset into account. I tried it first and gave up on it, but maybe I'm missing something... I mean, what are the problems with the current code? As far as I am aware (please elaborate if I'm missing something), the possible ones: (1) is painting the grip manually an issue? (2) is WM_NCHITTEST an issue? (3) is WM_NCCALCSIZE an issue? I can't see anything else compared to a SBS_SIZEBOX implementation, so let's analyze the above 3 and understand why they are needed *even* with SBS_SIZEBOX. But first, please take a look at patch 4/4 (162405) if you haven't, to see what kind of code would need to be at the end of the series. That's very important for my point below. Now, let's assume that SBS_SIZEBOX was used for the grip on patch 2/4 (presumably that's why it was rejected) and look at the 3 issues again, with the patch 4/4 in mind: (1) painting the grip manually will *still* have to be done because the grip needs to be flipped vertically in patch 4/4. No gain in simplicity. (2) WM_NCHITTEST will *still* have to be done manually because of the vertical flip (HTTOPRIGHT instead) *and* the fact the grip acts like a square even when it's a triangle, to match Windows. No gain. (3) WM_NCCALCSIZE can be removed. However, since with SBS_SIZEBOX when the scrollbar is visible, we can't just simply set the scroll/grip window to the listbox height in update_listbox_size, but instead have to special-case the flip to position both properly in that case... it would simply move the logic to update_listbox_size instead of WM_NCCALCSIZE. No real gain in simplicity. Meanwhile, using SBS_SIZEBOX means adding yet another window to keep track of, initialize, and then position in update_listbox_size with the rest. No matter how I look at it, it will add *more* code, not less, after patch 4/4. But again, maybe I am missing something, and if so please elaborate on why you think using SBS_SIZEBOX is a better idea. I'd appreciate if I didn't have to actually waste time changing the code to end up with slightly more complex code, which is the opposite goal of what was intended... Thanks, Gabriel On 4/12/19 9:11 PM, Marvin wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Rejected". > > This means that the patch has been rejected by a reviewer. You should > have received a mail explaining why it was rejected. You need to fix > the issue and resend the patch, or if you are convinced that your > patch is good as is, you should reply to the rejection message with > your counterarguments. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email. >

1 0

Wine Mono packaging updates
by Vincent Povirk 13 Apr '19

13 Apr '19

With yesterday's Git update, Wine now has the ability to use a shared install of Wine Mono. This greatly reduces the disk space needed by each prefix, and it probably speeds up prefix creation as well. Those changes will be in Wine 4.6. The .msi package will continue to work as before. We recently added /opt/wine/mono and /opt/wine/gecko to the search paths for the Mono and Gecko msi's, mainly so that third-party distro packages (such as winehq's) can install them without interfering with future official distribution packages that may be named differently. I think the commit adding this, 2f6896b14d2b1905a25b1ef55bcdc792f9fa02ac, is safe to apply to older versions. The "shared" version of Wine Mono can be found at https://dl.winehq.org/wine/wine-mono/4.8.1/wine-mono-bin-4.8.1.tar.gz. It should be extracted to /usr/share/wine/mono or /opt/wine/mono. This will create a directory that includes the version number, so multiple versions can be installed independently. This file can also be built using the source tarball, of course. For more details, see the release notes I put on Github: https://github.com/madewokherd/wine-mono/releases/tag/wine-mono-4.8.1

2 2

[PATCH] include: Add cast to avoid a compiler warning on MSVC.
by Mathew Hodson 13 Apr '19

13 Apr '19

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- include/wine/test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 22ba7e8..0797204 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -511,7 +511,7 @@ const char *wine_dbgstr_wn( const WCHAR *str, int n ) case '\\': *dst++ = '\\'; *dst++ = '\\'; break; default: if (c >= ' ' && c <= 126) - *dst++ = c; + *dst++ = (char)c; else { *dst++ = '\\'; -- 2.7.4

1 0

[PATCH] dxgi: Add DECLSPEC_HOTPATCH to d3d11_swapchain_Present().
by Andrey Gusev 12 Apr '19

12 Apr '19

> That's not a commit message. Regardless, would whatever issue this > resolves also apply to d3d11_swapchain_Present1(), > d3d12_swapchain_Present() and/or d3d12_swapchain_Present1()? Any of the listed have no effect.

1 0

Testing an API which require Windows to generate input files
by Conor McCarthy 12 Apr '19

12 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12501 I've implemented some of the functions in mspatcha.dll, including ApplyPatchToFileW. I'm currently writing tests, but patch creation is not implemented, so only Windows can generate patch test files. How does testing normally work in this situation? It is possible to embed some very small test files as strings within the source code. A crosstest build should work too. Any other suggestions? I am not yet very familiar with the code base. Regards, Conor

2 1

[PATCH vkd3d 5/5] vkd3d: Implement d3d12_versioned_root_signature_deserializer_GetRootSignatureDescAtVersion().
by Józef Kucia 12 Apr '19

12 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/vkd3d_main.c | 51 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index be8c400caf4c..29e7e8ae5ca6 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -217,7 +217,7 @@ struct d3d12_versioned_root_signature_deserializer { D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12; struct vkd3d_versioned_root_signature_desc vkd3d; - } desc; + } desc, other_desc; }; STATIC_ASSERT(sizeof(D3D12_VERSIONED_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_versioned_root_signature_desc)); @@ -270,20 +270,61 @@ static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_Relea if (!refcount) { vkd3d_shader_free_versioned_root_signature(&deserializer->desc.vkd3d); + vkd3d_shader_free_versioned_root_signature(&deserializer->other_desc.vkd3d); vkd3d_free(deserializer); } return refcount; } +static enum vkd3d_root_signature_version vkd3d_root_signature_version_from_d3d12(D3D_ROOT_SIGNATURE_VERSION version) +{ + switch (version) + { + case D3D_ROOT_SIGNATURE_VERSION_1_0: + return VKD3D_ROOT_SIGNATURE_VERSION_1_0; + case D3D_ROOT_SIGNATURE_VERSION_1_1: + return VKD3D_ROOT_SIGNATURE_VERSION_1_1; + default: + WARN("Unknown root signature version %#x.\n", version); + return 0; + } +} + static HRESULT STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_GetRootSignatureDescAtVersion( ID3D12VersionedRootSignatureDeserializer *iface, D3D_ROOT_SIGNATURE_VERSION version, const D3D12_VERSIONED_ROOT_SIGNATURE_DESC **desc) { - FIXME("iface %p, version %#x, desc %p stub!\n", iface, version, desc); + struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); + int ret; - *desc = NULL; - return E_NOTIMPL; + TRACE("iface %p, version %#x, desc %p.\n", iface, version, desc); + + if (version != D3D_ROOT_SIGNATURE_VERSION_1_0 && version != D3D_ROOT_SIGNATURE_VERSION_1_1) + { + WARN("Root signature version %#x not supported.\n", version); + return E_INVALIDARG; + } + + if (deserializer->desc.d3d12.Version == version) + { + *desc = &deserializer->desc.d3d12; + return S_OK; + } + + if (!deserializer->other_desc.d3d12.Version) + { + if ((ret = vkd3d_shader_convert_root_signature(&deserializer->other_desc.vkd3d, + vkd3d_root_signature_version_from_d3d12(version), &deserializer->desc.vkd3d)) < 0) + { + WARN("Failed to convert versioned root signature, vkd3d result %d.\n", ret); + return hresult_from_vkd3d_result(ret); + } + } + + assert(deserializer->other_desc.d3d12.Version == version); + *desc = &deserializer->other_desc.d3d12; + return S_OK; } static const D3D12_VERSIONED_ROOT_SIGNATURE_DESC * STDMETHODCALLTYPE @@ -321,6 +362,8 @@ static HRESULT d3d12_versioned_root_signature_deserializer_init(struct d3d12_ver return hresult_from_vkd3d_result(ret); } + memset(&deserializer->other_desc, 0, sizeof(deserializer->other_desc)); + return S_OK; } -- 2.21.0

1 0

[PATCH vkd3d 3/5] vkd3d: Implement vkd3d_create_versioned_root_signature_deserializer().
by Józef Kucia 12 Apr '19

12 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/vkd3d_main.c | 137 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 8f9351bbacac..be8c400caf4c 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -92,6 +92,8 @@ struct d3d12_root_signature_deserializer } desc; }; +STATIC_ASSERT(sizeof(D3D12_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_root_signature_desc)); + static struct d3d12_root_signature_deserializer *impl_from_ID3D12RootSignatureDeserializer( ID3D12RootSignatureDeserializer *iface) { @@ -205,13 +207,144 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s &IID_ID3D12RootSignatureDeserializer, iid, deserializer); } +/* ID3D12VersionedRootSignatureDeserializer */ +struct d3d12_versioned_root_signature_deserializer +{ + ID3D12VersionedRootSignatureDeserializer ID3D12VersionedRootSignatureDeserializer_iface; + LONG refcount; + + union + { + D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12; + struct vkd3d_versioned_root_signature_desc vkd3d; + } desc; +}; + +STATIC_ASSERT(sizeof(D3D12_VERSIONED_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_versioned_root_signature_desc)); + +static struct d3d12_versioned_root_signature_deserializer *impl_from_ID3D12VersionedRootSignatureDeserializer( + ID3D12VersionedRootSignatureDeserializer *iface) +{ + return CONTAINING_RECORD(iface, struct d3d12_versioned_root_signature_deserializer, + ID3D12VersionedRootSignatureDeserializer_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_QueryInterface( + ID3D12VersionedRootSignatureDeserializer *iface, REFIID iid, void **object) +{ + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + /* QueryInterface() implementation is broken, E_NOINTERFACE is returned for + * IUnknown. + */ + if (IsEqualGUID(iid, &IID_ID3D12VersionedRootSignatureDeserializer)) + { + ID3D12VersionedRootSignatureDeserializer_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_AddRef(ID3D12VersionedRootSignatureDeserializer *iface) +{ + struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); + ULONG refcount = InterlockedIncrement(&deserializer->refcount); + + TRACE("%p increasing refcount to %u.\n", deserializer, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_Release(ID3D12VersionedRootSignatureDeserializer *iface) +{ + struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); + ULONG refcount = InterlockedDecrement(&deserializer->refcount); + + TRACE("%p decreasing refcount to %u.\n", deserializer, refcount); + + if (!refcount) + { + vkd3d_shader_free_versioned_root_signature(&deserializer->desc.vkd3d); + vkd3d_free(deserializer); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_GetRootSignatureDescAtVersion( + ID3D12VersionedRootSignatureDeserializer *iface, D3D_ROOT_SIGNATURE_VERSION version, + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC **desc) +{ + FIXME("iface %p, version %#x, desc %p stub!\n", iface, version, desc); + + *desc = NULL; + return E_NOTIMPL; +} + +static const D3D12_VERSIONED_ROOT_SIGNATURE_DESC * STDMETHODCALLTYPE +d3d12_versioned_root_signature_deserializer_GetUnconvertedRootSignatureDesc(ID3D12VersionedRootSignatureDeserializer *iface) +{ + struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); + + TRACE("iface %p.\n", iface); + + return &deserializer->desc.d3d12; +} + +static const struct ID3D12VersionedRootSignatureDeserializerVtbl d3d12_versioned_root_signature_deserializer_vtbl = +{ + /* IUnknown methods */ + d3d12_versioned_root_signature_deserializer_QueryInterface, + d3d12_versioned_root_signature_deserializer_AddRef, + d3d12_versioned_root_signature_deserializer_Release, + /* ID3D12VersionedRootSignatureDeserializer methods */ + d3d12_versioned_root_signature_deserializer_GetRootSignatureDescAtVersion, + d3d12_versioned_root_signature_deserializer_GetUnconvertedRootSignatureDesc, +}; + +static HRESULT d3d12_versioned_root_signature_deserializer_init(struct d3d12_versioned_root_signature_deserializer *deserializer, + const struct vkd3d_shader_code *dxbc) +{ + int ret; + + deserializer->ID3D12VersionedRootSignatureDeserializer_iface.lpVtbl = &d3d12_versioned_root_signature_deserializer_vtbl; + deserializer->refcount = 1; + + if ((ret = vkd3d_shader_parse_versioned_root_signature(dxbc, &deserializer->desc.vkd3d)) < 0) + { + WARN("Failed to parse root signature, vkd3d result %d.\n", ret); + return hresult_from_vkd3d_result(ret); + } + + return S_OK; +} + HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { - FIXME("data %p, data_size %lu, iid %s, deserializer %p stub!\n", + struct d3d12_versioned_root_signature_deserializer *object; + struct vkd3d_shader_code dxbc = {data, data_size}; + HRESULT hr; + + TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", data, data_size, debugstr_guid(iid), deserializer); - return E_NOTIMPL; + if (!(object = vkd3d_malloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d12_versioned_root_signature_deserializer_init(object, &dxbc))) + { + vkd3d_free(object); + return hr; + } + + return return_interface(&object->ID3D12VersionedRootSignatureDeserializer_iface, + &IID_ID3D12VersionedRootSignatureDeserializer, iid, deserializer); } /* ID3DBlob */ -- 2.21.0

1 0

[PATCH] dbgeng: Update stub to IDebugSymbols3.
by Nikolay Sivov 12 Apr '19

12 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbgeng/dbgeng.c | 795 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 733 insertions(+), 62 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index f9faef06dd..c54d13f6cd 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -46,7 +46,7 @@ struct debug_client { IDebugClient IDebugClient_iface; IDebugDataSpaces IDebugDataSpaces_iface; - IDebugSymbols IDebugSymbols_iface; + IDebugSymbols3 IDebugSymbols3_iface; IDebugControl2 IDebugControl2_iface; LONG refcount; ULONG engine_options; @@ -64,9 +64,9 @@ static struct debug_client *impl_from_IDebugDataSpaces(IDebugDataSpaces *iface) return CONTAINING_RECORD(iface, struct debug_client, IDebugDataSpaces_iface); } -static struct debug_client *impl_from_IDebugSymbols(IDebugSymbols *iface) +static struct debug_client *impl_from_IDebugSymbols3(IDebugSymbols3 *iface) { - return CONTAINING_RECORD(iface, struct debug_client, IDebugSymbols_iface); + return CONTAINING_RECORD(iface, struct debug_client, IDebugSymbols3_iface); } static struct debug_client *impl_from_IDebugControl2(IDebugControl2 *iface) @@ -89,9 +89,11 @@ static HRESULT STDMETHODCALLTYPE debugclient_QueryInterface(IDebugClient *iface, { *obj = &debug_client->IDebugDataSpaces_iface; } - else if (IsEqualIID(riid, &IID_IDebugSymbols)) + else if (IsEqualIID(riid, &IID_IDebugSymbols) + || IsEqualIID(riid, &IID_IDebugSymbols2) + || IsEqualIID(riid, &IID_IDebugSymbols3)) { - *obj = &debug_client->IDebugSymbols_iface; + *obj = &debug_client->IDebugSymbols3_iface; } else if (IsEqualIID(riid, &IID_IDebugControl2) || IsEqualIID(riid, &IID_IDebugControl)) @@ -766,56 +768,56 @@ static const IDebugDataSpacesVtbl debugdataspacesvtbl = debugdataspaces_ReadProcessorSystemData, }; -static HRESULT STDMETHODCALLTYPE debugsymbols_QueryInterface(IDebugSymbols *iface, REFIID riid, void **obj) +static HRESULT STDMETHODCALLTYPE debugsymbols_QueryInterface(IDebugSymbols3 *iface, REFIID riid, void **obj) { - struct debug_client *debug_client = impl_from_IDebugSymbols(iface); + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; return IUnknown_QueryInterface(unk, riid, obj); } -static ULONG STDMETHODCALLTYPE debugsymbols_AddRef(IDebugSymbols *iface) +static ULONG STDMETHODCALLTYPE debugsymbols_AddRef(IDebugSymbols3 *iface) { - struct debug_client *debug_client = impl_from_IDebugSymbols(iface); + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; return IUnknown_AddRef(unk); } -static ULONG STDMETHODCALLTYPE debugsymbols_Release(IDebugSymbols *iface) +static ULONG STDMETHODCALLTYPE debugsymbols_Release(IDebugSymbols3 *iface) { - struct debug_client *debug_client = impl_from_IDebugSymbols(iface); + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; return IUnknown_Release(unk); } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolOptions(IDebugSymbols *iface, ULONG *options) +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolOptions(IDebugSymbols3 *iface, ULONG *options) { FIXME("%p, %p stub.\n", iface, options); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_AddSymbolOptions(IDebugSymbols *iface, ULONG options) +static HRESULT STDMETHODCALLTYPE debugsymbols_AddSymbolOptions(IDebugSymbols3 *iface, ULONG options) { FIXME("%p, %#x stub.\n", iface, options); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveSymbolOptions(IDebugSymbols *iface, ULONG options) +static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveSymbolOptions(IDebugSymbols3 *iface, ULONG options) { FIXME("%p, %#x stub.\n", iface, options); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolOptions(IDebugSymbols *iface, ULONG options) +static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolOptions(IDebugSymbols3 *iface, ULONG options) { FIXME("%p, %#x stub.\n", iface, options); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetNameByOffset(IDebugSymbols *iface, ULONG64 offset, char *buffer, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNameByOffset(IDebugSymbols3 *iface, ULONG64 offset, char *buffer, ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) { FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, @@ -824,7 +826,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetNameByOffset(IDebugSymbols *ifa return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByName(IDebugSymbols *iface, const char *symbol, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByName(IDebugSymbols3 *iface, const char *symbol, ULONG64 *offset) { FIXME("%p, %s, %p stub.\n", iface, debugstr_a(symbol), offset); @@ -832,7 +834,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByName(IDebugSymbols *ifa return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffset(IDebugSymbols *iface, ULONG64 offset, LONG delta, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffset(IDebugSymbols3 *iface, ULONG64 offset, LONG delta, char *buffer, ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) { FIXME("%p, %s, %d, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size, @@ -841,7 +843,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffset(IDebugSymbols return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffset(IDebugSymbols *iface, ULONG64 offset, ULONG *line, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffset(IDebugSymbols3 *iface, ULONG64 offset, ULONG *line, char *buffer, ULONG buffer_size, ULONG *file_size, ULONG64 *displacement) { FIXME("%p, %s, %p, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size, @@ -850,7 +852,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffset(IDebugSymbols *ifa return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLine(IDebugSymbols *iface, ULONG line, const char *file, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLine(IDebugSymbols3 *iface, ULONG line, const char *file, ULONG64 *offset) { FIXME("%p, %u, %s, %p stub.\n", iface, line, debugstr_a(file), offset); @@ -858,21 +860,21 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLine(IDebugSymbols *ifa return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetNumberModules(IDebugSymbols *iface, ULONG *loaded, ULONG *unloaded) +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNumberModules(IDebugSymbols3 *iface, ULONG *loaded, ULONG *unloaded) { FIXME("%p, %p, %p stub.\n", iface, loaded, unloaded); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByIndex(IDebugSymbols *iface, ULONG index, ULONG64 *base) +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByIndex(IDebugSymbols3 *iface, ULONG index, ULONG64 *base) { FIXME("%p, %u, %p stub.\n", iface, index, base); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName(IDebugSymbols *iface, const char *name, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName(IDebugSymbols3 *iface, const char *name, ULONG start_index, ULONG *index, ULONG64 *base) { FIXME("%p, %s, %u, %p, %p stub.\n", iface, debugstr_a(name), start_index, index, base); @@ -880,7 +882,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName(IDebugSymbol return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset(IDebugSymbols *iface, ULONG64 offset, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset(IDebugSymbols3 *iface, ULONG64 offset, ULONG start_index, ULONG *index, ULONG64 *base) { FIXME("%p, %s, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), start_index, index, base); @@ -888,7 +890,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset(IDebugSymbols *i return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNames(IDebugSymbols *iface, ULONG index, ULONG64 base, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNames(IDebugSymbols3 *iface, ULONG index, ULONG64 base, char *image_name, ULONG image_name_buffer_size, ULONG *image_name_size, char *module_name, ULONG module_name_buffer_size, ULONG *module_name_size, char *loaded_image_name, ULONG loaded_image_name_buffer_size, ULONG *loaded_image_size) @@ -900,7 +902,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNames(IDebugSymbols *ifac return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleParameters(IDebugSymbols *iface, ULONG count, ULONG64 *bases, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleParameters(IDebugSymbols3 *iface, ULONG count, ULONG64 *bases, ULONG start, DEBUG_MODULE_PARAMETERS *parameters) { FIXME("%p, %u, %p, %u, %p stub.\n", iface, count, bases, start, parameters); @@ -908,14 +910,14 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleParameters(IDebugSymbols return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolModule(IDebugSymbols *iface, const char *symbol, ULONG64 *base) +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolModule(IDebugSymbols3 *iface, const char *symbol, ULONG64 *base) { FIXME("%p, %s, %p stub.\n", iface, debugstr_a(symbol), base); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeName(IDebugSymbols *iface, ULONG64 base, ULONG type_id, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeName(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id, char *buffer, ULONG buffer_size, ULONG *name_size) { FIXME("%p, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, buffer, @@ -924,7 +926,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeName(IDebugSymbols *iface, return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeId(IDebugSymbols *iface, ULONG64 base, const char *name, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeId(IDebugSymbols3 *iface, ULONG64 base, const char *name, ULONG *type_id) { FIXME("%p, %s, %s, %p stub.\n", iface, wine_dbgstr_longlong(base), debugstr_a(name), type_id); @@ -932,7 +934,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeId(IDebugSymbols *iface, UL return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeSize(IDebugSymbols *iface, ULONG64 base, ULONG type_id, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeSize(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id, ULONG *size) { FIXME("%p, %s, %u, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, size); @@ -940,7 +942,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeSize(IDebugSymbols *iface, return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldOffset(IDebugSymbols *iface, ULONG64 base, ULONG type_id, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldOffset(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id, const char *field, ULONG *offset) { FIXME("%p, %s, %u, %s, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, debugstr_a(field), offset); @@ -948,7 +950,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldOffset(IDebugSymbols *ifac return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolTypeId(IDebugSymbols *iface, const char *symbol, ULONG *type_id, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolTypeId(IDebugSymbols3 *iface, const char *symbol, ULONG *type_id, ULONG64 *base) { FIXME("%p, %s, %p, %p stub.\n", iface, debugstr_a(symbol), type_id, base); @@ -956,7 +958,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolTypeId(IDebugSymbols *ifa return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetTypeId(IDebugSymbols *iface, ULONG64 offset, ULONG *type_id, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetTypeId(IDebugSymbols3 *iface, ULONG64 offset, ULONG *type_id, ULONG64 *base) { FIXME("%p, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), type_id, base); @@ -964,7 +966,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetTypeId(IDebugSymbols *ifa return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataVirtual(IDebugSymbols *iface, ULONG64 offset, ULONG64 base, +static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataVirtual(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base, ULONG type_id, void *buffer, ULONG buffer_size, ULONG *read_len) { FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), @@ -973,7 +975,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataVirtual(IDebugSymbols return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataVirtual(IDebugSymbols *iface, ULONG64 offset, ULONG64 base, +static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataVirtual(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base, ULONG type_id, void *buffer, ULONG buffer_size, ULONG *written) { FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), @@ -982,7 +984,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataVirtual(IDebugSymbol return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataVirtual(IDebugSymbols *iface, ULONG output_control, +static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataVirtual(IDebugSymbols3 *iface, ULONG output_control, ULONG64 offset, ULONG64 base, ULONG type_id, ULONG flags) { FIXME("%p, %#x, %s, %s, %u, %#x stub.\n", iface, output_control, wine_dbgstr_longlong(offset), @@ -991,7 +993,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataVirtual(IDebugSymbo return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataPhysical(IDebugSymbols *iface, ULONG64 offset, ULONG64 base, +static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataPhysical(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base, ULONG type_id, void *buffer, ULONG buffer_size, ULONG *read_len) { FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), @@ -1000,7 +1002,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataPhysical(IDebugSymbol return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataPhysical(IDebugSymbols *iface, ULONG64 offset, +static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataPhysical(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base, ULONG type_id, void *buffer, ULONG buffer_size, ULONG *written) { FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), @@ -1009,7 +1011,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataPhysical(IDebugSymbo return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataPhysical(IDebugSymbols *iface, ULONG output_control, +static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataPhysical(IDebugSymbols3 *iface, ULONG output_control, ULONG64 offset, ULONG64 base, ULONG type_id, ULONG flags) { FIXME("%p, %#x, %s, %s, %u, %#x stub.\n", iface, output_control, wine_dbgstr_longlong(offset), @@ -1018,7 +1020,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataPhysical(IDebugSymb return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetScope(IDebugSymbols *iface, ULONG64 *instr_offset, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetScope(IDebugSymbols3 *iface, ULONG64 *instr_offset, DEBUG_STACK_FRAME *frame, void *scope_context, ULONG scope_context_size) { FIXME("%p, %p, %p, %p, %u stub.\n", iface, instr_offset, frame, scope_context, scope_context_size); @@ -1026,7 +1028,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetScope(IDebugSymbols *iface, ULO return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_SetScope(IDebugSymbols *iface, ULONG64 instr_offset, +static HRESULT STDMETHODCALLTYPE debugsymbols_SetScope(IDebugSymbols3 *iface, ULONG64 instr_offset, DEBUG_STACK_FRAME *frame, void *scope_context, ULONG scope_context_size) { FIXME("%p, %s, %p, %p, %u stub.\n", iface, wine_dbgstr_longlong(instr_offset), frame, scope_context, @@ -1035,14 +1037,14 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_SetScope(IDebugSymbols *iface, ULO return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_ResetScope(IDebugSymbols *iface) +static HRESULT STDMETHODCALLTYPE debugsymbols_ResetScope(IDebugSymbols3 *iface) { FIXME("%p stub.\n", iface); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetScopeSymbolGroup(IDebugSymbols *iface, ULONG flags, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetScopeSymbolGroup(IDebugSymbols3 *iface, ULONG flags, IDebugSymbolGroup *update, IDebugSymbolGroup **symbols) { FIXME("%p, %#x, %p, %p stub.\n", iface, flags, update, symbols); @@ -1050,14 +1052,14 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetScopeSymbolGroup(IDebugSymbols return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_CreateSymbolGroup(IDebugSymbols *iface, IDebugSymbolGroup **group) +static HRESULT STDMETHODCALLTYPE debugsymbols_CreateSymbolGroup(IDebugSymbols3 *iface, IDebugSymbolGroup **group) { FIXME("%p, %p stub.\n", iface, group); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_StartSymbolMatch(IDebugSymbols *iface, const char *pattern, +static HRESULT STDMETHODCALLTYPE debugsymbols_StartSymbolMatch(IDebugSymbols3 *iface, const char *pattern, ULONG64 *handle) { FIXME("%p, %s, %p stub.\n", iface, pattern, handle); @@ -1065,7 +1067,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_StartSymbolMatch(IDebugSymbols *if return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetNextSymbolMatch(IDebugSymbols *iface, ULONG64 handle, char *buffer, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNextSymbolMatch(IDebugSymbols3 *iface, ULONG64 handle, char *buffer, ULONG buffer_size, ULONG *match_size, ULONG64 *offset) { FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset); @@ -1073,21 +1075,21 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetNextSymbolMatch(IDebugSymbols * return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_EndSymbolMatch(IDebugSymbols *iface, ULONG64 handle) +static HRESULT STDMETHODCALLTYPE debugsymbols_EndSymbolMatch(IDebugSymbols3 *iface, ULONG64 handle) { FIXME("%p, %s stub.\n", iface, wine_dbgstr_longlong(handle)); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_Reload(IDebugSymbols *iface, const char *path) +static HRESULT STDMETHODCALLTYPE debugsymbols_Reload(IDebugSymbols3 *iface, const char *path) { FIXME("%p, %s stub.\n", iface, debugstr_a(path)); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolPath(IDebugSymbols *iface, char *buffer, ULONG buffer_size, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolPath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size, ULONG *path_size) { FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); @@ -1095,21 +1097,21 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolPath(IDebugSymbols *iface return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolPath(IDebugSymbols *iface, const char *path) +static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolPath(IDebugSymbols3 *iface, const char *path) { FIXME("%p, %s stub.\n", iface, debugstr_a(path)); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSymbolPath(IDebugSymbols *iface, const char *path) +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSymbolPath(IDebugSymbols3 *iface, const char *path) { FIXME("%p, %s stub.\n", iface, debugstr_a(path)); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetImagePath(IDebugSymbols *iface, char *buffer, ULONG buffer_size, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetImagePath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size, ULONG *path_size) { FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); @@ -1117,21 +1119,21 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetImagePath(IDebugSymbols *iface, return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_SetImagePath(IDebugSymbols *iface, const char *path) +static HRESULT STDMETHODCALLTYPE debugsymbols_SetImagePath(IDebugSymbols3 *iface, const char *path) { FIXME("%p, %s stub.\n", iface, debugstr_a(path)); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_AppendImagePath(IDebugSymbols *iface, const char *path) +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendImagePath(IDebugSymbols3 *iface, const char *path) { FIXME("%p, %s stub.\n", iface, debugstr_a(path)); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePath(IDebugSymbols *iface, char *buffer, ULONG buffer_size, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size, ULONG *path_size) { FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); @@ -1139,7 +1141,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePath(IDebugSymbols *iface return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathElement(IDebugSymbols *iface, ULONG index, char *buffer, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathElement(IDebugSymbols3 *iface, ULONG index, char *buffer, ULONG buffer_size, ULONG *element_size) { FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, element_size); @@ -1147,21 +1149,21 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathElement(IDebugSymbols return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_SetSourcePath(IDebugSymbols *iface, const char *path) +static HRESULT STDMETHODCALLTYPE debugsymbols_SetSourcePath(IDebugSymbols3 *iface, const char *path) { FIXME("%p, %s stub.\n", iface, debugstr_a(path)); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSourcePath(IDebugSymbols *iface, const char *path) +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSourcePath(IDebugSymbols3 *iface, const char *path) { FIXME("%p, %s stub.\n", iface, debugstr_a(path)); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFile(IDebugSymbols *iface, ULONG start, const char *file, +static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFile(IDebugSymbols3 *iface, ULONG start, const char *file, ULONG flags, ULONG *found_element, char *buffer, ULONG buffer_size, ULONG *found_size) { FIXME("%p, %u, %s, %#x, %p, %p, %u, %p stub.\n", iface, start, debugstr_a(file), flags, found_element, buffer, @@ -1170,7 +1172,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFile(IDebugSymbols *ifac return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsets(IDebugSymbols *iface, const char *file, +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsets(IDebugSymbols3 *iface, const char *file, ULONG64 *buffer, ULONG buffer_lines, ULONG *file_lines) { FIXME("%p, %s, %p, %u, %p stub.\n", iface, debugstr_a(file), buffer, buffer_lines, file_lines); @@ -1178,7 +1180,600 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsets(IDebugSym return E_NOTIMPL; } -static const IDebugSymbolsVtbl debugsymbolsvtbl = +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebugSymbols3 *iface, ULONG index, + ULONG64 base, const char *item, void *buffer, ULONG buffer_size, ULONG *info_size) +{ + FIXME("%p, %u, %s, %s, %p, %u, %p stub.\n", iface, index, wine_dbgstr_longlong(base), debugstr_a(item), buffer, + buffer_size, info_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameString(IDebugSymbols3 *iface, ULONG which, ULONG index, + ULONG64 base, char *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %u, %u, %s, %p, %u, %p stub.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size, + name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantName(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + ULONG64 value, char *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %s, %u, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, + wine_dbgstr_longlong(value), buffer, buffer_size, name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldName(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + ULONG field_index, char *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %s, %u, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer, + buffer_size, name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeOptions(IDebugSymbols3 *iface, ULONG *options) +{ + FIXME("%p, %p stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AddTypeOptions(IDebugSymbols3 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveTypeOptions(IDebugSymbols3 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetTypeOptions(IDebugSymbols3 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNameByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset, WCHAR *buffer, + ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) +{ + FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, name_size, + displacement); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByNameWide(IDebugSymbols3 *iface, const WCHAR *symbol, + ULONG64 *offset) +{ + FIXME("%p, %s, %p stub.\n", iface, debugstr_w(symbol), offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset, + LONG delta, WCHAR *buffer, ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) +{ + FIXME("%p, %s, %d, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size, + name_size, displacement); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset, ULONG *line, + WCHAR *buffer, ULONG buffer_size, ULONG *file_size, ULONG64 *displacement) +{ + FIXME("%p, %s, %p, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size, + file_size, displacement); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLineWide(IDebugSymbols3 *iface, ULONG line, const WCHAR *file, + ULONG64 *offset) +{ + FIXME("%p, %u, %s, %p stub.\n", iface, line, debugstr_w(file), offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleNameWide(IDebugSymbols3 *iface, const WCHAR *name, + ULONG start_index, ULONG *index, ULONG64 *base) +{ + FIXME("%p, %s, %u, %p, %p stub.\n", iface, debugstr_w(name), start_index, index, base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolModuleWide(IDebugSymbols3 *iface, const WCHAR *symbol, + ULONG64 *base) +{ + FIXME("%p, %s, %p stub.\n", iface, debugstr_w(symbol), base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + WCHAR *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, buffer, buffer_size, + name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeIdWide(IDebugSymbols3 *iface, ULONG64 module, const WCHAR *name, + ULONG *type_id) +{ + FIXME("%p, %s, %s, %p stub.\n", iface, wine_dbgstr_longlong(module), debugstr_w(name), type_id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldOffsetWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + const WCHAR *field, ULONG *offset) +{ + FIXME("%p, %s, %u, %s, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, debugstr_w(field), offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolTypeIdWide(IDebugSymbols3 *iface, const WCHAR *symbol, + ULONG *type_id, ULONG64 *module) +{ + FIXME("%p, %s, %p, %p stub.\n", iface, debugstr_w(symbol), type_id, module); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetScopeSymbolGroup2(IDebugSymbols3 *iface, ULONG flags, + PDEBUG_SYMBOL_GROUP2 update, PDEBUG_SYMBOL_GROUP2 *symbols) +{ + FIXME("%p, %#x, %p, %p stub.\n", iface, flags, update, symbols); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_CreateSymbolGroup2(IDebugSymbols3 *iface, PDEBUG_SYMBOL_GROUP2 *group) +{ + FIXME("%p, %p stub.\n", iface, group); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_StartSymbolMatchWide(IDebugSymbols3 *iface, const WCHAR *pattern, + ULONG64 *handle) +{ + FIXME("%p, %s, %p stub.\n", iface, debugstr_w(pattern), handle); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNextSymbolMatchWide(IDebugSymbols3 *iface, ULONG64 handle, + WCHAR *buffer, ULONG buffer_size, ULONG *match_size, ULONG64 *offset) +{ + FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_ReloadWide(IDebugSymbols3 *iface, const WCHAR *module) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(module)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolPathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size, + ULONG *path_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolPathWide(IDebugSymbols3 *iface, const WCHAR *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSymbolPathWide(IDebugSymbols3 *iface, const WCHAR *addition) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(addition)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetImagePathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size, + ULONG *path_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetImagePathWide(IDebugSymbols3 *iface, const WCHAR *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendImagePathWide(IDebugSymbols3 *iface, const WCHAR *addition) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(addition)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size, + ULONG *path_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathElementWide(IDebugSymbols3 *iface, ULONG index, + WCHAR *buffer, ULONG buffer_size, ULONG *element_size) +{ + FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, element_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetSourcePathWide(IDebugSymbols3 *iface, const WCHAR *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSourcePathWide(IDebugSymbols3 *iface, const WCHAR *addition) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(addition)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFileWide(IDebugSymbols3 *iface, ULONG start_element, + const WCHAR *file, ULONG flags, ULONG *found_element, WCHAR *buffer, ULONG buffer_size, ULONG *found_size) +{ + FIXME("%p, %u, %s, %#x, %p, %p, %u, %p stub.\n", iface, start_element, debugstr_w(file), flags, found_element, + buffer, buffer_size, found_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsetsWide(IDebugSymbols3 *iface, const WCHAR *file, + ULONG64 *buffer, ULONG buffer_lines, ULONG *file_lines) +{ + FIXME("%p, %s, %p, %u, %p stub.\n", iface, debugstr_w(file), buffer, buffer_lines, file_lines); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformationWide(IDebugSymbols3 *iface, ULONG index, + ULONG64 base, const WCHAR *item, void *buffer, ULONG buffer_size, ULONG *version_info_size) +{ + FIXME("%p, %u, %s, %s, %p, %u, %p stub.\n", iface, index, wine_dbgstr_longlong(base), debugstr_w(item), buffer, + buffer_size, version_info_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameStringWide(IDebugSymbols3 *iface, ULONG which, ULONG index, + ULONG64 base, WCHAR *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %u, %u, %s, %p, %u, %p stub.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size, + name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + ULONG64 value, WCHAR *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %s, %u, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, + wine_dbgstr_longlong(value), buffer, buffer_size, name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + ULONG field_index, WCHAR *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %s, %u, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer, + buffer_size, name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_IsManagedModule(IDebugSymbols3 *iface, ULONG index, ULONG64 base) +{ + FIXME("%p, %u, %s stub.\n", iface, index, wine_dbgstr_longlong(base)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2(IDebugSymbols3 *iface, const char *name, + ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base) +{ + FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, debugstr_a(name), start_index, flags, index, base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2Wide(IDebugSymbols3 *iface, const WCHAR *name, + ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base) +{ + FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, debugstr_w(name), start_index, flags, index, base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset2(IDebugSymbols3 *iface, ULONG64 offset, + ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base) +{ + FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), start_index, flags, index, base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticModule(IDebugSymbols3 *iface, ULONG64 base, ULONG size, + const char *image_path, const char *module_name, ULONG flags) +{ + FIXME("%p, %s, %u, %s, %s, %#x stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_a(image_path), + debugstr_a(module_name), flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticModuleWide(IDebugSymbols3 *iface, ULONG64 base, ULONG size, + const WCHAR *image_path, const WCHAR *module_name, ULONG flags) +{ + FIXME("%p, %s, %u, %s, %s, %#x stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_w(image_path), + debugstr_w(module_name), flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveSyntheticModule(IDebugSymbols3 *iface, ULONG64 base) +{ + FIXME("%p, %s stub.\n", iface, wine_dbgstr_longlong(base)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetCurrentScopeFrameIndex(IDebugSymbols3 *iface, ULONG *index) +{ + FIXME("%p, %p stub.\n", iface, index); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFrameByIndex(IDebugSymbols3 *iface, ULONG index) +{ + FIXME("%p, %u stub.\n", iface, index); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFromJitDebugInfo(IDebugSymbols3 *iface, ULONG output_control, + ULONG64 info_offset) +{ + FIXME("%p, %u, %s stub.\n", iface, output_control, wine_dbgstr_longlong(info_offset)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFromStoredEvent(IDebugSymbols3 *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_OutputSymbolByOffset(IDebugSymbols3 *iface, ULONG output_control, + ULONG flags, ULONG64 offset) +{ + FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, flags, wine_dbgstr_longlong(offset)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFunctionEntryByOffset(IDebugSymbols3 *iface, ULONG64 offset, + ULONG flags, void *buffer, ULONG buffer_size, ULONG *needed_size) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, buffer, buffer_size, + needed_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffset(IDebugSymbols3 *iface, ULONG64 module, + ULONG container_type_id, const char *field, ULONG *field_type_id, ULONG *offset) +{ + FIXME("%p, %s, %u, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_a(field), + field_type_id, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffsetWide(IDebugSymbols3 *iface, ULONG64 module, + ULONG container_type_id, const WCHAR *field, ULONG *field_type_id, ULONG *offset) +{ + FIXME("%p, %s, %u, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_w(field), + field_type_id, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticSymbol(IDebugSymbols3 *iface, ULONG64 offset, ULONG size, + const char *name, ULONG flags, DEBUG_MODULE_AND_ID *id) +{ + FIXME("%p, %s, %u, %s, %#x, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_a(name), flags, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticSymbolWide(IDebugSymbols3 *iface, ULONG64 offset, ULONG size, + const WCHAR *name, ULONG flags, DEBUG_MODULE_AND_ID *id) +{ + FIXME("%p, %s, %u, %s, %#x, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_w(name), flags, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveSyntheticSymbol(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id) +{ + FIXME("%p, %p stub.\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByOffset(IDebugSymbols3 *iface, ULONG64 offset, + ULONG flags, DEBUG_MODULE_AND_ID *ids, LONG64 *displacements, ULONG count, ULONG *entries) +{ + FIXME("%p, %s, %#x, %p, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, ids, displacements, count, + entries); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByName(IDebugSymbols3 *iface, const char *symbol, + ULONG flags, DEBUG_MODULE_AND_ID *ids, ULONG count, ULONG *entries) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_a(symbol), flags, ids, count, entries); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByNameWide(IDebugSymbols3 *iface, const WCHAR *symbol, + ULONG flags, DEBUG_MODULE_AND_ID *ids, ULONG count, ULONG *entries) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_w(symbol), flags, ids, count, entries); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryByToken(IDebugSymbols3 *iface, ULONG64 base, ULONG token, + DEBUG_MODULE_AND_ID *id) +{ + FIXME("%p, %s, %p stub.\n", iface, wine_dbgstr_longlong(base), id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryInformation(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id, + DEBUG_SYMBOL_ENTRY *info) +{ + FIXME("%p, %p, %p stub.\n", iface, id, info); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryString(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id, + ULONG which, char *buffer, ULONG buffer_size, ULONG *string_size) +{ + FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, id, which, buffer, buffer_size, string_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryStringWide(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id, + ULONG which, WCHAR *buffer, ULONG buffer_size, ULONG *string_size) +{ + FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, id, which, buffer, buffer_size, string_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryOffsetRegions(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id, + ULONG flags, DEBUG_OFFSET_REGION *regions, ULONG regions_count, ULONG *regions_avail) +{ + FIXME("%p, %p, %#x, %p, %u, %p stub.\n", iface, id, flags, regions, regions_count, regions_avail); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryBySymbolEntry(IDebugSymbols3 *iface, + DEBUG_MODULE_AND_ID *from_id, ULONG flags, DEBUG_MODULE_AND_ID *to_id) +{ + FIXME("%p, %p, %#x, %p stub.\n", iface, from_id, flags, to_id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByOffset(IDebugSymbols3 *iface, ULONG64 offset, + ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, entries, count, entries_avail); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLine(IDebugSymbols3 *iface, ULONG line, + const char *file, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_a(file), flags, entries, count, entries_avail); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLineWide(IDebugSymbols3 *iface, ULONG line, + const WCHAR *file, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_w(file), flags, entries, count, entries_avail); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryString(IDebugSymbols3 *iface, + DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG which, char *buffer, ULONG buffer_size, ULONG *string_size) +{ + FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryStringWide(IDebugSymbols3 *iface, + DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG which, WCHAR *buffer, ULONG buffer_size, ULONG *string_size) +{ + FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryOffsetRegions(IDebugSymbols3 *iface, + DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG flags, DEBUG_OFFSET_REGION *regions, ULONG count, ULONG *regions_avail) +{ + FIXME("%p, %p, %#x, %p, %u, %p stub.\n", iface, entry, flags, regions, count, regions_avail); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryBySourceEntry(IDebugSymbols3 *iface, + DEBUG_SYMBOL_SOURCE_ENTRY *from_entry, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *to_entry) +{ + FIXME("%p, %p, %#x, %p stub.\n", iface, from_entry, flags, to_entry); + + return E_NOTIMPL; +} + +static const IDebugSymbols3Vtbl debugsymbolsvtbl = { debugsymbols_QueryInterface, debugsymbols_AddRef, @@ -1232,6 +1827,82 @@ static const IDebugSymbolsVtbl debugsymbolsvtbl = debugsymbols_AppendSourcePath, debugsymbols_FindSourceFile, debugsymbols_GetSourceFileLineOffsets, + /* IDebugSymbols2 */ + debugsymbols_GetModuleVersionInformation, + debugsymbols_GetModuleNameString, + debugsymbols_GetConstantName, + debugsymbols_GetFieldName, + debugsymbols_GetTypeOptions, + debugsymbols_AddTypeOptions, + debugsymbols_RemoveTypeOptions, + debugsymbols_SetTypeOptions, + /* IDebugSymbols3 */ + debugsymbols_GetNameByOffsetWide, + debugsymbols_GetOffsetByNameWide, + debugsymbols_GetNearNameByOffsetWide, + debugsymbols_GetLineByOffsetWide, + debugsymbols_GetOffsetByLineWide, + debugsymbols_GetModuleByModuleNameWide, + debugsymbols_GetSymbolModuleWide, + debugsymbols_GetTypeNameWide, + debugsymbols_GetTypeIdWide, + debugsymbols_GetFieldOffsetWide, + debugsymbols_GetSymbolTypeIdWide, + debugsymbols_GetScopeSymbolGroup2, + debugsymbols_CreateSymbolGroup2, + debugsymbols_StartSymbolMatchWide, + debugsymbols_GetNextSymbolMatchWide, + debugsymbols_ReloadWide, + debugsymbols_GetSymbolPathWide, + debugsymbols_SetSymbolPathWide, + debugsymbols_AppendSymbolPathWide, + debugsymbols_GetImagePathWide, + debugsymbols_SetImagePathWide, + debugsymbols_AppendImagePathWide, + debugsymbols_GetSourcePathWide, + debugsymbols_GetSourcePathElementWide, + debugsymbols_SetSourcePathWide, + debugsymbols_AppendSourcePathWide, + debugsymbols_FindSourceFileWide, + debugsymbols_GetSourceFileLineOffsetsWide, + debugsymbols_GetModuleVersionInformationWide, + debugsymbols_GetModuleNameStringWide, + debugsymbols_GetConstantNameWide, + debugsymbols_GetFieldNameWide, + debugsymbols_IsManagedModule, + debugsymbols_GetModuleByModuleName2, + debugsymbols_GetModuleByModuleName2Wide, + debugsymbols_GetModuleByOffset2, + debugsymbols_AddSyntheticModule, + debugsymbols_AddSyntheticModuleWide, + debugsymbols_RemoveSyntheticModule, + debugsymbols_GetCurrentScopeFrameIndex, + debugsymbols_SetScopeFrameByIndex, + debugsymbols_SetScopeFromJitDebugInfo, + debugsymbols_SetScopeFromStoredEvent, + debugsymbols_OutputSymbolByOffset, + debugsymbols_GetFunctionEntryByOffset, + debugsymbols_GetFieldTypeAndOffset, + debugsymbols_GetFieldTypeAndOffsetWide, + debugsymbols_AddSyntheticSymbol, + debugsymbols_AddSyntheticSymbolWide, + debugsymbols_RemoveSyntheticSymbol, + debugsymbols_GetSymbolEntriesByOffset, + debugsymbols_GetSymbolEntriesByName, + debugsymbols_GetSymbolEntriesByNameWide, + debugsymbols_GetSymbolEntryByToken, + debugsymbols_GetSymbolEntryInformation, + debugsymbols_GetSymbolEntryString, + debugsymbols_GetSymbolEntryStringWide, + debugsymbols_GetSymbolEntryOffsetRegions, + debugsymbols_GetSymbolEntryBySymbolEntry, + debugsymbols_GetSourceEntriesByOffset, + debugsymbols_GetSourceEntriesByLine, + debugsymbols_GetSourceEntriesByLineWide, + debugsymbols_GetSourceEntryString, + debugsymbols_GetSourceEntryStringWide, + debugsymbols_GetSourceEntryOffsetRegions, + debugsymbols_GetSourceEntryBySourceEntry, }; static HRESULT STDMETHODCALLTYPE debugcontrol_QueryInterface(IDebugControl2 *iface, REFIID riid, void **obj) @@ -2191,7 +2862,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) debug_client->IDebugClient_iface.lpVtbl = &debugclientvtbl; debug_client->IDebugDataSpaces_iface.lpVtbl = &debugdataspacesvtbl; - debug_client->IDebugSymbols_iface.lpVtbl = &debugsymbolsvtbl; + debug_client->IDebugSymbols3_iface.lpVtbl = &debugsymbolsvtbl; debug_client->IDebugControl2_iface.lpVtbl = &debugcontrolvtbl; debug_client->refcount = 1; list_init(&debug_client->targets); -- 2.20.1

1 0

[PATCH 5/5] dxgi: Slightly simplify d3d11_swapchain_init().
by Henri Verbeet 12 Apr '19

12 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/device.c | 4 ++-- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 12 +++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index d6dd0418c47..e3dc52b8ed6 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -474,7 +474,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX return E_OUTOFMEMORY; } - if (FAILED(hr = d3d11_swapchain_init(object, device, &wined3d_desc, FALSE))) + if (FAILED(hr = d3d11_swapchain_init(object, device, &wined3d_desc))) { WARN("Failed to initialise swapchain, hr %#x.\n", hr); heap_free(object); @@ -578,7 +578,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return E_OUTOFMEMORY; } - if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc, TRUE))) + if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc))) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); heap_free(swapchain); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5c5775ca377..b6999c729a4 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -178,7 +178,7 @@ struct d3d11_swapchain }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN; + struct wined3d_swapchain_desc *desc) DECLSPEC_HIDDEN; HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 17f9a1e43d6..53da2081e89 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -779,16 +779,14 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc, BOOL implicit) + struct wined3d_swapchain_desc *desc) { HRESULT hr; - /* - * A reference to the implicit swapchain is held by the wined3d device. - * In order to avoid circular references we do not keep a reference - * to the device in the implicit swapchain. - */ - if (!implicit) + /* A reference to the implicit swapchain is held by the wined3d device. In + * order to avoid circular references we do not keep a reference to the + * device in the implicit swapchain. */ + if (!(desc->flags & WINED3D_SWAPCHAIN_IMPLICIT)) { if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) return E_INVALIDARG; -- 2.11.0

2 1

[PATCH] ntoskrnl.exe: Open thread with THREAD_QUERY_INFORMATION access in KeGetCurrentThread.
by Jacek Caban 12 Apr '19

12 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This fixes a problem spotted by Derek where we don't have enough access to initialize thread object. We might need a more general solution, but it's a good idea to have those permissions in the first place anyway. As a side note, this code is not needed with hacks I have in the tree. As the FIXME says, we'd ideally just use GetCurrentThread() handle, but that needs more server support for device drivers acting as client threads. dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH] xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start().
by Paul Gofman 12 Apr '19

12 Apr '19

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. Details are in https://bugs.winehq.org/show_bug.cgi?id=46870, while that bug is not dedicated to this specific issue. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/xaudio2_7/xaudio_dll.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 18306a1603..da34e480c1 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") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") "subl $8,%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" -- 2.20.1

3 2

[PATCH 3/5] ddraw: Simplify ddraw_destroy_swapchain().
by Henri Verbeet 12 Apr '19

12 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index cb7c12a1de1..b2097726076 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -365,44 +365,34 @@ static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) static void ddraw_destroy_swapchain(struct ddraw *ddraw) { + unsigned int i; + HRESULT hr; + TRACE("Destroying the swapchain.\n"); wined3d_swapchain_decref(ddraw->wined3d_swapchain); ddraw->wined3d_swapchain = NULL; - if (!(ddraw->flags & DDRAW_NO3D)) + for (i = 0; i < ddraw->numConvertedDecls; ++i) { - UINT i; + wined3d_vertex_declaration_decref(ddraw->decls[i].decl); + } + heap_free(ddraw->decls); + ddraw->numConvertedDecls = 0; - for (i = 0; i < ddraw->numConvertedDecls; ++i) - { - wined3d_vertex_declaration_decref(ddraw->decls[i].decl); - } - heap_free(ddraw->decls); - ddraw->numConvertedDecls = 0; + if (FAILED(hr = wined3d_device_uninit_3d(ddraw->wined3d_device))) + ERR("Failed to uninit 3D, hr %#x.\n", hr); - if (FAILED(wined3d_device_uninit_3d(ddraw->wined3d_device))) - { - ERR("Failed to uninit 3D.\n"); - } - else - { - /* Free the d3d window if one was created. */ - if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) - { - TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window); - DestroyWindow(ddraw->d3d_window); - ddraw->d3d_window = 0; - } - } - - ddraw->flags &= ~DDRAW_D3D_INITIALIZED; - } - else + /* Free the d3d window if one was created. */ + if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) { - wined3d_device_uninit_3d(ddraw->wined3d_device); + TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window); + DestroyWindow(ddraw->d3d_window); + ddraw->d3d_window = 0; } + ddraw->flags &= ~DDRAW_D3D_INITIALIZED; + ddraw_set_swapchain_window(ddraw, NULL); TRACE("Swapchain destroyed.\n"); -- 2.11.0

1 0

[PATCH 2/5] wined3d: Get rid of wined3d_device_uninit_gdi().
by Henri Verbeet 12 Apr '19

12 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- 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 f4aabf4efab..cb7c12a1de1 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 1424ed4ab7e..a0c44b5d41c 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 1422c65245e..704e19db46b 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 e943e0d988c..8a29ef63999 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); -- 2.11.0

1 0

[PATCH 1/5] wined3d: get rid of wined3d_device_init_gdi().
by Henri Verbeet 12 Apr '19

12 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- 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 8467fbf4ccc..f4aabf4efab 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 1d870c0c201..1424ed4ab7e 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 75b9fe12c60..1422c65245e 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 51fb7e6c8c9..e943e0d988c 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, -- 2.11.0

1 0

[PATCH 1/4] shell32/autocomplete: Implement the listbox scrollbar manually
by Gabriel Ivăncescu 12 Apr '19

12 Apr '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is a no-op patch; its purpose is to keep the next patch smaller and focused only on implementing the resizing grip, because IMO it was a bit large before I split it. Note that to avoid more pointless changes in the next patch, names with "grip" have been used for the scrollbar, I hope that's not a problem. Some of the things are done purposefully to keep the next patch smaller, while they may not make sense by themselves. For example, the WM_WINDOWPOSCHANGED is also useful to that end. dlls/shell32/autocomplete.c | 132 ++++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index f0777ff..38ca8ca 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -65,9 +65,11 @@ typedef struct HWND hwndEdit; HWND hwndListBox; HWND hwndListBoxOwner; + HWND hwndListBoxGrip; WNDPROC wpOrigEditProc; WNDPROC wpOrigLBoxProc; WNDPROC wpOrigLBoxOwnerProc; + WNDPROC wpOrigLBoxGripProc; WCHAR *txtbackup; WCHAR *quickComplete; IEnumString *enumstr; @@ -284,6 +286,41 @@ static void free_enum_strs(IAutoCompleteImpl *ac) } } +static void update_listbox_size(IAutoCompleteImpl *ac, UINT width, UINT height) +{ + UINT item_height, listbox_width, grip_sz, grip_height; + SCROLLINFO info; + + info.nMax = SendMessageW(ac->hwndListBox, LB_GETCOUNT, 0, 0) - 1; + item_height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0); + grip_sz = GetSystemMetrics(SM_CXVSCROLL); + width -= GetSystemMetrics(SM_CXBORDER) * 2; + height -= GetSystemMetrics(SM_CYBORDER) * 2; + info.nPage = max(height / item_height, 1); + + /* Set the scrollbar info if it's visible */ + listbox_width = width; + if (info.nMax >= info.nPage) + { + grip_height = height; + info.cbSize = sizeof(info); + info.fMask = SIF_PAGE | SIF_POS | SIF_RANGE; + info.nMin = 0; + info.nPos = SendMessageW(ac->hwndListBox, LB_GETTOPINDEX, 0, 0); + SetScrollInfo(ac->hwndListBoxGrip, SB_VERT, &info, FALSE); + + listbox_width -= grip_sz; + } + else + grip_height = 0; + + SetWindowPos(ac->hwndListBoxGrip, NULL, width - grip_sz, 0, grip_sz, grip_height, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSENDCHANGING | SWP_DEFERERASE); + + SetWindowPos(ac->hwndListBox, NULL, 0, 0, listbox_width, height, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOSENDCHANGING | SWP_DEFERERASE); +} + static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd, BOOL reset) { ShowWindow(ac->hwndListBoxOwner, SW_HIDE); @@ -304,7 +341,12 @@ static void show_listbox(IAutoCompleteImpl *ac) width = r.right - r.left; SetWindowPos(ac->hwndListBoxOwner, HWND_TOP, r.left, r.bottom + 1, width, height, - SWP_SHOWWINDOW | SWP_NOACTIVATE); + SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOSENDCHANGING | SWP_DEFERERASE); + + /* Update the grip here (as we skip it during message processing), due + to the fact that the size itself might not always change, while the + count does and thus it possibly needs updating of the scrollbar */ + update_listbox_size(ac, width, height); } static void set_listbox_font(IAutoCompleteImpl *ac, HFONT font) @@ -863,6 +905,36 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, set_text_and_selection(This, This->hwndEdit, msg, 0, strlenW(msg)); hide_listbox(This, hwnd, TRUE); return 0; + case WM_VSCROLL: + /* Handle thumb tracking manually as the listbox doesn't have WS_VSCROLL */ + if (LOWORD(wParam) == SB_THUMBTRACK || LOWORD(wParam) == SB_THUMBPOSITION) + { + SCROLLINFO info; + info.cbSize = sizeof(info); + info.fMask = SIF_TRACKPOS; + if (!GetScrollInfo(This->hwndListBoxGrip, SB_VERT, &info)) + return 0; + uMsg = LB_SETTOPINDEX; + wParam = info.nTrackPos; + } + /* fall through */ + case WM_MOUSEWHEEL: + case LB_SETCURSEL: + case LB_SETITEMHEIGHT: + case LB_SETTOPINDEX: + { + LRESULT ret = CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); + SCROLLINFO info; + info.cbSize = sizeof(info); + info.fMask = SIF_PAGE | SIF_POS | SIF_RANGE; + info.nMin = 0; + info.nMax = SendMessageW(hwnd, LB_GETCOUNT, 0, 0) - 1; + info.nPage = SendMessageW(hwnd, LB_GETLISTBOXINFO, 0, 0); + info.nPos = SendMessageW(hwnd, LB_GETTOPINDEX, 0, 0); + + SetScrollInfo(This->hwndListBoxGrip, SB_VERT, &info, TRUE); + return ret; + } } return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); } @@ -879,16 +951,55 @@ static LRESULT APIENTRY ACLBoxOwnerSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPa if (draw_listbox_item(This, (DRAWITEMSTRUCT*)lParam, wParam)) return TRUE; break; - case WM_SIZE: - SetWindowPos(This->hwndListBox, NULL, 0, 0, LOWORD(lParam), HIWORD(lParam), - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_DEFERERASE); + case WM_WINDOWPOSCHANGED: + { + const WINDOWPOS *wp = (const WINDOWPOS*)lParam; + + if (!(wp->flags & SWP_NOSIZE)) + { + /* Only proceed with the update if the user resized it */ + if (wp->flags & SWP_NOSENDCHANGING) break; + + update_listbox_size(This, wp->cx, wp->cy); + } break; + } } return CallWindowProcW(This->wpOrigLBoxOwnerProc, hwnd, uMsg, wParam, lParam); } +static LRESULT APIENTRY ACLBoxGripSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + IAutoCompleteImpl *This = (IAutoCompleteImpl*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + + switch (uMsg) + { + case WM_MOUSEACTIVATE: + return MA_NOACTIVATE; + case WM_VSCROLL: + return SendMessageW(This->hwndListBox, uMsg, wParam, lParam); + case WM_NCCALCSIZE: + { + NCCALCSIZE_PARAMS *p = (NCCALCSIZE_PARAMS*)lParam; + if (wParam == FALSE) return 0; + + p->rgrc[0].right = p->rgrc[0].left; + + return 0; + } + case WM_NCHITTEST: + return HTVSCROLL; + case WM_NCLBUTTONDOWN: + case WM_NCLBUTTONDBLCLK: + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } + return CallWindowProcW(This->wpOrigLBoxGripProc, hwnd, uMsg, wParam, lParam); +} + static void create_listbox(IAutoCompleteImpl *This) { + UINT grip_sz = GetSystemMetrics(SM_CXVSCROLL); + This->hwndListBoxOwner = CreateWindowExW(WS_EX_NOACTIVATE, WC_STATICW, NULL, WS_BORDER | WS_POPUP | WS_CLIPCHILDREN, 0, 0, 0, 0, NULL, NULL, shell32_hInstance, NULL); @@ -899,8 +1010,15 @@ static void create_listbox(IAutoCompleteImpl *This) } /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ + This->hwndListBoxGrip = CreateWindowExW(WS_EX_NOACTIVATE, WC_STATICW, NULL, + WS_CHILD | WS_VISIBLE, 0, 0, grip_sz, grip_sz, + This->hwndListBoxOwner, NULL, shell32_hInstance, NULL); + if (!This->hwndListBoxGrip) goto fail; + + /* Create the listbox */ This->hwndListBox = CreateWindowExW(WS_EX_NOACTIVATE, WC_LISTBOXW, NULL, - WS_CHILD | WS_VISIBLE | WS_VSCROLL | LBS_NODATA | LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT, + WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + LBS_NODATA | LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT, 0, 0, 0, 0, This->hwndListBoxOwner, NULL, shell32_hInstance, NULL); if (This->hwndListBox) { @@ -912,6 +1030,9 @@ static void create_listbox(IAutoCompleteImpl *This) This->wpOrigLBoxOwnerProc = (WNDPROC)SetWindowLongPtrW(This->hwndListBoxOwner, GWLP_WNDPROC, (LONG_PTR)ACLBoxOwnerSubclassProc); SetWindowLongPtrW(This->hwndListBoxOwner, GWLP_USERDATA, (LONG_PTR)This); + This->wpOrigLBoxGripProc = (WNDPROC)SetWindowLongPtrW(This->hwndListBoxGrip, GWLP_WNDPROC, (LONG_PTR)ACLBoxGripSubclassProc); + SetWindowLongPtrW(This->hwndListBoxGrip, GWLP_USERDATA, (LONG_PTR)This); + /* Use the same font as the edit control, as it gets destroyed before it anyway */ edit_font = (HFONT)SendMessageW(This->hwndEdit, WM_GETFONT, 0, 0); if (edit_font) @@ -919,6 +1040,7 @@ static void create_listbox(IAutoCompleteImpl *This) return; } +fail: DestroyWindow(This->hwndListBoxOwner); This->hwndListBoxOwner = NULL; This->options &= ~ACO_AUTOSUGGEST; -- 2.20.1

3 8

[PATCH 1/2] include: add missing includes, functions to qos2.h
by Vijay Kiran Kamuju 12 Apr '19

12 Apr '19

Fix the definition of QOS_FLOWID Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/qos2.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/include/qos2.h b/include/qos2.h index ac486f71fd..0d0bc597c9 100644 --- a/include/qos2.h +++ b/include/qos2.h @@ -19,11 +19,14 @@ #ifndef __WINE_QOS2_H__ #define __WINE_QOS2_H__ +#include <ws2tcpip.h> +#include <mstcpip.h> + #ifdef __cplusplus extern "C" { #endif -typedef UINT32 QOS_FLOWID; +typedef ULONG QOS_FLOWID, *PQOS_FLOWID; typedef enum _QOS_SHAPING { QOSShapeOnly, @@ -93,6 +96,27 @@ typedef struct _QOS_VERSION { USHORT MinorVersion; } QOS_VERSION, *PQOS_VERSION; +#define QOS_OUTGOING_DEFAULT_MINIMUM_BANDWIDTH 0xFFFFFFFF + +#define QOS_QUERYFLOW_FRESH 0x00000001 +#define QOS_NON_ADAPTIVE_FLOW 0x00000002 + +BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle); +BOOL WINAPI QOSCloseHandle(HANDLE handle); +BOOL WINAPI QOSStartTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags); +BOOL WINAPI QOSStopTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags); +BOOL WINAPI QOSEnumerateFlows(HANDLE handle, PULONG size, PVOID buffer); +BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, + QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid); +BOOL WINAPI QOSRemoveSocketFromFlow(HANDLE handle, SOCKET socket, QOS_FLOWID flowid, DWORD flags); +BOOL WINAPI QOSSetFlow(HANDLE handle, QOS_FLOWID flowid, QOS_SET_FLOW op, ULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSQueryFlow(HANDLE handle, QOS_FLOWID flowid, QOS_QUERY_FLOW op, PULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSNotifyFlow(HANDLE handle, QOS_FLOWID flowid, QOS_NOTIFY_FLOW op, PULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSCancel(HANDLE handle, LPOVERLAPPED overlap); + #ifdef __cplusplus } #endif -- 2.21.0

2 2

[PATCH] dxgi: Add DECLSPEC_HOTPATCH to d3d11_swapchain_Present().
by Andrey Gusev 12 Apr '19

12 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46971 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 17f9a1e43d..0a121b9dc8 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -317,7 +317,7 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); } -static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) +static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); -- 2.20.1

2 1

[PATCH 1/2] ntdll/tests: Add some tests for thread suspend/resume.
by Nikolay Sivov 12 Apr '19

12 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 61 ++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index accb5d8646..c79fb8eb8d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -53,6 +53,8 @@ static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtClose)(HANDLE); +static NTSTATUS (WINAPI *pNtSuspendThread)(HANDLE thread, ULONG *count); +static NTSTATUS (WINAPI *pNtResumeThread)(HANDLE thread, ULONG *count); #if defined(__x86_64__) typedef struct @@ -3135,6 +3137,61 @@ static void test_vectored_continue_handler(void) } #endif /* defined(__i386__) || defined(__x86_64__) */ +static DWORD WINAPI suspend_thread_test( void *arg ) +{ + HANDLE event = arg; + WaitForSingleObject(event, INFINITE); + return 0; +} + +static void test_suspend_thread(void) +{ + HANDLE thread, event; + NTSTATUS status; + ULONG count; + DWORD ret; + + status = NtSuspendThread(0, NULL); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + + status = NtResumeThread(0, NULL); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + + thread = CreateThread(NULL, 0, suspend_thread_test, event, 0, NULL); + ok(thread != NULL, "Failed to create a thread.\n"); + + ret = WaitForSingleObject(thread, 0); + ok(ret == WAIT_TIMEOUT, "Unexpected status %d.\n", ret); + + status = NtResumeThread(thread, NULL); + ok(!status, "Unexpected status %#x.\n", status); + + status = NtResumeThread(thread, &count); + ok(!status, "Unexpected status %#x.\n", status); + ok(count == 0, "Unexpected suspended count %u.\n", count); + + status = NtSuspendThread(thread, NULL); + ok(!status, "Failed to suspend a thread, status %#x.\n", status); + + status = NtSuspendThread(thread, &count); + ok(!status, "Failed to suspend a thread, status %#x.\n", status); + ok(count == 1, "Unexpected suspended count %u.\n", count); + + status = NtResumeThread(thread, &count); + ok(!status, "Failed to resume a thread, status %#x.\n", status); + ok(count == 2, "Unexpected suspended count %u.\n", count); + + status = NtResumeThread(thread, NULL); + ok(!status, "Failed to resume a thread, status %#x.\n", status); + + SetEvent(event); + WaitForSingleObject(thread, INFINITE); + + CloseHandle(thread); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3169,6 +3226,8 @@ START_TEST(exception) pNtSetInformationProcess = (void*)GetProcAddress( hntdll, "NtSetInformationProcess" ); pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); + pNtSuspendThread = (void *)GetProcAddress( hntdll, "NtSuspendThread" ); + pNtResumeThread = (void *)GetProcAddress( hntdll, "NtResumeThread" ); #ifdef __i386__ if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -3253,6 +3312,7 @@ START_TEST(exception) test_dpe_exceptions(); test_prot_fault(); test_thread_context(); + test_suspend_thread(); #elif defined(__x86_64__) pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, @@ -3294,6 +3354,7 @@ START_TEST(exception) test_prot_fault(); test_dpe_exceptions(); test_wow64_context(); + test_suspend_thread(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind(); -- 2.20.1

2 2

[PATCH] pdh: Support the 'Processor' object string.
by Vijay Kiran Kamuju 12 Apr '19

12 Apr '19

From: Erich Hoover <ehoover(a)mines.edu> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33018 From: Erich Hoover <ehoover(a)mines.edu> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/pdh/pdh_main.c | 3 +++ dlls/pdh/tests/pdh.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 7ef91f1a7fb..ef69e45fca4 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -178,6 +178,8 @@ struct source static const WCHAR path_processor_time[] = {'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')', '\\','%',' ','P','r','o','c','e','s','s','o','r',' ','T','i','m','e',0}; +static const WCHAR path_processor[] = + {'\\','P','r','o','c','e','s','s','o','r',0}; static const WCHAR path_uptime[] = {'\\','S','y','s','t','e','m', '\\', 'S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; @@ -204,6 +206,7 @@ static void CALLBACK collect_uptime( struct counter *counter ) static const struct source counter_sources[] = { { 6, path_processor_time, collect_processor_time, TYPE_PROCESSOR_TIME, -5, 10000000 }, + { 238, path_processor, NULL, 0, 0, 0 }, { 674, path_uptime, collect_uptime, TYPE_UPTIME, -3, 1000 } }; diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 0a17906afbd..a9613e22b02 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -673,6 +673,13 @@ static void test_PdhLookupPerfNameByIndexA( void ) "PdhLookupPerfNameByIndexA failed, got %s expected \'%% Processor Time\'\n", buffer); ok(size == sizeof("% Processor Time"), "PdhLookupPerfNameByIndexA failed %d\n", size); + size = sizeof(buffer); + ret = PdhLookupPerfNameByIndexA( NULL, 238, buffer, &size ); + ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); + ok(!lstrcmpA( buffer, "Processor" ), + "PdhLookupPerfNameByIndexA failed, got %s expected \'Processor\'\n", buffer); + ok(size == sizeof("Processor"), "PdhLookupPerfNameByIndexA failed %d\n", size); + size = sizeof(buffer); ret = PdhLookupPerfNameByIndexA( NULL, 674, NULL, &size ); ok(ret == PDH_INVALID_ARGUMENT || -- 2.17.0

1 0

[PATCH 1/6] qcap/tests: Remove some unnecessary workarounds.
by Zebediah Figura 12 Apr '19

12 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/tests/smartteefilter.c | 42 ++++++++++---------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index f62a88fb79..0c79ea7056 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1,5 +1,5 @@ /* - * SmartTeeFilter tests + * Smart tee filter unit tests * * Copyright 2015 Damjan Jovanovic * @@ -18,18 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #define COBJMACROS -#include <dshow.h> -#include <guiddef.h> -#include <devguid.h> -#include <stdio.h> - -#include "wine/strmbase.h" +#include "dshow.h" #include "wine/test.h" static HANDLE event; @@ -2022,25 +2012,19 @@ end: START_TEST(smartteefilter) { - if (SUCCEEDED(CoInitialize(NULL))) - { - event = CreateEventW(NULL, FALSE, FALSE, NULL); - if (event) { - test_smart_tee_filter_aggregation(); - test_smart_tee_filter(); + CoInitialize(NULL); - test_audio_smart_tee_filter_auto_insertion(test_audio_preview); - test_audio_smart_tee_filter_auto_insertion(test_audio_capture); + event = CreateEventW(NULL, FALSE, FALSE, NULL); - test_video_smart_tee_filter_auto_insertion(test_video_preview); - test_video_smart_tee_filter_auto_insertion(test_video_capture); + test_smart_tee_filter_aggregation(); + test_smart_tee_filter(); - CloseHandle(event); - } else - skip("CreateEvent failed, error=%u\n", GetLastError()); + test_audio_smart_tee_filter_auto_insertion(test_audio_preview); + test_audio_smart_tee_filter_auto_insertion(test_audio_capture); - CoUninitialize(); - } - else - skip("CoInitialize failed\n"); + test_video_smart_tee_filter_auto_insertion(test_video_preview); + test_video_smart_tee_filter_auto_insertion(test_video_capture); + + CloseHandle(event); + CoUninitialize(); } -- 2.21.0

2 6

[PATCH v2 1/2] include: add missing includes, functions to qos2.h
by Vijay Kiran Kamuju 12 Apr '19

12 Apr '19

Fix the definition of QOS_FLOWID Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/qos2.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/include/qos2.h b/include/qos2.h index ac486f71fd..0d0bc597c9 100644 --- a/include/qos2.h +++ b/include/qos2.h @@ -19,11 +19,14 @@ #ifndef __WINE_QOS2_H__ #define __WINE_QOS2_H__ +#include <ws2tcpip.h> +#include <mstcpip.h> + #ifdef __cplusplus extern "C" { #endif -typedef UINT32 QOS_FLOWID; +typedef ULONG QOS_FLOWID, *PQOS_FLOWID; typedef enum _QOS_SHAPING { QOSShapeOnly, @@ -93,6 +96,27 @@ typedef struct _QOS_VERSION { USHORT MinorVersion; } QOS_VERSION, *PQOS_VERSION; +#define QOS_OUTGOING_DEFAULT_MINIMUM_BANDWIDTH 0xFFFFFFFF + +#define QOS_QUERYFLOW_FRESH 0x00000001 +#define QOS_NON_ADAPTIVE_FLOW 0x00000002 + +BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle); +BOOL WINAPI QOSCloseHandle(HANDLE handle); +BOOL WINAPI QOSStartTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags); +BOOL WINAPI QOSStopTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags); +BOOL WINAPI QOSEnumerateFlows(HANDLE handle, PULONG size, PVOID buffer); +BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, + QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid); +BOOL WINAPI QOSRemoveSocketFromFlow(HANDLE handle, SOCKET socket, QOS_FLOWID flowid, DWORD flags); +BOOL WINAPI QOSSetFlow(HANDLE handle, QOS_FLOWID flowid, QOS_SET_FLOW op, ULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSQueryFlow(HANDLE handle, QOS_FLOWID flowid, QOS_QUERY_FLOW op, PULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSNotifyFlow(HANDLE handle, QOS_FLOWID flowid, QOS_NOTIFY_FLOW op, PULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSCancel(HANDLE handle, LPOVERLAPPED overlap); + #ifdef __cplusplus } #endif -- 2.21.0

1 1

[PATCH v3 01/11] ntoskrnl.exe: Implement PsLookupThreadByThreadId.
by Derek Lesho 11 Apr '19

11 Apr '19

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- v3: Added a test and header definition. dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 17 +++++++++++++++++ include/ddk/ntifs.h | 1 + 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f5dee07e2f..770bdfd4fa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3245,6 +3245,26 @@ NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) } +/***************************************************** + * PsLookupThreadByThreadId (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE threadid, PETHREAD *thread) +{ + NTSTATUS status; + HANDLE hThread = OpenThread( THREAD_ALL_ACCESS, FALSE, HandleToUlong(threadid) ); + + if (!hThread) + return STATUS_INVALID_PARAMETER; + + status = kernel_object_from_handle( hThread, PsThreadType, (void**)thread ); + + ObReferenceObject( *thread ); + + NtClose( hThread ); + return status; +} + + /***************************************************** * IoSetThreadHardErrorMode (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 43f47470a9..601506246e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -913,7 +913,7 @@ @ stub PsJobType @ stdcall PsLookupProcessByProcessId(ptr ptr) @ stub PsLookupProcessThreadByCid -@ stub PsLookupThreadByThreadId +@ stdcall PsLookupThreadByThreadId(ptr ptr) @ extern PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 66465bb5ae..70831adede 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -826,6 +826,22 @@ static void test_ob_reference(const WCHAR *test_path) ok(!status, "ZwClose failed: %#x\n", status); } +static void test_lookup_thread(void) +{ + NTSTATUS status; + PETHREAD thread = NULL; + + status = PsLookupThreadByThreadId(PsGetCurrentThreadId(), &thread); + ok(!status, "PsLookupThreadByThreadId failed: %#x\n", status); + ok((PKTHREAD)thread == KeGetCurrentThread(), "thread != KeGetCurrentThread\n"); + + if (thread) + ObDereferenceObject(thread); + + status = PsLookupThreadByThreadId(NULL, &thread); + ok(status == STATUS_INVALID_PARAMETER, "PsLookupThreadByThreadId returned %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -868,6 +884,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_stack_callout(); test_lookaside_list(); test_ob_reference(test_input->path); + test_lookup_thread(); /* print process report */ if (winetest_debug) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index abe357fbc9..9b57ae7ad7 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -131,6 +131,7 @@ typedef struct _FS_FILTER_CALLBACKS BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); +NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); #endif -- 2.20.1

3 51

[PATCH] setupapi: Add DECLSPEC_HOTPATCH to SetupDiEnumDeviceInfo().
by Andrey Gusev 11 Apr '19

11 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46971 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 45f4df7346..7440465748 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1707,7 +1707,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO devinfo, SP_DEVICE_INTERFA /*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ -BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) +BOOL WINAPI DECLSPEC_HOTPATCH SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) { struct DeviceInfoSet *set; struct device *device; -- 2.20.1

1 0

[PATCH] packager: Prefer native version.
by Vijay Kiran Kamuju 11 Apr '19

11 Apr '19

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43472 From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/packager/packager_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index d70202b73b2..1ce184a5c74 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) TRACE("(%p, %u, %p)\n", instance, reason, reserved); switch(reason){ + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: g_instance = instance; DisableThreadLibraryCalls(instance); -- 2.17.0

4 4

[PATCH] ntdll: Add NtSuspendProcess()/NtResumeProcess() implementation.
by Nikolay Sivov 11 Apr '19

11 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/process.c | 24 ++++++++++++++++++++---- include/wine/server_protocol.h | 32 +++++++++++++++++++++++++++++++- server/process.c | 24 ++++++++++++++++++++++++ server/protocol.def | 12 ++++++++++++ server/request.h | 8 ++++++++ server/trace.c | 16 ++++++++++++++++ 6 files changed, 111 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 6c6c427372..573a7a771d 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -763,8 +763,16 @@ NTSTATUS WINAPI NtOpenProcess(PHANDLE handle, ACCESS_MASK access, */ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) { - FIXME("stub: %p\n", handle); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS ret; + + SERVER_START_REQ( resume_process ) + { + req->handle = wine_server_obj_handle( handle ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + return ret; } /****************************************************************************** @@ -773,8 +781,16 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) */ NTSTATUS WINAPI NtSuspendProcess( HANDLE handle ) { - FIXME("stub: %p\n", handle); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS ret; + + SERVER_START_REQ( suspend_process ) + { + req->handle = wine_server_obj_handle( handle ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 88b933cc14..c3d1bb6a59 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5742,6 +5742,30 @@ struct terminate_job_reply }; + +struct suspend_process_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct suspend_process_reply +{ + struct reply_header __header; +}; + + + +struct resume_process_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct resume_process_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -6040,6 +6064,8 @@ enum request REQ_set_job_limits, REQ_set_job_completion_port, REQ_terminate_job, + REQ_suspend_process, + REQ_resume_process, REQ_NB_REQUESTS }; @@ -6343,6 +6369,8 @@ union generic_request struct set_job_limits_request set_job_limits_request; struct set_job_completion_port_request set_job_completion_port_request; struct terminate_job_request terminate_job_request; + struct suspend_process_request suspend_process_request; + struct resume_process_request resume_process_request; }; union generic_reply { @@ -6644,8 +6672,10 @@ union generic_reply struct set_job_limits_reply set_job_limits_reply; struct set_job_completion_port_reply set_job_completion_port_reply; struct terminate_job_reply terminate_job_reply; + struct suspend_process_reply suspend_process_reply; + struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 578 +#define SERVER_PROTOCOL_VERSION 579 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 473d3b1a27..01555b37a9 100644 --- a/server/process.c +++ b/server/process.c @@ -1705,3 +1705,27 @@ DECL_HANDLER(set_job_completion_port) release_object( job ); } + +/* suspend a process */ +DECL_HANDLER(suspend_process) +{ + struct process *process; + + if ((process = get_process_from_handle( req->handle, PROCESS_SUSPEND_RESUME ))) + { + suspend_process( process ); + release_object( process ); + } +} + +/* resume a process */ +DECL_HANDLER(resume_process) +{ + struct process *process; + + if ((process = get_process_from_handle( req->handle, PROCESS_SUSPEND_RESUME ))) + { + resume_process( process ); + release_object( process ); + } +} diff --git a/server/protocol.def b/server/protocol.def index b6ad514463..8a3ca0a28f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3909,3 +3909,15 @@ struct handle_info obj_handle_t handle; /* handle to the job */ int status; /* process exit code */ @END + + +/* Suspend a process */ +@REQ(suspend_process) + obj_handle_t handle; /* process handle */ +@END + + +/* Resume a process */ +@REQ(resume_process) + obj_handle_t handle; /* process handle */ +@END diff --git a/server/request.h b/server/request.h index a3e95137e1..a21252c7a6 100644 --- a/server/request.h +++ b/server/request.h @@ -408,6 +408,8 @@ DECL_HANDLER(process_in_job); DECL_HANDLER(set_job_limits); DECL_HANDLER(set_job_completion_port); DECL_HANDLER(terminate_job); +DECL_HANDLER(suspend_process); +DECL_HANDLER(resume_process); #ifdef WANT_REQUEST_HANDLERS @@ -710,6 +712,8 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_job_limits, (req_handler)req_set_job_completion_port, (req_handler)req_terminate_job, + (req_handler)req_suspend_process, + (req_handler)req_resume_process, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -2436,6 +2440,10 @@ C_ASSERT( sizeof(struct set_job_completion_port_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct terminate_job_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct terminate_job_request, status) == 16 ); C_ASSERT( sizeof(struct terminate_job_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct suspend_process_request, handle) == 12 ); +C_ASSERT( sizeof(struct suspend_process_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct resume_process_request, handle) == 12 ); +C_ASSERT( sizeof(struct resume_process_request) == 16 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index d4d0c3eb8d..5c6325a257 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4582,6 +4582,16 @@ static void dump_terminate_job_request( const struct terminate_job_request *req fprintf( stderr, ", status=%d", req->status ); } +static void dump_suspend_process_request( const struct suspend_process_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_resume_process_request( const struct resume_process_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_exec_process_request, @@ -4879,6 +4889,8 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_job_limits_request, (dump_func)dump_set_job_completion_port_request, (dump_func)dump_terminate_job_request, + (dump_func)dump_suspend_process_request, + (dump_func)dump_resume_process_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -5178,6 +5190,8 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, NULL, + NULL, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -5477,6 +5491,8 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_job_limits", "set_job_completion_port", "terminate_job", + "suspend_process", + "resume_process", }; static const struct -- 2.20.1

2 1

[PATCH] ntoskrnl.exe: Use proper device handle in DevicePropertyPhysicalDeviceObjectName implementation.
by Jacek Caban 11 Apr '19

11 Apr '19

Spotted by Huw Davies. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

2 1

[PATCH] ntdll: Fix handling of DOS style device paths in RtlIsDosDeviceName_U
by Lukas Platz 11 Apr '19

11 Apr '19

Use existing general processing code instead of hardcoding a less general result. Signed-off-by: Lukas Platz <lukas.platz(a)bluescan.de> --- dlls/ntdll/path.c | 6 ++---- dlls/ntdll/tests/path.c | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 11483fabba..c41dc81a20 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -268,7 +268,6 @@ DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U( PCWSTR path ) */ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) { - static const WCHAR consoleW[] = {'\\','\\','.','\\','C','O','N',0}; static const WCHAR auxW[] = {'A','U','X'}; static const WCHAR comW[] = {'C','O','M'}; static const WCHAR conW[] = {'C','O','N'}; @@ -284,9 +283,8 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) case UNC_PATH: return 0; case DEVICE_PATH: - if (!strcmpiW( dos_name, consoleW )) - return MAKELONG( sizeof(conW), 4 * sizeof(WCHAR) ); /* 4 is length of \\.\ prefix */ - return 0; + start = dos_name + 4; /* skip device path prefix */ + break; case ABSOLUTE_DRIVE_PATH: case RELATIVE_DRIVE_PATH: start = dos_name + 2; /* skip drive letter */ diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 195dea37e8..e744c10649 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -114,6 +114,7 @@ static void test_RtlIsDosDeviceName_U(void) { "\\\\.\\CON", 8, 6, TRUE }, /* fails on win8 */ { "\\\\.\\con", 8, 6, TRUE }, /* fails on win8 */ { "\\\\.\\CON2", 0, 0 }, + { "\\\\.\\com3", 8, 8 }, { "", 0, 0 }, { "\\\\foo\\nul", 0, 0 }, { "c:\\nul:", 6, 6 }, -- 2.18.0

2 1

[PATCH v2] ddraw: Improve d3d_device7_GetClipStatus() stub.
by Paul Gofman 11 Apr '19

11 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43411 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - removed redundant explicit cast; - got word "stub" back into the message. dlls/ddraw/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 003ce1d2e4..054e2dccc9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3916,7 +3916,20 @@ static HRESULT WINAPI d3d_device2_SetClipStatus(IDirect3DDevice2 *iface, D3DCLIP *****************************************************************************/ static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIPSTATUS *clip_status) { - FIXME("iface %p, clip_status %p stub!\n", iface, clip_status); + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_viewport vp; + + FIXME("iface %p, clip_status %p stub.\n", iface, clip_status); + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + clip_status->minx = vp.x; + clip_status->maxx = vp.x + vp.width; + clip_status->miny = vp.y; + clip_status->maxy = vp.y + vp.height; + clip_status->minz = 0.0f; + clip_status->maxz = 0.0f; + clip_status->dwFlags = D3DCLIPSTATUS_EXTENTS2; + clip_status->dwStatus = 0; return D3D_OK; } -- 2.20.1

3 2

[PATCH] jscript: Support type conversion to VT_UI2.
by Jacek Caban 11 Apr '19

11 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsutils.c | 8 ++++++++ dlls/jscript/tests/caller.c | 3 +++ 2 files changed, 11 insertions(+)

1 0

[PATCH] ddraw: Improve d3d_device7_GetClipStatus() stub.
by Paul Gofman 11 Apr '19

11 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43411 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 003ce1d2e4..57fe19ecf7 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3916,7 +3916,20 @@ static HRESULT WINAPI d3d_device2_SetClipStatus(IDirect3DDevice2 *iface, D3DCLIP *****************************************************************************/ static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIPSTATUS *clip_status) { - FIXME("iface %p, clip_status %p stub!\n", iface, clip_status); + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_viewport vp; + + FIXME("iface %p, clip_status %p.\n", iface, clip_status); + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + clip_status->minx = (float)vp.x; + clip_status->maxx = (float)(vp.x + vp.width); + clip_status->miny = (float)vp.y; + clip_status->maxy = (float)(vp.y + vp.height); + clip_status->minz = 0.0f; + clip_status->maxz = 0.0f; + clip_status->dwFlags = D3DCLIPSTATUS_EXTENTS2; + clip_status->dwStatus = 0; return D3D_OK; } -- 2.20.1

3 2

[PATCH 1/2] dbgeng: Keep a list of processes to attach to.
by Nikolay Sivov 11 Apr '19

11 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbgeng/dbgeng.c | 39 ++++++- dlls/dbgeng/tests/dbgeng.c | 231 +++++++++++++++++++++++++++++++++++++ include/dbgeng.h | 89 ++++++++++++++ 3 files changed, 357 insertions(+), 2 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 75ae4505db..9aed1b0506 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -31,9 +31,17 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(dbgeng); +struct target_process +{ + struct list entry; + unsigned int pid; + unsigned int attach_flags; +}; + struct debug_client { IDebugClient IDebugClient_iface; @@ -42,6 +50,7 @@ struct debug_client IDebugControl2 IDebugControl2_iface; LONG refcount; ULONG engine_options; + struct list targets; }; static struct debug_client *impl_from_IDebugClient(IDebugClient *iface) @@ -113,11 +122,19 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient *iface) { struct debug_client *debug_client = impl_from_IDebugClient(iface); ULONG refcount = InterlockedDecrement(&debug_client->refcount); + struct target_process *cur, *cur2; TRACE("%p, %d.\n", debug_client, refcount); if (!refcount) + { + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &debug_client->targets, struct target_process, entry) + { + list_remove(&cur->entry); + heap_free(cur); + } heap_free(debug_client); + } return refcount; } @@ -195,9 +212,26 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessDescription(IDebug static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient *iface, ULONG64 server, ULONG pid, ULONG flags) { - FIXME("%p, %s, %u, %#x stub.\n", iface, wine_dbgstr_longlong(server), pid, flags); + struct debug_client *debug_client = impl_from_IDebugClient(iface); + struct target_process *process; - return E_NOTIMPL; + TRACE("%p, %s, %u, %#x.\n", iface, wine_dbgstr_longlong(server), pid, flags); + + if (server) + { + FIXME("Remote debugging is not supported.\n"); + return E_NOTIMPL; + } + + if (!(process = heap_alloc(sizeof(*process)))) + return E_OUTOFMEMORY; + + process->pid = pid; + process->attach_flags = flags; + + list_add_head(&debug_client->targets, &process->entry); + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess(IDebugClient *iface, ULONG64 server, char *cmdline, @@ -2142,6 +2176,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) debug_client->IDebugSymbols_iface.lpVtbl = &debugsymbolsvtbl; debug_client->IDebugControl2_iface.lpVtbl = &debugcontrolvtbl; debug_client->refcount = 1; + list_init(&debug_client->targets); unk = (IUnknown *)&debug_client->IDebugClient_iface; diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index a76b25a128..f5d50c899a 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <string.h> #include "windef.h" @@ -99,7 +100,237 @@ static void test_engine_options(void) control->lpVtbl->Release(control); } +static HRESULT WINAPI event_callbacks_QueryInterface(IDebugEventCallbacks *iface, REFIID riid, void **out) +{ + if (IsEqualIID(riid, &IID_IDebugEventCallbacks) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + iface->lpVtbl->AddRef(iface); + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI event_callbacks_AddRef(IDebugEventCallbacks *iface) +{ + return 2; +} + +static ULONG WINAPI event_callbacks_Release(IDebugEventCallbacks *iface) +{ + return 1; +} + +static HRESULT WINAPI event_callbacks_GetInterestMask(IDebugEventCallbacks *iface, ULONG *mask) +{ + *mask = ~0u; + return S_OK; +} + +static HRESULT WINAPI event_callbacks_Breakpoint(IDebugEventCallbacks *iface, PDEBUG_BREAKPOINT breakpoint) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_Exception(IDebugEventCallbacks *iface, EXCEPTION_RECORD64 *exception, + ULONG first_chance) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_CreateThread(IDebugEventCallbacks *iface, ULONG64 handle, ULONG64 data_offset, + ULONG64 start_offset) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_ExitThread(IDebugEventCallbacks *iface, ULONG exit_code) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_CreateProcess(IDebugEventCallbacks *iface, ULONG64 image_handle, ULONG64 handle, + ULONG64 base_offset, ULONG module_size, const char *module_name, const char *image_name, ULONG checksum, + ULONG timedatestamp, ULONG64 initial_thread_handle, ULONG64 thread_data_offset, ULONG64 start_offset) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_ExitProcess(IDebugEventCallbacks *iface, ULONG exit_code) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_LoadModule(IDebugEventCallbacks *iface, ULONG64 image_handle, + ULONG64 base_offset, ULONG module_size, const char *module_name, const char *image_name, ULONG checksum, + ULONG timedatestamp) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_UnloadModule(IDebugEventCallbacks *iface, const char *image_basename, + ULONG64 base_offset) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_SystemError(IDebugEventCallbacks *iface, ULONG error, ULONG level) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_SessionStatus(IDebugEventCallbacks *iface, ULONG status) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_ChangeDebuggeeState(IDebugEventCallbacks *iface, ULONG flags, ULONG64 argument) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_ChangeEngineState(IDebugEventCallbacks *iface, ULONG flags, ULONG64 argument) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI event_callbacks_ChangeSymbolState(IDebugEventCallbacks *iface, ULONG flags, ULONG64 argument) + +{ + return E_NOTIMPL; +} + +static const IDebugEventCallbacksVtbl event_callbacks_vtbl = +{ + event_callbacks_QueryInterface, + event_callbacks_AddRef, + event_callbacks_Release, + event_callbacks_GetInterestMask, + event_callbacks_Breakpoint, + event_callbacks_Exception, + event_callbacks_CreateThread, + event_callbacks_ExitThread, + event_callbacks_CreateProcess, + event_callbacks_ExitProcess, + event_callbacks_LoadModule, + event_callbacks_UnloadModule, + event_callbacks_SystemError, + event_callbacks_SessionStatus, + event_callbacks_ChangeDebuggeeState, + event_callbacks_ChangeEngineState, + event_callbacks_ChangeSymbolState, +}; + +static const char *event_name = "dbgeng_test_event"; + +static void test_attach(void) +{ + IDebugEventCallbacks event_callbacks = { &event_callbacks_vtbl }; + PROCESS_INFORMATION info; + char path_name[MAX_PATH]; + IDebugControl *control; + IDebugClient *client; + STARTUPINFOA startup; + BOOL is_debugged; + HANDLE event; + char **argv; + HRESULT hr; + BOOL ret; + + hr = DebugCreate(&IID_IDebugClient, (void **)&client); + ok(hr == S_OK, "Failed to create engine object, hr %#x.\n", hr); + + hr = client->lpVtbl->QueryInterface(client, &IID_IDebugControl, (void **)&control); + ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + + hr = client->lpVtbl->SetEventCallbacks(client, &event_callbacks); +todo_wine + ok(hr == S_OK, "Failed to set event callbacks, hr %#x.\n", hr); + + event = CreateEventA(NULL, FALSE, FALSE, event_name); + ok(event != NULL, "Failed to create event.\n"); + + winetest_get_mainargs(&argv); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s dbgeng target", argv[0]); + ret = CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + ok(ret, "Failed to create target process.\n"); + + is_debugged = TRUE; + CheckRemoteDebuggerPresent(info.hProcess, &is_debugged); + ok(!is_debugged, "Unexpected mode.\n"); + + /* Non-invasive mode. */ + hr = client->lpVtbl->AttachProcess(client, 0, info.dwProcessId, DEBUG_ATTACH_NONINVASIVE); + ok(hr == S_OK, "Failed to attach to process, hr %#x.\n", hr); + + is_debugged = TRUE; + ret = CheckRemoteDebuggerPresent(info.hProcess, &is_debugged); + ok(ret, "Failed to check target status.\n"); + ok(!is_debugged, "Unexpected mode.\n"); + + hr = control->lpVtbl->WaitForEvent(control, 0, INFINITE); +todo_wine + ok(hr == S_OK, "Waiting for event failed, hr %#x.\n", hr); + + is_debugged = TRUE; + ret = CheckRemoteDebuggerPresent(info.hProcess, &is_debugged); + ok(ret, "Failed to check target status.\n"); + ok(!is_debugged, "Unexpected mode.\n"); + + hr = client->lpVtbl->DetachProcesses(client); +todo_wine + ok(hr == S_OK, "Failed to detach, hr %#x.\n", hr); + + hr = client->lpVtbl->EndSession(client, DEBUG_END_ACTIVE_DETACH); +todo_wine + ok(hr == S_OK, "Failed to end session, hr %#x.\n", hr); + + SetEvent(event); + + winetest_wait_child_process(info.hProcess); + + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + CloseHandle(event); + + client->lpVtbl->Release(client); + control->lpVtbl->Release(control); +} + +static void target_proc(void) +{ + HANDLE event = OpenEventA(SYNCHRONIZE, FALSE, event_name); + + ok(event != NULL, "Failed to open event handle.\n"); + + for (;;) + { + if (WaitForSingleObject(event, 100) == WAIT_OBJECT_0) + break; + } + + CloseHandle(event); +} + START_TEST(dbgeng) { + char **argv; + int argc; + + argc = winetest_get_mainargs(&argv); + + if (argc >= 3 && !strcmp(argv[2], "target")) + { + target_proc(); + return; + } + test_engine_options(); + test_attach(); } diff --git a/include/dbgeng.h b/include/dbgeng.h index 8c5c78c07f..3b7ff2be4f 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -73,6 +73,95 @@ DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9 #define DEBUG_ATTACH_INVASIVE_RESUME_PROCESS 0x00000010 #define DEBUG_ATTACH_NONINVASIVE_ALLOW_PARTIAL 0x00000020 +/* EndSession() flags */ +#define DEBUG_END_PASSIVE 0x00000000 +#define DEBUG_END_ACTIVE_TERMINATE 0x00000001 +#define DEBUG_END_ACTIVE_DETACH 0x00000002 +#define DEBUG_END_REENTRANT 0x00000003 +#define DEBUG_END_DISCONNECT 0x00000004 + +/* ChangeEngineState() flags */ +#define DEBUG_CES_CURRENT_THREAD 0x00000001 +#define DEBUG_CES_EFFECTIVE_PROCESSOR 0x00000002 +#define DEBUG_CES_BREAKPOINTS 0x00000004 +#define DEBUG_CES_CODE_LEVEL 0x00000008 +#define DEBUG_CES_EXECUTION_STATUS 0x00000010 +#define DEBUG_CES_ENGINE_OPTIONS 0x00000020 +#define DEBUG_CES_LOG_FILE 0x00000040 +#define DEBUG_CES_RADIX 0x00000080 +#define DEBUG_CES_EVENT_FILTERS 0x00000100 +#define DEBUG_CES_PROCESS_OPTIONS 0x00000200 +#define DEBUG_CES_EXTENSIONS 0x00000400 +#define DEBUG_CES_SYSTEMS 0x00000800 +#define DEBUG_CES_ASSEMBLY_OPTIONS 0x00001000 +#define DEBUG_CES_EXPRESSION_SYNTAX 0x00002000 +#define DEBUG_CES_TEXT_REPLACEMENTS 0x00004000 +#define DEBUG_CES_ALL 0xffffffff + +#define DEBUG_STATUS_NO_CHANGE 0 +#define DEBUG_STATUS_GO 1 +#define DEBUG_STATUS_GO_HANDLED 2 +#define DEBUG_STATUS_GO_NOT_HANDLED 3 +#define DEBUG_STATUS_STEP_OVER 4 +#define DEBUG_STATUS_STEP_INTO 5 +#define DEBUG_STATUS_BREAK 6 +#define DEBUG_STATUS_NO_DEBUGGEE 7 +#define DEBUG_STATUS_STEP_BRANCH 8 +#define DEBUG_STATUS_IGNORE_EVENT 9 +#define DEBUG_STATUS_RESTART_REQUESTED 10 +#define DEBUG_STATUS_REVERSE_GO 11 +#define DEBUG_STATUS_REVERSE_STEP_BRANCH 12 +#define DEBUG_STATUS_REVERSE_STEP_OVER 13 +#define DEBUG_STATUS_REVERSE_STEP_INTO 14 +#define DEBUG_STATUS_OUT_OF_SYNC 15 +#define DEBUG_STATUS_WAIT_INPUT 16 +#define DEBUG_STATUS_TIMEOUT 17 +#define DEBUG_STATUS_MASK 0x1f + +/* ChangeSymbolState() flags */ +#define DEBUG_CSS_LOADS 0x00000001 +#define DEBUG_CSS_UNLOADS 0x00000002 +#define DEBUG_CSS_SCOPE 0x00000004 +#define DEBUG_CSS_PATHS 0x00000008 +#define DEBUG_CSS_SYMBOL_OPTIONS 0x00000010 +#define DEBUG_CSS_TYPE_OPTIONS 0x00000020 +#define DEBUG_CSS_COLLAPSE_CHILDREN 0x00000040 +#define DEBUG_CSS_ALL 0xffffffff + +/* SessionStatus() flags */ +#define DEBUG_SESSION_ACTIVE 0x00000000 +#define DEBUG_SESSION_END_SESSION_ACTIVE_TERMINATE 0x00000001 +#define DEBUG_SESSION_END_SESSION_ACTIVE_DETACH 0x00000002 +#define DEBUG_SESSION_END_SESSION_PASSIVE 0x00000003 +#define DEBUG_SESSION_END 0x00000004 +#define DEBUG_SESSION_REBOOT 0x00000005 +#define DEBUG_SESSION_HIBERNATE 0x00000006 +#define DEBUG_SESSION_FAILURE 0x00000007 + +/* ChangeDebuggeeState() flags */ +#define DEBUG_CDS_REGISTERS 0x00000001 +#define DEBUG_CDS_DATA 0x00000002 +#define DEBUG_CDS_REFRESH 0x00000004 +#define DEBUG_CDS_ALL 0xffffffff + +#define DEBUG_CDS_REFRESH_EVALUATE 1 +#define DEBUG_CDS_REFRESH_EXECUTE 2 +#define DEBUG_CDS_REFRESH_EXECUTECOMMANDFILE 3 +#define DEBUG_CDS_REFRESH_ADDBREAKPOINT 4 +#define DEBUG_CDS_REFRESH_REMOVEBREAKPOINT 5 +#define DEBUG_CDS_REFRESH_WRITEVIRTUAL 6 +#define DEBUG_CDS_REFRESH_WRITEVIRTUALUNCACHED 7 +#define DEBUG_CDS_REFRESH_WRITEPHYSICAL 8 +#define DEBUG_CDS_REFRESH_WRITEPHYSICAL2 9 +#define DEBUG_CDS_REFRESH_SETVALUE 10 +#define DEBUG_CDS_REFRESH_SETVALUE2 11 +#define DEBUG_CDS_REFRESH_SETSCOPE 12 +#define DEBUG_CDS_REFRESH_SETSCOPEFRAMEBYINDEX 13 +#define DEBUG_CDS_REFRESH_SETSCOPEFROMJITDEBUGINFO 14 +#define DEBUG_CDS_REFRESH_SETSCOPEFROMSTOREDEVENT 15 +#define DEBUG_CDS_REFRESH_INLINESTEP 16 +#define DEBUG_CDS_REFRESH_INLINESTEP_PSEUDO 17 + typedef struct _DEBUG_MODULE_PARAMETERS { ULONG64 Base; -- 2.20.1

1 1

[PATCH] mshtml.idl: Add more SVG interfaces.
by Jacek Caban 11 Apr '19

11 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 53 +++++++ include/mshtml.idl | 388 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 441 insertions(+)

1 0

[PATCH] dinput: Fix a possible deadlock at exit.
by Zhiyi Zhang 11 Apr '19

11 Apr '19

This fix another deadlock issue with dinput. The old implementation of dinput waits for a hook thread to exit during its uninitialization, which will never return during DLL_THREAD_DETACH. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 65aaf92313..1b2020c711 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1781,7 +1781,7 @@ static DWORD WINAPI hook_thread_proc(void *param) DispatchMessageW(&msg); } - return 0; + FreeLibraryAndExitThread(DINPUT_instance, 0); } static DWORD hook_thread_id; @@ -1798,15 +1798,16 @@ static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0 static BOOL check_hook_thread(void) { static HANDLE hook_thread; + HMODULE module; EnterCriticalSection(&dinput_hook_crit); TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); if (!list_empty(&direct_input_list) && !hook_thread) { + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)DINPUT_instance, &module); hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); - LeaveCriticalSection(&dinput_hook_crit); } else if (list_empty(&direct_input_list) && hook_thread) { @@ -1821,16 +1822,11 @@ static BOOL check_hook_thread(void) hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - LeaveCriticalSection(&dinput_hook_crit); - - /* wait for hook thread to exit */ - WaitForSingleObject(hook_thread, INFINITE); CloseHandle(hook_thread); hook_thread = NULL; } - else - LeaveCriticalSection(&dinput_hook_crit); + LeaveCriticalSection(&dinput_hook_crit); return hook_thread_id != 0; } -- 2.19.1

1 0

[PATCHv2] msvcrt: Implement the remquo family of functions
by Martin Storsjo 11 Apr '19

11 Apr '19

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Fixed the remquol signature in specfiles. --- configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr120_app/msvcr120_app.spec | 6 +-- dlls/msvcrt/math.c | 38 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +-- 6 files changed, 52 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 67b360d9a9..a38a9873df 100644 --- a/configure.ac +++ b/configure.ac @@ -2728,6 +2728,8 @@ AC_CHECK_FUNCS(\ powl \ remainder \ remainderf \ + remquo \ + remquof \ rint \ rintf \ round \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index dea5094a91..a9deec8e48 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -308,9 +308,9 @@ @ cdecl remainder(double double) ucrtbase.remainder @ cdecl remainderf(float float) ucrtbase.remainderf @ cdecl remainderl(double double) ucrtbase.remainderl -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) ucrtbase.remquo +@ cdecl remquof(float float ptr) ucrtbase.remquof +@ cdecl remquol(double double ptr) ucrtbase.remquol @ cdecl rint(double) ucrtbase.rint @ cdecl rintf(float) ucrtbase.rintf @ cdecl rintl(double) ucrtbase.rintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8cd39ea19e..618b9bccbc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2328,9 +2328,9 @@ @ cdecl remainderf(float float) MSVCR120_remainderf @ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) MSVCR120_remquo +@ cdecl remquof(float float ptr) MSVCR120_remquof +@ cdecl remquol(double double ptr) MSVCR120_remquol @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind @ cdecl rint(double) MSVCR120_rint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index dc3f3bd807..26ffaf7743 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1991,9 +1991,9 @@ @ cdecl remainderf(float float) msvcr120.remainderf @ cdecl remainderl(double double) msvcr120.remainderl @ cdecl remove(str) msvcr120.remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) msvcr120.remquo +@ cdecl remquof(float float ptr) msvcr120.remquof +@ cdecl remquol(double double ptr) msvcr120.remquol @ cdecl rename(str str) msvcr120.rename @ cdecl rewind(ptr) msvcr120.rewind @ cdecl rint(double) msvcr120.rint diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 754e46ce66..c893c83a69 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3272,6 +3272,44 @@ LDOUBLE CDECL MSVCR120_remainderl(LDOUBLE x, LDOUBLE y) return MSVCR120_remainder(x, y); } +/********************************************************************* + * remquo (MSVCR120.@) + */ +double CDECL MSVCR120_remquo(double x, double y, int *quo) +{ +#ifdef HAVE_REMQUO + if(!finite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0) *MSVCRT__errno() = MSVCRT_EDOM; + return remquo(x, y, quo); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * remquof (MSVCR120.@) + */ +float CDECL MSVCR120_remquof(float x, float y, int *quo) +{ +#ifdef HAVE_REMQUOF + if(!finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0f) *MSVCRT__errno() = MSVCRT_EDOM; + return remquof(x, y, quo); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * remquol (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_remquol(LDOUBLE x, LDOUBLE y, int *quo) +{ + return MSVCR120_remquo(x, y, quo); +} + /********************************************************************* * lgamma (MSVCR120.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d218aa3a7b..1866f1b8b0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2463,9 +2463,9 @@ @ cdecl remainderf(float float) MSVCR120_remainderf @ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) MSVCR120_remquo +@ cdecl remquof(float float ptr) MSVCR120_remquof +@ cdecl remquol(double double ptr) MSVCR120_remquol @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind @ cdecl rint(double) MSVCR120_rint -- 2.17.1

2 1

2025

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