November 2019 - wine-commits

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetScissorRect().
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 08ae44e82d643e371c8be65323411d67a5e2745c URL: https://source.winehq.org/git/wine.git/?a=commit;h=08ae44e82d643e371c8be653… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 18:28:52 2019 -0600 d3d9: Handle stateblocks in d3d9_device_SetScissorRect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b4ba9223e0..d83c24a640 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2685,7 +2685,9 @@ static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, cons TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rect); + wined3d_stateblock_set_scissor_rect(device->update_state, rect); + if (!device->recording) + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rect); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_scissor_rect().
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 0383f62b3ced50ca372190b4331f3df7fca05336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0383f62b3ced50ca372190b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 18:28:51 2019 -0600 wined3d: Introduce wined3d_stateblock_set_scissor_rect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 10 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1d522ad89b..df0bca33b0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1555,6 +1555,14 @@ void CDECL wined3d_stateblock_set_viewport(struct wined3d_stateblock *stateblock stateblock->changed.viewport = TRUE; } +void CDECL wined3d_stateblock_set_scissor_rect(struct wined3d_stateblock *stateblock, const RECT *rect) +{ + TRACE("stateblock %p, rect %s.\n", stateblock, wine_dbgstr_rect(rect)); + + stateblock->stateblock_state.scissor_rect = *rect; + stateblock->changed.scissorRect = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 48e5ea954b..4041db56da 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -272,6 +272,7 @@ @ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_render_state(ptr long long) @ cdecl wined3d_stateblock_set_sampler_state(ptr long long long) +@ cdecl wined3d_stateblock_set_scissor_rect(ptr ptr) @ cdecl wined3d_stateblock_set_texture(ptr long ptr) @ cdecl wined3d_stateblock_set_texture_stage_state(ptr long long long) @ cdecl wined3d_stateblock_set_transform(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c311ded731..e723678601 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2684,6 +2684,7 @@ void __cdecl wined3d_stateblock_set_render_state(struct wined3d_stateblock *stat enum wined3d_render_state state, DWORD value); void __cdecl wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); +void __cdecl wined3d_stateblock_set_scissor_rect(struct wined3d_stateblock *stateblock, const RECT *rect); void __cdecl wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, UINT stage, struct wined3d_texture *texture); void __cdecl wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, UINT stage, enum wined3d_texture_stage_state state, DWORD value);

1 0

Conor McCarthy : dxgi/tests: Add tests for IDXGISwapChain3::ResizeBuffers1().
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: a7cd70a8c842fdc1a0135a3bab274385af47ee92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7cd70a8c842fdc1a0135a3b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Nov 8 00:54:41 2019 +1000 dxgi/tests: Add tests for IDXGISwapChain3::ResizeBuffers1(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b05e7f8bf9..874c39b88e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3534,6 +3534,8 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; DXGI_SWAP_EFFECT swap_effect; + IDXGISwapChain3 *swapchain3; + IUnknown *present_queue[2]; IDXGISwapChain *swapchain; ID3D12Resource *resource; ID3D10Texture2D *texture; @@ -3541,6 +3543,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) IDXGISurface *surface; IDXGIFactory *factory; RECT client_rect, r; + UINT node_mask[2]; ULONG refcount; HWND window; BOOL ret; @@ -3803,6 +3806,41 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) ok(!swapchain_desc.Flags, "Got unexpected Flags %#x.\n", swapchain_desc.Flags); + node_mask[0] = 1; + node_mask[1] = 1; + present_queue[0] = device; + present_queue[1] = device; + if (IDXGISwapChain_QueryInterface(swapchain, &IID_IDXGISwapChain3, (void **)&swapchain3) == E_NOINTERFACE) + { + skip("IDXGISwapChain3 is not supported.\n"); + } + else if (!is_d3d12) + { + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + IDXGISwapChain3_Release(swapchain3); + } + else + { + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); + ok(hr == S_OK, "Failed to resize buffers, hr %#x.\n", hr); + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, present_queue); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 0, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + node_mask[0] = 2; + node_mask[1] = 2; + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + /* Windows validates node masks even when the buffer count is zero. It defaults to the current buffer count. + * NULL queues cause some Windows versions to crash. */ + hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 0, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + IDXGISwapChain3_Release(swapchain3); + } + IDXGISwapChain_Release(swapchain); DestroyWindow(window); refcount = IDXGIFactory_Release(factory);

1 0

Conor McCarthy : dxgi: Implement IDXGISwapChain3::ResizeBuffers1().
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 58b482c9f4bb98fd2fcc534476669e71d3292153 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b482c9f4bb98fd2fcc5344… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Nov 8 00:54:34 2019 +1000 dxgi: Implement IDXGISwapChain3::ResizeBuffers1(). Used by Hitman 2. Multiple nodes and command queues are not supported. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 9e620e0b1e..004bd1457d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2311,17 +2311,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain3 *iface, return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 *iface, +static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain, UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags) { - struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); DXGI_SWAP_CHAIN_DESC1 *desc, new_desc; unsigned int i; ULONG refcount; - TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", - iface, buffer_count, width, height, debug_dxgi_format(format), flags); - if (flags) FIXME("Ignoring flags %#x.\n", flags); @@ -2373,6 +2369,17 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); } +static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 *iface, + UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags) +{ + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + + TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", + iface, buffer_count, width, height, debug_dxgi_format(format), flags); + + return d3d12_swapchain_resize_buffers(swapchain, buffer_count, width, height, format, flags); +} + static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *iface, const DXGI_MODE_DESC *target_mode_desc) { @@ -2642,11 +2649,26 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers1(IDXGISwapChain3 UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags, const UINT *node_mask, IUnknown * const *present_queue) { - FIXME("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x, " - "node_mask %p, present_queue %p stub!\n", + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + size_t i, count; + + TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x, " + "node_mask %p, present_queue %p.\n", iface, buffer_count, width, height, debug_dxgi_format(format), flags, node_mask, present_queue); - return E_NOTIMPL; + if (!node_mask || !present_queue) + return DXGI_ERROR_INVALID_CALL; + + count = buffer_count ? buffer_count : swapchain->desc.BufferCount; + for (i = 0; i < count; ++i) + { + if (node_mask[i] > 1 || !present_queue[i]) + return DXGI_ERROR_INVALID_CALL; + if ((ID3D12CommandQueue*)present_queue[i] != swapchain->command_queue) + FIXME("Ignoring present queue %p.\n", present_queue[i]); + } + + return d3d12_swapchain_resize_buffers(swapchain, buffer_count, width, height, format, flags); } static const struct IDXGISwapChain3Vtbl d3d12_swapchain_vtbl =

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.126.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 0425b6ad64791088adc13b74626dd8ac6e192420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0425b6ad64791088adc13b74… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:05 2019 -0700 winevulkan: Update to VK spec version 1.1.126. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 222 +++++++ dlls/winevulkan/vulkan_thunks.h | 53 +- include/wine/vulkan.h | 1401 +++++++++++++++++++++++---------------- 4 files changed, 1097 insertions(+), 581 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0425b6ad64791088adc1…

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.117.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 54acff1227488bae34e4bd7d7ad01c67a23f21b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54acff1227488bae34e4bd7d… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:04 2019 -0700 winevulkan: Update to VK spec version 1.1.117. Adds int16 types needed for spec update. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/vulkan_thunks.c | 76 +- dlls/winevulkan/vulkan_thunks.h | 2 + include/wine/vulkan.h | 1527 +++++++++++++++++++++------------------ 4 files changed, 903 insertions(+), 708 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54acff1227488bae34e4…

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.114.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 9126cd623e78d1feee1c16e088c6ebd2f3b9bc92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9126cd623e78d1feee1c16e0… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:03 2019 -0700 winevulkan: Update to VK spec version 1.1.114. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 17 ++ include/wine/vulkan.h | 354 +++++++++++++++++++++++----------------- 3 files changed, 219 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9126cd623e78d1feee1c…

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.1.113.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 7e736b5903d3d078bbf7bb6a509536a942f6b9a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e736b5903d3d078bbf7bb6a… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:01 2019 -0700 winevulkan: Update to VK spec version 1.1.113. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 260 ++++++- dlls/winevulkan/vulkan_thunks.h | 46 ++ include/wine/vulkan.h | 1631 +++++++++++++++++++++++---------------- 4 files changed, 1252 insertions(+), 687 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e736b5903d3d078bbf7…

1 0

Liam Middlebrook : winevulkan: Don't add alias structs to struct-extensions list.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: b5752327125bc5f8bc6de16bb0bffe0fc096c973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5752327125bc5f8bc6de16b… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Oct 30 13:00:00 2019 -0700 winevulkan: Don't add alias structs to struct-extensions list. This resolves compilation errors relating to duplicate case values for alias structures when building against spec version 1.1.106. An example of one of these errors has been included below: vulkan_thunks.c: In function ‘convert_VkDeviceCreateInfo_struct_chain’: vulkan_thunks.c:1997:9: error: duplicate case value case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES: ^~~~ vulkan_thunks.c:1377:9: note: previously used here case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES: ^~~~ Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3b80005c58..92be0941ed 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2962,6 +2962,13 @@ class VkRegistry(object): for struct in structs: struct.set_type_info(self.types) + # Alias structures have enum values equivalent to those of the + # structure which they are aliased against. we need to ignore alias + # structs when populating the struct extensions list, otherwise we + # will create duplicate case entries. + if struct.alias: + continue + for structextend in struct.structextends: s = self.types[structextend]["data"] s.struct_extensions.append(struct)

1 0

Derek Lesho : winevulkan: Mark members of required structs as required recursively.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 410f5623e706b5b9b914c3934c8070872bc1d3c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=410f5623e706b5b9b914c393… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Oct 30 16:12:36 2019 -0500 winevulkan: Mark members of required structs as required recursively. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4f1c03cc7c..3b80005c58 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2718,6 +2718,16 @@ class VkRegistry(object): elif "value" in enum_elem.keys(): self.consts.append(VkConstant(enum_elem.attrib["name"], enum_elem.attrib["value"])) + @staticmethod + def _require_type(type_info): + if type_info.is_alias(): + type_info = type_info.alias + type_info.required = True + if type(type_info) == VkStruct: + for member in type_info.members: + if "data" in member.type_info: + VkRegistry._require_type(member.type_info["data"]) + def _parse_extensions(self, root): """ Parse extensions section and pull in any types and commands for this extensioin. """ extensions = [] @@ -2771,10 +2781,7 @@ class VkRegistry(object): for t in require.findall("type"): type_info = self.types[t.attrib["name"]]["data"] - if type_info.is_alias(): - type_info = type_info.alias - type_info.required = True - + self._require_type(type_info) feature = require.attrib.get("feature") if feature and not self._is_feature_supported(feature): continue

1 0

Alistair Leslie-Hughes : dinput: Mouse device doesn't support property DIPROP_VIDPID.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: d61d710121b1dc36acc68ae46cc5bd47cdc0c826 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d61d710121b1dc36acc68ae4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 10 08:58:48 2019 +0000 dinput: Mouse device doesn't support property DIPROP_VIDPID. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 3 ++- dlls/dinput/tests/mouse.c | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 52a766b2a1..08ace2f4e9 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -652,7 +652,8 @@ static HRESULT WINAPI SysMouseWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF break; } - + case (DWORD_PTR) DIPROP_VIDPID: + return DIERR_UNSUPPORTED; default: return IDirectInputDevice2WImpl_GetProperty(iface, rguid, pdiph); } diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 19d1c3708b..2e0b8cdf2e 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -198,6 +198,14 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) /* Granularity of Y axis should be 1! */ ok(hr == S_OK && di_op.dwData == 1, "GetProperty(): %08x, dwData: %i but should be 1.\n", hr, di_op.dwData); + memset(&di_op, 0, sizeof(di_op)); + di_op.diph.dwSize = sizeof(DIPROPDWORD); + di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); + di_op.diph.dwHow = DIPH_DEVICE; + di_op.diph.dwObj = 0; + hr = IDirectInputDevice_GetProperty(pMouse, DIPROP_VIDPID, &di_op.diph); + ok(hr == DIERR_UNSUPPORTED, "got %08x\n", hr); + IUnknown_Release(pMouse); DestroyWindow( hwnd2 );

1 0

Alistair Leslie-Hughes : dinput: Keyboard device doesn't support property DIPROP_VIDPID.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: f10f98cfa2b956c73e48b83936a44e4a92c7409d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f10f98cfa2b956c73e48b839… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 10 08:58:47 2019 +0000 dinput: Keyboard device doesn't support property DIPROP_VIDPID. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 1 + dlls/dinput/tests/keyboard.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index b5e665933e..47f28cac52 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -577,6 +577,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, memcpy(ps->wsz, didoi.tszName, sizeof(ps->wsz)); return hr; } + case (DWORD_PTR) DIPROP_VIDPID: case (DWORD_PTR) DIPROP_RANGE: return DIERR_UNSUPPORTED; default: diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 84e6fed078..1cd31e0318 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -258,6 +258,7 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd) HRESULT hr; IDirectInputDeviceA *pKeyboard = NULL; DIPROPRANGE diprg; + DIPROPDWORD vidpid; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -272,6 +273,15 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_RANGE, &diprg.diph); ok(hr == DIERR_UNSUPPORTED, "IDirectInputDevice_GetProperty() did not return DIPROP_RANGE but: %08x\n", hr); + memset(&vidpid, 0, sizeof(vidpid)); + vidpid.diph.dwSize = sizeof(DIPROPDWORD); + vidpid.diph.dwHeaderSize = sizeof(DIPROPHEADER); + vidpid.diph.dwHow = DIPH_DEVICE; + vidpid.diph.dwObj = 0; + + hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_VIDPID, &vidpid.diph); + ok(hr == DIERR_UNSUPPORTED, "got %08x\n", hr); + IUnknown_Release(pKeyboard); }

1 0

Nikolay Sivov : ole32: Add separate IEnumSTATPROPSTG implementation.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: ecb2c8dd2e5e2076e4fd624fdb77224eed930cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecb2c8dd2e5e2076e4fd624f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:39:23 2019 +0300 ole32: Add separate IEnumSTATPROPSTG implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 1 - dlls/ole32/enumx.c | 205 ------------------------------------ dlls/ole32/enumx.h | 34 ------ dlls/ole32/stg_prop.c | 281 ++++++++++++++++++++++++++++++------------------- 4 files changed, 175 insertions(+), 346 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecb2c8dd2e5e2076e4fd…

1 0

Nikolay Sivov : comsvcs/tests: Remove traces from tests.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: dd6e100ff116180af71d88c4a3093318252fb485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd6e100ff116180af71d88c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:36:57 2019 +0300 comsvcs/tests: Remove traces from tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/comsvcs.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index e6717e0ea3..ca59951c81 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -42,7 +42,6 @@ #define CHECK_EXPECT2(func) \ do { \ - trace(#func "\n"); \ ok(expect_ ##func, "unexpected call " #func "\n"); \ called_ ## func = TRUE; \ }while(0) @@ -94,7 +93,6 @@ static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid static ULONG WINAPI driver_AddRef(IDispenserDriver *iface) { - trace("AddRef\n"); return 2; }

1 0

Nikolay Sivov : comsvcs: Support progid in "new" moniker serialization stream.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: f055e369ee5cd0da036451ccbb6e1937c3b166ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=f055e369ee5cd0da036451cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:36:56 2019 +0300 comsvcs: Support progid in "new" moniker serialization stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 71 ++++++++++++++++++++------ dlls/comsvcs/tests/comsvcs.c | 115 ++++++++++++++++++++++++++++++------------- 2 files changed, 138 insertions(+), 48 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 7bfde03b34..9ab77dfced 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -57,6 +57,7 @@ struct new_moniker IROTData IROTData_iface; LONG refcount; CLSID clsid; + WCHAR *progid; }; static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret); @@ -481,7 +482,10 @@ static ULONG WINAPI new_moniker_Release(IMoniker* iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) + { + heap_free(moniker->progid); heap_free(moniker); + } return refcount; } @@ -508,10 +512,10 @@ static HRESULT WINAPI new_moniker_IsDirty(IMoniker* iface) static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) { struct new_moniker *moniker = impl_from_IMoniker(iface); - ULARGE_INTEGER pad; + DWORD progid_len = 0, len, pad = ~0u; + WCHAR *progid = NULL; CLSID clsid; HRESULT hr; - DWORD len; TRACE("%p, %p.\n", iface, stream); @@ -519,29 +523,49 @@ static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) if (FAILED(hr)) return hr; - pad.QuadPart = 1; - hr = IStream_Read(stream, &pad, sizeof(pad), &len); - if (FAILED(hr)) - return hr; + if (SUCCEEDED(hr)) + hr = IStream_Read(stream, &progid_len, sizeof(progid_len), &len); - if (pad.QuadPart != 0) - return E_FAIL; + if (SUCCEEDED(hr) && progid_len) + { + if (!(progid = heap_alloc(progid_len))) + return E_OUTOFMEMORY; + hr = IStream_Read(stream, progid, progid_len, &len); + } - moniker->clsid = clsid; + /* Skip terminator. */ + if (SUCCEEDED(hr)) + hr = IStream_Read(stream, &pad, sizeof(pad), &len); - return S_OK; + if (SUCCEEDED(hr) && pad == 0) + { + moniker->clsid = clsid; + heap_free(moniker->progid); + moniker->progid = progid; + progid = NULL; + } + + heap_free(progid); + + return hr; } static HRESULT WINAPI new_moniker_Save(IMoniker *iface, IStream *stream, BOOL clear_dirty) { struct new_moniker *moniker = impl_from_IMoniker(iface); - static const ULARGE_INTEGER pad; - ULONG written; + ULONG written, pad = 0, progid_len = 0; HRESULT hr; TRACE("%p, %p, %d.\n", iface, stream, clear_dirty); + if (moniker->progid) + progid_len = lstrlenW(moniker->progid) * sizeof(WCHAR); + hr = IStream_Write(stream, &moniker->clsid, sizeof(moniker->clsid), &written); + if (SUCCEEDED(hr)) + hr = IStream_Write(stream, &progid_len, sizeof(progid_len), &written); + if (SUCCEEDED(hr) && progid_len) + hr = IStream_Write(stream, moniker->progid, progid_len, &written); if (SUCCEEDED(hr)) hr = IStream_Write(stream, &pad, sizeof(pad), &written); @@ -550,12 +574,16 @@ static HRESULT WINAPI new_moniker_Save(IMoniker *iface, IStream *stream, BOOL cl static HRESULT WINAPI new_moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *size) { + struct new_moniker *moniker = impl_from_IMoniker(iface); + TRACE("%p, %p.\n", iface, size); if (!size) return E_POINTER; size->QuadPart = sizeof(CLSID) + 2 * sizeof(DWORD); + if (moniker->progid) + size->QuadPart += lstrlenW(moniker->progid) * sizeof(WCHAR); return S_OK; } @@ -867,15 +895,21 @@ static HRESULT guid_from_string(const WCHAR *s, GUID *ret) static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) { struct new_moniker *moniker; + WCHAR *progid = NULL, *str; GUID guid; *ret = NULL; if (wcsnicmp(name, L"new:", 4)) return MK_E_SYNTAX; + str = name + 4; - if (!guid_from_string(name + 4, &guid) && FAILED(CLSIDFromProgID(name + 4, &guid))) - return MK_E_SYNTAX; + if (!guid_from_string(str, &guid)) + { + if (FAILED(CLSIDFromProgID(str, &guid))) + return MK_E_SYNTAX; + progid = str; + } moniker = heap_alloc_zero(sizeof(*moniker)); if (!moniker) @@ -885,6 +919,15 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG moniker->IROTData_iface.lpVtbl = &new_moniker_rotdata_vtbl; moniker->refcount = 1; moniker->clsid = guid; + if (progid) + { + if (!(moniker->progid = heap_alloc((lstrlenW(progid) + 1) * sizeof(WCHAR)))) + { + IMoniker_Release(&moniker->IMoniker_iface); + return E_OUTOFMEMORY; + } + lstrcpyW(moniker->progid, progid); + } *ret = &moniker->IMoniker_iface; diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 3b15a1f7e6..e6717e0ea3 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -293,23 +293,90 @@ static void create_dispenser(void) IDispenserManager_Release(dispenser); } +static void test_new_moniker_serialize(const WCHAR *clsid, const WCHAR *progid, IMoniker *moniker) +{ + DWORD expected_size, progid_len = 0; + ULARGE_INTEGER size; + IStream *stream; + HGLOBAL hglobal; + CLSID guid; + HRESULT hr; + DWORD *ptr; + + hr = IMoniker_GetSizeMax(moniker, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + expected_size = sizeof(GUID) + 2 * sizeof(DWORD); + if (progid) + { + progid_len = lstrlenW(progid) * sizeof(*progid); + expected_size += progid_len; + } + + size.QuadPart = 0; + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Failed to get size, hr %#x.\n", hr); + ok(size.QuadPart == expected_size, "Unexpected size %s, expected %#x.\n", wine_dbgstr_longlong(size.QuadPart), + expected_size); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + hr = IMoniker_Save(moniker, stream, FALSE); + ok(hr == S_OK, "Failed to save moniker, hr %#x.\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "Failed to get a handle, hr %#x.\n", hr); + + ptr = GlobalLock(hglobal); + ok(!!ptr, "Failed to get data pointer.\n"); + + hr = CLSIDFromString(clsid, &guid); + ok(hr == S_OK, "Failed to get CLSID, hr %#x.\n", hr); + ok(IsEqualGUID((GUID *)ptr, &guid), "Unexpected buffer content.\n"); + ptr += sizeof(GUID)/sizeof(DWORD); + + /* Serialization format: + + GUID guid; + DWORD progid_len; + WCHAR progid[progid_len/2]; + DWORD null; + */ + + if (progid) + { + ok(*ptr == progid_len, "Unexpected progid length.\n"); + ptr++; + ok(!memcmp(ptr, progid, progid_len), "Unexpected progid.\n"); + ptr += progid_len / sizeof(DWORD); + } + else + { + ok(*ptr == 0, "Unexpected progid length.\n"); + ptr++; + } + ok(*ptr == 0, "Unexpected terminator.\n"); + + GlobalUnlock(hglobal); + + IStream_Release(stream); +} + static void test_new_moniker(void) { IMoniker *moniker, *moniker2, *inverse, *class_moniker, *moniker_left; IRunningObjectTable *rot; IUnknown *obj, *obj2; BIND_OPTS2 bind_opts; - ULARGE_INTEGER size; DWORD moniker_type; IROTData *rot_data; IBindCtx *bindctx; FILETIME filetime; DWORD hash, eaten; - IStream *stream; - HGLOBAL hglobal; CLSID clsid; HRESULT hr; - void *ptr; + WCHAR *str; hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); @@ -424,36 +491,7 @@ todo_wine ok(obj == NULL, "Unexpected return value.\n"); /* Serialization. */ - hr = IMoniker_GetSizeMax(moniker, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - - size.QuadPart = 0; - hr = IMoniker_GetSizeMax(moniker, &size); - ok(hr == S_OK, "Failed to get size, hr %#x.\n", hr); - ok(size.QuadPart == (sizeof(GUID) + 2 * sizeof(DWORD)), "Unexpected size %s.\n", - wine_dbgstr_longlong(size.QuadPart)); - - hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - - hr = IMoniker_Save(moniker, stream, FALSE); - ok(hr == S_OK, "Failed to save moniker, hr %#x.\n", hr); - - hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "Failed to get a handle, hr %#x.\n", hr); - - ptr = GlobalLock(hglobal); - ok(!!ptr, "Failed to get data pointer.\n"); - - hr = CLSIDFromString(L"{20d04fe0-3aea-1069-a2d8-08002b30309d}", &clsid); - ok(hr == S_OK, "Failed to get CLSID, hr %#x.\n", hr); - ok(IsEqualGUID((GUID *)ptr, &clsid), "Unexpected buffer content.\n"); - ok(*(DWORD *)((BYTE *)ptr + sizeof(GUID)) == 0, "Unexpected buffer content.\n"); - ok(*(DWORD *)((BYTE *)ptr + sizeof(GUID) + sizeof(DWORD)) == 0, "Unexpected buffer content.\n"); - - GlobalUnlock(hglobal); - - IStream_Release(stream); + test_new_moniker_serialize(L"{20d04fe0-3aea-1069-a2d8-08002b30309d}", NULL, moniker); hr = IMoniker_IsDirty(moniker); ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); @@ -483,6 +521,15 @@ todo_wine ok(hr == S_OK, "Failed to parse display name, hr %#x.\n", hr); ok(eaten, "Unexpected eaten length %u.\n", eaten); + hr = CLSIDFromProgID(L"msxml2.domdocument", &clsid); + ok(hr == S_OK, "Failed to get clsid, hr %#x.\n", hr); + + hr = StringFromCLSID(&clsid, &str); + ok(hr == S_OK, "Failed to get guid string, hr %#x.\n", hr); + + test_new_moniker_serialize(str, L"msxml2.domdocument", moniker); + CoTaskMemFree(str); + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); ok(hr == S_OK, "Failed to bind to object, hr %#x.\n", hr); EXPECT_REF(obj, 1);

1 0

Nikolay Sivov : comsvcs: Add IROTData stub for "new" moniker.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 2485f2d035c0acbfe460b92f87e338734df74fc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2485f2d035c0acbfe460b92f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:36:55 2019 +0300 comsvcs: Add IROTData stub for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comsvcs/tests/comsvcs.c | 5 +++++ 2 files changed, 51 insertions(+) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 0f287a681f..7bfde03b34 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -54,6 +54,7 @@ typedef struct holder struct new_moniker { IMoniker IMoniker_iface; + IROTData IROTData_iface; LONG refcount; CLSID clsid; }; @@ -75,6 +76,11 @@ static struct new_moniker *impl_from_IMoniker(IMoniker *iface) return CONTAINING_RECORD(iface, struct new_moniker, IMoniker_iface); } +static struct new_moniker *impl_from_IROTData(IROTData *iface) +{ + return CONTAINING_RECORD(iface, struct new_moniker, IROTData_iface); +} + static HRESULT WINAPI holder_QueryInterface(IHolder *iface, REFIID riid, void **object) { holder *This = impl_from_IHolder(iface); @@ -429,6 +435,8 @@ static const IClassFactoryVtbl comsvcscf_vtbl = static HRESULT WINAPI new_moniker_QueryInterface(IMoniker* iface, REFIID riid, void **obj) { + struct new_moniker *moniker = impl_from_IMoniker(iface); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); *obj = NULL; @@ -440,6 +448,10 @@ static HRESULT WINAPI new_moniker_QueryInterface(IMoniker* iface, REFIID riid, v { *obj = iface; } + else if (IsEqualIID(&IID_IROTData, riid)) + { + *obj = &moniker->IROTData_iface; + } if (*obj) { @@ -738,6 +750,39 @@ static const IMonikerVtbl new_moniker_vtbl = new_moniker_IsSystemMoniker }; +static HRESULT WINAPI new_moniker_rotdata_QueryInterface(IROTData *iface, REFIID riid, void **obj) +{ + struct new_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, obj); +} + +static ULONG WINAPI new_moniker_rotdata_AddRef(IROTData *iface) +{ + struct new_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_AddRef(&moniker->IMoniker_iface); +} + +static ULONG WINAPI new_moniker_rotdata_Release(IROTData *iface) +{ + struct new_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_Release(&moniker->IMoniker_iface); +} + +static HRESULT WINAPI new_moniker_rotdata_GetComparisonData(IROTData *iface, byte *data, ULONG data_len, ULONG *length) +{ + FIXME("%p, %p, %u, %p.\n", iface, data, data_len, length); + + return E_NOTIMPL; +} + +static const IROTDataVtbl new_moniker_rotdata_vtbl = +{ + new_moniker_rotdata_QueryInterface, + new_moniker_rotdata_AddRef, + new_moniker_rotdata_Release, + new_moniker_rotdata_GetComparisonData, +}; + static const BYTE guid_conv_table[256] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ @@ -837,6 +882,7 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG return E_OUTOFMEMORY; moniker->IMoniker_iface.lpVtbl = &new_moniker_vtbl; + moniker->IROTData_iface.lpVtbl = &new_moniker_rotdata_vtbl; moniker->refcount = 1; moniker->clsid = guid; diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 4d37b60eb9..3b15a1f7e6 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -301,6 +301,7 @@ static void test_new_moniker(void) BIND_OPTS2 bind_opts; ULARGE_INTEGER size; DWORD moniker_type; + IROTData *rot_data; IBindCtx *bindctx; FILETIME filetime; DWORD hash, eaten; @@ -318,6 +319,10 @@ static void test_new_moniker(void) ok(hr == S_OK, "Failed to parse display name, hr %#x.\n", hr); ok(eaten == 40, "Unexpected eaten length %u.\n", eaten); + hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rot_data); + ok(hr == S_OK, "Failed to get IROTData, hr %#x.\n", hr); + IROTData_Release(rot_data); + eaten = 0; hr = IMoniker_ParseDisplayName(moniker, bindctx, NULL, (WCHAR *)L"new:20d04fe0-3aea-1069-a2d8-08002b30309d", &eaten, &moniker2);

1 0

Nikolay Sivov : comsvcs: Add Reduce() for "new" moniker.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 015ad98f5410d1c8f053059bbfd63a78712ef24f URL: https://source.winehq.org/git/wine.git/?a=commit;h=015ad98f5410d1c8f053059b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:36:54 2019 +0300 comsvcs: Add Reduce() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 10 ++++++++-- dlls/comsvcs/tests/comsvcs.c | 18 +++++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 827a6e8e5e..0f287a681f 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -600,9 +600,15 @@ static HRESULT WINAPI new_moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, static HRESULT WINAPI new_moniker_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD flags, IMoniker **ppmkToLeft, IMoniker **ret) { - FIXME("%p, %p, %d, %p, %p.\n", iface, pbc, flags, ppmkToLeft, ret); + TRACE("%p, %p, %d, %p, %p.\n", iface, pbc, flags, ppmkToLeft, ret); - return E_NOTIMPL; + if (!ret) + return E_POINTER; + + *ret = iface; + IMoniker_AddRef(iface); + + return MK_S_REDUCED_TO_SELF; } static HRESULT WINAPI new_moniker_ComposeWith(IMoniker *iface, IMoniker *mkRight, BOOL fOnlyIfNotGeneric, diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 63db25bed2..4d37b60eb9 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -295,7 +295,7 @@ static void create_dispenser(void) static void test_new_moniker(void) { - IMoniker *moniker, *moniker2, *inverse, *class_moniker; + IMoniker *moniker, *moniker2, *inverse, *class_moniker, *moniker_left; IRunningObjectTable *rot; IUnknown *obj, *obj2; BIND_OPTS2 bind_opts; @@ -356,6 +356,22 @@ static void test_new_moniker(void) IMoniker_Release(class_moniker); + /* Reducing. */ + moniker_left = (void *)0xdeadbeef; + hr = IMoniker_Reduce(moniker, bindctx, MKRREDUCE_ONE, &moniker_left, &moniker2); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(moniker_left == (void *)0xdeadbeef, "Unexpected left moniker.\n"); + ok(moniker2 == moniker, "Unexpected returned moniker.\n"); + IMoniker_Release(moniker2); + + hr = IMoniker_Reduce(moniker, bindctx, MKRREDUCE_ONE, NULL, &moniker2); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(moniker2 == moniker, "Unexpected returned moniker.\n"); + IMoniker_Release(moniker2); + + hr = IMoniker_Reduce(moniker, bindctx, MKRREDUCE_ONE, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + /* Hashing */ hash = 0; hr = IMoniker_Hash(moniker, &hash);

1 0

Nikolay Sivov : comsvcs/tests: Get rid of global variable.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 0fbf3688e9c508fa9aa6d8cff631665c78e3cc2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fbf3688e9c508fa9aa6d8cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:36:53 2019 +0300 comsvcs/tests: Get rid of global variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/comsvcs.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index d75cbfc642..63db25bed2 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -67,7 +67,16 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } -HRESULT driver_DestroyResource_ret = S_OK; +struct test_driver +{ + IDispenserDriver IDispenserDriver_iface; + HRESULT destroy_resource_hr; +}; + +static struct test_driver *impl_from_IDispenserDriver(IDispenserDriver *iface) +{ + return CONTAINING_RECORD(iface, struct test_driver, IDispenserDriver_iface); +} static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid, void **object) { @@ -125,8 +134,9 @@ static HRESULT WINAPI driver_ResetResource(IDispenserDriver *iface, const RESID static HRESULT WINAPI driver_DestroyResource(IDispenserDriver *iface, const RESID resid) { + struct test_driver *driver = impl_from_IDispenserDriver(iface); todo_wine CHECK_EXPECT2(driver_DestroyResource); - return driver_DestroyResource_ret; + return driver->destroy_resource_hr; } static HRESULT WINAPI driver_DestroyResourceS(IDispenserDriver *iface, const SRESID resid) @@ -149,7 +159,11 @@ static const struct IDispenserDriverVtbl driver_vtbl = driver_DestroyResourceS }; -static IDispenserDriver DispenserDriver = { &driver_vtbl }; +static void init_test_driver(struct test_driver *driver) +{ + driver->IDispenserDriver_iface.lpVtbl = &driver_vtbl; + driver->destroy_resource_hr = S_OK; +} static DWORD WINAPI com_thread(void *arg) { @@ -174,6 +188,7 @@ static void create_dispenser(void) RESID resid; DWORD ret; BSTR str; + struct test_driver driver; hr = CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)&dispenser); ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); @@ -188,7 +203,9 @@ static void create_dispenser(void) GetExitCodeThread(thread, &ret); ok(ret == CO_E_NOTINITIALIZED, "got unexpected hr %#x\n", ret); - hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder1); + init_test_driver(&driver); + + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool0, &holder1); ok(hr == S_OK, "got 0x%08x\n", hr); /* The above call creates an MTA thread, but we need to wait for it to @@ -199,11 +216,11 @@ static void create_dispenser(void) GetExitCodeThread(thread, &ret); ok(ret == S_OK, "got unexpected hr %#x\n", ret); - hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder2); + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool0, &holder2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(holder1 != holder2, "same holder object returned\n"); - hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool1, &holder3); + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool1, &holder3); ok(hr == S_OK, "got 0x%08x\n", hr); if(holder1) @@ -254,14 +271,14 @@ static void create_dispenser(void) todo_wine CHECK_CALLED(driver_ResetResource); /* DestroyResource return doesn't directly affect the Holder Close return value */ - driver_DestroyResource_ret = E_FAIL; + driver.destroy_resource_hr = E_FAIL; SET_EXPECT(driver_DestroyResource); SET_EXPECT(driver_Release); hr = IHolder_Close(holder2); ok(hr == S_OK, "got 0x%08x\n", hr); CHECK_CALLED(driver_Release); CHECK_CALLED(driver_DestroyResource); - driver_DestroyResource_ret = S_OK; + driver.destroy_resource_hr = S_OK; IHolder_Release(holder2); } if(holder3)

1 0

Nikolay Sivov : comsvcs/tests: Add some tests for "new" moniker interfaction with bind context.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: bfbd3ed44f4dd1ae5e62659e70a895239be663fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfbd3ed44f4dd1ae5e62659e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:36:52 2019 +0300 comsvcs/tests: Add some tests for "new" moniker interfaction with bind context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/comsvcs.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 29de7cfe97..d75cbfc642 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -58,6 +58,15 @@ DEFINE_EXPECT(driver_DestroyResource); DEFINE_EXPECT(driver_ResetResource); DEFINE_EXPECT(driver_Release); +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + HRESULT driver_DestroyResource_ret = S_OK; static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid, void **object) @@ -270,6 +279,7 @@ static void create_dispenser(void) static void test_new_moniker(void) { IMoniker *moniker, *moniker2, *inverse, *class_moniker; + IRunningObjectTable *rot; IUnknown *obj, *obj2; BIND_OPTS2 bind_opts; ULARGE_INTEGER size; @@ -425,6 +435,32 @@ todo_wine IUnknown_Release(obj); IBindCtx_Release(bindctx); + + /* Returned object is not bound to context. */ + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + eaten = 0; + hr = MkParseDisplayName(bindctx, L"new:msxml2.domdocument", &eaten, &moniker); + ok(hr == S_OK, "Failed to parse display name, hr %#x.\n", hr); + ok(eaten, "Unexpected eaten length %u.\n", eaten); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); + ok(hr == S_OK, "Failed to bind to object, hr %#x.\n", hr); + EXPECT_REF(obj, 1); + + hr = IBindCtx_GetRunningObjectTable(bindctx, &rot); + ok(hr == S_OK, "Failed to get rot, hr %#x.\n", hr); + + hr = IRunningObjectTable_GetObject(rot, moniker, &obj2); +todo_wine + ok(hr == MK_E_UNAVAILABLE, "Unexpected hr %#x.\n", hr); + + IRunningObjectTable_Release(rot); + + IUnknown_Release(obj); + + IBindCtx_Release(bindctx); } START_TEST(comsvcs)

1 0

Nikolay Sivov : comsvcs: Implement BindToObject() for "new" moniker.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 5e32397cdee1c0ea5a7de7c6e8157ddad8a605b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e32397cdee1c0ea5a7de7c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:36:51 2019 +0300 comsvcs: Implement BindToObject() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/comsvcs/tests/comsvcs.c | 8 ++------ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 86ffe2587b..827a6e8e5e 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -551,9 +551,42 @@ static HRESULT WINAPI new_moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *si static HRESULT WINAPI new_moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, void **ret) { - FIXME("%p, %p, %p, %s, %p.\n", iface, pbc, pmkToLeft, debugstr_guid(riid), ret); + struct new_moniker *moniker = impl_from_IMoniker(iface); + IClassActivator *activator; + IClassFactory *factory; + BIND_OPTS2 bindopts; + MULTI_QI qi; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p, %s, %p.\n", iface, pbc, pmkToLeft, debugstr_guid(riid), ret); + + bindopts.cbStruct = sizeof(bindopts); + if (FAILED(hr = IBindCtx_GetBindOptions(pbc, (BIND_OPTS *)&bindopts))) + return hr; + + if (!pmkToLeft) + { + qi.pIID = riid; + qi.pItf = NULL; + qi.hr = S_OK; + hr = CoCreateInstanceEx(&moniker->clsid, NULL, bindopts.dwClassContext, bindopts.pServerInfo, 1, &qi); + *ret = qi.pItf; + } + else + { + if (SUCCEEDED(hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IClassActivator, (void **)&activator))) + { + hr = IClassActivator_GetClassObject(activator, &moniker->clsid, bindopts.dwClassContext, bindopts.locale, riid, ret); + IClassActivator_Release(activator); + } + else if (SUCCEEDED(hr = IMoniker_BindToObject(pmkToLeft, pbc, NULL, &IID_IClassFactory, (void **)&factory))) + { + hr = IClassFactory_CreateInstance(factory, NULL, riid, ret); + IClassFactory_Release(factory); + } + } + + return hr; } static HRESULT WINAPI new_moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index d94b99afd1..29de7cfe97 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -352,10 +352,8 @@ todo_wine ok(hr == MK_E_UNAVAILABLE, "Unexpected hr %#x.\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); -todo_wine ok(hr == S_OK, "Failed to bind to object, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(obj); + IUnknown_Release(obj); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); todo_wine @@ -423,10 +421,8 @@ todo_wine bind_opts.dwClassContext = CLSCTX_INPROC_SERVER; hr = CoGetObject(L"new:msxml2.domdocument", (BIND_OPTS *)&bind_opts, &IID_IXMLDOMDocument, (void **)&obj); -todo_wine ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(obj); + IUnknown_Release(obj); IBindCtx_Release(bindctx); }

1 0

Alistair Leslie-Hughes : dmscript: Script track IPersistStream IsDirty return S_FALSE.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: e437e48254e0febb9914a8f6ee4cb86a45942c6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e437e48254e0febb9914a8f6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 10 05:40:13 2019 +0000 dmscript: Script track IPersistStream IsDirty return S_FALSE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/scripttrack.c | 2 +- dlls/dmscript/tests/dmscript.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index bc8e8ce595..47fe3ef0d2 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -277,7 +277,7 @@ static HRESULT WINAPI IPersistStreamImpl_GetClassID(IPersistStream *iface, CLSID static HRESULT WINAPI IPersistStreamImpl_IsDirty(IPersistStream *iface) { - return E_NOTIMPL; + return S_FALSE; } static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index ef2c17c3ca..d372f39d9e 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -227,7 +227,7 @@ static void test_scripttrack(void) /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE);

1 0

Alistair Leslie-Hughes : dmband: Rename IDirectMusicTrack8Impl to band_track.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: wine Branch: master Commit: 9f90994b2fdd183830dce7435c5f59570d52a7a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f90994b2fdd183830dce743… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 10 17:23:39 2019 +0100 dmband: Rename IDirectMusicTrack8Impl to band_track. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/bandtrack.c | 79 ++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index eb62ec11ce..a0305bdb28 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -40,7 +40,7 @@ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr return CONTAINING_RECORD(iface, IDirectMusicBandTrack, IDirectMusicTrack8_iface); } -static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, +static HRESULT WINAPI band_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -63,7 +63,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 * return S_OK; } -static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) +static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) return ref; } -static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) +static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -88,15 +88,14 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) return ref; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, - IDirectMusicSegment *pSegment) +static HRESULT WINAPI band_track_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *pSegment) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pSegment); return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface, IDirectMusicSegmentState *segment_state, IDirectMusicPerformance *performance, void **state_data, DWORD virtual_track8id, DWORD flags) { @@ -107,14 +106,14 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) +static HRESULT WINAPI band_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *state_data, +static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_data, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD flags, IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD virtual_id) @@ -133,7 +132,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -141,7 +140,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, void *pParam) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -149,8 +148,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, - REFGUID rguidType) +static HRESULT WINAPI band_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -178,8 +176,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, - REFGUID notiftype) +static HRESULT WINAPI band_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -187,7 +184,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -196,7 +193,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, +static HRESULT WINAPI band_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -204,7 +201,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *state_data, +static HRESULT WINAPI band_track_PlayEx(IDirectMusicTrack8 *iface, void *state_data, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD flags, IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD virtual_id) @@ -217,7 +214,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, v return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *rtNext, void *param, void *state_data, DWORD flags) { @@ -229,8 +226,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, - REFGUID rguidType, REFERENCE_TIME rtTime, void *param, void *state_data, DWORD flags) +static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, + REFERENCE_TIME rtTime, void *param, void *state_data, DWORD flags) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -240,7 +237,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, +static HRESULT WINAPI band_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **track) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -249,8 +246,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, - IDirectMusicTrack *pNewTrack, MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, +static HRESULT WINAPI band_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *pNewTrack, + MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -259,24 +256,24 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, } static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { - IDirectMusicTrack8Impl_QueryInterface, - IDirectMusicTrack8Impl_AddRef, - IDirectMusicTrack8Impl_Release, - IDirectMusicTrack8Impl_Init, - IDirectMusicTrack8Impl_InitPlay, - IDirectMusicTrack8Impl_EndPlay, - IDirectMusicTrack8Impl_Play, - IDirectMusicTrack8Impl_GetParam, - IDirectMusicTrack8Impl_SetParam, - IDirectMusicTrack8Impl_IsParamSupported, - IDirectMusicTrack8Impl_AddNotificationType, - IDirectMusicTrack8Impl_RemoveNotificationType, - IDirectMusicTrack8Impl_Clone, - IDirectMusicTrack8Impl_PlayEx, - IDirectMusicTrack8Impl_GetParamEx, - IDirectMusicTrack8Impl_SetParamEx, - IDirectMusicTrack8Impl_Compose, - IDirectMusicTrack8Impl_Join + band_track_QueryInterface, + band_track_AddRef, + band_track_Release, + band_track_Init, + band_track_InitPlay, + band_track_EndPlay, + band_track_Play, + band_track_GetParam, + band_track_SetParam, + band_track_IsParamSupported, + band_track_AddNotificationType, + band_track_RemoveNotificationType, + band_track_Clone, + band_track_PlayEx, + band_track_GetParamEx, + band_track_SetParamEx, + band_track_Compose, + band_track_Join }; /* IDirectMusicBandTrack IPersistStream part: */

1 0

Julian Rüger : German translation for release 4.19.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: website Branch: master Commit: 29be6c21c7c9b5095002f5cb75351f0a5d4c0699 URL: https://source.winehq.org/git/website.git/?a=commit;h=29be6c21c7c9b5095002f… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 11 14:53:33 2019 +0100 German translation for release 4.19. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019110101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2019110101.xml b/news/de/2019110101.xml new file mode 100644 index 00000000..116653a5 --- /dev/null +++ b/news/de/2019110101.xml @@ -0,0 +1,15 @@ +<news> +<date>1. November 2019</date> +<title>Wine 4.19 freigegeben</title> +<body> + Die Entwicklungsversion 4.19 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.19">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mehrere zusätzliche VBScript-Features.</li> + <li>Weitere Stateblock-Unterstützung in WineD3D.</li> + <li>Einige Korrekturen an der ARM64-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.19.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.18.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: website Branch: master Commit: 18d4ec16f185a71038a6686d82523c37c01694c6 URL: https://source.winehq.org/git/website.git/?a=commit;h=18d4ec16f185a71038a66… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 11 14:51:42 2019 +0100 German translation for release 4.18. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019101801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2019101801.xml b/news/de/2019101801.xml new file mode 100644 index 00000000..09525f38 --- /dev/null +++ b/news/de/2019101801.xml @@ -0,0 +1,15 @@ +<news> +<date>18. Oktober 2019</date> +<title>Wine 4.18 freigegeben</title> +<body> + Die Entwicklungsversion 4.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele neue VBScript-Funktionen.</li> + <li>Einige Aufräumarbeiten und Verbesserungen an Quartz.</li> + <li>Korrektur von etlichen Test-Fehlschlägen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.18.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.17.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: website Branch: master Commit: ae7c29cf73c244de3d6bb775ed5927595968e05f URL: https://source.winehq.org/git/website.git/?a=commit;h=ae7c29cf73c244de3d6bb… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 11 14:49:17 2019 +0100 German translation for release 4.17. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019092701.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2019092701.xml b/news/de/2019092701.xml new file mode 100644 index 00000000..883cf81d --- /dev/null +++ b/news/de/2019092701.xml @@ -0,0 +1,18 @@ +<news> +<date>27. September 2019</date> +<title>Wine 4.17 freigegeben</title> +<body> + Die Entwicklungsversion 4.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Mono-Engine mit Korrekturen aus dem Upstream-Projekt.</li> + <li>Unterstützung von DXTn-komprimierten Texturen.</li> + <li>Anfängliche Version der Windows-Script-Laufzeitbibliothek.</li> + <li>Unterstützung von XRandR-Geräteänderungsbenachrichtigungen.</li> + <li>Unterstützung für das Erzeugen von RSA-Schlüsseln.</li> + <li>Stubless-Proxies-Unterstützung unter ARM64.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.17.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.16.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: website Branch: master Commit: 6ca99513c85bbe5105575f3ba1a519d0480712d1 URL: https://source.winehq.org/git/website.git/?a=commit;h=6ca99513c85bbe5105575… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 11 14:45:13 2019 +0100 German translation for release 4.16. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019091301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2019091301.xml b/news/de/2019091301.xml new file mode 100644 index 00000000..77ee5c17 --- /dev/null +++ b/news/de/2019091301.xml @@ -0,0 +1,15 @@ +<news> +<date>13. September 2019</date> +<title>Wine 4.16 freigegeben</title> +<body> + Die Entwicklungsversion 4.16 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.16">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Zuverlässigeres "Einfangen" der Maus in Spielen.</li> + <li>Bessere Unterstützung von Cross-Compilierung in WineGCC.</li> + <li>Verbesserte Kompatibilität mit Windows-Debuggern.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.16.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation, remembering Józef Kucia.
by Alexandre Julliard 11 Nov '19

11 Nov '19

Module: website Branch: master Commit: 845a3aad07695031cf3968862c87be66a1bcdac8 URL: https://source.winehq.org/git/website.git/?a=commit;h=845a3aad07695031cf396… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 11 19:04:23 2019 +0100 German translation, remembering Józef Kucia. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019091101.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/news/de/2019091101.xml b/news/de/2019091101.xml new file mode 100644 index 00000000..5585ee34 --- /dev/null +++ b/news/de/2019091101.xml @@ -0,0 +1,24 @@ +<news> +<date>11. September 2019</date> +<title>Gedenken an Józef Kucia</title> +<body> +<a href="{$root}/images/Józef-Kucia.png"><img src="{$root}/images/Józef-Kucia.png" + style="margin: 0 20px 20px 0;"/></a> + Mit großer Trauer verkünden wir den Tod unseres Freundes Józef Kucia. + Józef war ein wichtiger Mitwirkender am Wine-Projekt mit über 2500 Patches seit seinem ersten +Beitrag im Jahr 2012. Er war ein außerordentlich talentierter Entwickler mit Fokus auf Wines +Direct3D-Subsystem. Józef gründete und leitete das vkd3d-Projekt und unterstützte die Vulkan-Arbeitsgruppe +mit seinem Sachverständnis und gutem Rat. Er leistete auch wertvolle Beiträge zu anderen Open-Source-Projekten, +unter anderem Mesa und Debian. + Józef war ein regelmäßiger Teilnehmer an der jährlichen WineConf. Als ein Mann weniger Worte +war er dennoch stets hilfsbereit und zeigte stille Freundlichkeit und Güte. Seine Fähigkeiten +erweckten das Interesse von CodeWeavers und so trat Józef <a +href="https://www.codeweavers.com/about/blogs/jwhite/2019/09/08/a-tragic-loss">ihrem Team</a> +2015 bei. Das erlaubte ihm, Wine noch mehr seiner Zeit zu widmen. + Józef starb letzten Monat im Alter von 30 Jahren bei einem Unfall in der Jaskinia +Wielka Śnieżna ("Die große Schneehöhle") im Tatra-Gebirge in Polen. Das Höhlenwandern war seine +Leidenschaft. + + Józef wird allen, die mit ihm zusammengearbeitet haben, in wohliger Erinnnerung bleiben. +Unsere Gedanken und unser Beileid sind bei Józefs Familie, Freunden, Liebsten und jedem, der um ihn trauert. +</body></news>

1 0

Alistair Leslie-Hughes : dmband: Handle the DirectX 7 version of DMUS_IO_INSTRUMENT structure.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 070cfc358c8ed67ba08a49ae78c20205ab4e2d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=070cfc358c8ed67ba08a49ae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 8 22:32:56 2019 +0100 dmband: Handle the DirectX 7 version of DMUS_IO_INSTRUMENT structure. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/band.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 4338791971..53f407c1a4 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -171,6 +171,8 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { band_IDirectMusicObject_ParseDescriptor }; +#define DMUS_IO_INSTRUMENT_DX7_SIZE offsetof(DMUS_IO_INSTRUMENT, nPitchBendRange) + /* IDirectMusicBandImpl IPersistStream part: */ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) @@ -199,8 +201,14 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * switch (Chunk.fccID) { case DMUS_FOURCC_INSTRUMENT_CHUNK: { TRACE_(dmfile)(": Instrument chunk\n"); - if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT)) return E_FAIL; - IStream_Read (pStm, &inst, sizeof(DMUS_IO_INSTRUMENT), NULL); + if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT) && Chunk.dwSize != DMUS_IO_INSTRUMENT_DX7_SIZE) { + ERR_(dmfile)("unexpected size %d\n", Chunk.dwSize); + return E_FAIL; + } + IStream_Read (pStm, &inst, Chunk.dwSize, NULL); + if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT)) + inst.nPitchBendRange = 0; + TRACE_(dmfile)(" - dwPatch: %u\n", inst.dwPatch); TRACE_(dmfile)(" - dwAssignPatch: %u\n", inst.dwAssignPatch); TRACE_(dmfile)(" - dwNoteRanges[0]: %u\n", inst.dwNoteRanges[0]);

1 0

Alistair Leslie-Hughes : dmime: Trace dwGroupBits parameter consistently.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: e4a5af6c0d812572ffff2d3a452c1d301e0f00ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4a5af6c0d812572ffff2d3a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 8 21:48:44 2019 +0100 dmime: Trace dwGroupBits parameter consistently. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index a0e6191864..d47c2f2c23 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -170,7 +170,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if IPersistStream* pCLSIDStream = NULL; HRESULT hr = S_OK; - TRACE("(%p, %s, %d, 0x%x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); + TRACE("(%p, %s, %#x, %#x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); if (NULL == ppTrack) { return E_POINTER; @@ -243,12 +243,12 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL; - TRACE("(%p, %p, %d)\n", This, pTrack, dwGroupBits); + TRACE("(%p, %p, %#x)\n", This, pTrack, dwGroupBits); LIST_FOR_EACH (pEntry, &This->Tracks) { i++; pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - #%u: %p -> %d,%p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - #%u: %p -> %#x, %p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { ERR("(%p, %p): track is already in list\n", This, pTrack); return E_FAIL; @@ -424,7 +424,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *if REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, void *pParam) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %d, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, %#x, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; } @@ -503,7 +503,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetTrackConfig(IDirectMusicSegmen DWORD dwFlagsOff) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %d, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, %#x, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; }

1 0

Alistair Leslie-Hughes : dsound/tests: Add media object query tests.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 65488e6cf181d28e091debfe76899ffafbdbdfb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65488e6cf181d28e091debfe… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 8 13:26:30 2019 -0600 dsound/tests: Add media object query tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/dsound8.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index b66275973f..8190a61736 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1424,6 +1424,38 @@ static void test_effects(void) while (IDirectSound8_Release(dso)); } +static void test_dsfx_interfaces(const char *test_prefix, IUnknown *dmo, REFGUID refguid) +{ + HRESULT rc; + IMediaObject *mediaobject; + IMediaObjectInPlace *inplace; + IUnknown *parent; + + rc = IUnknown_QueryInterface(dmo, &IID_IMediaObject, (void**)&mediaobject); + ok(rc == DS_OK, "%s: Failed: %08x\n", test_prefix, rc); + if (rc == DS_OK) + { + rc = IMediaObject_QueryInterface(mediaobject, refguid, (void**)&parent); + ok(rc == S_OK, "%s: got: %08x\n", test_prefix, rc); + ok(dmo == parent, "%s: Objects not equal\n", test_prefix); + IUnknown_Release(parent); + + IMediaObject_Release(mediaobject); + } + + rc = IUnknown_QueryInterface(dmo, &IID_IMediaObjectInPlace, (void**)&inplace); + ok(rc == DS_OK, "%s: Failed: %08x\n", test_prefix, rc); + if (rc == DS_OK) + { + rc = IMediaObjectInPlace_QueryInterface(inplace, refguid, (void**)&parent); + ok(rc == S_OK, "%s: got: %08x\n", test_prefix, rc); + ok(dmo == parent, "%s: Objects not equal\n", test_prefix); + IUnknown_Release(parent); + + IMediaObjectInPlace_Release(inplace); + } +} + static void test_echo_parameters(IDirectSoundBuffer8 *secondary8) { HRESULT rc; @@ -1446,6 +1478,8 @@ static void test_echo_parameters(IDirectSoundBuffer8 *secondary8) ok(params.lPanDelay == 0, "got %d\n", params.lPanDelay); } + test_dsfx_interfaces("FXEcho", (IUnknown *)echo, &IID_IDirectSoundFXEcho); + IDirectSoundFXEcho_Release(echo); } } @@ -1469,6 +1503,8 @@ static void test_gargle_parameters(IDirectSoundBuffer8 *secondary8) ok(params.dwWaveShape == DSFXGARGLE_WAVE_TRIANGLE, "got %d\n", params.dwWaveShape); } + test_dsfx_interfaces("FXGargle", (IUnknown *)gargle, &IID_IDirectSoundFXGargle); + IDirectSoundFXGargle_Release(gargle); } } @@ -1497,6 +1533,8 @@ static void test_chorus_parameters(IDirectSoundBuffer8 *secondary8) ok(params.lPhase == 3, "got %d\n", params.lPhase); } + test_dsfx_interfaces("FXChorus", (IUnknown *)chorus, &IID_IDirectSoundFXChorus); + IDirectSoundFXChorus_Release(chorus); } } @@ -1525,6 +1563,8 @@ static void test_flanger_parameters(IDirectSoundBuffer8 *secondary8) ok(params.lPhase == 2, "got %d\n", params.lPhase); } + test_dsfx_interfaces("FXFlanger", (IUnknown *)flanger, &IID_IDirectSoundFXFlanger); + IDirectSoundFXFlanger_Release(flanger); } } @@ -1551,6 +1591,8 @@ static void test_distortion_parameters(IDirectSoundBuffer8 *secondary8) ok(params.fPreLowpassCutoff == 3675.0f, "got %f\n", params.fPreLowpassCutoff); } + test_dsfx_interfaces("FXDistortion", (IUnknown *)distortion, &IID_IDirectSoundFXDistortion); + IDirectSoundFXDistortion_Release(distortion); } } @@ -1577,6 +1619,8 @@ static void test_compressor_parameters(IDirectSoundBuffer8 *secondary8) ok(params.fPredelay == 4.0f, "got %f\n", params.fPredelay); } + test_dsfx_interfaces("FXCompressor", (IUnknown *)compressor, &IID_IDirectSoundFXCompressor); + IDirectSoundFXCompressor_Release(compressor); } } @@ -1601,6 +1645,8 @@ static void test_parameq_parameters(IDirectSoundBuffer8 *secondary8) ok(params.fGain == 0.0f, "got %f\n", params.fGain); } + test_dsfx_interfaces("FXParamEq", (IUnknown *)parameq, &IID_IDirectSoundFXParamEq); + IDirectSoundFXParamEq_Release(parameq); } } @@ -1632,6 +1678,8 @@ static void test_reverb_parameters(IDirectSoundBuffer8 *secondary8) ok(params.flHFReference == 5000.0f, "got %f\n", params.flHFReference); } + test_dsfx_interfaces("FXI3DL2Reverb", (IUnknown *)reverb, &IID_IDirectSoundFXI3DL2Reverb); + IDirectSoundFXI3DL2Reverb_Release(reverb); } }

1 0

Jacek Caban : vbscript: Treat only ASCII digits as digits.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: a35adb1950b4eaadc0c53b77a6bd9dd89e1a73cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35adb1950b4eaadc0c53b77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 21:28:32 2019 +0100 vbscript: Treat only ASCII digits as digits. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 14 +++++++------- dlls/vbscript/vbregexp.c | 4 ++-- dlls/vbscript/vbscript.h | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 005e7c3d58..197285c98e 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -214,7 +214,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) if(*ctx->ptr == '0' && !('0' <= ctx->ptr[1] && ctx->ptr[1] <= '9') && ctx->ptr[1] != '.') return *ctx->ptr++; - while(ctx->ptr < ctx->end && iswdigit(*ctx->ptr)) { + while(ctx->ptr < ctx->end && is_digit(*ctx->ptr)) { hlp = d*10 + *(ctx->ptr++) - '0'; if(d>MAXLONGLONG/10 || hlp<0) { exp++; @@ -223,7 +223,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) else d = hlp; } - while(ctx->ptr < ctx->end && iswdigit(*ctx->ptr)) { + while(ctx->ptr < ctx->end && is_digit(*ctx->ptr)) { exp++; ctx->ptr++; } @@ -232,7 +232,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) use_int = FALSE; ctx->ptr++; - while(ctx->ptr < ctx->end && iswdigit(*ctx->ptr)) { + while(ctx->ptr < ctx->end && is_digit(*ctx->ptr)) { hlp = d*10 + *(ctx->ptr++) - '0'; if(d>MAXLONGLONG/10 || hlp<0) break; @@ -240,7 +240,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) d = hlp; exp--; } - while(ctx->ptr < ctx->end && iswdigit(*ctx->ptr)) + while(ctx->ptr < ctx->end && is_digit(*ctx->ptr)) ctx->ptr++; } @@ -255,7 +255,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) ctx->ptr++; } - if(!iswdigit(*ctx->ptr)) { + if(!is_digit(*ctx->ptr)) { FIXME("Invalid numeric literal\n"); return 0; } @@ -266,7 +266,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) e = e*10 + *(ctx->ptr++) - '0'; if(sign == -1 && -e+exp < -(INT_MAX/100)) { /* The literal will be rounded to 0 anyway. */ - while(iswdigit(*ctx->ptr)) + while(is_digit(*ctx->ptr)) ctx->ptr++; *(double*)ret = 0; return tDouble; @@ -276,7 +276,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) FIXME("Invalid numeric literal\n"); return 0; } - } while(iswdigit(*ctx->ptr)); + } while(is_digit(*ctx->ptr)); exp += sign*e; } diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index ac667da442..60c99772d3 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1560,14 +1560,14 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl default: { DWORD idx; - if(!iswdigit(ptr[1])) { + if(!is_digit(ptr[1])) { hres = strbuf_append(&buf, ptr, 1); prev_ptr = ptr + 1; break; } idx = ptr[1] - '0'; - if(iswdigit(ptr[2]) && idx * 10 + (ptr[2] - '0') <= state->paren_count) { + if(is_digit(ptr[2]) && idx * 10 + (ptr[2] - '0') <= state->paren_count) { idx = idx * 10 + (ptr[2] - '0'); prev_ptr = ptr + 3; }else if(idx && idx <= state->paren_count) { diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 04a9b8372d..ef5cee23bf 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -373,6 +373,11 @@ static inline BOOL is_int32(double d) return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d; } +static inline BOOL is_digit(WCHAR c) +{ + return '0' <= c && c <= '9'; +} + HRESULT create_regexp(IDispatch**) DECLSPEC_HIDDEN; BSTR string_replace(BSTR,BSTR,BSTR,int,int) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Treat only ASCII digits as digits.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: f34cecbae27a484f1aa026840dc6d224ffa0b65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f34cecbae27a484f1aa02684… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 21:26:08 2019 +0100 jscript: Treat only ASCII digits as digits. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 4 ++-- dlls/jscript/dispex.c | 2 +- dlls/jscript/global.c | 18 ++++++++++-------- dlls/jscript/jscript.h | 5 +++++ dlls/jscript/json.c | 2 +- dlls/jscript/jsutils.c | 6 +++--- dlls/jscript/lex.c | 30 +++++++++++++++--------------- dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 1 + 9 files changed, 40 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f34cecbae27a484f1aa0…

1 0

Michael Stefaniuc : vbscript: Remove redundant NULL checks before SysFreeString().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 8b7e38c542d0939c3f8cbd6d7c3d417fa801e1dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7e38c542d0939c3f8cbd6d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 8 21:07:09 2019 +0100 vbscript: Remove redundant NULL checks before SysFreeString(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 8d4150ad70..a4442960d9 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2948,19 +2948,19 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA error = (code & ~0xffff) ? map_hres(code) : MAKE_VBSERROR(code); if(source) { - if(ctx->ei.bstrSource) SysFreeString(ctx->ei.bstrSource); + SysFreeString(ctx->ei.bstrSource); ctx->ei.bstrSource = source; } if(!ctx->ei.bstrSource) ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); if(description) { - if(ctx->ei.bstrDescription) SysFreeString(ctx->ei.bstrDescription); + SysFreeString(ctx->ei.bstrDescription); ctx->ei.bstrDescription = description; } if(!ctx->ei.bstrDescription) ctx->ei.bstrDescription = get_vbscript_error_string(error); if(helpfile) { - if(ctx->ei.bstrHelpFile) SysFreeString(ctx->ei.bstrHelpFile); + SysFreeString(ctx->ei.bstrHelpFile); ctx->ei.bstrHelpFile = helpfile; } if(args_cnt >= 5)

1 0

Jacek Caban : configure: Get rid of no longer needed __builtin_clz check.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: a94c8d5b6b68b883d3951b0064f39d427d269b25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a94c8d5b6b68b883d3951b00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 20:03:06 2019 +0100 configure: Get rid of no longer needed __builtin_clz check. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 33 --------------------------------- configure.ac | 9 --------- include/config.h.in | 3 --- 3 files changed, 45 deletions(-) diff --git a/configure b/configure index f1797bf603..ad0b149b7d 100755 --- a/configure +++ b/configure @@ -19490,39 +19490,6 @@ done LIBS="$ac_save_LIBS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5 -$as_echo_n "checking for __builtin_clz... " >&6; } -if ${ac_cv_have___builtin_clz+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return __builtin_clz(1) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_have___builtin_clz="yes" -else - ac_cv_have___builtin_clz="no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have___builtin_clz" >&5 -$as_echo "$ac_cv_have___builtin_clz" >&6; } -if test "$ac_cv_have___builtin_clz" = "yes" -then - -$as_echo "#define HAVE___BUILTIN_CLZ 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5 $as_echo_n "checking for __builtin_popcount... " >&6; } if ${ac_cv_have___builtin_popcount+:} false; then : diff --git a/configure.ac b/configure.ac index e5003f769c..4f651efbd5 100644 --- a/configure.ac +++ b/configure.ac @@ -2738,15 +2738,6 @@ AC_CHECK_FUNCS(\ ) LIBS="$ac_save_LIBS" -dnl Check for __builtin_clz -AC_CACHE_CHECK([for __builtin_clz], ac_cv_have___builtin_clz, - AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[return __builtin_clz(1)]])], - [ac_cv_have___builtin_clz="yes"], [ac_cv_have___builtin_clz="no"])) -if test "$ac_cv_have___builtin_clz" = "yes" -then - AC_DEFINE(HAVE___BUILTIN_CLZ, 1, [Define to 1 if you have the `__builtin_clz' built-in function.]) -fi - dnl Check for __builtin_popcount AC_CACHE_CHECK([for __builtin_popcount], ac_cv_have___builtin_popcount, AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[return __builtin_popcount(1)]])], diff --git a/include/config.h.in b/include/config.h.in index 9c7a49ae9a..858ee9bfd8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1304,9 +1304,6 @@ /* Define to 1 if you have the `_spawnvp' function. */ #undef HAVE__SPAWNVP -/* Define to 1 if you have the `__builtin_clz' built-in function. */ -#undef HAVE___BUILTIN_CLZ - /* Define to 1 if you have the `__builtin_popcount' built-in function. */ #undef HAVE___BUILTIN_POPCOUNT

1 0

Jacek Caban : widl: Use strmake in get_name.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: c15f83a2a32d0026e22c8e3bf14231482d756d31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c15f83a2a32d0026e22c8e3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 20:01:43 2019 +0100 widl: Use strmake in get_name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 61fadcf72f..c00a3e1bb3 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -180,18 +180,16 @@ static void write_namespace_end(FILE *header, struct namespace *namespace) const char *get_name(const var_t *v) { - static char buffer[256]; - + static char *buffer; + free( buffer ); if (is_attr( v->attrs, ATTR_PROPGET )) - strcpy( buffer, "get_" ); - else if (is_attr( v->attrs, ATTR_PROPPUT )) - strcpy( buffer, "put_" ); - else if (is_attr( v->attrs, ATTR_PROPPUTREF )) - strcpy( buffer, "putref_" ); - else - buffer[0] = 0; - strcat( buffer, v->name ); - return buffer; + return buffer = strmake( "get_%s", v->name ); + if (is_attr( v->attrs, ATTR_PROPPUT )) + return buffer = strmake( "put_%s", v->name ); + if (is_attr( v->attrs, ATTR_PROPPUTREF )) + return buffer = strmake( "putref_%s", v->name ); + buffer = NULL; + return v->name; } static void write_fields(FILE *h, var_list_t *fields)

1 0

Jacek Caban : widl: Don't use fixed size buffer in ctl2_encode_string.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: d5c745e4670b0fa226bbd3f006c6373c41a9da56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5c745e4670b0fa226bbd3f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 20:01:31 2019 +0100 widl: Don't use fixed size buffer in ctl2_encode_string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index a573351e23..dc0a6cb45b 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -342,11 +342,14 @@ static int ctl2_encode_string( const char *string, /* [I] The string to encode. */ char **result) /* [O] A pointer to a pointer to receive the encoded string. */ { - int length; - static char converted_string[0x104]; + char *converted_string; + size_t length, size; int offset; length = strlen(string); + size = (length + 5) & ~3; + if (length < 3) size += 4; + converted_string = xmalloc(size); memcpy(converted_string + 2, string, length); #ifdef WORDS_BIGENDIAN @@ -365,8 +368,7 @@ static int ctl2_encode_string( for (offset = (4 - (length + 2)) & 3; offset; offset--) converted_string[length + offset + 1] = 0x57; *result = converted_string; - - return (length + 5) & ~3; + return size; } /**************************************************************************** @@ -604,6 +606,7 @@ static int ctl2_alloc_string( string_space = typelib->typelib_segment_data[MSFT_SEG_STRING] + offset; memcpy(string_space, encoded_string, length); + free(encoded_string); return offset; } @@ -684,6 +687,7 @@ static int alloc_importfile( importfile->lcid = typelib->typelib_header.lcid2; importfile->version = major_version | (minor_version << 16); memcpy(&importfile->filename, encoded_string, length); + free(encoded_string); return offset; }

1 0

Jacek Caban : widl: Don't use fixed size buffer in ctl2_encode_name.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 908c2bec28be49dcfebc7b8b1d07fa50bbfff496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=908c2bec28be49dcfebc7b8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 20:01:23 2019 +0100 widl: Don't use fixed size buffer in ctl2_encode_name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 0e6ef087e5..a573351e23 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -291,27 +291,27 @@ static int ctl2_encode_name( const char *name, /* [I] The name string to encode. */ char **result) /* [O] A pointer to a pointer to receive the encoded name. */ { - int length; - static char converted_name[0x104]; + char *converted_name; + size_t length, size; int offset; int value; length = strlen(name); + size = (length + 7) & ~3; + converted_name = xmalloc(size + 1); memcpy(converted_name + 4, name, length); - converted_name[length + 4] = 0; - value = lhash_val_of_name_sys(typelib->typelib_header.varflags & 0x0f, typelib->typelib_header.lcid, converted_name + 4); #ifdef WORDS_BIGENDIAN converted_name[3] = length & 0xff; - converted_name[2] = 0x00; + converted_name[2] = length >> 8; converted_name[1] = value; converted_name[0] = value >> 8; #else converted_name[0] = length & 0xff; - converted_name[1] = 0x00; + converted_name[1] = length >> 8; converted_name[2] = value; converted_name[3] = value >> 8; #endif @@ -320,7 +320,7 @@ static int ctl2_encode_name( *result = converted_name; - return (length + 7) & ~3; + return size; } /**************************************************************************** @@ -548,7 +548,11 @@ static int ctl2_alloc_name( length = ctl2_encode_name(typelib, name, &encoded_name); offset = ctl2_find_name(typelib, encoded_name); - if (offset != -1) return offset; + if (offset != -1) + { + free(encoded_name); + return offset; + } offset = ctl2_alloc_segment(typelib, MSFT_SEG_NAME, length + 8, 0); @@ -565,6 +569,7 @@ static int ctl2_alloc_name( typelib->typelib_header.nametablecount += 1; typelib->typelib_header.nametablechars += *encoded_name; + free(encoded_name); return offset; }

1 0

Gabriel Ivăncescu : vbscript: Implement script persistence.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: e2eb099a943f82f18a9efeea5a6175ccb88680de URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2eb099a943f82f18a9efeea… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 8 18:19:06 2019 +0100 vbscript: Implement script persistence. Persistent code has to be re-executed if the script is uninitialized and then reinitialized and restarted. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 5 ++++- dlls/vbscript/vbscript.c | 12 ++++++++++++ dlls/vbscript/vbscript.h | 3 +++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9c18e2bf27..de45961ad6 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1997,8 +1997,11 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli class->next = script->classes; script->classes = ctx.classes; + code->last_class = class; } + code->is_persistent = (flags & SCRIPTTEXT_ISPERSISTENT) != 0; + if(TRACE_ON(vbscript_disas)) dump_code(&ctx); @@ -2016,7 +2019,7 @@ HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *d vbscode_t *code; HRESULT hres; - hres = compile_script(script, src, delimiter, flags, &code); + hres = compile_script(script, src, delimiter, flags & ~SCRIPTTEXT_ISPERSISTENT, &code); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 47fa4562f4..07763fa3d7 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -130,6 +130,7 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag static void release_script(script_ctx_t *ctx) { + vbscode_t *code, *code_next; class_desc_t *class_desc; unsigned i; @@ -148,6 +149,17 @@ static void release_script(script_ctx_t *ctx) ctx->global_funcs_cnt = 0; ctx->global_funcs_size = 0; + LIST_FOR_EACH_ENTRY_SAFE(code, code_next, &ctx->code_list, vbscode_t, entry) + { + if(code->is_persistent) + { + code->pending_exec = TRUE; + if(code->last_class) code->last_class->next = NULL; + } + else + release_vbscode(code); + } + while(!list_empty(&ctx->named_items)) { named_item_t *iter = LIST_ENTRY(list_head(&ctx->named_items), named_item_t, entry); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9f14e147ba..04a9b8372d 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -341,6 +341,7 @@ struct _vbscode_t { BOOL option_explicit; BOOL pending_exec; + BOOL is_persistent; function_t main_code; IDispatch *context; @@ -349,6 +350,8 @@ struct _vbscode_t { unsigned bstr_cnt; heap_pool_t heap; + class_desc_t *last_class; + struct list entry; };

1 0

Gabriel Ivăncescu : vbscript: Avoid special casing the global function when compiling a function's variables.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 71ce853032fd3c9bd6a54f48e6a7795ad4f42c90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71ce853032fd3c9bd6a54f48… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 8 18:18:57 2019 +0100 vbscript: Avoid special casing the global function when compiling a function's variables. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 77 ++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 45 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 7b6649ec56..9c18e2bf27 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -56,7 +56,6 @@ typedef struct { dim_decl_t *dim_decls; dim_decl_t *dim_decls_tail; - dynamic_var_t *global_vars; const_decl_t *const_decls; const_decl_t *global_consts; @@ -1479,43 +1478,19 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(func->var_cnt) { dim_decl_t *dim_decl; + unsigned i; - if(func->type == FUNC_GLOBAL) { - dynamic_var_t *new_var; - - func->var_cnt = 0; - - for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { - new_var = compiler_alloc(ctx->code, sizeof(*new_var)); - if(!new_var) - return E_OUTOFMEMORY; - - new_var->name = compiler_alloc_string(ctx->code, dim_decl->name); - if(!new_var->name) - return E_OUTOFMEMORY; - - V_VT(&new_var->v) = VT_EMPTY; - new_var->is_const = FALSE; - new_var->array = NULL; - - new_var->next = ctx->global_vars; - ctx->global_vars = new_var; - } - }else { - unsigned i; + func->vars = compiler_alloc(ctx->code, func->var_cnt * sizeof(var_desc_t)); + if(!func->vars) + return E_OUTOFMEMORY; - func->vars = compiler_alloc(ctx->code, func->var_cnt * sizeof(var_desc_t)); - if(!func->vars) + for(dim_decl = ctx->dim_decls, i=0; dim_decl; dim_decl = dim_decl->next, i++) { + func->vars[i].name = compiler_alloc_string(ctx->code, dim_decl->name); + if(!func->vars[i].name) return E_OUTOFMEMORY; - - for(dim_decl = ctx->dim_decls, i=0; dim_decl; dim_decl = dim_decl->next, i++) { - func->vars[i].name = compiler_alloc_string(ctx->code, dim_decl->name); - if(!func->vars[i].name) - return E_OUTOFMEMORY; - } - - assert(i == func->var_cnt); } + + assert(i == func->var_cnt); } if(func->array_cnt) { @@ -1809,12 +1784,13 @@ static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifi static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) { + unsigned i, var_cnt = ctx->code->main_code.var_cnt; + var_desc_t *vars = ctx->code->main_code.vars; class_desc_t *class; - dynamic_var_t *var; - for(var = ctx->global_vars; var; var = var->next) { - if(lookup_script_identifier(script, var->name)) { - FIXME("%s: redefined\n", debugstr_w(var->name)); + for(i = 0; i < var_cnt; i++) { + if(lookup_script_identifier(script, vars[i].name)) { + FIXME("%s: redefined\n", debugstr_w(vars[i].name)); return E_FAIL; } } @@ -1894,10 +1870,10 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli function_t *new_func, *func_iter; function_decl_t *func_decl; class_decl_t *class_decl; - dynamic_var_t *var_iter; compile_ctx_t ctx; vbscode_t *code; size_t cnt; + unsigned i; HRESULT hres; if (!src) src = L""; @@ -1912,7 +1888,6 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli ctx.funcs = NULL; ctx.func_decls = NULL; - ctx.global_vars = NULL; ctx.classes = NULL; ctx.labels = NULL; ctx.global_consts = NULL; @@ -1952,9 +1927,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli return compile_error(script, hres); } - cnt = script->global_vars_cnt; - for(var_iter = ctx.global_vars; var_iter; var_iter = var_iter->next) - cnt++; + cnt = script->global_vars_cnt + ctx.code->main_code.var_cnt; if(cnt > script->global_vars_size) { dynamic_var_t **new_vars; if(script->global_vars) @@ -1982,8 +1955,22 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli script->global_funcs_size = cnt; } - for(var_iter = ctx.global_vars; var_iter; var_iter = var_iter->next) - script->global_vars[script->global_vars_cnt++] = var_iter; + for(i = 0; i < ctx.code->main_code.var_cnt; i++) { + dynamic_var_t *var = compiler_alloc(ctx.code, sizeof(*var)); + if(!var) { + release_compiler(&ctx); + return compile_error(script, E_OUTOFMEMORY); + } + + var->name = ctx.code->main_code.vars[i].name; + V_VT(&var->v) = VT_EMPTY; + var->is_const = FALSE; + var->array = NULL; + + script->global_vars[script->global_vars_cnt + i] = var; + } + + script->global_vars_cnt += ctx.code->main_code.var_cnt; for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) { unsigned i;

1 0

Francois Gouget : kernel32: Match the Windows 10 1709+ GetConsoleFontInfo().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 31046449e6a0ff2c47b4bfb1f1ad2f08a168c4f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31046449e6a0ff2c47b4bfb1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 6 16:46:09 2019 +0100 kernel32: Match the Windows 10 1709+ GetConsoleFontInfo(). That is return the same 'E_NOTIMPL' error code. Remove the todo_wine-s but keep the tests in case we want to implement the API for compatibility with older Windows versions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 2 +- dlls/kernel32/tests/console.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 03df90c7e1..4c0bee2caf 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1711,7 +1711,7 @@ COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, CONSOLE_FONT_INFO *info) { FIXME("(%p %d %u %p): stub!\n", hConsole, maximize, numfonts, info); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */); return FALSE; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 97bea44e19..a22051deaf 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2847,7 +2847,7 @@ static void test_GetConsoleFontInfo(HANDLE std_output) pGetNumberOfConsoleFonts = (void *)GetProcAddress(hmod, "GetNumberOfConsoleFonts"); if (!pGetNumberOfConsoleFonts) { - win_skip("GetNumberOfConsoleFonts is not available\n"); + skip("GetNumberOfConsoleFonts is not available\n"); return; } @@ -2873,17 +2873,17 @@ static void test_GetConsoleFontInfo(HANDLE std_output) HeapFree(GetProcessHeap(), 0, cfi); return; } - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleFontInfo(GetStdHandle(STD_INPUT_HANDLE), FALSE, 0, cfi); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleFontInfo(std_output, FALSE, 0, cfi); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); GetConsoleScreenBufferInfo(std_output, &csbi); win_width = csbi.srWindow.Right - csbi.srWindow.Left + 1; @@ -2895,11 +2895,11 @@ static void test_GetConsoleFontInfo(HANDLE std_output) memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, FALSE, num_fonts, cfi); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", - cfi[index].dwFontSize.X, win_width); - todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, win_height); + ok(ret, "got %d, expected non-zero\n", ret); + ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", + cfi[index].dwFontSize.X, win_width); + ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, win_height); for (i = 0; i < num_fonts; i++) { @@ -2907,32 +2907,32 @@ static void test_GetConsoleFontInfo(HANDLE std_output) tmp_font = GetConsoleFontSize(std_output, cfi[i].nFont); tmp_w = (double)orig_font.X / tmp_font.X * win_width; tmp_h = (double)orig_font.Y / tmp_font.Y * win_height; - todo_wine ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); - todo_wine ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); + ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); + ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); } SetLastError(0xdeadbeef); ret = pGetConsoleFontInfo(NULL, TRUE, 0, cfi); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleFontInfo(GetStdHandle(STD_INPUT_HANDLE), TRUE, 0, cfi); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleFontInfo(std_output, TRUE, 0, cfi); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, TRUE, num_fonts, cfi); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", - cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); - todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); + ok(ret, "got %d, expected non-zero\n", ret); + ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", + cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); + ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); for (i = 0; i < num_fonts; i++) { @@ -2940,8 +2940,8 @@ static void test_GetConsoleFontInfo(HANDLE std_output) tmp_font = GetConsoleFontSize(std_output, cfi[i].nFont); tmp_w = (double)orig_font.X / tmp_font.X * csbi.dwMaximumWindowSize.X; tmp_h = (double)orig_font.Y / tmp_font.Y * csbi.dwMaximumWindowSize.Y; - todo_wine ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); - todo_wine ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); + ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); + ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); } HeapFree(GetProcessHeap(), 0, cfi);

1 0

Francois Gouget : kernel32/tests: Windows 10 dropped support for GetConsoleFontInfo().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 2f30f28b04b657e174985d6b34aa59a8f544333b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f30f28b04b657e174985d6b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 6 16:45:34 2019 +0100 kernel32/tests: Windows 10 dropped support for GetConsoleFontInfo(). Windows 10 1507 still supports it but not 1607+. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f85cd44ca7..97bea44e19 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2865,6 +2865,14 @@ static void test_GetConsoleFontInfo(HANDLE std_output) SetLastError(0xdeadbeef); ret = pGetConsoleFontInfo(NULL, FALSE, 0, cfi); ok(!ret, "got %d, expected zero\n", ret); + if (GetLastError() == LOWORD(E_NOTIMPL) /* win10 1709+ */ || + broken(GetLastError() == ERROR_GEN_FAILURE) /* win10 1607 */) + { + skip("GetConsoleFontInfo is not implemented\n"); + SetConsoleScreenBufferSize(std_output, orig_sb_size); + HeapFree(GetProcessHeap(), 0, cfi); + return; + } todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); @@ -2887,14 +2895,11 @@ static void test_GetConsoleFontInfo(HANDLE std_output) memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, FALSE, num_fonts, cfi); - todo_wine ok(ret || broken(!ret) /* win10 1809 */, "got %d, expected non-zero\n", ret); - if (ret) - { - todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", - cfi[index].dwFontSize.X, win_width); - todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, win_height); - } + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", + cfi[index].dwFontSize.X, win_width); + todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, win_height); for (i = 0; i < num_fonts; i++) { @@ -2923,14 +2928,11 @@ static void test_GetConsoleFontInfo(HANDLE std_output) memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, TRUE, num_fonts, cfi); - todo_wine ok(ret || broken(!ret) /* win10 1809 */, "got %d, expected non-zero\n", ret); - if (ret) - { - todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", - cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); - todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); - } + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", + cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); + todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); for (i = 0; i < num_fonts; i++) {

1 0

Nikolay Sivov : ole32: Add separate enumerator implementation for IEnumSTATPROPSETSTG.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 7279121f4fc919d3c5cc64e7c96da23a40c98514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7279121f4fc919d3c5cc64e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 8 16:33:52 2019 +0300 ole32: Add separate enumerator implementation for IEnumSTATPROPSETSTG. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 329 +++++++++++++++++++++++++++----------------- dlls/ole32/tests/stg_prop.c | 115 ++++++++++++++++ 2 files changed, 317 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7279121f4fc919d3c5cc…

1 0

Jacek Caban : jscript/tests: Use wchar string literals instead of a2bstr helper.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: f51a80f4ac299d87ee9c24f14dcd934c170fb1bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51a80f4ac299d87ee9c24f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 17:02:55 2019 +0100 jscript/tests: Use wchar string literals instead of a2bstr helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 50 ++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 57f06652f8..0904374062 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -95,18 +95,6 @@ DEFINE_EXPECT(OnLeaveScript); static const CLSID *engine_clsid = &CLSID_JScript; -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len-1); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - #define test_state(s,ss) _test_state(__LINE__,s,ss) static void _test_state(unsigned line, IActiveScript *script, SCRIPTSTATE exstate) { @@ -240,12 +228,12 @@ static void test_script_dispatch(IDispatchEx *dispex) VARIANT v; HRESULT hres; - str = a2bstr("ActiveXObject"); + str = SysAllocString(L"ActiveXObject"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); SysFreeString(str); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); - str = a2bstr("Math"); + str = SysAllocString(L"Math"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); SysFreeString(str); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); @@ -257,7 +245,7 @@ static void test_script_dispatch(IDispatchEx *dispex) ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(v) = NULL\n"); VariantClear(&v); - str = a2bstr("String"); + str = SysAllocString(L"String"); hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseSensitive, &id); SysFreeString(str); ok(hres == S_OK, "GetDispID failed: %08x\n", hres); @@ -287,20 +275,22 @@ static IDispatchEx *get_script_dispatch(IActiveScript *script) } #define get_disp_id(a,b,c,d) _get_disp_id(__LINE__,a,b,c,d) -static void _get_disp_id(unsigned line, IDispatchEx *dispex, const char *name, HRESULT exhr, DISPID *id) +static void _get_disp_id(unsigned line, IDispatchEx *dispex, const WCHAR *name, HRESULT exhr, DISPID *id) { DISPID id2; HRESULT hr; BSTR str; - str = a2bstr(name); + str = SysAllocString(name); hr = IDispatchEx_GetDispID(dispex, str, 0, id); - ok_(__FILE__,line)(hr == exhr, "GetDispID(%s) returned %08x, expected %08x\n", name, hr, exhr); + ok_(__FILE__,line)(hr == exhr, "GetDispID(%s) returned %08x, expected %08x\n", + wine_dbgstr_w(name), hr, exhr); hr = IDispatchEx_GetIDsOfNames(dispex, &IID_NULL, &str, 1, 0, &id2); SysFreeString(str); - ok_(__FILE__,line)(hr == exhr, "GetIDsOfNames(%s) returned %08x, expected %08x\n", name, hr, exhr); - ok_(__FILE__,line)(*id == id2, "GetIDsOfNames(%s) id != id2\n", name); + ok_(__FILE__,line)(hr == exhr, "GetIDsOfNames(%s) returned %08x, expected %08x\n", + wine_dbgstr_w(name), hr, exhr); + ok_(__FILE__,line)(*id == id2, "GetIDsOfNames(%s) id != id2\n", wine_dbgstr_w(name)); } static void test_no_script_dispatch(IActiveScript *script) @@ -734,13 +724,13 @@ static void test_code_persistence(void) /* Pending code does not add identifiers to the global scope */ dispex = get_script_dispatch(script); id = 0; - get_disp_id(dispex, "x", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"x", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); id = 0; - get_disp_id(dispex, "y", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"y", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); id = 0; - get_disp_id(dispex, "z", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"z", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); IDispatchEx_Release(dispex); @@ -773,13 +763,13 @@ static void test_code_persistence(void) dispex = get_script_dispatch(script); id = 0; - get_disp_id(dispex, "x", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"x", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); id = 0; - get_disp_id(dispex, "y", S_OK, &id); + get_disp_id(dispex, L"y", S_OK, &id); ok(id != -1, "id = -1\n"); id = 0; - get_disp_id(dispex, "z", S_OK, &id); + get_disp_id(dispex, L"z", S_OK, &id); ok(id != -1, "id = -1\n"); IDispatchEx_Release(dispex); @@ -819,7 +809,7 @@ static void test_code_persistence(void) dispex = get_script_dispatch(script); id = 0; - get_disp_id(dispex, "z", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"z", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); IDispatchEx_Release(dispex); @@ -835,7 +825,7 @@ static void test_code_persistence(void) dispex = get_script_dispatch(script); id = 0; - get_disp_id(dispex, "z", S_OK, &id); + get_disp_id(dispex, L"z", S_OK, &id); ok(id != -1, "id = -1\n"); IDispatchEx_Release(dispex); @@ -898,10 +888,10 @@ static void test_code_persistence(void) dispex = get_script_dispatch(script); id = 0; - get_disp_id(dispex, "y", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"y", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); id = 0; - get_disp_id(dispex, "z", DISP_E_UNKNOWNNAME, &id); + get_disp_id(dispex, L"z", DISP_E_UNKNOWNNAME, &id); ok(id == -1, "id = %d, expected -1\n", id); IDispatchEx_Release(dispex);

1 0

Micah N Gorrell : ole32: Obtain stream size regardless of current position.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: e08eb410ee2f596b57bee64bfa1f55287092f630 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e08eb410ee2f596b57bee64b… Author: Micah N Gorrell <mgorrell(a)codeweavers.com> Date: Thu Nov 7 14:38:24 2019 -0700 ole32: Obtain stream size regardless of current position. Use STREAM_SEEK_END when attempting to determine the size of a stream that clipboard data has just been rendered into. This corrects an issue with Office 2016 where the current position of the stream is 0 while rendering a target of image/png. Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 0c02d02a65..9df37750a3 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -788,7 +788,7 @@ static HRESULT get_data_from_stream(IDataObject *data, FORMATETC *fmt, HGLOBAL * if(FAILED(hr)) goto error; offs.QuadPart = 0; - IStream_Seek(med.u.pstm, offs, STREAM_SEEK_CUR, &pos); + IStream_Seek(med.u.pstm, offs, STREAM_SEEK_END, &pos); IStream_Seek(med.u.pstm, offs, STREAM_SEEK_SET, NULL); hr = IStream_CopyTo(med.u.pstm, stm, pos, NULL, NULL); ReleaseStgMedium(&med);

1 0

Zebediah Figura : setupapi: Set the DeviceDesc value in SetupDiInstallDevice().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 404cee2aa6ed08ae8b9a205396bee1fc2e3fd6d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=404cee2aa6ed08ae8b9a2053… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 23:37:54 2019 -0600 setupapi: Set the DeviceDesc value in SetupDiInstallDevice(). At least one PnP enumeration utility expects this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 6de26b943f..61ddade405 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4720,7 +4720,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; static const WCHAR rootW[] = {'r','o','o','t','\\',0}; WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; - WCHAR svc_name[LINE_LEN]; + WCHAR svc_name[LINE_LEN], field[LINE_LEN]; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; SC_HANDLE manager, service; @@ -4747,6 +4747,10 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) return FALSE; SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); + + SetupGetStringFieldW(&ctx, 0, field, ARRAY_SIZE(field), NULL); + RegSetValueExW(device->key, L"DeviceDesc", 0, REG_SZ, (BYTE *)field, wcslen(field) * sizeof(WCHAR)); + SetupGetStringFieldW(&ctx, 1, section, ARRAY_SIZE(section), NULL); SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, &extptr);

1 0

Zebediah Figura : setupapi: Set the device class in SetupDiBuildDriverInfoList().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 7d152715ef69ba2dd9945466f04cc5e93c2e86b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d152715ef69ba2dd9945466… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 23:37:53 2019 -0600 setupapi: Set the device class in SetupDiBuildDriverInfoList(). This matches Windows XP behaviour. In Vista and later this appears to be done by UpdateDriverForPlugAndPlayDevices(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f0d75f90b8..6de26b943f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4545,6 +4545,20 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device } } + if (device->driver_count) + { + WCHAR classname[MAX_CLASS_NAME_LEN], guidstr[39]; + GUID class; + + if (SetupDiGetINFClassW(device->drivers[0].inf_path, &class, classname, ARRAY_SIZE(classname), NULL)) + { + device_data->ClassGuid = device->class = class; + SETUPDI_GuidToString(&class, guidstr); + RegSetValueExW(device->key, L"ClassGUID", 0, REG_SZ, (BYTE *)guidstr, sizeof(guidstr)); + RegSetValueExW(device->key, L"Class", 0, REG_SZ, (BYTE *)classname, wcslen(classname) * sizeof(WCHAR)); + } + } + return TRUE; }

1 0

Zebediah Figura : setupapi: Fix setting filepart in SetupCopyOEMInfW().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 161a0c259acc97064cdf9d71f86f982506b01538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=161a0c259acc97064cdf9d71… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 23:37:52 2019 -0600 setupapi: Fix setting filepart in SetupCopyOEMInfW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 3fadb6827b..3b5d62b682 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1073,6 +1073,7 @@ done: if (buffer_size >= size) { lstrcpyW( dest, target ); + if (filepart) *filepart = wcsrchr( dest, '\\' ) + 1; } else { @@ -1081,7 +1082,6 @@ done: } } - if (filepart) *filepart = wcsrchr( target, '\\' ) + 1; if (required_size) *required_size = size; if (ret) SetLastError(ERROR_SUCCESS);

1 0

Zebediah Figura : configure: Install winebus.inf.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 86f51040e8912398547a9a8093941fc6fc385fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f51040e8912398547a9a80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 23:37:51 2019 -0600 configure: Install winebus.inf. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index d69d1ac4a3..f1797bf603 100755 --- a/configure +++ b/configure @@ -21231,6 +21231,7 @@ else fonts \ loader/l_intl.nls \ loader/wine.inf \ +loader/winebus.inf \ loader/winehid.inf \ programs/msidb/msidb \ programs/msiexec/msiexec \ diff --git a/configure.ac b/configure.ac index c99db6984b..e5003f769c 100644 --- a/configure.ac +++ b/configure.ac @@ -4100,6 +4100,7 @@ else fonts \ loader/l_intl.nls \ loader/wine.inf \ +loader/winebus.inf \ loader/winehid.inf \ programs/msidb/msidb \ programs/msiexec/msiexec \

1 0

Nikolay Sivov : ole32: Reimplement CoGetCurrentProcess() to use global counter from rpcss.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: c79b9bb46fca1df2d10b58ce3ea032016c8a0d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c79b9bb46fca1df2d10b58ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 7 23:00:01 2019 +0300 ole32: Reimplement CoGetCurrentProcess() to use global counter from rpcss. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 1 + dlls/ole32/compobj.c | 18 +++++------ dlls/ole32/compobj_private.h | 5 ++- dlls/ole32/irpcss.idl | 21 +++++++++++++ dlls/ole32/moniker.c | 75 +++++++++++++++++++++++++++++++++++++------- dlls/ole32/tests/compobj.c | 27 ++++++++++++++++ 6 files changed, 125 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 6c2f1231f1..32de987a8c 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -48,6 +48,7 @@ RC_SRCS = ole32res.rc IDL_SRCS = \ dcom.idl \ irot.idl \ + irpcss.idl \ ole32_objidl.idl \ ole32_oleidl.idl \ ole32_unknwn.idl diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0dc0d39c22..a91067fcb7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4027,18 +4027,18 @@ done: /****************************************************************************** * CoGetCurrentProcess [OLE32.@] - * - * Gets the current process ID. - * - * RETURNS - * The current process ID. - * - * NOTES - * Is DWORD really the correct return type for this function? */ DWORD WINAPI CoGetCurrentProcess(void) { - return GetCurrentProcessId(); + struct oletls *info = COM_CurrentInfo(); + + if (!info) + return 0; + + if (!info->thread_seqid) + info->thread_seqid = rpcss_get_next_seqid(); + + return info->thread_seqid; } /*********************************************************************** diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index bda1c6bff2..29f94421d1 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -165,7 +165,7 @@ struct oletls { struct apartment *apt; IErrorInfo *errorinfo; /* see errorinfo.c */ - IUnknown *state; /* see CoSetState */ + DWORD thread_seqid;/* returned with CoGetCurrentProcess */ DWORD apt_mask; /* apartment mask (+0Ch on x86) */ void *unknown0; DWORD inits; /* number of times CoInitializeEx called */ @@ -178,6 +178,7 @@ struct oletls IUnknown *call_state; /* current call context (+3Ch on x86) */ DWORD unknown2[46]; IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ + IUnknown *state; /* see CoSetState */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; }; @@ -355,4 +356,6 @@ static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) extern HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, BOOL copy, IEnumSTATDATA **ppenum) DECLSPEC_HIDDEN; +extern DWORD rpcss_get_next_seqid(void) DECLSPEC_HIDDEN; + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/irpcss.idl b/dlls/ole32/irpcss.idl new file mode 100644 index 0000000000..65078167de --- /dev/null +++ b/dlls/ole32/irpcss.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep client + +#include "wine/irpcss.idl" diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 82d829d719..f82159d9e1 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -41,6 +41,7 @@ #include "compobj_private.h" #include "moniker.h" #include "irot.h" +#include "irpcss.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -77,6 +78,7 @@ typedef struct RunningObjectTableImpl static RunningObjectTableImpl* runningObjectTableInstance = NULL; static IrotHandle irot_handle; +static RPC_BINDING_HANDLE irpcss_handle; /* define the EnumMonikerImpl structure */ typedef struct EnumMonikerImpl @@ -102,23 +104,30 @@ static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface) static HRESULT EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, ULONG pos, IEnumMoniker **ppenumMoniker); +static RPC_BINDING_HANDLE get_rpc_handle(unsigned short *protseq, unsigned short *endpoint) +{ + RPC_BINDING_HANDLE handle = NULL; + RPC_STATUS status; + RPC_WSTR binding; + + status = RpcStringBindingComposeW(NULL, protseq, NULL, endpoint, NULL, &binding); + if (status == RPC_S_OK) + { + status = RpcBindingFromStringBindingW(binding, &handle); + RpcStringFreeW(&binding); + } + + return handle; +} + static IrotHandle get_irot_handle(void) { if (!irot_handle) { - RPC_STATUS status; - RPC_WSTR binding; - IrotHandle new_handle; - unsigned short ncacn_np[] = IROT_PROTSEQ; + unsigned short protseq[] = IROT_PROTSEQ; unsigned short endpoint[] = IROT_ENDPOINT; - status = RpcStringBindingComposeW(NULL, ncacn_np, NULL, endpoint, NULL, &binding); - if (status == RPC_S_OK) - { - status = RpcBindingFromStringBindingW(binding, &new_handle); - RpcStringFreeW(&binding); - } - if (status != RPC_S_OK) - return NULL; + + IrotHandle new_handle = get_rpc_handle(protseq, endpoint); if (InterlockedCompareExchangePointer(&irot_handle, new_handle, NULL)) /* another thread beat us to it */ RpcBindingFree(&new_handle); @@ -126,6 +135,21 @@ static IrotHandle get_irot_handle(void) return irot_handle; } +static RPC_BINDING_HANDLE get_irpcss_handle(void) +{ + if (!irpcss_handle) + { + unsigned short protseq[] = IROT_PROTSEQ; + unsigned short endpoint[] = IROT_ENDPOINT; + + RPC_BINDING_HANDLE new_handle = get_rpc_handle(protseq, endpoint); + if (InterlockedCompareExchangePointer(&irpcss_handle, new_handle, NULL)) + /* another thread beat us to it */ + RpcBindingFree(&new_handle); + } + return irpcss_handle; +} + static BOOL start_rpcss(void) { static const WCHAR rpcssW[] = {'R','p','c','S','s',0}; @@ -176,6 +200,33 @@ static BOOL start_rpcss(void) return ret; } +DWORD rpcss_get_next_seqid(void) +{ + DWORD id = 0; + HRESULT hr; + + for (;;) + { + __TRY + { + hr = irpcss_get_thread_seq_id(get_irpcss_handle(), &id); + } + __EXCEPT(rpc_filter) + { + hr = HRESULT_FROM_WIN32(GetExceptionCode()); + } + __ENDTRY + if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) + { + if (start_rpcss()) + continue; + } + break; + } + + return id; +} + static HRESULT create_stream_on_mip_ro(const InterfaceData *mip, IStream **stream) { HGLOBAL hglobal = GlobalAlloc(0, mip->ulCntData); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 8412ee45a0..6b15040ebe 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3893,6 +3893,31 @@ static void test_implicit_mta(void) CoUninitialize(); } +static DWORD WINAPI co_get_current_process_thread(void *param) +{ + DWORD *id = param; + + *id = CoGetCurrentProcess(); + return 0; +} + +static void test_CoGetCurrentProcess(void) +{ + DWORD id, id2; + HANDLE thread; + + id = CoGetCurrentProcess(); + ok(!!id && id != GetCurrentProcessId() && id != GetCurrentThreadId(), "Unexpected result %d.\n", id); + + id2 = 0; + thread = CreateThread(NULL, 0, co_get_current_process_thread, &id2, 0, NULL); + ok(thread != NULL, "Failed to create test thread.\n"); + ok(!WaitForSingleObject(thread, 10000), "Wait timed out.\n"); + CloseHandle(thread); + + ok(id2 && id2 != id, "Unexpected id from another thread.\n"); +} + START_TEST(compobj) { init_funcs(); @@ -3949,5 +3974,7 @@ START_TEST(compobj) test_CoGetInstanceFromFile(); test_GlobalOptions(); test_implicit_mta(); + test_CoGetCurrentProcess(); + DeleteFileA( testlib ); }

1 0

Nikolay Sivov : rpcss: Make initialization helper easier to extend.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 52218251368ae7b9c9abfa309be7c1cc5d8e2e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=52218251368ae7b9c9abfa30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 7 22:59:59 2019 +0300 rpcss: Make initialization helper easier to extend. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/rpcss_main.c | 102 +++++++++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 45 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 6d24ccbc07..42749028c3 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -37,53 +37,60 @@ static WCHAR rpcssW[] = {'R','p','c','S','s',0}; static HANDLE exit_event; static SERVICE_STATUS_HANDLE service_handle; -static BOOL RPCSS_Initialize(void) +static RPC_STATUS RPCSS_Initialize(void) { - static unsigned short irot_protseq[] = IROT_PROTSEQ; - static unsigned short irot_endpoint[] = IROT_ENDPOINT; - static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; - static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; - static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; - static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; - RPC_STATUS status; - - WINE_TRACE("\n"); - - status = RpcServerRegisterIf(epm_v3_0_s_ifspec, NULL, NULL); - if (status != RPC_S_OK) - return status; - status = RpcServerRegisterIf(Irot_v0_2_s_ifspec, NULL, NULL); - if (status != RPC_S_OK) - { - RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); - return FALSE; - } - - status = RpcServerUseProtseqEpW(epm_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - epm_endpoint, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerUseProtseqEpW(epm_protseq_lrpc, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - epm_endpoint_lrpc, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerUseProtseqEpW(irot_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - irot_endpoint, NULL); - if (status != RPC_S_OK) - goto fail; - - status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); - if (status != RPC_S_OK) - goto fail; - - return TRUE; + static unsigned short irot_protseq[] = IROT_PROTSEQ; + static unsigned short irot_endpoint[] = IROT_ENDPOINT; + static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; + static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; + static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + static const struct protseq_map + { + unsigned short *protseq; + unsigned short *endpoint; + } protseqs[] = + { + { epm_protseq, epm_endpoint }, + { epm_protseq_lrpc, epm_endpoint_lrpc }, + { irot_protseq, irot_endpoint }, + }; + RPC_IF_HANDLE ifspecs[] = + { + epm_v3_0_s_ifspec, + Irot_v0_2_s_ifspec, + }; + RPC_STATUS status; + int i, j; + + WINE_TRACE("\n"); + + for (i = 0, j = 0; i < ARRAY_SIZE(ifspecs); ++i, j = i) + { + status = RpcServerRegisterIf(ifspecs[i], NULL, NULL); + if (status != RPC_S_OK) + goto fail; + } + + for (i = 0; i < ARRAY_SIZE(protseqs); ++i) + { + status = RpcServerUseProtseqEpW(protseqs[i].protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + protseqs[i].endpoint, NULL); + if (status != RPC_S_OK) + goto fail; + } + + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); + if (status != RPC_S_OK) + goto fail; + + return RPC_S_OK; fail: - RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); - RpcServerUnregisterIf(Irot_v0_2_s_ifspec, NULL, FALSE); - return FALSE; + for (i = 0; i < j; ++i) + RpcServerUnregisterIf(ifspecs[i], NULL, FALSE); + + return status; } static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) @@ -121,10 +128,15 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { SERVICE_STATUS status; + RPC_STATUS ret; TRACE( "starting service\n" ); - if (!RPCSS_Initialize()) return; + if ((ret = RPCSS_Initialize())) + { + WARN("Failed to initialize rpc interfaces, status %d.\n", ret); + return; + } exit_event = CreateEventW( NULL, TRUE, FALSE, NULL );

1 0

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-commits November 2019