- wine-devel - winehq.org

[PATCH 5/5] d3d12: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet 18 Mar '22

18 Mar '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d12/Makefile.in | 1 - dlls/d3d12/d3d12_main.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index e5fb77be025..09ca3f24d9e 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = d3d12.dll IMPORTLIB = d3d12 IMPORTS = dxgi dxguid wined3d gdi32 user32 uuid win32u diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 40e3165ee80..2dddfe60efe 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -89,13 +89,13 @@ static HRESULT d3d12_get_adapter(IWineDXGIAdapter **wine_adapter, IUnknown *adap { if (FAILED(hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory))) { - WARN("Failed to create DXGI factory, hr %#x.\n", hr); + WARN("Failed to create DXGI factory, hr %#lx.\n", hr); goto done; } if (FAILED(hr = IDXGIFactory4_EnumAdapters(factory, 0, &dxgi_adapter))) { - WARN("Failed to enumerate primary adapter, hr %#x.\n", hr); + WARN("Failed to enumerate primary adapter, hr %#lx.\n", hr); goto done; } @@ -103,7 +103,7 @@ static HRESULT d3d12_get_adapter(IWineDXGIAdapter **wine_adapter, IUnknown *adap } if (FAILED(hr = IUnknown_QueryInterface(adapter, &IID_IWineDXGIAdapter, (void **)wine_adapter))) - WARN("Invalid adapter %p, hr %#x.\n", adapter, hr); + WARN("Invalid adapter %p, hr %#lx.\n", adapter, hr); done: if (dxgi_adapter) @@ -284,7 +284,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe if (FAILED(hr = IWineDXGIAdapter_get_adapter_info(wine_adapter, &adapter_info))) { - WARN("Failed to get adapter info, hr %#x.\n", hr); + WARN("Failed to get adapter info, hr %#lx.\n", hr); goto done; } @@ -305,7 +305,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe if (FAILED(hr = vkd3d_create_instance(&instance_create_info, &instance))) { - WARN("Failed to create vkd3d instance, hr %#x.\n", hr); + WARN("Failed to create vkd3d instance, hr %#lx.\n", hr); goto done; } @@ -332,7 +332,7 @@ done: HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { - TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", + TRACE("data %p, data_size %Iu, iid %s, deserializer %p.\n", data, data_size, debugstr_guid(iid), deserializer); return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer); @@ -341,7 +341,7 @@ HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T dat HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { - TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", + TRACE("data %p, data_size %Iu, iid %s, deserializer %p.\n", data, data_size, debugstr_guid(iid), deserializer); return vkd3d_create_versioned_root_signature_deserializer(data, data_size, iid, deserializer); -- 2.30.2

1 0

[PATCH 4/5] d3d12/tests: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet 18 Mar '22

18 Mar '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d12/tests/Makefile.in | 1 - dlls/d3d12/tests/d3d12.c | 158 +++++++++++++++++------------------ 2 files changed, 79 insertions(+), 80 deletions(-) diff --git a/dlls/d3d12/tests/Makefile.in b/dlls/d3d12/tests/Makefile.in index ad0eff48cf7..b3406f9e6c1 100644 --- a/dlls/d3d12/tests/Makefile.in +++ b/dlls/d3d12/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3d12.dll IMPORTS = d3d12 dxgi user32 diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index f5a4c2ba11e..0d3deafda45 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -90,7 +90,7 @@ static IDXGIAdapter *create_adapter(void) return NULL; hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); - ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); adapter = NULL; if (use_warp_adapter) @@ -103,7 +103,7 @@ static IDXGIAdapter *create_adapter(void) } IDXGIFactory4_Release(factory); if (FAILED(hr)) - trace("Failed to get adapter, hr %#x.\n", hr); + trace("Failed to get adapter, hr %#lx.\n", hr); return adapter; } @@ -138,16 +138,16 @@ static void print_adapter_info(void) ID3D12Device_Release(device); hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); - ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIFactory4_EnumAdapterByLuid(factory, luid, &IID_IDXGIAdapter, (void **)&adapter); - ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIFactory4_Release(factory); if (FAILED(hr)) return; hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); - ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); trace("Adapter: %s, %04x:%04x.\n", wine_dbgstr_w(adapter_desc.Description), @@ -171,7 +171,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO expected_hr = supported ? S_OK : E_NOINTERFACE; hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -210,7 +210,7 @@ static ID3D12RootSignature *create_default_root_signature(ID3D12Device *device) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); return root_signature; } @@ -282,7 +282,7 @@ static ID3D12PipelineState *create_pipeline_state_(unsigned int line, ID3D12Devi pipeline_state_desc.SampleDesc.Count = 1; hr = ID3D12Device_CreateGraphicsPipelineState(device, &pipeline_state_desc, &IID_ID3D12PipelineState, (void **)&pipeline_state); - ok_(__FILE__, line)(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create graphics pipeline state, hr %#lx.\n", hr); return pipeline_state; } @@ -301,7 +301,7 @@ static ID3D12CommandQueue *create_command_queue_(unsigned int line, command_queue_desc.NodeMask = 0; hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, &IID_ID3D12CommandQueue, (void **)&queue); - ok_(__FILE__, line)(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create command queue, hr %#lx.\n", hr); return queue; } @@ -342,9 +342,9 @@ static void reset_command_list_(unsigned int line, struct test_context *context, assert(index < MAX_FRAME_COUNT); hr = ID3D12CommandAllocator_Reset(context->allocator[index]); - ok_(__FILE__, line)(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to reset command allocator, hr %#lx.\n", hr); hr = ID3D12GraphicsCommandList_Reset(context->list[index], context->allocator[index], NULL); - ok_(__FILE__, line)(hr == S_OK, "Failed to reset command list, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to reset command list, hr %#lx.\n", hr); } static void destroy_render_targets(struct test_context *context) @@ -394,7 +394,7 @@ static void create_render_target_(unsigned int line, struct test_context *contex &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&context->render_target[0]); - ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); set_viewport(&context->viewport, 0.0f, 0.0f, resource_desc.Width, resource_desc.Height, 0.0f, 1.0f); SetRect(&context->scissor_rect, 0, 0, resource_desc.Width, resource_desc.Height); @@ -427,14 +427,14 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, { hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, &IID_ID3D12CommandAllocator, (void **)&context->allocator[i]); - ok_(__FILE__, line)(hr == S_OK, "Failed to create command allocator %u, hr %#x.\n", i, hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create command allocator %u, hr %#lx.\n", i, hr); } for (i = 0; i < ARRAY_SIZE(context->list); ++i) { hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, context->allocator[i], NULL, &IID_ID3D12GraphicsCommandList, (void **)&context->list[i]); - ok_(__FILE__, line)(hr == S_OK, "Failed to create command list %u, hr %#x.\n", i, hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create command list %u, hr %#lx.\n", i, hr); } if (desc && desc->no_render_target) @@ -446,7 +446,7 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context, rtv_heap_desc.NodeMask = 0; hr = ID3D12Device_CreateDescriptorHeap(device, &rtv_heap_desc, &IID_ID3D12DescriptorHeap, (void **)&context->rtv_heap); - ok_(__FILE__, line)(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create descriptor heap, hr %#lx.\n", hr); rtv_size = ID3D12Device_GetDescriptorHandleIncrementSize(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV); for (i = 0; i < ARRAY_SIZE(context->rtv); ++i) @@ -528,12 +528,12 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); - ok_(__FILE__, line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create fence, hr %#lx.\n", hr); hr = ID3D12CommandQueue_Signal(queue, fence, 1); - ok_(__FILE__, line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to signal fence, hr %#lx.\n", hr); hr = wait_for_fence(fence, 1); - ok_(__FILE__, line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to wait for fence, hr %#lx.\n", hr); ID3D12Fence_Release(fence); } @@ -581,7 +581,7 @@ static ID3D12Resource *create_buffer_(unsigned int line, ID3D12Device *device, hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, initial_resource_state, NULL, &IID_ID3D12Resource, (void **)&buffer); - ok_(__FILE__, line)(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create buffer, hr %#lx.\n", hr); return buffer; } @@ -614,7 +614,7 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12Com destroy_render_targets(context); hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); - ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); desc.Width = width; desc.Height = height; @@ -629,12 +629,12 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12Com desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; desc.Flags = 0; hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &desc, NULL, NULL, &swapchain1); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIFactory4_Release(factory); hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain3, (void **)&swapchain); - ok(hr == S_OK, "Failed to query IDXGISwapChain3, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGISwapChain1_Release(swapchain1); if (context) @@ -645,7 +645,7 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12Com for (i = 0; i < buffer_count; ++i) { hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&context->render_target[i]); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#lx.\n", i, hr); ID3D12Device_CreateRenderTargetView(context->device, context->render_target[i], NULL, context->rtv[i]); } } @@ -674,7 +674,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi HRESULT hr; hr = ID3D12Resource_GetDevice(texture, &IID_ID3D12Device, (void **)&device); - ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); resource_desc = ID3D12Resource_GetDesc(texture); ok(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, @@ -707,7 +707,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); exec_command_list(queue, command_list); wait_queue_idle(device, queue); @@ -716,7 +716,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi read_range.Begin = 0; read_range.End = resource_desc.Width; hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); - ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } static void *get_readback_data(struct resource_readback *rb, unsigned int x, unsigned int y, @@ -825,7 +825,7 @@ static void test_interfaces(void) desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; desc.NodeMask = 0; hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&queue); - ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_interface(queue, &IID_ID3D12Object, TRUE); check_interface(queue, &IID_ID3D12DeviceChild, TRUE); @@ -841,9 +841,9 @@ static void test_interfaces(void) check_interface(queue, &IID_IDXGIDevice4, FALSE); refcount = ID3D12CommandQueue_Release(queue); - ok(!refcount, "Command queue has %u references left.\n", refcount); + ok(!refcount, "Command queue has %lu references left.\n", refcount); refcount = ID3D12Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_create_device(void) @@ -868,28 +868,28 @@ static void test_create_device(void) return; } refcount = ID3D12Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIFactory4_EnumAdapters(factory, 0, &adapter); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIFactory4_Release(factory); hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); adapter_luid = adapter_desc.AdapterLuid; refcount = get_refcount(adapter); - ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); hr = D3D12CreateDevice((IUnknown *)adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = IDXGIAdapter_Release(adapter); - ok(refcount >= 1, "Got unexpected refcount %u.\n", refcount); + ok(refcount >= 1, "Got unexpected refcount %lu.\n", refcount); adapter = NULL; luid = ID3D12Device_GetAdapterLuid(device); - ok(equal_luid(luid, adapter_luid), "Got LUID %08x:%08x, expected %08x:%08x.\n", + ok(equal_luid(luid, adapter_luid), "Got unexpected LUID %08lx:%08lx, expected %08lx:%08lx.\n", luid.HighPart, luid.LowPart, adapter_luid.HighPart, adapter_luid.LowPart); queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT); @@ -901,18 +901,18 @@ static void test_create_device(void) hr = IDXGISwapChain3_GetContainingOutput(swapchain, &output); if (hr != DXGI_ERROR_UNSUPPORTED) { - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&adapter); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIOutput_Release(output); memset(&adapter_desc, 0, sizeof(adapter_desc)); hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); ok(equal_luid(adapter_desc.AdapterLuid, adapter_luid), - "Got LUID %08x:%08x, expected %08x:%08x.\n", + "Got unexpected LUID %08lx:%08lx, expected %08lx:%08lx.\n", adapter_desc.AdapterLuid.HighPart, adapter_desc.AdapterLuid.LowPart, adapter_luid.HighPart, adapter_luid.LowPart); } @@ -922,12 +922,12 @@ static void test_create_device(void) } refcount = IDXGISwapChain3_Release(swapchain); - ok(!refcount, "Swapchain has %u references left.\n", refcount); + ok(!refcount, "Swapchain has %lu references left.\n", refcount); DestroyWindow(window); ID3D12CommandQueue_Release(queue); refcount = ID3D12Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_draw(void) @@ -1059,17 +1059,17 @@ static void test_swapchain_draw(void) transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); exec_command_list(queue, command_list); hr = IDXGISwapChain3_Present(swapchain, 0, 0); - ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); wait_queue_idle(device, queue); destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); - ok(!refcount, "Swapchain has %u references left.\n", refcount); + ok(!refcount, "Swapchain has %lu references left.\n", refcount); ID3D12PipelineState_Release(context.pipeline_state); context.pipeline_state = NULL; @@ -1107,45 +1107,45 @@ static void test_swapchain_refcount(void) for (i = 0; i < buffer_count; ++i) { refcount = get_refcount(swapchain); - todo_wine ok(refcount == 2, "Got refcount %u.\n", refcount); + todo_wine ok(refcount == 2, "Got refcount %lu.\n", refcount); ID3D12Resource_Release(context.render_target[i]); context.render_target[i] = NULL; } refcount = get_refcount(swapchain); - ok(refcount == 1, "Got refcount %u.\n", refcount); + ok(refcount == 1, "Got refcount %lu.\n", refcount); refcount = IDXGISwapChain3_AddRef(swapchain); - ok(refcount == 2, "Got refcount %u.\n", refcount); + ok(refcount == 2, "Got refcount %lu.\n", refcount); hr = IDXGISwapChain3_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&context.render_target[0]); - ok(hr == S_OK, "Failed to get swapchain buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(swapchain); - todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + todo_wine ok(refcount == 3, "Got refcount %lu.\n", refcount); refcount = ID3D12Resource_AddRef(context.render_target[0]); - ok(refcount == 2, "Got refcount %u.\n", refcount); + ok(refcount == 2, "Got refcount %lu.\n", refcount); refcount = get_refcount(swapchain); - todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + todo_wine ok(refcount == 3, "Got refcount %lu.\n", refcount); hr = IDXGISwapChain3_GetBuffer(swapchain, 1, &IID_ID3D12Resource, (void **)&context.render_target[1]); - ok(hr == S_OK, "Failed to get swapchain buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(swapchain); - todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + todo_wine ok(refcount == 3, "Got refcount %lu.\n", refcount); ID3D12Resource_Release(context.render_target[0]); ID3D12Resource_Release(context.render_target[0]); context.render_target[0] = NULL; refcount = get_refcount(swapchain); - todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + todo_wine ok(refcount == 3, "Got refcount %lu.\n", refcount); refcount = IDXGISwapChain3_Release(swapchain); - todo_wine ok(refcount == 2, "Got refcount %u.\n", refcount); + todo_wine ok(refcount == 2, "Got refcount %lu.\n", refcount); ID3D12Resource_Release(context.render_target[1]); context.render_target[1] = NULL; refcount = get_refcount(swapchain); - ok(refcount == 1, "Got refcount %u.\n", refcount); + ok(refcount == 1, "Got refcount %lu.\n", refcount); refcount = IDXGISwapChain3_Release(swapchain); - ok(!refcount, "Swapchain has %u references left.\n", refcount); + ok(!refcount, "Swapchain has %lu references left.\n", refcount); DestroyWindow(window); destroy_test_context(&context); } @@ -1196,18 +1196,18 @@ static void test_swapchain_size_mismatch(void) transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); exec_command_list(queue, command_list); hr = IDXGISwapChain3_Present(swapchain, 1, 0); - ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); wait_queue_idle(device, queue); reset_command_list(&context, 0); destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); - ok(!refcount, "Swapchain has %u references left.\n", refcount); + ok(!refcount, "Swapchain has %lu references left.\n", refcount); DestroyWindow(window); window = create_window(WS_VISIBLE); @@ -1216,12 +1216,12 @@ static void test_swapchain_size_mismatch(void) swapchain = create_swapchain(&context, queue, window, 4, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); - ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(context.list); ++i) { hr = ID3D12GraphicsCommandList_Close(context.list[i]); - ok(hr == S_OK, "Failed to close command list %u, hr %#x.\n", i, hr); + ok(hr == S_OK, "Failed to close command list %u, hr %#lx.\n", i, hr); } fence_value = 1; @@ -1230,7 +1230,7 @@ static void test_swapchain_size_mismatch(void) index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); hr = wait_for_fence(fence, frame_fence_value[index]); - ok(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); reset_command_list(&context, index); backbuffer = context.render_target[index]; @@ -1243,11 +1243,11 @@ static void test_swapchain_size_mismatch(void) transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); exec_command_list(queue, command_list); hr = IDXGISwapChain3_Present(swapchain, 1, 0); - ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); if (i == 6) { @@ -1257,7 +1257,7 @@ static void test_swapchain_size_mismatch(void) frame_fence_value[index] = fence_value; hr = ID3D12CommandQueue_Signal(queue, fence, fence_value); - ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ++fence_value; } @@ -1266,7 +1266,7 @@ static void test_swapchain_size_mismatch(void) ID3D12Fence_Release(fence); destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); - ok(!refcount, "Swapchain has %u references left.\n", refcount); + ok(!refcount, "Swapchain has %lu references left.\n", refcount); DestroyWindow(window); destroy_test_context(&context); } @@ -1308,12 +1308,12 @@ static void test_swapchain_backbuffer_index(void) buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); - ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(context.list); ++i) { hr = ID3D12GraphicsCommandList_Close(context.list[i]); - ok(hr == S_OK, "Failed to close command list %u, hr %#x.\n", i, hr); + ok(hr == S_OK, "Failed to close command list %u, hr %#lx.\n", i, hr); } index = 1; @@ -1325,7 +1325,7 @@ static void test_swapchain_backbuffer_index(void) ok(index == expected_index, "Test %u: Got index %u, expected %u.\n", i, index, expected_index); hr = wait_for_fence(fence, frame_fence_value[index]); - ok(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); reset_command_list(&context, index); backbuffer = context.render_target[index]; @@ -1338,7 +1338,7 @@ static void test_swapchain_backbuffer_index(void) transition_sub_resource_state(command_list, backbuffer, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); exec_command_list(queue, command_list); if (i <= 4 || (8 <= i && i <= 14)) @@ -1347,11 +1347,11 @@ static void test_swapchain_backbuffer_index(void) sync_interval = 0; hr = IDXGISwapChain3_Present(swapchain, sync_interval, 0); - ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); frame_fence_value[index] = fence_value; hr = ID3D12CommandQueue_Signal(queue, fence, fence_value); - ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ++fence_value; } @@ -1360,7 +1360,7 @@ static void test_swapchain_backbuffer_index(void) ID3D12Fence_Release(fence); destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); - ok(!refcount, "Swapchain has %u references left.\n", refcount); + ok(!refcount, "Swapchain has %lu references left.\n", refcount); DestroyWindow(window); destroy_test_context(&context); } @@ -1389,7 +1389,7 @@ static void test_desktop_window(void) ok(ret, "Failed to get client rect.\n"); hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); - ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); swapchain_desc.Width = 640; swapchain_desc.Height = 480; @@ -1404,12 +1404,12 @@ static void test_desktop_window(void) swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; swapchain_desc.Flags = 0; hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, queue, window, &swapchain_desc, NULL, NULL, &swapchain); - ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + ok(hr == E_ACCESSDENIED, "Got unexpected hr %#lx.\n", hr); swapchain_desc.Width = rect.right; swapchain_desc.Height = rect.bottom; hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, queue, window, &swapchain_desc, NULL, NULL, &swapchain); - ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr); + ok(hr == E_ACCESSDENIED, "Got unexpected hr %#lx.\n", hr); IDXGIFactory4_Release(factory); destroy_test_context(&context); -- 2.30.2

1 0

[PATCH 3/5] dxgi: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet 18 Mar '22

18 Mar '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/Makefile.in | 1 - dlls/dxgi/adapter.c | 12 +++++------ dlls/dxgi/device.c | 20 +++++++++--------- dlls/dxgi/dxgi_main.c | 6 +++--- dlls/dxgi/factory.c | 20 +++++++++--------- dlls/dxgi/output.c | 16 +++++++-------- dlls/dxgi/surface.c | 4 ++-- dlls/dxgi/swapchain.c | 48 +++++++++++++++++++++---------------------- 8 files changed, 63 insertions(+), 64 deletions(-) diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index d4398008dad..db52f49a68a 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxgi.dll IMPORTLIB = dxgi IMPORTS = gdi32 dxguid uuid wined3d user32 win32u diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 644f7e889ec..8962c082c17 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -55,7 +55,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IWineDXGIAdapter *iface) struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); ULONG refcount = InterlockedIncrement(&adapter->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -65,7 +65,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IWineDXGIAdapter *iface) struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); ULONG refcount = InterlockedDecrement(&adapter->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -165,7 +165,7 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, ARRAY_SIZE(description))) { DWORD err = GetLastError(); - ERR("Failed to translate description %s (%#x).\n", debugstr_a(description), err); + ERR("Failed to translate description %s (%#lx).\n", debugstr_a(description), err); hr = E_FAIL; } @@ -285,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_RegisterHardwareContentProtectionT static void STDMETHODCALLTYPE dxgi_adapter_UnregisterHardwareContentProtectionTeardownStatus( IWineDXGIAdapter *iface, DWORD cookie) { - FIXME("iface %p, cookie %#x stub!\n", iface, cookie); + FIXME("iface %p, cookie %#lx stub!\n", iface, cookie); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdapter *iface, @@ -354,7 +354,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_RegisterVideoMemoryBudgetChangeNot static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification( IWineDXGIAdapter *iface, DWORD cookie) { - FIXME("iface %p, cookie %#x stub!\n", iface, cookie); + FIXME("iface %p, cookie %#lx stub!\n", iface, cookie); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) @@ -431,7 +431,7 @@ struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) return NULL; if (FAILED(hr = IDXGIAdapter_QueryInterface(iface, &IID_IWineDXGIAdapter, (void **)&wine_adapter))) { - ERR("Failed to get IWineDXGIAdapter interface, hr %#x.\n", hr); + ERR("Failed to get IWineDXGIAdapter interface, hr %#lx.\n", hr); return NULL; } assert(wine_adapter->lpVtbl == &dxgi_adapter_vtbl); diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 7dcc081ee0a..b9c5ff177c9 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -71,7 +71,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IWineDXGIDevice *iface) struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); ULONG refcount = InterlockedIncrement(&device->refcount); - TRACE("%p increasing refcount to %u\n", device, refcount); + TRACE("%p increasing refcount to %lu\n", device, refcount); return refcount; } @@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); ULONG refcount = InterlockedDecrement(&device->refcount); - TRACE("%p decreasing refcount to %u.\n", device, refcount); + TRACE("%p decreasing refcount to %lu.\n", device, refcount); if (!refcount) { @@ -141,7 +141,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, R hr = IWineDXGIDevice_GetAdapter(iface, &adapter); if (FAILED(hr)) { - ERR("Failed to get adapter, hr %#x.\n", hr); + ERR("Failed to get adapter, hr %#lx.\n", hr); return hr; } @@ -209,7 +209,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac if (FAILED(hr = device_parent->ops->create_swapchain_texture(device_parent, NULL, &surface_desc, 0, &wined3d_texture))) { - ERR("Failed to create surface, hr %#x.\n", hr); + ERR("Failed to create surface, hr %#lx.\n", hr); goto fail; } @@ -344,7 +344,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, wined3d_texture))) { - WARN("Failed to initialize surface, hr %#x.\n", hr); + WARN("Failed to initialize surface, hr %#lx.\n", hr); heap_free(object); return hr; } @@ -440,7 +440,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX if (FAILED(hr = dxgi_get_output_from_window(&dxgi_factory->IWineDXGIFactory_iface, window, &containing_output))) { - WARN("Failed to get output from window %p, hr %#x.\n", window, hr); + WARN("Failed to get output from window %p, hr %#lx.\n", window, hr); return hr; } @@ -458,7 +458,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX if (FAILED(hr = d3d11_swapchain_init(object, device, &wined3d_desc))) { - WARN("Failed to initialise swapchain, hr %#x.\n", hr); + WARN("Failed to initialise swapchain, hr %#lx.\n", hr); heap_free(object); return hr; } @@ -517,7 +517,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l if (FAILED(hr = layer->create(layer->id, &layer_base, 0, device, &IID_IUnknown, (void **)&device->child_layer))) { - WARN("Failed to create device, returning %#x.\n", hr); + WARN("Failed to create device, returning %#lx.\n", hr); wined3d_private_store_cleanup(&device->private_store); wined3d_mutex_unlock(); return hr; @@ -540,7 +540,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l (const enum wined3d_feature_level *)feature_levels, level_count, wined3d_device_parent, &device->wined3d_device))) { - WARN("Failed to create a wined3d device, returning %#x.\n", hr); + WARN("Failed to create a wined3d device, returning %#lx.\n", hr); IUnknown_Release(device->child_layer); wined3d_private_store_cleanup(&device->private_store); wined3d_mutex_unlock(); @@ -579,7 +579,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc))) { - WARN("Failed to initialize swapchain, hr %#x.\n", hr); + WARN("Failed to initialize swapchain, hr %#lx.\n", hr); heap_free(swapchain); wined3d_device_decref(device->wined3d_device); IUnknown_Release(device->child_layer); diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 3a69e1d55c2..5dd85a1b374 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -118,7 +118,7 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core) hr = d3d11core_register_layers(); if (FAILED(hr)) { - ERR("Failed to register d3d11 layers, returning %#x.\n", hr); + ERR("Failed to register d3d11 layers, returning %#lx.\n", hr); FreeLibrary(mod); wined3d_mutex_unlock(); return hr; @@ -154,7 +154,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I hr = register_d3d10core_layers(d3d10core); if (FAILED(hr)) { - ERR("Failed to register d3d10core layers, returning %#x.\n", hr); + ERR("Failed to register d3d10core layers, returning %#lx.\n", hr); return hr; } @@ -194,7 +194,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I hr = dxgi_device_init(dxgi_device, &d3d10_layer, factory, adapter, feature_levels, level_count); if (FAILED(hr)) { - WARN("Failed to initialize device, hr %#x.\n", hr); + WARN("Failed to initialize device, hr %#lx.\n", hr); heap_free(dxgi_device); *device = NULL; return hr; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 97f71bc8fc1..8de882b388d 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -60,7 +60,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IWineDXGIFactory *iface) struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); ULONG refcount = InterlockedIncrement(&factory->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -70,7 +70,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); ULONG refcount = InterlockedDecrement(&factory->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -353,7 +353,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusEvent(IWineDXG static void STDMETHODCALLTYPE dxgi_factory_UnregisterStereoStatus(IWineDXGIFactory *iface, DWORD cookie) { - FIXME("iface %p, cookie %#x stub!\n", iface, cookie); + FIXME("iface %p, cookie %#lx stub!\n", iface, cookie); } static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusWindow(IWineDXGIFactory *iface, @@ -375,7 +375,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterOcclusionStatusEvent(IWine static void STDMETHODCALLTYPE dxgi_factory_UnregisterOcclusionStatus(IWineDXGIFactory *iface, DWORD cookie) { - FIXME("iface %p, cookie %#x stub!\n", iface, cookie); + FIXME("iface %p, cookie %#lx stub!\n", iface, cookie); } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForComposition(IWineDXGIFactory *iface, @@ -402,7 +402,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory IDXGIAdapter1 *adapter1; HRESULT hr; - TRACE("iface %p, luid %08x:%08x, iid %s, adapter %p.\n", + TRACE("iface %p, luid %08lx:%08lx, iid %s, adapter %p.\n", iface, luid.HighPart, luid.LowPart, debugstr_guid(iid), adapter); if (!adapter) @@ -413,7 +413,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory { if (FAILED(hr = IDXGIAdapter1_GetDesc1(adapter1, &desc))) { - WARN("Failed to get adapter %u desc, hr %#x.\n", adapter_index, hr); + WARN("Failed to get adapter %u desc, hr %#lx.\n", adapter_index, hr); ++adapter_index; continue; } @@ -430,7 +430,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory ++adapter_index; } if (hr != DXGI_ERROR_NOT_FOUND) - WARN("Failed to enumerate adapters, hr %#x.\n", hr); + WARN("Failed to enumerate adapters, hr %#lx.\n", hr); WARN("Adapter could not be found.\n"); return DXGI_ERROR_NOT_FOUND; @@ -495,7 +495,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterAdaptersChangedEvent(IWine static HRESULT STDMETHODCALLTYPE dxgi_factory_UnregisterAdaptersChangedEvent(IWineDXGIFactory *iface, DWORD cookie) { - FIXME("iface %p, cookie %#x stub!\n", iface, cookie); + FIXME("iface %p, cookie %#lx stub!\n", iface, cookie); return E_NOTIMPL; } @@ -553,7 +553,7 @@ struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface) return NULL; if (FAILED(hr = IDXGIFactory_QueryInterface(iface, &IID_IWineDXGIFactory, (void **)&wine_factory))) { - ERR("Failed to get IWineDXGIFactory interface, hr %#x.\n", hr); + ERR("Failed to get IWineDXGIFactory interface, hr %#lx.\n", hr); return NULL; } assert(wine_factory->lpVtbl == &dxgi_factory_vtbl); @@ -592,7 +592,7 @@ HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) if (FAILED(hr = dxgi_factory_init(object, extended))) { - WARN("Failed to initialize factory, hr %#x.\n", hr); + WARN("Failed to initialize factory, hr %#lx.\n", hr); heap_free(object); return hr; } diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 585f5ae5b82..797851c67f1 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -146,7 +146,7 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, if (FAILED(hr = wined3d_output_get_mode(output->wined3d_output, wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode))) { - WARN("Failed to get output mode %u, hr %#x.\n", i, hr); + WARN("Failed to get output mode %u, hr %#lx.\n", i, hr); wined3d_mutex_unlock(); return hr; } @@ -220,7 +220,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput6 *iface) struct dxgi_output *output = impl_from_IDXGIOutput6(iface); ULONG refcount = InterlockedIncrement(&output->refcount); - TRACE("%p increasing refcount to %u.\n", output, refcount); + TRACE("%p increasing refcount to %lu.\n", output, refcount); return refcount; } @@ -230,7 +230,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput6 *iface) struct dxgi_output *output = impl_from_IDXGIOutput6(iface); ULONG refcount = InterlockedDecrement(&output->refcount); - TRACE("%p decreasing refcount to %u.\n", output, refcount); + TRACE("%p decreasing refcount to %lu.\n", output, refcount); if (!refcount) { @@ -303,7 +303,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_O hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc); if (FAILED(hr)) { - WARN("Failed to get output desc, hr %#x.\n", hr); + WARN("Failed to get output desc, hr %#lx.\n", hr); wined3d_mutex_unlock(); return hr; } @@ -311,7 +311,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_O hr = wined3d_output_get_display_mode(output->wined3d_output, &mode, &rotation); if (FAILED(hr)) { - WARN("Failed to get output display mode, hr %#x.\n", hr); + WARN("Failed to get output display mode, hr %#lx.\n", hr); wined3d_mutex_unlock(); return hr; } @@ -610,7 +610,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc); if (FAILED(hr)) { - WARN("Failed to get output desc, hr %#x.\n", hr); + WARN("Failed to get output desc, hr %#lx.\n", hr); wined3d_mutex_unlock(); return hr; } @@ -618,7 +618,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, hr = wined3d_output_get_display_mode(output->wined3d_output, &mode, &rotation); if (FAILED(hr)) { - WARN("Failed to get output display mode, hr %#x.\n", hr); + WARN("Failed to get output display mode, hr %#lx.\n", hr); wined3d_mutex_unlock(); return hr; } @@ -626,7 +626,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, if (FAILED(hr)) { - WARN("Failed to get output desc, hr %#x.\n", hr); + WARN("Failed to get output desc, hr %#lx.\n", hr); return hr; } diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index dd069524fbc..628e335ee0d 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -56,7 +56,7 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_AddRef(IUnknown *iface) struct dxgi_surface *surface = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&surface->refcount); - TRACE("%p increasing refcount to %u.\n", surface, refcount); + TRACE("%p increasing refcount to %lu.\n", surface, refcount); return refcount; } @@ -66,7 +66,7 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) struct dxgi_surface *surface = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&surface->refcount); - TRACE("%p decreasing refcount to %u.\n", surface, refcount); + TRACE("%p decreasing refcount to %lu.\n", surface, refcount); if (!refcount) { diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 98b020217e4..9677142e0af 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -123,7 +123,7 @@ HRESULT dxgi_get_output_from_window(IWineDXGIFactory *factory, HWND window, IDXG { if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) { - WARN("Adapter %u output %u: Failed to get output desc, hr %#x.\n", adapter_idx, + WARN("Adapter %u output %u: Failed to get output desc, hr %#lx.\n", adapter_idx, output_idx, hr); IDXGIOutput_Release(output); continue; @@ -142,7 +142,7 @@ HRESULT dxgi_get_output_from_window(IWineDXGIFactory *factory, HWND window, IDXG } if (hr != DXGI_ERROR_NOT_FOUND) - WARN("Failed to enumerate outputs, hr %#x.\n", hr); + WARN("Failed to enumerate outputs, hr %#lx.\n", hr); WARN("Output could not be found.\n"); return DXGI_ERROR_NOT_FOUND; @@ -213,7 +213,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_AddRef(IDXGISwapChain1 *iface) struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); ULONG refcount = InterlockedIncrement(&swapchain->refcount); - TRACE("%p increasing refcount to %u.\n", swapchain, refcount); + TRACE("%p increasing refcount to %lu.\n", swapchain, refcount); if (refcount == 1) wined3d_swapchain_incref(swapchain->wined3d_swapchain); @@ -226,7 +226,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); ULONG refcount = InterlockedDecrement(&swapchain->refcount); - TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); + TRACE("%p decreasing refcount to %lu.\n", swapchain, refcount); if (!refcount) { @@ -399,7 +399,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen } else if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &target))) { - WARN("Failed to get target output for swapchain, hr %#x.\n", hr); + WARN("Failed to get target output for swapchain, hr %#lx.\n", hr); return hr; } dxgi_output = unsafe_impl_from_IDXGIOutput(target); @@ -849,7 +849,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi if (FAILED(hr = IWineDXGIAdapter_GetParent(device->adapter, &IID_IWineDXGIFactory, (void **)&swapchain->factory))) { - WARN("Failed to get adapter parent, hr %#x.\n", hr); + WARN("Failed to get adapter parent, hr %#lx.\n", hr); return hr; } IWineDXGIDevice_AddRef(swapchain->device = &device->IWineDXGIDevice_iface); @@ -874,7 +874,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, &swapchain->state_parent, swapchain, &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { - WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); + WARN("Failed to create wined3d swapchain, hr %#lx.\n", hr); goto cleanup; } @@ -889,14 +889,14 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(&swapchain->IDXGISwapChain1_iface, &swapchain->target))) { - WARN("Failed to get target output for fullscreen swapchain, hr %#x.\n", hr); + WARN("Failed to get target output for fullscreen swapchain, hr %#lx.\n", hr); wined3d_swapchain_decref(swapchain->wined3d_swapchain); goto cleanup; } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(state, desc, NULL))) { - WARN("Failed to set fullscreen state, hr %#x.\n", hr); + WARN("Failed to set fullscreen state, hr %#lx.\n", hr); IDXGIOutput_Release(swapchain->target); wined3d_swapchain_decref(swapchain->wined3d_swapchain); goto cleanup; @@ -1537,7 +1537,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, if (FAILED(hr = vkd3d_create_image_resource(device, &resource_info, &swapchain->buffers[i]))) { - WARN("Failed to create vkd3d resource for Vulkan image %u, hr %#x.\n", i, hr); + WARN("Failed to create vkd3d resource for Vulkan image %u, hr %#lx.\n", i, hr); return hr; } @@ -1769,7 +1769,7 @@ static HRESULT d3d12_swapchain_recreate_vulkan_swapchain(struct d3d12_swapchain } else { - ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); + ERR("Failed to recreate Vulkan swapchain, hr %#lx.\n", hr); } return hr; @@ -1811,7 +1811,7 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_AddRef(IDXGISwapChain4 *iface) struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); ULONG refcount = InterlockedIncrement(&swapchain->refcount); - TRACE("%p increasing refcount to %u.\n", swapchain, refcount); + TRACE("%p increasing refcount to %lu.\n", swapchain, refcount); return refcount; } @@ -1865,7 +1865,7 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain4 *iface) struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); ULONG refcount = InterlockedDecrement(&swapchain->refcount); - TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); + TRACE("%p decreasing refcount to %lu.\n", swapchain, refcount); if (!refcount) { @@ -2106,14 +2106,14 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, if (FAILED(hr = ID3D12CommandQueue_Signal(swapchain->command_queue, swapchain->frame_latency_fence, swapchain->frame_number))) { - ERR("Failed to signal frame latency fence, hr %#x.\n", hr); + ERR("Failed to signal frame latency fence, hr %#lx.\n", hr); return hr; } if (FAILED(hr = ID3D12Fence_SetEventOnCompletion(swapchain->frame_latency_fence, swapchain->frame_number - swapchain->frame_latency, frame_latency_event))) { - ERR("Failed to enqueue frame latency event, hr %#x.\n", hr); + ERR("Failed to enqueue frame latency event, hr %#lx.\n", hr); return hr; } } @@ -2189,7 +2189,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen } else if (FAILED(hr = IDXGISwapChain4_GetContainingOutput(iface, &target))) { - WARN("Failed to get target output for swapchain, hr %#x.\n", hr); + WARN("Failed to get target output for swapchain, hr %#lx.\n", hr); return hr; } @@ -2312,7 +2312,7 @@ static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain, ID3D12Resource_AddRef(swapchain->buffers[i]); if ((refcount = ID3D12Resource_Release(swapchain->buffers[i]))) { - WARN("Buffer %p has %u references left.\n", swapchain->buffers[i], refcount); + WARN("Buffer %p has %lu references left.\n", swapchain->buffers[i], refcount); return DXGI_ERROR_INVALID_CALL; } } @@ -2328,7 +2328,7 @@ static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain, if (!GetClientRect(swapchain->window, &client_rect)) { - WARN("Failed to get client rect, last error %#x.\n", GetLastError()); + WARN("Failed to get client rect, last error %#lx.\n", GetLastError()); return DXGI_ERROR_INVALID_CALL; } @@ -2397,13 +2397,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh if (FAILED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) { - WARN("Failed to get adapter, hr %#x.\n", hr); + WARN("Failed to get adapter, hr %#lx.\n", hr); return hr; } if (FAILED(hr = IDXGIAdapter_GetParent(adapter, &IID_IWineDXGIFactory, (void **)&factory))) { - WARN("Failed to get factory, hr %#x.\n", hr); + WARN("Failed to get factory, hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); return hr; } @@ -2921,7 +2921,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (FAILED(hr = dxgi_get_output_from_window(factory, window, &output))) { - WARN("Failed to get output from window %p, hr %#x.\n", window, hr); + WARN("Failed to get output from window %p, hr %#lx.\n", window, hr); return hr; } @@ -3047,7 +3047,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (FAILED(hr = ID3D12Device_CreateFence(device, DXGI_MAX_SWAP_CHAIN_BUFFERS, 0, &IID_ID3D12Fence, (void **)&swapchain->frame_latency_fence))) { - WARN("Failed to create frame latency fence, hr %#x.\n", hr); + WARN("Failed to create frame latency fence, hr %#lx.\n", hr); d3d12_swapchain_destroy(swapchain); return hr; } @@ -3055,7 +3055,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (!(swapchain->frame_latency_event = CreateEventW(NULL, FALSE, TRUE, NULL))) { hr = HRESULT_FROM_WIN32(GetLastError()); - WARN("Failed to create frame latency event, hr %#x.\n", hr); + WARN("Failed to create frame latency event, hr %#lx.\n", hr); d3d12_swapchain_destroy(swapchain); return hr; } @@ -3090,7 +3090,7 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu if (FAILED(hr = ID3D12CommandQueue_GetDevice(queue, &IID_ID3D12Device, (void **)&device))) { - ERR("Failed to get D3D12 device, hr %#x.\n", hr); + ERR("Failed to get d3d12 device, hr %#lx.\n", hr); heap_free(object); return hr; } -- 2.30.2

1 0

[PATCH 2/5] wined3d: Store "multisample_quality" as an unsigned int in struct wined3d_swapchain_desc.
by Henri Verbeet 18 Mar '22

18 Mar '22

Consistent with what we do in other places in wined3d, like e.g. struct wined3d_resource_desc. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/wine/wined3d.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1fdbd105cc4..7fbff07a3ad 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1774,7 +1774,7 @@ struct wined3d_swapchain_desc unsigned int backbuffer_count; unsigned int backbuffer_bind_flags; enum wined3d_multisample_type multisample_type; - DWORD multisample_quality; + unsigned int multisample_quality; enum wined3d_swap_effect swap_effect; HWND device_window; BOOL windowed; -- 2.30.2

1 0

[PATCH 5/5] win32u: Don't use designated initializers for lazy_load_driver.
by Jacek Caban 18 Mar '22

18 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/driver.c | 86 +++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 41 deletions(-)

2 1

[PATCH 4/5] win32u: Move ArrangeIconicWindows implementation from user32.
by Jacek Caban 18 Mar '22

18 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 123 +------------------------------------------ dlls/win32u/window.c | 44 ++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 46 insertions(+), 122 deletions(-)

3 2

[PATCH 3/5] win32u: Move apply_window_pos implementation from user32.
by Jacek Caban 18 Mar '22

18 Mar '22

3 2

[PATCH 2/5] win32u: Move NtUserCreateWindowEx implementation from user32.
by Jacek Caban 18 Mar '22

18 Mar '22

3 3

[PATCH 1/5] user32: Move MDI child coordinates fixup out of WIN_FixCoordinates.
by Jacek Caban 18 Mar '22

18 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 53 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 27 deletions(-)

3 2

[PATCH 1/5] jscript: Pass a jsval "this" to builtin functions.
by Gabriel Ivăncescu 18 Mar '22

18 Mar '22

And get rid of vdisp_t since it's no longer needed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- The spec says that in ES3, apply and call convert null or undefined arguments to the global object, but that's wrong for builtins. Or at least, it's not how it works on Windows. In fact, passing them to builtin functions results in exceptions in many cases, because they're not objects or can't be converted to objects. So the ES5 checks are still needed. dlls/jscript/activex.c | 2 +- dlls/jscript/array.c | 250 +++++++++++++++++++++++--------------- dlls/jscript/bool.c | 44 ++++--- dlls/jscript/date.c | 199 +++++++++++++++--------------- dlls/jscript/dispex.c | 17 +-- dlls/jscript/enumerator.c | 28 ++--- dlls/jscript/error.c | 28 +++-- dlls/jscript/function.c | 51 ++++---- dlls/jscript/global.c | 34 +++--- dlls/jscript/jscript.h | 75 +----------- dlls/jscript/json.c | 4 +- dlls/jscript/jsregexp.c | 32 +++-- dlls/jscript/math.c | 36 +++--- dlls/jscript/number.c | 69 ++++++----- dlls/jscript/object.c | 182 ++++++++++++++++++--------- dlls/jscript/set.c | 81 +++++++----- dlls/jscript/string.c | 180 +++++++++++++-------------- dlls/jscript/vbarray.c | 24 ++-- 18 files changed, 696 insertions(+), 640 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 42cb513..5d79d2b 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -138,7 +138,7 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) return obj; } -static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT ActiveXObject_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsstr_t * progid_str; diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 6ee1809..9b97ef2 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -37,14 +37,10 @@ static inline ArrayInstance *array_from_jsdisp(jsdisp_t *jsdisp) return CONTAINING_RECORD(jsdisp, ArrayInstance, dispex); } -static inline ArrayInstance *array_from_vdisp(vdisp_t *vdisp) +static inline ArrayInstance *array_this(jsval_t vthis) { - return array_from_jsdisp(vdisp->u.jsdisp); -} - -static inline ArrayInstance *array_this(vdisp_t *jsthis) -{ - return is_vclass(jsthis, JSCLASS_ARRAY) ? array_from_vdisp(jsthis) : NULL; + jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL; + return (jsdisp && is_class(jsdisp, JSCLASS_ARRAY)) ? array_from_jsdisp(jsdisp) : NULL; } unsigned array_get_length(jsdisp_t *array) @@ -53,33 +49,38 @@ unsigned array_get_length(jsdisp_t *array) return array_from_jsdisp(array)->length; } -static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsdisp_t **jsthis, UINT32 *ret) +static HRESULT get_length(script_ctx_t *ctx, jsval_t vthis, jsdisp_t **jsthis, UINT32 *ret) { - ArrayInstance *array; + jsdisp_t *jsdisp; + IDispatch *disp; jsval_t val; HRESULT hres; - array = array_this(vdisp); - if(array) { - *jsthis = &array->dispex; - *ret = array->length; - return S_OK; - } + hres = to_object(ctx, vthis, &disp); + if(FAILED(hres)) + return hres; - if(!is_jsdisp(vdisp)) + jsdisp = iface_to_jsdisp(disp); + IDispatch_Release(disp); + if(!jsdisp) return JS_E_JSCRIPT_EXPECTED; + *jsthis = jsdisp; - hres = jsdisp_propget_name(vdisp->u.jsdisp, L"length", &val); - if(FAILED(hres)) - return hres; + if(is_class(jsdisp, JSCLASS_ARRAY)) { + *ret = array_from_jsdisp(jsdisp)->length; + return S_OK; + } - hres = to_uint32(ctx, val, ret); - jsval_release(val); - if(FAILED(hres)) - return hres; + hres = jsdisp_propget_name(jsdisp, L"length", &val); + if(SUCCEEDED(hres)) { + hres = to_uint32(ctx, val, ret); + jsval_release(val); + if(SUCCEEDED(hres)) + return hres; + } - *jsthis = vdisp->u.jsdisp; - return S_OK; + jsdisp_release(jsdisp); + return hres; } static HRESULT set_length(jsdisp_t *obj, DWORD length) @@ -183,20 +184,25 @@ static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len) return jsdisp_propput_idx(array, (*len)++, jsval_disp(obj)); } -static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_concat(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + IDispatch *jsthis; jsdisp_t *ret; DWORD len = 0; HRESULT hres; TRACE("\n"); - hres = create_array(ctx, 0, &ret); + hres = to_object(ctx, vthis, &jsthis); if(FAILED(hres)) return hres; - hres = concat_obj(ret, jsthis->u.disp, &len); + hres = create_array(ctx, 0, &ret); + if(FAILED(hres)) + goto done; + + hres = concat_obj(ret, jsthis, &len); if(SUCCEEDED(hres)) { DWORD i; @@ -211,12 +217,14 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } if(FAILED(hres)) - return hres; + goto done; if(r) *r = jsval_obj(ret); else jsdisp_release(ret); +done: + IDispatch_Release(jsthis); return S_OK; } @@ -310,7 +318,7 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons } /* ECMA-262 3rd Edition 15.4.4.5 */ -static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_join(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsthis; @@ -329,7 +337,7 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne hres = to_flat_string(ctx, argv[0], &sep_str, &sep); if(FAILED(hres)) - return hres; + goto done; hres = array_join(ctx, jsthis, length, sep, jsstr_length(sep_str), r); @@ -338,10 +346,12 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne hres = array_join(ctx, jsthis, length, L",", 1, r); } +done: + jsdisp_release(jsthis); return hres; } -static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_pop(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsthis; @@ -358,11 +368,11 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned if(!length) { hres = set_length(jsthis, 0); if(FAILED(hres)) - return hres; + goto done; if(r) *r = jsval_undefined(); - return S_OK; + goto done; } length--; @@ -373,25 +383,27 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned val = jsval_undefined(); hres = S_OK; }else - return hres; + goto done; if(SUCCEEDED(hres)) hres = set_length(jsthis, length); if(FAILED(hres)) { jsval_release(val); - return hres; + goto done; } if(r) *r = val; else jsval_release(val); +done: + jsdisp_release(jsthis); return hres; } /* ECMA-262 3rd Edition 15.4.4.7 */ -static HRESULT Array_push(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_push(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsthis; @@ -408,19 +420,21 @@ static HRESULT Array_push(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne for(i=0; i < argc; i++) { hres = jsdisp_propput_idx(jsthis, length+i, argv[i]); if(FAILED(hres)) - return hres; + goto done; } hres = set_length(jsthis, length+argc); if(FAILED(hres)) - return hres; + goto done; if(r) *r = jsval_number(length+argc); - return S_OK; +done: + jsdisp_release(jsthis); + return hres; } -static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_reverse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsthis; @@ -439,12 +453,13 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi hres1 = jsdisp_get_idx(jsthis, k, &v1); if(FAILED(hres1) && hres1!=DISP_E_UNKNOWNNAME) - return hres1; + goto done; hres2 = jsdisp_get_idx(jsthis, l, &v2); if(FAILED(hres2) && hres2!=DISP_E_UNKNOWNNAME) { jsval_release(v1); - return hres2; + hres1 = hres2; + goto done; } if(hres1 == DISP_E_UNKNOWNNAME) @@ -455,7 +470,7 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi if(FAILED(hres1)) { jsval_release(v1); jsval_release(v2); - return hres1; + goto done; } if(hres2 == DISP_E_UNKNOWNNAME) @@ -465,17 +480,20 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi if(FAILED(hres2)) { jsval_release(v2); - return hres2; + hres1 = hres2; + goto done; } } if(r) *r = jsval_obj(jsdisp_addref(jsthis)); - return S_OK; +done: + jsdisp_release(jsthis); + return hres1; } /* ECMA-262 3rd Edition 15.4.4.9 */ -static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_shift(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsthis; @@ -492,11 +510,11 @@ static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign if(!length) { hres = set_length(jsthis, 0); if(FAILED(hres)) - return hres; + goto done; if(r) *r = jsval_undefined(); - return S_OK; + goto done; } hres = jsdisp_get_idx(jsthis, 0, &ret); @@ -520,17 +538,19 @@ static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign } if(FAILED(hres)) - return hres; + goto done; if(r) *r = ret; else jsval_release(ret); +done: + jsdisp_release(jsthis); return hres; } /* ECMA-262 3rd Edition 15.4.4.10 */ -static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Array_slice(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *arr, *jsthis; DOUBLE range; @@ -546,7 +566,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign if(argc) { hres = to_number(ctx, argv[0], &range); if(FAILED(hres)) - return hres; + goto done; range = floor(range); if(-range>length || isnan(range)) start = 0; @@ -559,7 +579,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign if(argc > 1) { hres = to_number(ctx, argv[1], &range); if(FAILED(hres)) - return hres; + goto done; range = floor(range); if(-range>length) end = 0; @@ -571,7 +591,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign hres = create_array(ctx, (end>start)?end-start:0, &arr); if(FAILED(hres)) - return hres; + goto done; for(idx=start; idx<end; idx++) { jsval_t v; @@ -587,7 +607,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign if(FAILED(hres)) { jsdisp_release(arr); - return hres; + goto done; } } @@ -595,8 +615,11 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign *r = jsval_obj(arr); else jsdisp_release(arr); + hres = S_OK; - return S_OK; +done: + jsdisp_release(jsthis); + return hres; } static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, jsval_t v1, jsval_t v2, INT *cmp) @@ -651,7 +674,7 @@ static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, jsval_t v1, jsval } /* ECMA-262 3rd Edition 15.4.4.11 */ -static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_sort(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsthis, *cmp_func = NULL; @@ -670,18 +693,21 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne if(is_object_instance(argv[0])) { if(argc > 1 && ctx->version < SCRIPTLANGUAGEVERSION_ES5) { WARN("invalid arg_cnt %d\n", argc); - return JS_E_JSCRIPT_EXPECTED; + hres = JS_E_JSCRIPT_EXPECTED; + goto done; } cmp_func = iface_to_jsdisp(get_object(argv[0])); if(!cmp_func || !is_class(cmp_func, JSCLASS_FUNCTION)) { WARN("cmp_func is not a function\n"); if(cmp_func) jsdisp_release(cmp_func); - return JS_E_JSCRIPT_EXPECTED; + hres = JS_E_JSCRIPT_EXPECTED; + goto done; } }else if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5 ? !is_undefined(argv[0]) : !is_null(argv[0])) { WARN("invalid arg %s\n", debugstr_jsval(argv[0])); - return JS_E_JSCRIPT_EXPECTED; + hres = JS_E_JSCRIPT_EXPECTED; + goto done; } } @@ -690,7 +716,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne jsdisp_release(cmp_func); if(r) *r = jsval_obj(jsdisp_addref(jsthis)); - return S_OK; + goto done; } vtab = heap_alloc_zero(length * sizeof(*vtab)); @@ -789,15 +815,17 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne jsdisp_release(cmp_func); if(FAILED(hres)) - return hres; + goto done; if(r) *r = jsval_obj(jsdisp_addref(jsthis)); - return S_OK; +done: + jsdisp_release(jsthis); + return hres; } /* ECMA-262 3rd Edition 15.4.4.12 */ -static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_splice(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { UINT32 length, start=0, delete_cnt=0, i, add_args = 0; @@ -816,7 +844,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig if(argc) { hres = to_integer(ctx, argv[0], &d); if(FAILED(hres)) - return hres; + goto done; if(is_int32(d)) { if((n = d) >= 0) @@ -831,7 +859,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig if(argc >= 2) { hres = to_integer(ctx, argv[1], &d); if(FAILED(hres)) - return hres; + goto done; if(is_int32(d)) { if((n = d) > 0) @@ -846,7 +874,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig if(r) { hres = create_array(ctx, 0, &ret_array); if(FAILED(hres)) - return hres; + goto done; for(i=0; SUCCEEDED(hres) && i < delete_cnt; i++) { hres = jsdisp_get_idx(jsthis, start+i, &val); @@ -896,37 +924,39 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig if(FAILED(hres)) { if(ret_array) jsdisp_release(ret_array); - return hres; + goto done; } if(r) *r = jsval_obj(ret_array); - return S_OK; +done: + jsdisp_release(jsthis); + return hres; } /* ECMA-262 3rd Edition 15.4.4.2 */ -static HRESULT Array_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { ArrayInstance *array; TRACE("\n"); - array = array_this(jsthis); + array = array_this(vthis); if(!array) return JS_E_ARRAY_EXPECTED; return array_join(ctx, &array->dispex, array->length, L",", 1, r); } -static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_toLocaleString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { IDispatch *context_obj = NULL, *callback; @@ -944,14 +974,16 @@ static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi /* Fixme check IsCallable */ if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); - return E_INVALIDARG; + hres = E_INVALIDARG; + goto done; } callback = get_object(argv[0]); if(argc > 1 && !is_undefined(argv[1])) { if(!is_object_instance(argv[1]) || !get_object(argv[1])) { FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - return E_NOTIMPL; + hres = E_NOTIMPL; + goto done; } context_obj = get_object(argv[1]); } @@ -961,7 +993,7 @@ static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi if(hres == DISP_E_UNKNOWNNAME) continue; if(FAILED(hres)) - return hres; + goto done; args[0] = value; args[1] = jsval_number(i); @@ -969,15 +1001,18 @@ static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi hres = disp_call_value(ctx, callback, context_obj, DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); jsval_release(value); if(FAILED(hres)) - return hres; + goto done; jsval_release(res); } if(r) *r = jsval_undefined(); - return S_OK; + hres = S_OK; +done: + jsdisp_release(jsthis); + return hres; } -static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_indexOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsthis; @@ -993,7 +1028,7 @@ static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi return hres; if(!length) { if(r) *r = jsval_number(-1); - return S_OK; + goto done; } search = argc ? argv[0] : jsval_undefined(); @@ -1003,7 +1038,7 @@ static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi hres = to_integer(ctx, argv[1], &from_arg); if(FAILED(hres)) - return hres; + goto done; if(from_arg >= 0) from = min(from_arg, length); @@ -1016,23 +1051,26 @@ static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi if(hres == DISP_E_UNKNOWNNAME) continue; if(FAILED(hres)) - return hres; + goto done; hres = jsval_strict_equal(value, search, &eq); jsval_release(value); if(FAILED(hres)) - return hres; + goto done; if(eq) { if(r) *r = jsval_number(i); - return S_OK; + goto done; } } if(r) *r = jsval_number(-1); - return S_OK; + hres = S_OK; +done: + jsdisp_release(jsthis); + return hres; } -static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Array_map(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { IDispatch *context_this = NULL, *callback; jsval_t callback_args[3], mapped_value; @@ -1051,7 +1089,8 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned /* FIXME: check IsCallable */ if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); - return E_INVALIDARG; + hres = E_INVALIDARG; + goto done; } callback = get_object(argv[0]); @@ -1060,13 +1099,14 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned context_this = get_object(argv[1]); }else if(!is_undefined(argv[1])) { FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - return E_NOTIMPL; + hres = E_NOTIMPL; + goto done; } } hres = create_array(ctx, length, &array); if(FAILED(hres)) - return hres; + goto done; for(k = 0; k < length; k++) { hres = jsdisp_get_idx(jsthis, k, &callback_args[0]); @@ -1091,10 +1131,12 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned *r = jsval_obj(array); else jsdisp_release(array); +done: + jsdisp_release(jsthis); return hres; } -static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Array_reduce(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { IDispatch *context_this = NULL, *callback; jsval_t callback_args[4], acc, new_acc; @@ -1114,7 +1156,8 @@ static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig /* Fixme check IsCallable */ if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); - return E_INVALIDARG; + hres = E_INVALIDARG; + goto done; } callback = get_object(argv[0]); @@ -1122,7 +1165,7 @@ static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig have_value = TRUE; hres = jsval_copy(argv[1], &acc); if(FAILED(hres)) - return hres; + goto done; } for(k = 0; k < length; k++) { @@ -1159,11 +1202,13 @@ static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig *r = acc; else if(have_value) jsval_release(acc); +done: + jsdisp_release(jsthis); return hres; } /* ECMA-262 3rd Edition 15.4.4.13 */ -static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Array_unshift(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsthis; @@ -1191,35 +1236,38 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi if(SUCCEEDED(hres)) { hres = jsdisp_propget(jsthis, id, &val); if(FAILED(hres)) - return hres; + goto done; hres = jsdisp_propput_idx(jsthis, i+argc, val); jsval_release(val); }else if(hres == DISP_E_UNKNOWNNAME) { - hres = IDispatchEx_DeleteMemberByDispID(vthis->u.dispex, id); + hres = IDispatchEx_DeleteMemberByDispID(&jsthis->IDispatchEx_iface, id); } } if(FAILED(hres)) - return hres; + goto done; } for(i=0; i<argc; i++) { hres = jsdisp_propput_idx(jsthis, i, argv[i]); if(FAILED(hres)) - return hres; + goto done; } if(argc) { length += argc; hres = set_length(jsthis, length); if(FAILED(hres)) - return hres; + goto done; } if(r) *r = ctx->version < 2 ? jsval_undefined() : jsval_number(length); - return S_OK; + hres = S_OK; +done: + jsdisp_release(jsthis); + return hres; } static void Array_destructor(jsdisp_t *dispex) @@ -1291,7 +1339,7 @@ static const builtin_info_t ArrayInst_info = { }; /* ECMA-262 5.1 Edition 15.4.3.2 */ -static HRESULT ArrayConstr_isArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT ArrayConstr_isArray(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; @@ -1308,7 +1356,7 @@ static HRESULT ArrayConstr_isArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags return S_OK; } -static HRESULT ArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT ArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 184d8d0..a230855 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -36,14 +36,16 @@ static inline BoolInstance *bool_from_jsdisp(jsdisp_t *jsdisp) return CONTAINING_RECORD(jsdisp, BoolInstance, dispex); } -static inline BoolInstance *bool_from_vdisp(vdisp_t *vdisp) +static inline HRESULT boolval_this(jsval_t vthis, BOOL *ret) { - return bool_from_jsdisp(vdisp->u.jsdisp); -} - -static inline BoolInstance *bool_this(vdisp_t *jsthis) -{ - return is_vclass(jsthis, JSCLASS_BOOLEAN) ? bool_from_vdisp(jsthis) : NULL; + jsdisp_t *jsdisp; + if(is_bool(vthis)) + *ret = get_bool(vthis); + else if(is_object_instance(vthis) && (jsdisp = to_jsdisp(get_object(vthis))) && is_class(jsdisp, JSCLASS_BOOLEAN)) + *ret = bool_from_jsdisp(jsdisp)->val; + else + return JS_E_BOOLEAN_EXPECTED; + return S_OK; } BOOL bool_obj_value(jsdisp_t *obj) @@ -53,19 +55,21 @@ BOOL bool_obj_value(jsdisp_t *obj) } /* ECMA-262 3rd Edition 15.6.4.2 */ -static HRESULT Bool_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Bool_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - BoolInstance *bool; + BOOL boolval; + HRESULT hres; TRACE("\n"); - if(!(bool = bool_this(jsthis))) - return JS_E_BOOLEAN_EXPECTED; + hres = boolval_this(vthis, &boolval); + if(FAILED(hres)) + return hres; if(r) { jsstr_t *val; - val = jsstr_alloc(bool->val ? L"true" : L"false"); + val = jsstr_alloc(boolval ? L"true" : L"false"); if(!val) return E_OUTOFMEMORY; @@ -76,21 +80,23 @@ static HRESULT Bool_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } /* ECMA-262 3rd Edition 15.6.4.3 */ -static HRESULT Bool_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Bool_valueOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - BoolInstance *bool; + BOOL boolval; + HRESULT hres; TRACE("\n"); - if(!(bool = bool_this(jsthis))) - return JS_E_BOOLEAN_EXPECTED; + hres = boolval_this(vthis, &boolval); + if(FAILED(hres)) + return hres; if(r) - *r = jsval_bool(bool->val); + *r = jsval_bool(boolval); return S_OK; } -static HRESULT Bool_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Bool_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); @@ -129,7 +135,7 @@ static const builtin_info_t BoolInst_info = { NULL }; -static HRESULT BoolConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT BoolConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { BOOL value = FALSE; diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index b130c83..e482c4a 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -49,9 +49,10 @@ static inline DateInstance *date_from_jsdisp(jsdisp_t *jsdisp) return CONTAINING_RECORD(jsdisp, DateInstance, dispex); } -static inline DateInstance *date_this(vdisp_t *jsthis) +static inline DateInstance *date_this(jsval_t vthis) { - return is_vclass(jsthis, JSCLASS_DATE) ? date_from_jsdisp(jsthis->u.jsdisp) : NULL; + jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL; + return (jsdisp && is_class(jsdisp, JSCLASS_DATE)) ? date_from_jsdisp(jsdisp) : NULL; } /*ECMA-262 3rd Edition 15.9.1.2 */ @@ -513,20 +514,20 @@ static HRESULT dateobj_to_string(DateInstance *date, jsval_t *r) return date_to_string(time, TRUE, offset, r); } -static HRESULT Date_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Date_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; return dateobj_to_string(date, r); } /* ECMA-262 3rd Edition 15.9.1.5 */ -static HRESULT Date_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_toLocaleString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { SYSTEMTIME st; @@ -536,7 +537,7 @@ static HRESULT Date_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(isnan(date->time)) { @@ -569,7 +570,7 @@ static HRESULT Date_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return S_OK; } -static HRESULT Date_toISOString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_toISOString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -578,7 +579,7 @@ static HRESULT Date_toISOString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; year = year_from_time(date->time); @@ -611,14 +612,14 @@ static HRESULT Date_toISOString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } -static HRESULT Date_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_valueOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -626,7 +627,7 @@ static HRESULT Date_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi return S_OK; } -static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r) +static inline HRESULT create_utc_string(script_ctx_t *ctx, jsval_t vthis, jsval_t *r) { static const DWORD week_ids[] = { LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, @@ -646,7 +647,7 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva int year, day; DWORD lcid_en; - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(isnan(date->time)) { @@ -687,18 +688,18 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva } /* ECMA-262 3rd Edition 15.9.5.42 */ -static HRESULT Date_toUTCString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_toUTCString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); - return create_utc_string(ctx, jsthis, r); + return create_utc_string(ctx, vthis, r); } -static HRESULT Date_toGMTString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_toGMTString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); - return create_utc_string(ctx, jsthis, r); + return create_utc_string(ctx, vthis, r); } /* ECMA-262 3rd Edition 15.9.5.3 */ @@ -758,19 +759,19 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) return S_OK; } -static HRESULT Date_toDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_toDateString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; return dateobj_to_date_string(date, r); } /* ECMA-262 3rd Edition 15.9.5.4 */ -static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_toTimeString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -782,7 +783,7 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(isnan(date->time)) { @@ -821,7 +822,7 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } /* ECMA-262 3rd Edition 15.9.5.6 */ -static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { SYSTEMTIME st; @@ -831,7 +832,7 @@ static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(isnan(date->time)) { @@ -860,7 +861,7 @@ static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD } /* ECMA-262 3rd Edition 15.9.5.7 */ -static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { SYSTEMTIME st; @@ -870,7 +871,7 @@ static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(isnan(date->time)) { @@ -882,7 +883,7 @@ static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD st = create_systemtime(local_time(date->time, date)); if(st.wYear<1601 || st.wYear>9999) - return Date_toTimeString(ctx, jsthis, flags, argc, argv, r); + return Date_toTimeString(ctx, vthis, flags, argc, argv, r); if(r) { WCHAR *ptr; @@ -899,14 +900,14 @@ static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD } /* ECMA-262 3rd Edition 15.9.5.9 */ -static HRESULT Date_getTime(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getTime(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -915,14 +916,14 @@ static HRESULT Date_getTime(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } /* ECMA-262 3rd Edition 15.9.5.10 */ -static HRESULT Date_getFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getFullYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) { @@ -934,14 +935,14 @@ static HRESULT Date_getFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } /* ECMA-262 3rd Edition 15.9.5.11 */ -static HRESULT Date_getUTCFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getUTCFullYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -950,13 +951,13 @@ static HRESULT Date_getUTCFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag } /* ECMA-262 3rd Edition 15.9.5.12 */ -static HRESULT Date_getMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Date_getMonth(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -965,14 +966,14 @@ static HRESULT Date_getMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } /* ECMA-262 3rd Edition 15.9.5.13 */ -static HRESULT Date_getUTCMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getUTCMonth(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -981,13 +982,13 @@ static HRESULT Date_getUTCMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } /* ECMA-262 3rd Edition 15.9.5.14 */ -static HRESULT Date_getDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Date_getDate(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -996,14 +997,14 @@ static HRESULT Date_getDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } /* ECMA-262 3rd Edition 15.9.5.15 */ -static HRESULT Date_getUTCDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getUTCDate(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1012,14 +1013,14 @@ static HRESULT Date_getUTCDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } /* ECMA-262 3rd Edition 15.9.5.16 */ -static HRESULT Date_getDay(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getDay(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1028,14 +1029,14 @@ static HRESULT Date_getDay(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig } /* ECMA-262 3rd Edition 15.9.5.17 */ -static HRESULT Date_getUTCDay(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getUTCDay(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1044,14 +1045,14 @@ static HRESULT Date_getUTCDay(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un } /* ECMA-262 3rd Edition 15.9.5.18 */ -static HRESULT Date_getHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getHours(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1060,14 +1061,14 @@ static HRESULT Date_getHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } /* ECMA-262 3rd Edition 15.9.5.19 */ -static HRESULT Date_getUTCHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getUTCHours(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1076,14 +1077,14 @@ static HRESULT Date_getUTCHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } /* ECMA-262 3rd Edition 15.9.5.20 */ -static HRESULT Date_getMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getMinutes(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1092,14 +1093,14 @@ static HRESULT Date_getMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } /* ECMA-262 3rd Edition 15.9.5.21 */ -static HRESULT Date_getUTCMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getUTCMinutes(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1108,13 +1109,13 @@ static HRESULT Date_getUTCMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } /* ECMA-262 3rd Edition 15.9.5.22 */ -static HRESULT Date_getSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Date_getSeconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1123,14 +1124,14 @@ static HRESULT Date_getSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } /* ECMA-262 3rd Edition 15.9.5.23 */ -static HRESULT Date_getUTCSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getUTCSeconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1139,14 +1140,14 @@ static HRESULT Date_getUTCSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } /* ECMA-262 3rd Edition 15.9.5.24 */ -static HRESULT Date_getMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getMilliseconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1155,14 +1156,14 @@ static HRESULT Date_getMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla } /* ECMA-262 3rd Edition 15.9.5.25 */ -static HRESULT Date_getUTCMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getUTCMilliseconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1171,14 +1172,14 @@ static HRESULT Date_getUTCMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD } /* ECMA-262 3rd Edition 15.9.5.26 */ -static HRESULT Date_getTimezoneOffset(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getTimezoneOffset(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(r) @@ -1187,7 +1188,7 @@ static HRESULT Date_getTimezoneOffset(script_ctx_t *ctx, vdisp_t *jsthis, WORD f } /* ECMA-262 3rd Edition 15.9.5.27 */ -static HRESULT Date_setTime(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setTime(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double n; @@ -1196,7 +1197,7 @@ static HRESULT Date_setTime(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1214,7 +1215,7 @@ static HRESULT Date_setTime(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } /* ECMA-262 3rd Edition 15.9.5.28 */ -static HRESULT Date_setMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setMilliseconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1223,7 +1224,7 @@ static HRESULT Date_setMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1244,7 +1245,7 @@ static HRESULT Date_setMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla } /* ECMA-262 3rd Edition 15.9.5.29 */ -static HRESULT Date_setUTCMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setUTCMilliseconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1253,7 +1254,7 @@ static HRESULT Date_setUTCMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1274,7 +1275,7 @@ static HRESULT Date_setUTCMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD } /* ECMA-262 3rd Edition 15.9.5.30 */ -static HRESULT Date_setSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setSeconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1283,7 +1284,7 @@ static HRESULT Date_setSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1313,7 +1314,7 @@ static HRESULT Date_setSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } /* ECMA-262 3rd Edition 15.9.5.31 */ -static HRESULT Date_setUTCSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setUTCSeconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1322,7 +1323,7 @@ static HRESULT Date_setUTCSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1352,7 +1353,7 @@ static HRESULT Date_setUTCSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } /* ECMA-262 3rd Edition 15.9.5.33 */ -static HRESULT Date_setMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setMinutes(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1361,7 +1362,7 @@ static HRESULT Date_setMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1399,7 +1400,7 @@ static HRESULT Date_setMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } /* ECMA-262 3rd Edition 15.9.5.34 */ -static HRESULT Date_setUTCMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setUTCMinutes(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1408,7 +1409,7 @@ static HRESULT Date_setUTCMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1446,7 +1447,7 @@ static HRESULT Date_setUTCMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } /* ECMA-262 3rd Edition 15.9.5.35 */ -static HRESULT Date_setHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setHours(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1455,7 +1456,7 @@ static HRESULT Date_setHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1500,7 +1501,7 @@ static HRESULT Date_setHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } /* ECMA-262 3rd Edition 15.9.5.36 */ -static HRESULT Date_setUTCHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setUTCHours(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1509,7 +1510,7 @@ static HRESULT Date_setUTCHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1554,7 +1555,7 @@ static HRESULT Date_setUTCHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } /* ECMA-262 3rd Edition 15.9.5.36 */ -static HRESULT Date_setDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setDate(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1563,7 +1564,7 @@ static HRESULT Date_setDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1583,7 +1584,7 @@ static HRESULT Date_setDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } /* ECMA-262 3rd Edition 15.9.5.37 */ -static HRESULT Date_setUTCDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setUTCDate(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1592,7 +1593,7 @@ static HRESULT Date_setUTCDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1612,7 +1613,7 @@ static HRESULT Date_setUTCDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } /* ECMA-262 3rd Edition 15.9.5.38 */ -static HRESULT Date_setMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setMonth(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1621,7 +1622,7 @@ static HRESULT Date_setMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1651,7 +1652,7 @@ static HRESULT Date_setMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } /* ECMA-262 3rd Edition 15.9.5.39 */ -static HRESULT Date_setUTCMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setUTCMonth(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1660,7 +1661,7 @@ static HRESULT Date_setUTCMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1690,7 +1691,7 @@ static HRESULT Date_setUTCMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } /* ECMA-262 3rd Edition 15.9.5.40 */ -static HRESULT Date_setFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setFullYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1699,7 +1700,7 @@ static HRESULT Date_setFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1736,7 +1737,7 @@ static HRESULT Date_setFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } /* ECMA-262 3rd Edition 15.9.5.41 */ -static HRESULT Date_setUTCFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setUTCFullYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1745,7 +1746,7 @@ static HRESULT Date_setUTCFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -1782,7 +1783,7 @@ static HRESULT Date_setUTCFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag } /* ECMA-262 3rd Edition B2.4 */ -static HRESULT Date_getYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_getYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1790,7 +1791,7 @@ static HRESULT Date_getYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; t = local_time(date->time, date); @@ -1807,7 +1808,7 @@ static HRESULT Date_getYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } /* ECMA-262 3rd Edition B2.5 */ -static HRESULT Date_setYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Date_setYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; @@ -1816,7 +1817,7 @@ static HRESULT Date_setYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi TRACE("\n"); - if(!(date = date_this(jsthis))) + if(!(date = date_this(vthis))) return JS_E_DATE_EXPECTED; if(!argc) @@ -2223,7 +2224,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { return S_OK; } -static HRESULT DateConstr_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT DateConstr_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsstr_t *parse_str; @@ -2321,7 +2322,7 @@ static HRESULT date_utc(script_ctx_t *ctx, unsigned argc, jsval_t *argv, double return S_OK; } -static HRESULT DateConstr_UTC(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT DateConstr_UTC(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double n; @@ -2336,7 +2337,7 @@ static HRESULT DateConstr_UTC(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un } /* ECMA-262 5.1 Edition 15.9.4.4 */ -static HRESULT DateConstr_now(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT DateConstr_now(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); @@ -2344,7 +2345,7 @@ static HRESULT DateConstr_now(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un return S_OK; } -static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT DateConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DateInstance *date; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f8c3b55..e140010 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -550,7 +550,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t switch(prop->type) { case PROP_BUILTIN: { - vdisp_t vthis; + jsval_t vthis; if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { WARN("%s is not a constructor\n", debugstr_w(prop->name)); @@ -560,13 +560,10 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(jsthis) - set_disp(&vthis, jsthis); + vthis = jsval_disp(jsthis); else - set_jsdisp(&vthis, This); - hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r); - vdisp_release(&vthis); - - return hres; + vthis = jsval_obj(This); + return prop->u.p->invoke(This->ctx, vthis, flags, argc, argv, r); } case PROP_PROTREF: return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, @@ -1979,17 +1976,13 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig if(is_class(jsfunc, JSCLASS_FUNCTION)) { hres = Function_invoke(jsfunc, jsthis, flags, argc, argv, r); }else { - vdisp_t vdisp; - if(!jsfunc->builtin_info->call) { WARN("Not a function\n"); return JS_E_FUNCTION_EXPECTED; } - set_disp(&vdisp, jsthis); flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; - hres = jsfunc->builtin_info->call(jsfunc->ctx, &vdisp, flags, argc, argv, r); - vdisp_release(&vdisp); + hres = jsfunc->builtin_info->call(jsfunc->ctx, jsval_disp(jsthis), flags, argc, argv, r); } return hres; } diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index 038b474..0fc6750 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -38,14 +38,10 @@ static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp) return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex); } -static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp) +static inline EnumeratorInstance *enumerator_this(jsval_t vthis) { - return enumerator_from_jsdisp(vdisp->u.jsdisp); -} - -static inline EnumeratorInstance *enumerator_this(vdisp_t *jsthis) -{ - return is_vclass(jsthis, JSCLASS_ENUMERATOR) ? enumerator_from_vdisp(jsthis) : NULL; + jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL; + return (jsdisp && is_class(jsdisp, JSCLASS_ENUMERATOR)) ? enumerator_from_jsdisp(jsdisp) : NULL; } static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This) @@ -92,12 +88,12 @@ static void Enumerator_destructor(jsdisp_t *dispex) heap_free(dispex); } -static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_atEnd(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { EnumeratorInstance *This; - if (!(This = enumerator_this(jsthis))) + if (!(This = enumerator_this(vthis))) return JS_E_ENUMERATOR_EXPECTED; TRACE("%d\n", This->atend); @@ -107,20 +103,20 @@ static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } -static HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_item(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { EnumeratorInstance *This; TRACE("\n"); - if (!(This = enumerator_this(jsthis))) + if (!(This = enumerator_this(vthis))) return JS_E_ENUMERATOR_EXPECTED; return r ? jsval_copy(This->item, r) : S_OK; } -static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { EnumeratorInstance *This; @@ -128,7 +124,7 @@ static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla TRACE("\n"); - if (!(This = enumerator_this(jsthis))) + if (!(This = enumerator_this(vthis))) return JS_E_ENUMERATOR_EXPECTED; if (This->enumvar) @@ -148,7 +144,7 @@ static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla return S_OK; } -static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_moveNext(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { EnumeratorInstance *This; @@ -156,7 +152,7 @@ static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag TRACE("\n"); - if (!(This = enumerator_this(jsthis))) + if (!(This = enumerator_this(vthis))) return JS_E_ENUMERATOR_EXPECTED; if (This->enumvar) @@ -287,7 +283,7 @@ static HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **re return S_OK; } -static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 26f41fd..6f17699 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -29,17 +29,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); /* ECMA-262 3rd Edition 15.11.4.4 */ -static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, +static HRESULT Error_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - jsdisp_t *jsthis; jsstr_t *name = NULL, *msg = NULL, *ret = NULL; + jsdisp_t *jsthis = NULL; jsval_t v; HRESULT hres; TRACE("\n"); - jsthis = get_jsdisp(vthis); + if(is_object_instance(vthis)) + jsthis = to_jsdisp(get_object(vthis)); + else if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5) + return JS_E_OBJECT_EXPECTED; + if(!jsthis || ctx->version < 2) { if(r) { jsstr_t *str; @@ -114,7 +118,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, return S_OK; } -static HRESULT Error_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT Error_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); @@ -260,56 +264,56 @@ static HRESULT error_constr(script_ctx_t *ctx, WORD flags, unsigned argc, jsval_ } } -static HRESULT ErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT ErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); return error_constr(ctx, flags, argc, argv, r, ctx->error_constr); } -static HRESULT EvalErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT EvalErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); return error_constr(ctx, flags, argc, argv, r, ctx->eval_error_constr); } -static HRESULT RangeErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT RangeErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); return error_constr(ctx, flags, argc, argv, r, ctx->range_error_constr); } -static HRESULT ReferenceErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT ReferenceErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); return error_constr(ctx, flags, argc, argv, r, ctx->reference_error_constr); } -static HRESULT RegExpErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT RegExpErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); return error_constr(ctx, flags, argc, argv, r, ctx->regexp_error_constr); } -static HRESULT SyntaxErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT SyntaxErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); return error_constr(ctx, flags, argc, argv, r, ctx->syntax_error_constr); } -static HRESULT TypeErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT TypeErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); return error_constr(ctx, flags, argc, argv, r, ctx->type_error_constr); } -static HRESULT URIErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT URIErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index f24d539..fd1380d 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -77,14 +77,10 @@ static inline FunctionInstance *function_from_jsdisp(jsdisp_t *jsdisp) return CONTAINING_RECORD(jsdisp, FunctionInstance, dispex); } -static inline FunctionInstance *function_from_vdisp(vdisp_t *vdisp) +static inline FunctionInstance *function_this(jsval_t vthis) { - return function_from_jsdisp(vdisp->u.jsdisp); -} - -static inline FunctionInstance *function_this(vdisp_t *jsthis) -{ - return is_vclass(jsthis, JSCLASS_FUNCTION) ? function_from_vdisp(jsthis) : NULL; + jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL; + return (jsdisp && is_class(jsdisp, JSCLASS_FUNCTION)) ? function_from_jsdisp(jsdisp) : NULL; } static inline ArgumentsInstance *arguments_from_jsdisp(jsdisp_t *jsdisp) @@ -92,7 +88,7 @@ static inline ArgumentsInstance *arguments_from_jsdisp(jsdisp_t *jsdisp) return CONTAINING_RECORD(jsdisp, ArgumentsInstance, jsdisp); } -static HRESULT Arguments_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Arguments_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FIXME("\n"); @@ -271,7 +267,7 @@ static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return S_OK; } -static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Function_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FunctionInstance *function; @@ -280,7 +276,7 @@ static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, TRACE("\n"); - if(!(function = function_this(jsthis))) + if(!(function = function_this(vthis))) return JS_E_FUNCTION_EXPECTED; hres = function->vtbl->toString(function, &str); @@ -330,7 +326,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, unsigned *a return S_OK; } -static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Function_apply(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FunctionInstance *function; jsval_t *args = NULL; @@ -340,7 +336,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un TRACE("\n"); - if(!(function = function_this(jsthis)) && (jsthis->flags & VDISP_JSDISP)) + if(!is_object_instance(vthis) || (!(function = function_this(vthis)) && to_jsdisp(get_object(vthis)))) return JS_E_FUNCTION_EXPECTED; if(argc) { @@ -377,7 +373,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un hres = function->vtbl->call(ctx, function, this_obj, flags, cnt, args, r); }else { jsval_t res; - hres = disp_call_value(ctx, jsthis->u.disp, this_obj, DISPATCH_METHOD, cnt, args, &res); + hres = disp_call_value(ctx, get_object(vthis), this_obj, DISPATCH_METHOD, cnt, args, &res); if(SUCCEEDED(hres)) { if(r) *r = res; @@ -395,7 +391,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un return hres; } -static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Function_call(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FunctionInstance *function; @@ -405,7 +401,7 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns TRACE("\n"); - if(!(function = function_this(jsthis))) + if(!(function = function_this(vthis))) return JS_E_FUNCTION_EXPECTED; if(argc) { @@ -425,7 +421,7 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return hres; } -static HRESULT Function_bind(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Function_bind(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { IDispatch *bound_this = NULL; @@ -435,7 +431,7 @@ static HRESULT Function_bind(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns TRACE("\n"); - if(!(function = function_this(jsthis))) + if(!(function = function_this(vthis))) return JS_E_FUNCTION_EXPECTED; if(argc < 1) { @@ -461,19 +457,18 @@ static HRESULT Function_bind(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return S_OK; } -HRESULT Function_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +HRESULT Function_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FunctionInstance *function; TRACE("\n"); - if(!is_vclass(jsthis, JSCLASS_FUNCTION)) { + if(!(function = function_this(vthis))) { ERR("dispex is not a function\n"); return E_FAIL; } - function = function_from_jsdisp(jsthis->u.jsdisp); return function->vtbl->call(ctx, function, NULL, flags, argc, argv, r); } @@ -599,18 +594,14 @@ static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, ID unsigned argc, jsval_t *argv, jsval_t *r) { NativeFunction *function = (NativeFunction*)func; - vdisp_t vthis; - HRESULT hres; + jsval_t vthis; if(this_disp) - set_disp(&vthis, this_disp); + vthis = jsval_disp(this_disp); else - set_disp(&vthis, lookup_global_host(ctx)); - - hres = function->proc(ctx, &vthis, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r); + vthis = jsval_disp(lookup_global_host(ctx)); - vdisp_release(&vthis); - return hres; + return function->proc(ctx, vthis, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r); } static HRESULT NativeFunction_toString(FunctionInstance *func, jsstr_t **ret) @@ -984,7 +975,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg return S_OK; } -static HRESULT FunctionConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT FunctionConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { HRESULT hres; @@ -1011,7 +1002,7 @@ static HRESULT FunctionConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla return S_OK; } -static HRESULT FunctionProt_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT FunctionProt_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FIXME("\n"); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index d425c88..b9e3d89 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -65,7 +65,7 @@ static WCHAR int_to_char(int i) return 'A'+i-10; } -static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_escape(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsstr_t *ret_str, *str; @@ -130,7 +130,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } /* ECMA-262 3rd Edition 15.1.2.1 */ -HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +HRESULT JSGlobal_eval(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { call_frame_t *frame = ctx->call_ctx; @@ -174,7 +174,7 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a return hres; } -static HRESULT JSGlobal_isNaN(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_isNaN(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { BOOL ret = TRUE; @@ -197,7 +197,7 @@ static HRESULT JSGlobal_isNaN(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un return S_OK; } -static HRESULT JSGlobal_isFinite(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_isFinite(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { BOOL ret = FALSE; @@ -231,7 +231,7 @@ static INT char_to_int(WCHAR c) return 100; } -static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { BOOL neg = FALSE, empty = TRUE; @@ -314,7 +314,7 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } -static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { LONGLONG d = 0, hlp; @@ -421,7 +421,7 @@ static inline int hex_to_int(const WCHAR wch) { return -1; } -static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_unescape(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsstr_t *ret_str, *str; @@ -491,14 +491,14 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } -static HRESULT JSGlobal_GetObject(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_GetObject(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT JSGlobal_ScriptEngine(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_ScriptEngine(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); @@ -516,7 +516,7 @@ static HRESULT JSGlobal_ScriptEngine(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return S_OK; } -static HRESULT JSGlobal_ScriptEngineMajorVersion(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_ScriptEngineMajorVersion(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); @@ -526,7 +526,7 @@ static HRESULT JSGlobal_ScriptEngineMajorVersion(script_ctx_t *ctx, vdisp_t *jst return S_OK; } -static HRESULT JSGlobal_ScriptEngineMinorVersion(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_ScriptEngineMinorVersion(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); @@ -536,7 +536,7 @@ static HRESULT JSGlobal_ScriptEngineMinorVersion(script_ctx_t *ctx, vdisp_t *jst return S_OK; } -static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); @@ -546,7 +546,7 @@ static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, vdisp_t *jst return S_OK; } -static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { static int once = 0; @@ -555,7 +555,7 @@ static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, vdisp_t *jsthis, WORD return S_OK; } -static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { const WCHAR *ptr, *uri; @@ -620,7 +620,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } -static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { const WCHAR *ptr, *uri; @@ -706,7 +706,7 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } -static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsstr_t *str, *ret_str; @@ -770,7 +770,7 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W } /* ECMA-262 3rd Edition 15.1.3.2 */ -static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { const WCHAR *ptr, *uri; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 8ca2ea9..41b6c01 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -138,71 +138,7 @@ typedef enum { jsdisp_t *iface_to_jsdisp(IDispatch*) DECLSPEC_HIDDEN; -typedef struct { - union { - IDispatch *disp; - IDispatchEx *dispex; - jsdisp_t *jsdisp; - } u; - DWORD flags; -} vdisp_t; - -#define VDISP_DISPEX 0x0001 -#define VDISP_JSDISP 0x0002 - -static inline void vdisp_release(vdisp_t *vdisp) -{ - IDispatch_Release(vdisp->u.disp); -} - -static inline BOOL is_jsdisp(vdisp_t *vdisp) -{ - return (vdisp->flags & VDISP_JSDISP) != 0; -} - -static inline BOOL is_dispex(vdisp_t *vdisp) -{ - return (vdisp->flags & VDISP_DISPEX) != 0; -} - -static inline void set_jsdisp(vdisp_t *vdisp, jsdisp_t *jsdisp) -{ - vdisp->u.jsdisp = jsdisp; - vdisp->flags = VDISP_JSDISP | VDISP_DISPEX; - IDispatch_AddRef(vdisp->u.disp); -} - -static inline void set_disp(vdisp_t *vdisp, IDispatch *disp) -{ - IDispatchEx *dispex; - jsdisp_t *jsdisp; - HRESULT hres; - - jsdisp = iface_to_jsdisp(disp); - if(jsdisp) { - vdisp->u.jsdisp = jsdisp; - vdisp->flags = VDISP_JSDISP | VDISP_DISPEX; - return; - } - - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - vdisp->u.dispex = dispex; - vdisp->flags = VDISP_DISPEX; - return; - } - - IDispatch_AddRef(disp); - vdisp->u.disp = disp; - vdisp->flags = 0; -} - -static inline jsdisp_t *get_jsdisp(vdisp_t *vdisp) -{ - return is_jsdisp(vdisp) ? vdisp->u.jsdisp : NULL; -} - -typedef HRESULT (*builtin_invoke_t)(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*); +typedef HRESULT (*builtin_invoke_t)(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*); typedef HRESULT (*builtin_getter_t)(script_ctx_t*,jsdisp_t*,jsval_t*); typedef HRESULT (*builtin_setter_t)(script_ctx_t*,jsdisp_t*,jsval_t); @@ -337,7 +273,7 @@ HRESULT create_builtin_constructor(script_ctx_t*,builtin_invoke_t,const WCHAR*,c jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT Function_invoke(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT Function_value(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT Function_value(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN; @@ -514,18 +450,13 @@ HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,jsstr_t*,jsval_t*) DECLSPEC_ BOOL bool_obj_value(jsdisp_t*) DECLSPEC_HIDDEN; unsigned array_get_length(jsdisp_t*) DECLSPEC_HIDDEN; -HRESULT JSGlobal_eval(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT JSGlobal_eval(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; static inline BOOL is_class(jsdisp_t *jsdisp, jsclass_t class) { return jsdisp->builtin_info->class == class; } -static inline BOOL is_vclass(vdisp_t *vdisp, jsclass_t class) -{ - return is_jsdisp(vdisp) && is_class(vdisp->u.jsdisp, class); -} - static inline BOOL is_int32(double d) { return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d; diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index d3896ca..e0867eb 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -268,7 +268,7 @@ static HRESULT parse_json_value(json_parse_ctx_t *ctx, jsval_t *r) } /* ECMA-262 5.1 Edition 15.12.2 */ -static HRESULT JSON_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT JSON_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { json_parse_ctx_t parse_ctx; const WCHAR *buf; @@ -749,7 +749,7 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *na } /* ECMA-262 5.1 Edition 15.12.3 */ -static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT JSON_stringify(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { stringify_ctx_t stringify_ctx = { ctx }; jsdisp_t *obj = NULL, *replacer; diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 90663d3..15ebb11 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -39,9 +39,10 @@ static inline RegExpInstance *regexp_from_jsdisp(jsdisp_t *jsdisp) return CONTAINING_RECORD(jsdisp, RegExpInstance, dispex); } -static inline RegExpInstance *regexp_from_vdisp(vdisp_t *vdisp) +static inline RegExpInstance *regexp_this(jsval_t vthis) { - return regexp_from_jsdisp(vdisp->u.jsdisp); + jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL; + return (jsdisp && is_class(jsdisp, JSCLASS_REGEXP)) ? regexp_from_jsdisp(jsdisp) : NULL; } static void set_last_index(RegExpInstance *This, DWORD last_index) @@ -294,7 +295,7 @@ static HRESULT RegExp_set_lastIndex(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return S_OK; } -static HRESULT RegExp_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT RegExp_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { RegExpInstance *regexp; @@ -304,12 +305,11 @@ static HRESULT RegExp_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u TRACE("\n"); - if(!is_vclass(jsthis, JSCLASS_REGEXP)) { + if(!(regexp = regexp_this(vthis))) { WARN("Not a RegExp\n"); return JS_E_REGEXP_EXPECTED; } - regexp = regexp_from_vdisp(jsthis); if(!r) return S_OK; @@ -408,7 +408,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input_str, return S_OK; } -static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, +static HRESULT run_exec(script_ctx_t *ctx, jsval_t vthis, jsval_t arg, jsstr_t **input, match_state_t **result, BOOL *ret) { RegExpInstance *regexp; @@ -418,13 +418,11 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsstr_t *jsstr; HRESULT hres; - if(!is_vclass(jsthis, JSCLASS_REGEXP)) { - FIXME("Not a RegExp\n"); - return E_NOTIMPL; + if(!(regexp = regexp_this(vthis))) { + WARN("Not a RegExp\n"); + return JS_E_REGEXP_EXPECTED; } - regexp = regexp_from_vdisp(jsthis); - hres = to_flat_string(ctx, arg, &jsstr, &string); if(FAILED(hres)) return hres; @@ -463,7 +461,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, return S_OK; } -static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT RegExp_exec(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { match_state_t *match; @@ -476,7 +474,7 @@ static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig mark = heap_pool_mark(&ctx->tmp_heap); - hres = run_exec(ctx, jsthis, argc ? argv[0] : jsval_string(jsstr_empty()), &string, &match, &b); + hres = run_exec(ctx, vthis, argc ? argv[0] : jsval_string(jsstr_empty()), &string, &match, &b); if(FAILED(hres)) { heap_pool_clear(mark); return hres; @@ -499,7 +497,7 @@ static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig return hres; } -static HRESULT RegExp_test(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT RegExp_test(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { match_state_t *match; @@ -511,7 +509,7 @@ static HRESULT RegExp_test(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig TRACE("\n"); mark = heap_pool_mark(&ctx->tmp_heap); - hres = run_exec(ctx, jsthis, argc ? argv[0] : jsval_string(undef_str = jsstr_undefined()), NULL, &match, &b); + hres = run_exec(ctx, vthis, argc ? argv[0] : jsval_string(undef_str = jsstr_undefined()), NULL, &match, &b); heap_pool_clear(mark); if(!argc) jsstr_release(undef_str); @@ -523,7 +521,7 @@ static HRESULT RegExp_test(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig return S_OK; } -static HRESULT RegExp_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT RegExp_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); @@ -886,7 +884,7 @@ static HRESULT RegExpConstr_get_rightContext(script_ctx_t *ctx, jsdisp_t *jsthis return S_OK; } -static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT RegExpConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index c65bbaf..46dd58c 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); /* ECMA-262 3rd Edition 15.8.2.12 */ -static HRESULT Math_abs(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_abs(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double d; @@ -52,7 +52,7 @@ static HRESULT Math_abs(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return S_OK; } -static HRESULT Math_acos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_acos(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; @@ -75,7 +75,7 @@ static HRESULT Math_acos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne return S_OK; } -static HRESULT Math_asin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_asin(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; @@ -98,7 +98,7 @@ static HRESULT Math_asin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne return S_OK; } -static HRESULT Math_atan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_atan(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; @@ -121,7 +121,7 @@ static HRESULT Math_atan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne return S_OK; } -static HRESULT Math_atan2(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_atan2(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x, y; @@ -149,7 +149,7 @@ static HRESULT Math_atan2(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign } /* ECMA-262 3rd Edition 15.8.2.6 */ -static HRESULT Math_ceil(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_ceil(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; @@ -172,7 +172,7 @@ static HRESULT Math_ceil(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne return S_OK; } -static HRESULT Math_cos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_cos(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; @@ -195,7 +195,7 @@ static HRESULT Math_cos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return S_OK; } -static HRESULT Math_exp(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_exp(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; @@ -218,7 +218,7 @@ static HRESULT Math_exp(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return S_OK; } -static HRESULT Math_floor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_floor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; @@ -241,7 +241,7 @@ static HRESULT Math_floor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign return S_OK; } -static HRESULT Math_log(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_log(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; @@ -265,7 +265,7 @@ static HRESULT Math_log(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned } /* ECMA-262 3rd Edition 15.8.2.11 */ -static HRESULT Math_max(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_max(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DOUBLE max, d; @@ -299,7 +299,7 @@ static HRESULT Math_max(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned } /* ECMA-262 3rd Edition 15.8.2.12 */ -static HRESULT Math_min(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_min(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { DOUBLE min, d; @@ -333,7 +333,7 @@ static HRESULT Math_min(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned } /* ECMA-262 3rd Edition 15.8.2.13 */ -static HRESULT Math_pow(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_pow(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x, y; @@ -361,7 +361,7 @@ static HRESULT Math_pow(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned } /* ECMA-262 3rd Edition 15.8.2.14 */ -static HRESULT Math_random(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_random(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { UINT x; @@ -377,7 +377,7 @@ static HRESULT Math_random(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig } /* ECMA-262 3rd Edition 15.8.2.15 */ -static HRESULT Math_round(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_round(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; @@ -400,7 +400,7 @@ static HRESULT Math_round(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign return S_OK; } -static HRESULT Math_sin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_sin(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; @@ -423,7 +423,7 @@ static HRESULT Math_sin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return S_OK; } -static HRESULT Math_sqrt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_sqrt(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; @@ -446,7 +446,7 @@ static HRESULT Math_sqrt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne return S_OK; } -static HRESULT Math_tan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Math_tan(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double x; diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 410f27b..472acd0 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -39,14 +39,16 @@ static inline NumberInstance *number_from_jsdisp(jsdisp_t *jsdisp) return CONTAINING_RECORD(jsdisp, NumberInstance, dispex); } -static inline NumberInstance *number_from_vdisp(vdisp_t *vdisp) +static inline HRESULT numberval_this(jsval_t vthis, DOUBLE *ret) { - return number_from_jsdisp(vdisp->u.jsdisp); -} - -static inline NumberInstance *number_this(vdisp_t *jsthis) -{ - return is_vclass(jsthis, JSCLASS_NUMBER) ? number_from_vdisp(jsthis) : NULL; + jsdisp_t *jsdisp; + if(is_number(vthis)) + *ret = get_number(vthis); + else if(is_object_instance(vthis) && (jsdisp = to_jsdisp(get_object(vthis))) && is_class(jsdisp, JSCLASS_NUMBER)) + *ret = number_from_jsdisp(jsdisp)->value; + else + return JS_E_NUMBER_EXPECTED; + return S_OK; } static inline void number_to_str(double d, WCHAR *buf, int size, int *dec_point) @@ -222,10 +224,9 @@ static inline jsstr_t *number_to_exponential(double val, int prec) } /* ECMA-262 3rd Edition 15.7.4.2 */ -static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Number_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - NumberInstance *number; INT radix = 10; DOUBLE val; jsstr_t *str; @@ -233,8 +234,9 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u TRACE("\n"); - if(!(number = number_this(jsthis))) - return JS_E_NUMBER_EXPECTED; + hres = numberval_this(vthis, &val); + if(FAILED(hres)) + return hres; if(argc) { hres = to_int32(ctx, argv[0], &radix); @@ -245,8 +247,6 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u return JS_E_INVALIDARG; } - val = number->value; - if(radix==10 || !isfinite(val)) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) @@ -341,17 +341,16 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u return S_OK; } -static HRESULT Number_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Number_toLocaleString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Number_toFixed(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - NumberInstance *number; DOUBLE val; INT prec = 0; jsstr_t *str; @@ -359,8 +358,9 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un TRACE("\n"); - if(!(number = number_this(jsthis))) - return JS_E_NUMBER_EXPECTED; + hres = numberval_this(vthis, &val); + if(FAILED(hres)) + return hres; if(argc) { hres = to_int32(ctx, argv[0], &prec); @@ -371,7 +371,6 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un return JS_E_FRACTION_DIGITS_OUT_OF_RANGE; } - val = number->value; if(!isfinite(val)) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) @@ -389,10 +388,9 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un return S_OK; } -static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Number_toExponential(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - NumberInstance *number; DOUBLE val; INT prec = 0; jsstr_t *str; @@ -400,8 +398,9 @@ static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla TRACE("\n"); - if(!(number = number_this(jsthis))) - return JS_E_NUMBER_EXPECTED; + hres = numberval_this(vthis, &val); + if(FAILED(hres)) + return hres; if(argc) { hres = to_int32(ctx, argv[0], &prec); @@ -412,7 +411,6 @@ static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla return JS_E_FRACTION_DIGITS_OUT_OF_RANGE; } - val = number->value; if(!isfinite(val)) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) @@ -432,17 +430,17 @@ static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla return S_OK; } -static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Number_toPrecision(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - NumberInstance *number; INT prec = 0, size; jsstr_t *str; DOUBLE val; HRESULT hres; - if(!(number = number_this(jsthis))) - return JS_E_NUMBER_EXPECTED; + hres = numberval_this(vthis, &val); + if(FAILED(hres)) + return hres; if(argc) { hres = to_int32(ctx, argv[0], &prec); @@ -453,7 +451,6 @@ static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return JS_E_PRECISION_OUT_OF_RANGE; } - val = number->value; if(!isfinite(val) || !prec) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) @@ -479,18 +476,20 @@ static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } -static HRESULT Number_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Number_valueOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - NumberInstance *number; + HRESULT hres; + DOUBLE val; TRACE("\n"); - if(!(number = number_this(jsthis))) - return JS_E_NUMBER_EXPECTED; + hres = numberval_this(vthis, &val); + if(FAILED(hres)) + return hres; if(r) - *r = jsval_number(number->value); + *r = jsval_number(val); return S_OK; } @@ -520,7 +519,7 @@ static const builtin_info_t NumberInst_info = { NULL }; -static HRESULT NumberConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT NumberConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { double n; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 24692f8..3b5a1f8 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -24,11 +24,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsdisp; const WCHAR *str; + IDispatch *disp; + HRESULT hres; /* Keep in sync with jsclass_t enum */ static const WCHAR *names[] = { @@ -54,7 +56,16 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u TRACE("\n"); - jsdisp = get_jsdisp(jsthis); + if(is_undefined(vthis) || is_null(vthis)) { + str = L"[object Object]"; + goto set_output; + } + + hres = to_object(ctx, vthis, &disp); + if(FAILED(hres)) + return hres; + + jsdisp = to_jsdisp(disp); if(!jsdisp) { str = L"[object Object]"; }else if(names[jsdisp->builtin_info->class]) { @@ -62,9 +73,13 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u }else { assert(jsdisp->builtin_info->class != JSCLASS_NONE); FIXME("jsdisp->builtin_info->class = %d\n", jsdisp->builtin_info->class); - return E_FAIL; + hres = E_FAIL; } + IDispatch_Release(disp); + if(FAILED(hres)) + return hres; +set_output: if(r) { jsstr_t *ret; ret = jsstr_alloc(str); @@ -76,34 +91,56 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u return S_OK; } -static HRESULT Object_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Object_toLocaleString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + jsdisp_t *jsdisp; + IDispatch *disp; + HRESULT hres; + TRACE("\n"); - if(!is_jsdisp(jsthis)) { + hres = to_object(ctx, vthis, &disp); + if(FAILED(hres)) + return hres; + + if(!(jsdisp = to_jsdisp(disp))) { FIXME("Host object this\n"); - return E_FAIL; + hres = E_FAIL; + goto done; } - return jsdisp_call_name(jsthis->u.jsdisp, L"toString", DISPATCH_METHOD, 0, NULL, r); + hres = jsdisp_call_name(jsdisp, L"toString", DISPATCH_METHOD, 0, NULL, r); +done: + IDispatch_Release(disp); + return hres; } -static HRESULT Object_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Object_valueOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + IDispatch *disp; + HRESULT hres; + TRACE("\n"); - if(r) { - IDispatch_AddRef(jsthis->u.disp); - *r = jsval_disp(jsthis->u.disp); - } + hres = to_object(ctx, vthis, &disp); + if(FAILED(hres)) + return hres; + + if(r) + *r = jsval_disp(disp); + else + IDispatch_Release(disp); return S_OK; } -static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + IDispatchEx *dispex; + jsdisp_t *jsdisp; + IDispatch *disp; jsstr_t *name; DISPID id; BSTR bstr; @@ -111,33 +148,39 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl TRACE("\n"); + hres = to_object(ctx, vthis, &disp); + if(FAILED(hres)) + return hres; + if(!argc) { if(r) *r = jsval_bool(FALSE); - return S_OK; + goto done; } hres = to_string(ctx, argv[0], &name); if(FAILED(hres)) - return hres; + goto done; - if(is_jsdisp(jsthis)) { + if((jsdisp = to_jsdisp(disp))) { property_desc_t prop_desc; const WCHAR *name_str; name_str = jsstr_flatten(name); if(!name_str) { jsstr_release(name); - return E_OUTOFMEMORY; + hres = E_OUTOFMEMORY; + goto done; } - hres = jsdisp_get_own_property(jsthis->u.jsdisp, name_str, TRUE, &prop_desc); + hres = jsdisp_get_own_property(jsdisp, name_str, TRUE, &prop_desc); jsstr_release(name); if(FAILED(hres) && hres != DISP_E_UNKNOWNNAME) - return hres; + goto done; if(r) *r = jsval_bool(hres == S_OK); - return S_OK; + hres = S_OK; + goto done; } @@ -145,66 +188,91 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl if(bstr) jsstr_flush(name, bstr); jsstr_release(name); - if(!bstr) - return E_OUTOFMEMORY; - - if(is_dispex(jsthis)) - hres = IDispatchEx_GetDispID(jsthis->u.dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive), &id); - else - hres = IDispatch_GetIDsOfNames(jsthis->u.disp, &IID_NULL, &bstr, 1, ctx->lcid, &id); + if(!bstr) { + hres = E_OUTOFMEMORY; + goto done; + } + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_GetDispID(dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive), &id); + IDispatchEx_Release(dispex); + }else { + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &bstr, 1, ctx->lcid, &id); + } SysFreeString(bstr); if(r) *r = jsval_bool(SUCCEEDED(hres)); - return S_OK; + hres = S_OK; +done: + IDispatch_Release(disp); + return hres; } -static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { property_desc_t prop_desc; const WCHAR *name; jsstr_t *name_str; + jsdisp_t *jsdisp; + IDispatch *disp; HRESULT hres; TRACE("\n"); + hres = to_object(ctx, vthis, &disp); + if(FAILED(hres)) + return hres; + if(argc != 1) { FIXME("argc %d not supported\n", argc); - return E_NOTIMPL; + hres = E_NOTIMPL; + goto done; } - if(!is_jsdisp(jsthis)) { + if(!(jsdisp = to_jsdisp(disp))) { FIXME("Host object this\n"); - return E_FAIL; + hres = E_FAIL; + goto done; } hres = to_flat_string(ctx, argv[0], &name_str, &name); if(FAILED(hres)) - return hres; + goto done; - hres = jsdisp_get_own_property(jsthis->u.jsdisp, name, TRUE, &prop_desc); + hres = jsdisp_get_own_property(jsdisp, name, TRUE, &prop_desc); jsstr_release(name_str); if(FAILED(hres) && hres != DISP_E_UNKNOWNNAME) - return hres; + goto done; if(r) *r = jsval_bool(hres == S_OK && (prop_desc.flags & PROPF_ENUMERABLE) != 0); - return S_OK; + hres = S_OK; +done: + IDispatch_Release(disp); + return hres; } -static HRESULT Object_isPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Object_isPrototypeOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - jsdisp_t *jsdisp; + jsdisp_t *jsthis, *jsdisp; + IDispatch *disp; BOOL ret = FALSE; + HRESULT hres; + + hres = to_object(ctx, vthis, &disp); + if(FAILED(hres)) + return hres; if(!r) - return S_OK; + goto done; - if(argc && is_jsdisp(jsthis) && is_object_instance(argv[0]) && (jsdisp = to_jsdisp(get_object(argv[0])))) { + if(argc && (jsthis = to_jsdisp(disp)) && is_object_instance(argv[0]) && + (jsdisp = to_jsdisp(get_object(argv[0])))) { while(jsdisp->prototype) { - if(jsdisp->prototype == jsthis->u.jsdisp) { + if(jsdisp->prototype == jsthis) { ret = TRUE; break; } @@ -213,7 +281,9 @@ static HRESULT Object_isPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla } *r = jsval_bool(ret); - return S_OK; +done: + IDispatch_Release(disp); + return hres; } static HRESULT Object_get_proto_(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) @@ -466,7 +536,7 @@ static HRESULT jsdisp_define_properties(script_ctx_t *ctx, jsdisp_t *obj, jsval_ return FAILED(hres) ? hres : S_OK; } -static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT Object_defineProperty(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { property_desc_t prop_desc; @@ -515,7 +585,7 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return hres; } -static HRESULT Object_defineProperties(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT Object_defineProperties(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; @@ -534,7 +604,7 @@ static HRESULT Object_defineProperties(script_ctx_t *ctx, vdisp_t *jsthis, WORD return hres; } -static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { property_desc_t prop_desc; @@ -597,7 +667,7 @@ static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthi return hres; } -static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT Object_create(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *proto = NULL, *obj; @@ -636,7 +706,7 @@ static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; } -static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; @@ -704,7 +774,7 @@ static HRESULT object_keys(script_ctx_t *ctx, jsval_t arg, enum jsdisp_enum_type return hres; } -static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT Object_keys(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsval_t arg = argc ? argv[0] : jsval_undefined(); @@ -714,7 +784,7 @@ static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return object_keys(ctx, arg, JSDISP_ENUM_OWN_ENUMERABLE, r); } -static HRESULT Object_getOwnPropertyNames(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT Object_getOwnPropertyNames(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsval_t arg = argc ? argv[0] : jsval_undefined(); @@ -724,7 +794,7 @@ static HRESULT Object_getOwnPropertyNames(script_ctx_t *ctx, vdisp_t *jsthis, WO return object_keys(ctx, arg, JSDISP_ENUM_OWN, r); } -static HRESULT Object_preventExtensions(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Object_preventExtensions(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; @@ -746,7 +816,7 @@ static HRESULT Object_preventExtensions(script_ctx_t *ctx, vdisp_t *jsthis, WORD return S_OK; } -static HRESULT Object_freeze(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, +static HRESULT Object_freeze(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; @@ -769,7 +839,7 @@ static HRESULT Object_freeze(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return S_OK; } -static HRESULT Object_seal(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, +static HRESULT Object_seal(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; @@ -792,7 +862,7 @@ static HRESULT Object_seal(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig return S_OK; } -static HRESULT Object_isExtensible(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT Object_isExtensible(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; @@ -813,7 +883,7 @@ static HRESULT Object_isExtensible(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return S_OK; } -static HRESULT Object_isFrozen(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, +static HRESULT Object_isFrozen(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; @@ -835,7 +905,7 @@ static HRESULT Object_isFrozen(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u return S_OK; } -static HRESULT Object_isSealed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, +static HRESULT Object_isSealed(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; @@ -882,7 +952,7 @@ static const builtin_info_t ObjectConstr_info = { NULL }; -static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT ObjectConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { HRESULT hres; diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 5ae41d8..35edcf8 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -37,42 +37,42 @@ typedef struct { size_t size; } MapInstance; -static HRESULT Set_add(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Set_add(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); + FIXME("%p\n", debugstr_jsval(vthis)); return E_NOTIMPL; } -static HRESULT Set_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); + FIXME("%p\n", debugstr_jsval(vthis)); return E_NOTIMPL; } -static HRESULT Set_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Set_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); + FIXME("%p\n", debugstr_jsval(vthis)); return E_NOTIMPL; } -static HRESULT Set_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Set_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); + FIXME("%p\n", debugstr_jsval(vthis)); return E_NOTIMPL; } -static HRESULT Set_has(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Set_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); + FIXME("%p\n", debugstr_jsval(vthis)); return E_NOTIMPL; } -static HRESULT Set_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Set_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FIXME("\n"); @@ -104,7 +104,7 @@ static const builtin_info_t Set_info = { NULL }; -static HRESULT Set_constructor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { SetInstance *set; @@ -176,14 +176,19 @@ static int jsval_map_compare(const void *k, const struct wine_rb_entry *e) } } -static MapInstance *get_map_this(vdisp_t *jsthis) +static HRESULT get_map_this(jsval_t vthis, MapInstance **ret) { - if(!(jsthis->flags & VDISP_JSDISP) || !is_class(jsthis->u.jsdisp, JSCLASS_MAP)) { + jsdisp_t *jsdisp; + + if(!is_object_instance(vthis)) + return JS_E_OBJECT_EXPECTED; + if(!(jsdisp = to_jsdisp(get_object(vthis))) || !is_class(jsdisp, JSCLASS_MAP)) { WARN("not a Map object passed as 'this'\n"); - return NULL; + return JS_E_MAP_EXPECTED; } - return CONTAINING_RECORD(jsthis->u.jsdisp, MapInstance, dispex); + *ret = CONTAINING_RECORD(jsdisp, MapInstance, dispex); + return S_OK; } static struct jsval_map_entry *get_map_entry(MapInstance *map, jsval_t key) @@ -215,12 +220,15 @@ static void delete_map_entry(MapInstance *map, struct jsval_map_entry *entry) release_map_entry(entry); } -static HRESULT Map_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { MapInstance *map; + HRESULT hres; - if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + hres = get_map_this(vthis, &map); + if(FAILED(hres)) + return hres; TRACE("%p\n", map); @@ -233,14 +241,17 @@ static HRESULT Map_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne return S_OK; } -static HRESULT Map_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Map_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); struct jsval_map_entry *entry; MapInstance *map; + HRESULT hres; - if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + hres = get_map_this(vthis, &map); + if(FAILED(hres)) + return hres; TRACE("%p (%s)\n", map, debugstr_jsval(key)); @@ -249,7 +260,7 @@ static HRESULT Map_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign return S_OK; } -static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Map_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsval_t callback = argc ? argv[0] : jsval_undefined(); @@ -257,7 +268,9 @@ static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig MapInstance *map; HRESULT hres; - if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + hres = get_map_this(vthis, &map); + if(FAILED(hres)) + return hres; TRACE("%p (%s)\n", map, debugstr_jsval(argc >= 1 ? argv[0] : jsval_undefined())); @@ -290,14 +303,17 @@ static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig return S_OK; } -static HRESULT Map_get(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Map_get(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); struct jsval_map_entry *entry; MapInstance *map; + HRESULT hres; - if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + hres = get_map_this(vthis, &map); + if(FAILED(hres)) + return hres; TRACE("%p (%s)\n", map, debugstr_jsval(key)); @@ -309,7 +325,7 @@ static HRESULT Map_get(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return r ? jsval_copy(entry->value, r) : S_OK; } -static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Map_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); @@ -318,7 +334,9 @@ static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned MapInstance *map; HRESULT hres; - if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + hres = get_map_this(vthis, &map); + if(FAILED(hres)) + return hres; TRACE("%p (%s %s)\n", map, debugstr_jsval(key), debugstr_jsval(value)); @@ -353,14 +371,17 @@ static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return S_OK; } -static HRESULT Map_has(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Map_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); struct jsval_map_entry *entry; MapInstance *map; + HRESULT hres; - if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + hres = get_map_this(vthis, &map); + if(FAILED(hres)) + return hres; TRACE("%p (%s)\n", map, debugstr_jsval(key)); @@ -379,7 +400,7 @@ static HRESULT Map_get_size(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) return S_OK; } -static HRESULT Map_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Map_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FIXME("\n"); @@ -430,7 +451,7 @@ static const builtin_info_t Map_info = { NULL }; -static HRESULT Map_constructor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Map_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { MapInstance *map; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 4d65d6b..0b2e695 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -36,33 +36,32 @@ static inline StringInstance *string_from_jsdisp(jsdisp_t *jsdisp) return CONTAINING_RECORD(jsdisp, StringInstance, dispex); } -static inline StringInstance *string_from_vdisp(vdisp_t *vdisp) +static inline StringInstance *string_this(jsval_t vthis) { - return string_from_jsdisp(vdisp->u.jsdisp); + jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL; + return (jsdisp && is_class(jsdisp, JSCLASS_STRING)) ? string_from_jsdisp(jsdisp) : NULL; } -static inline StringInstance *string_this(vdisp_t *jsthis) -{ - return is_vclass(jsthis, JSCLASS_STRING) ? string_from_vdisp(jsthis) : NULL; -} - -static HRESULT get_string_val(script_ctx_t *ctx, vdisp_t *jsthis, jsstr_t **val) +static HRESULT get_string_val(script_ctx_t *ctx, jsval_t vthis, jsstr_t **val) { StringInstance *string; - if((string = string_this(jsthis))) { + if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && (is_undefined(vthis) || is_null(vthis))) + return JS_E_OBJECT_EXPECTED; + + if((string = string_this(vthis))) { *val = jsstr_addref(string->str); return S_OK; } - return to_string(ctx, jsval_disp(jsthis->u.disp), val); + return to_string(ctx, vthis, val); } -static HRESULT get_string_flat_val(script_ctx_t *ctx, vdisp_t *jsthis, jsstr_t **jsval, const WCHAR **val) +static HRESULT get_string_flat_val(script_ctx_t *ctx, jsval_t vthis, jsstr_t **jsval, const WCHAR **val) { HRESULT hres; - hres = get_string_val(ctx, jsthis, jsval); + hres = get_string_val(ctx, vthis, jsval); if(FAILED(hres)) return hres; @@ -84,11 +83,11 @@ static HRESULT String_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT stringobj_to_string(vdisp_t *jsthis, jsval_t *r) +static HRESULT stringobj_to_string(jsval_t vthis, jsval_t *r) { StringInstance *string; - if(!(string = string_this(jsthis))) { + if(!(string = string_this(vthis))) { WARN("this is not a string object\n"); return E_FAIL; } @@ -99,31 +98,31 @@ static HRESULT stringobj_to_string(vdisp_t *jsthis, jsval_t *r) } /* ECMA-262 3rd Edition 15.5.4.2 */ -static HRESULT String_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); - return stringobj_to_string(jsthis, r); + return stringobj_to_string(vthis, r); } /* ECMA-262 3rd Edition 15.5.4.2 */ -static HRESULT String_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_valueOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); - return stringobj_to_string(jsthis, r); + return stringobj_to_string(vthis, r); } -static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r, const WCHAR *tagname) +static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, jsval_t vthis, jsval_t *r, const WCHAR *tagname) { unsigned tagname_len; jsstr_t *str, *ret; WCHAR *ptr; HRESULT hres; - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_val(ctx, vthis, &str); if(FAILED(hres)) return hres; @@ -158,13 +157,13 @@ static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, j return S_OK; } -static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsigned argc, jsval_t *argv, jsval_t *r, +static HRESULT do_attribute_tag_format(script_ctx_t *ctx, jsval_t vthis, unsigned argc, jsval_t *argv, jsval_t *r, const WCHAR *tagname, const WCHAR *attrname) { jsstr_t *str, *attr_value = NULL; HRESULT hres; - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_val(ctx, vthis, &str); if(FAILED(hres)) return hres; @@ -216,32 +215,32 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig return hres; } -static HRESULT String_anchor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_anchor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"A", L"NAME"); + return do_attribute_tag_format(ctx, vthis, argc, argv, r, L"A", L"NAME"); } -static HRESULT String_big(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_big(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attributeless_tag_format(ctx, jsthis, r, L"BIG"); + return do_attributeless_tag_format(ctx, vthis, r, L"BIG"); } -static HRESULT String_blink(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_blink(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attributeless_tag_format(ctx, jsthis, r, L"BLINK"); + return do_attributeless_tag_format(ctx, vthis, r, L"BLINK"); } -static HRESULT String_bold(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_bold(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attributeless_tag_format(ctx, jsthis, r, L"B"); + return do_attributeless_tag_format(ctx, vthis, r, L"B"); } /* ECMA-262 3rd Edition 15.5.4.5 */ -static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_charAt(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsstr_t *str, *ret; @@ -250,7 +249,7 @@ static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns TRACE("\n"); - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_val(ctx, vthis, &str); if(FAILED(hres)) return hres; @@ -283,7 +282,7 @@ static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } /* ECMA-262 3rd Edition 15.5.4.5 */ -static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_charCodeAt(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsstr_t *str; @@ -292,7 +291,7 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, TRACE("\n"); - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_val(ctx, vthis, &str); if(FAILED(hres)) return hres; @@ -326,7 +325,7 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } /* ECMA-262 3rd Edition 15.5.4.6 */ -static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_concat(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsstr_t *ret = NULL, *str; @@ -334,7 +333,7 @@ static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns TRACE("\n"); - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_val(ctx, vthis, &str); if(FAILED(hres)) return hres; @@ -411,25 +410,25 @@ static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return S_OK; } -static HRESULT String_fixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_fixed(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attributeless_tag_format(ctx, jsthis, r, L"TT"); + return do_attributeless_tag_format(ctx, vthis, r, L"TT"); } -static HRESULT String_fontcolor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_fontcolor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"FONT", L"COLOR"); + return do_attribute_tag_format(ctx, vthis, argc, argv, r, L"FONT", L"COLOR"); } -static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_fontsize(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"FONT", L"SIZE"); + return do_attribute_tag_format(ctx, vthis, argc, argv, r, L"FONT", L"SIZE"); } -static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_indexOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { unsigned pos = 0, search_len, length; @@ -440,7 +439,7 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un TRACE("\n"); - hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); + hres = get_string_flat_val(ctx, vthis, &jsstr, &str); if(FAILED(hres)) return hres; @@ -490,14 +489,14 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un return S_OK; } -static HRESULT String_italics(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_italics(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attributeless_tag_format(ctx, jsthis, r, L"I"); + return do_attributeless_tag_format(ctx, vthis, r, L"I"); } /* ECMA-262 3rd Edition 15.5.4.8 */ -static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_lastIndexOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { unsigned pos = 0, search_len, length; @@ -508,7 +507,7 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags TRACE("\n"); - hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); + hres = get_string_flat_val(ctx, vthis, &jsstr, &str); if(FAILED(hres)) return hres; @@ -559,14 +558,14 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } -static HRESULT String_link(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_link(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"A", L"HREF"); + return do_attribute_tag_format(ctx, vthis, argc, argv, r, L"A", L"HREF"); } /* ECMA-262 3rd Edition 15.5.4.10 */ -static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_match(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *regexp = NULL; @@ -602,7 +601,7 @@ static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi return hres; } - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_val(ctx, vthis, &str); if(SUCCEEDED(hres)) hres = regexp_string_match(ctx, regexp, str, r); @@ -718,7 +717,7 @@ static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, } /* ECMA-262 3rd Edition 15.5.4.11 */ -static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_replace(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { const WCHAR *str, *match_str = NULL, *rep_str = NULL; @@ -732,7 +731,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un TRACE("\n"); - hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); + hres = get_string_flat_val(ctx, vthis, &jsstr, &str); if(FAILED(hres)) return hres; @@ -938,7 +937,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un return hres; } -static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_search(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *regexp = NULL; @@ -949,7 +948,7 @@ static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns TRACE("\n"); - hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); + hres = get_string_flat_val(ctx, vthis, &jsstr, &str); if(FAILED(hres)) return hres; @@ -989,7 +988,7 @@ static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } /* ECMA-262 3rd Edition 15.5.4.13 */ -static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_slice(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { int start=0, end, length; @@ -999,7 +998,7 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi TRACE("\n"); - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_val(ctx, vthis, &str); if(FAILED(hres)) return hres; @@ -1065,13 +1064,13 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi return S_OK; } -static HRESULT String_small(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_small(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attributeless_tag_format(ctx, jsthis, r, L"SMALL"); + return do_attributeless_tag_format(ctx, vthis, r, L"SMALL"); } -static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_split(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { match_state_t match_result, *match_ptr = &match_result; @@ -1082,7 +1081,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi jsstr_t *jsstr, *match_jsstr, *tmp_str; HRESULT hres; - hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); + hres = get_string_flat_val(ctx, vthis, &jsstr, &str); if(FAILED(hres)) return hres; length = jsstr_length(jsstr); @@ -1231,20 +1230,20 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi return hres; } -static HRESULT String_strike(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_strike(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attributeless_tag_format(ctx, jsthis, r, L"STRIKE"); + return do_attributeless_tag_format(ctx, vthis, r, L"STRIKE"); } -static HRESULT String_sub(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_sub(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attributeless_tag_format(ctx, jsthis, r, L"SUB"); + return do_attributeless_tag_format(ctx, vthis, r, L"SUB"); } /* ECMA-262 3rd Edition 15.5.4.15 */ -static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_substring(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { INT start=0, end, length; @@ -1254,7 +1253,7 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, TRACE("\n"); - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_val(ctx, vthis, &str); if(FAILED(hres)) return hres; @@ -1303,7 +1302,7 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } /* ECMA-262 3rd Edition B.2.3 */ -static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_substr(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { int start=0, len, length; @@ -1313,7 +1312,7 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns TRACE("\n"); - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_val(ctx, vthis, &str); if(FAILED(hres)) return hres; @@ -1357,19 +1356,19 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return hres; } -static HRESULT String_sup(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_sup(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - return do_attributeless_tag_format(ctx, jsthis, r, L"SUP"); + return do_attributeless_tag_format(ctx, vthis, r, L"SUP"); } -static HRESULT to_upper_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r) +static HRESULT to_upper_case(script_ctx_t *ctx, jsval_t vthis, jsval_t *r) { jsstr_t *str; HRESULT hres; - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_val(ctx, vthis, &str); if(FAILED(hres)) return hres; @@ -1393,13 +1392,13 @@ static HRESULT to_upper_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r) return S_OK; } -static HRESULT to_lower_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r) +static HRESULT to_lower_case(script_ctx_t *ctx, jsval_t vthis, jsval_t *r) { jsstr_t *str; HRESULT hres; - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_val(ctx, vthis, &str); if(FAILED(hres)) return hres; @@ -1423,35 +1422,35 @@ static HRESULT to_lower_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r) return S_OK; } -static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_toLowerCase(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); - return to_lower_case(ctx, jsthis, r); + return to_lower_case(ctx, vthis, r); } -static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_toUpperCase(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); - return to_upper_case(ctx, jsthis, r); + return to_upper_case(ctx, vthis, r); } -static HRESULT String_toLocaleLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_toLocaleLowerCase(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); - return to_lower_case(ctx, jsthis, r); + return to_lower_case(ctx, vthis, r); } -static HRESULT String_toLocaleUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_toLocaleUpperCase(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("\n"); - return to_upper_case(ctx, jsthis, r); + return to_upper_case(ctx, vthis, r); } -static HRESULT String_trim(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, +static HRESULT String_trim(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { const WCHAR *str, *begin, *end; @@ -1459,7 +1458,10 @@ static HRESULT String_trim(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig unsigned len; HRESULT hres; - hres = to_flat_string(ctx, jsval_disp(jsthis->u.disp), &jsstr, &str); + if(is_undefined(vthis) || is_null(vthis)) + return JS_E_OBJECT_EXPECTED; + + hres = to_flat_string(ctx, vthis, &jsstr, &str); if(FAILED(hres)) { WARN("to_flat_string failed: %08lx\n", hres); return hres; @@ -1486,7 +1488,7 @@ static HRESULT String_trim(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig return hres; } -static HRESULT String_localeCompare(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT String_localeCompare(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FIXME("\n"); @@ -1592,7 +1594,7 @@ static const builtin_info_t StringInst_info = { }; /* ECMA-262 3rd Edition 15.5.3.2 */ -static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { WCHAR *ret_str; @@ -1623,7 +1625,7 @@ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WOR return S_OK; } -static HRESULT StringConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT StringConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { HRESULT hres; diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 74b9a29..881c45e 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -33,17 +33,13 @@ static inline VBArrayInstance *vbarray_from_jsdisp(jsdisp_t *jsdisp) return CONTAINING_RECORD(jsdisp, VBArrayInstance, dispex); } -static inline VBArrayInstance *vbarray_from_vdisp(vdisp_t *vdisp) +static inline VBArrayInstance *vbarray_this(jsval_t vthis) { - return vbarray_from_jsdisp(vdisp->u.jsdisp); + jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL; + return (jsdisp && is_class(jsdisp, JSCLASS_VBARRAY)) ? vbarray_from_jsdisp(jsdisp) : NULL; } -static inline VBArrayInstance *vbarray_this(vdisp_t *jsthis) -{ - return is_vclass(jsthis, JSCLASS_VBARRAY) ? vbarray_from_vdisp(jsthis) : NULL; -} - -static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT VBArray_dimensions(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { VBArrayInstance *vbarray; @@ -59,7 +55,7 @@ static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, return S_OK; } -static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT VBArray_getItem(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { VBArrayInstance *vbarray; @@ -103,7 +99,7 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un return hres; } -static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT VBArray_lbound(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { VBArrayInstance *vbarray; @@ -134,7 +130,7 @@ static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns return S_OK; } -static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT VBArray_toArray(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { VBArrayInstance *vbarray; @@ -189,7 +185,7 @@ static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un return S_OK; } -static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT VBArray_ubound(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { VBArrayInstance *vbarray; @@ -220,7 +216,7 @@ static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns return S_OK; } -static HRESULT VBArray_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT VBArray_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FIXME("\n"); @@ -282,7 +278,7 @@ static HRESULT alloc_vbarray(script_ctx_t *ctx, jsdisp_t *object_prototype, VBAr return S_OK; } -static HRESULT VBArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT VBArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { VBArrayInstance *vbarray; -- 2.34.1

4 12

[PATCH 2/2] sc: Don't silently fail when something doesn't work as expected.
by Dmitry Timoshkov 18 Mar '22

18 Mar '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/sc/sc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index bd3064da2d8..4e642874237 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -207,7 +207,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } if (!parse_create_params( argc - 3, argv + 3, &cp )) { - WINE_WARN("failed to parse create parameters\n"); + WINE_ERR("failed to parse create parameters\n"); CloseServiceHandle( manager ); return 1; } @@ -219,7 +219,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) CloseServiceHandle( service ); ret = TRUE; } - else WINE_TRACE("failed to create service %lu\n", GetLastError()); + else WINE_ERR("failed to create service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"description" )) { @@ -229,10 +229,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) SERVICE_DESCRIPTIONW sd; sd.lpDescription = argc > 3 ? (WCHAR *)argv[3] : NULL; ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_DESCRIPTION, &sd ); - if (!ret) WINE_TRACE("failed to set service description %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to set service description %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"failure" )) { @@ -247,10 +247,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); } else - WINE_WARN("failed to parse failure parameters\n"); + WINE_ERR("failed to parse failure parameters\n"); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"delete" )) { @@ -261,7 +261,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (!ret) WINE_TRACE("failed to delete service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"start" )) { @@ -272,7 +272,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"stop" )) { @@ -283,7 +283,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"sdset" )) { -- 2.35.1

1 0

[PATCH vkd3d v2] vkd3d-shader/hlsl: Correctly calculate offsets for array elements.
by Matteo Bruni 18 Mar '22

18 Mar '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Improve comment in the shader test. Makefile.am | 2 +- libs/vkd3d-shader/hlsl.c | 7 +++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 2 +- tests/hlsl-struct-array.shader_test | 19 +++++++++++++++++++ 6 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 tests/hlsl-struct-array.shader_test diff --git a/Makefile.am b/Makefile.am index 79aacfcd..f2c8440c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,6 +96,7 @@ vkd3d_shader_tests = \ tests/hlsl-state-block-syntax.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ + tests/hlsl-struct-array.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ @@ -339,7 +340,6 @@ XFAIL_TESTS = \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-mul.shader_test \ - tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ea5e35d2..d88b0b6d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -202,6 +202,13 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type } } +/* Returns the size of a type, considered as part of an array of that type. + * As such it includes padding after the type. */ +unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type) +{ + return align(type->reg_size, 4); +} + static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 243ed72b..2e8ba4af 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -783,6 +783,7 @@ bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type); struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, unsigned int default_majority, unsigned int modifiers); unsigned int hlsl_type_component_count(struct hlsl_type *type); +unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type); unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int offset); bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 92dcb3f2..521ca0a7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -607,7 +607,7 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in return NULL; } - if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size, loc))) + if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), loc))) return NULL; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, index, &c->node))) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 62dbce5e..ca3acba0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -621,7 +621,7 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, if (type->type != HLSL_CLASS_ARRAY) return false; element_type = type->e.array.type; - element_size = element_type->reg_size; + element_size = hlsl_type_get_array_element_reg_size(element_type); for (i = 0; i < type->e.array.elements_count; ++i) { diff --git a/tests/hlsl-struct-array.shader_test b/tests/hlsl-struct-array.shader_test new file mode 100644 index 00000000..a5df9cdb --- /dev/null +++ b/tests/hlsl-struct-array.shader_test @@ -0,0 +1,19 @@ +% In SM4, array elements are always aligned to the next vec4, although structs are not. + +[pixel shader] +uniform struct +{ + float p, q; +} colours[3]; + +float4 main() : sv_target +{ + return float4(colours[0].q, colours[1].p, colours[2].q, colours[2].p); +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +uniform 8 float4 0.5 0.6 0.0 0.0 +draw quad +probe all rgba (0.2, 0.3, 0.6, 0.5) -- 2.34.1

3 2

[PATCH 1/3] kernel32/tests: Add some GlobalMemoryStatusEx tests.
by Rémi Bernon 18 Mar '22

18 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 61 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index bc573050d16..f09b5eace21 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1264,6 +1264,66 @@ static void test_GlobalMemoryStatus(void) wine_dbgstr_longlong(mem.dwAvailVirtual), wine_dbgstr_longlong(memex.ullAvailVirtual)); } +static void test_GlobalMemoryStatusEx(void) +{ + char buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 16]; /* some Win 7 versions need a larger info */ + SYSTEM_PERFORMANCE_INFORMATION *perf_info = (void *)buffer; + SYSTEM_BASIC_INFORMATION basic_info; + MEMORYSTATUSEX memex = {0}, expect; + VM_COUNTERS_EX vmc; + NTSTATUS status; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = GlobalMemoryStatusEx( &memex ); + ok( !ret, "GlobalMemoryStatusEx succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + + do + { + status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL ); + ok( !status, "NtQueryInformationProcess returned %#lx\n", status ); + memex.dwLength = sizeof(MEMORYSTATUSEX); + ret = GlobalMemoryStatusEx( &memex ); + ok( ret, "GlobalMemoryStatusEx succeeded\n" ); + } while (memex.ullAvailPhys != (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize); + + ok( basic_info.PageSize, "got 0 PageSize\n" ); + ok( basic_info.MmNumberOfPhysicalPages, "got 0 MmNumberOfPhysicalPages\n" ); + ok( !!basic_info.HighestUserAddress, "got 0 HighestUserAddress\n" ); + ok( !!basic_info.LowestUserAddress, "got 0 LowestUserAddress\n" ); + ok( perf_info->TotalCommittedPages, "got 0 TotalCommittedPages\n" ); + ok( perf_info->TotalCommitLimit, "got 0 TotalCommitLimit\n" ); + ok( perf_info->AvailablePages, "got 0 AvailablePages\n" ); + + expect.dwMemoryLoad = (memex.ullTotalPhys - memex.ullAvailPhys) / (memex.ullTotalPhys / 100); + expect.ullTotalPhys = (ULONGLONG)basic_info.MmNumberOfPhysicalPages * basic_info.PageSize; + expect.ullAvailPhys = (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize; + expect.ullTotalPageFile = (ULONGLONG)perf_info->TotalCommitLimit * basic_info.PageSize; + expect.ullAvailPageFile = (ULONGLONG)(perf_info->TotalCommitLimit - perf_info->TotalCommittedPages) * basic_info.PageSize; + expect.ullTotalVirtual = (ULONG_PTR)basic_info.HighestUserAddress - (ULONG_PTR)basic_info.LowestUserAddress + 1; + expect.ullAvailVirtual = expect.ullTotalVirtual - (ULONGLONG)vmc.WorkingSetSize /* approximate */; + expect.ullAvailExtendedVirtual = 0; + + ok( memex.dwMemoryLoad == expect.dwMemoryLoad, "got dwMemoryLoad %lu\n", memex.dwMemoryLoad ); + todo_wine + ok( memex.ullTotalPhys == expect.ullTotalPhys, "got ullTotalPhys %#I64x\n", memex.ullTotalPhys ); + ok( memex.ullAvailPhys == expect.ullAvailPhys, "got ullAvailPhys %#I64x\n", memex.ullAvailPhys ); + todo_wine + ok( memex.ullTotalPageFile == expect.ullTotalPageFile, "got ullTotalPageFile %#I64x\n", memex.ullTotalPageFile ); + todo_wine + ok( memex.ullAvailPageFile == expect.ullAvailPageFile, "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile ); + todo_wine + ok( memex.ullTotalVirtual == expect.ullTotalVirtual, "got ullTotalVirtual %#I64x\n", memex.ullTotalVirtual ); + todo_wine + ok( memex.ullAvailVirtual <= expect.ullAvailVirtual, "got ullAvailVirtual %#I64x\n", memex.ullAvailVirtual ); + ok( memex.ullAvailExtendedVirtual == 0, "got ullAvailExtendedVirtual %#I64x\n", memex.ullAvailExtendedVirtual ); +} + START_TEST(heap) { int argc; @@ -1298,6 +1358,7 @@ START_TEST(heap) test_HeapQueryInformation(); test_GetPhysicallyInstalledSystemMemory(); test_GlobalMemoryStatus(); + test_GlobalMemoryStatusEx(); if (pRtlGetNtGlobalFlags) { -- 2.35.1

2 3

[PATCH 1/2] kernelbase: Query FileStandardInformation instead of FileEndOfFileInformation in SetFilePointerEx().
by Paul Gofman 18 Mar '22

18 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- These patches fix Fall in Labirinth game which is using VX Ace RPG Maker and Enigma2 (not sure if and how those two are related). The engine introduces a virtual file system by hotpatching a number of functions. The issues preventing game start are which these patches are fixing: - Hooked NtQueryInformationFile doesn't understand FileEndOfFileInformation and returns success while leaving the output data unitialized; - Hooked NtQueryDirectoryFile gets confused by the access mask given to NtOpenFile for directory file (patch 2). dlls/kernelbase/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 15bfe89df7a..cd6b62409ff 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3629,7 +3629,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFilePointerEx( HANDLE file, LARGE_INTEGER dista LONGLONG pos; IO_STATUS_BLOCK io; FILE_POSITION_INFORMATION info; - FILE_END_OF_FILE_INFORMATION eof; + FILE_STANDARD_INFORMATION eof; switch(method) { @@ -3642,7 +3642,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFilePointerEx( HANDLE file, LARGE_INTEGER dista pos = info.CurrentByteOffset.QuadPart + distance.QuadPart; break; case FILE_END: - if (NtQueryInformationFile( file, &io, &eof, sizeof(eof), FileEndOfFileInformation )) + if (NtQueryInformationFile( file, &io, &eof, sizeof(eof), FileStandardInformation )) goto error; pos = eof.EndOfFile.QuadPart + distance.QuadPart; break; -- 2.35.1

1 1

[PATCH vkd3d v5 7/8] vkd3d-shader/hlsl: Remove redundant type check in declare_vars().
by Francisco Casas 18 Mar '22

18 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v5: - No changes from v4. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 0b6093ba..d6ba2c12 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1623,23 +1623,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) { FIXME("Initializers for non scalar/struct variables not supported yet.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } - if (v->arrays.count) + + if (type->type == HLSL_CLASS_STRUCT) { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); + struct_var_initializer(ctx, statements_list, var, &v->initializer); vkd3d_free(v); continue; } -- 2.25.1

4 3

[PATCH vkd3d v5 1/8] vkd3d-shader/hlsl: Allow offsets for scalar and vector variables.
by Francisco Casas 18 Mar '22

18 Mar '22

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v5: - No changes from v4. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 3 +-- libs/vkd3d-shader/hlsl_codegen.c | 22 +++++----------------- libs/vkd3d-shader/hlsl_sm1.c | 4 ++-- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++++----- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 243ed72b..1fd5dc58 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -793,8 +793,7 @@ unsigned int hlsl_swizzle_from_writemask(unsigned int writemask); bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset); unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type); +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 62dbce5e..6da2b3a9 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1542,11 +1542,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) } } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset) { struct hlsl_ir_node *offset_node = deref->offset.node; @@ -1589,8 +1584,7 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl return 0; } -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type) +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref) { const struct hlsl_ir_var *var = deref->var; struct hlsl_reg ret = var->reg; @@ -1598,16 +1592,10 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere ret.id += offset / 4; - if (type_is_single_reg(var->data_type)) - { - assert(!offset); - ret.writemask = var->reg.writemask; - } - else - { - assert(type_is_single_reg(type)); - ret.writemask = ((1 << type->dimx) - 1) << (offset % 4); - } + ret.writemask = 0xf & (0xf << (offset % 4)); + if (var->reg.writemask) + ret.writemask = hlsl_combine_writemasks(var->reg.writemask, ret.writemask); + return ret; } diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 90ec6058..f661dbc2 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -663,7 +663,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_load *load = hlsl_ir_load(instr); - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src, instr->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, @@ -707,7 +707,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * { const struct hlsl_ir_store *store = hlsl_ir_store(instr); const struct hlsl_ir_node *rhs = store->rhs.node; - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs, rhs->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 6996bb2d..802db3c1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -870,6 +870,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -877,11 +879,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_INPUT; @@ -899,6 +901,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -909,11 +913,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r reg->dim = VKD3D_SM4_DIMENSION_SCALAR; else reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_OUTPUT; @@ -925,7 +929,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_TEMP; -- 2.25.1

4 3

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Cast pow() input to float.
by Zebediah Figura 18 Mar '22

18 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 92dcb3f2a..1e85e390c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1806,10 +1806,13 @@ static bool intrinsic_min(struct hlsl_ctx *ctx, static bool intrinsic_pow(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_node *log, *exp; + struct hlsl_ir_node *log, *exp, *arg; struct hlsl_ir_expr *mul; - if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, params->args[0], *loc))) + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, arg, *loc))) return false; list_add_tail(params->instrs, &log->entry); -- 2.35.1

5 29

[PATCH] win32u: Remove workaround for Mac OS X 10.4 and 10.5.
by Brendan Shanks 18 Mar '22

18 Mar '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/win32u/freetype.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 77f4ef8eab3..b6063a14570 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -1773,35 +1773,7 @@ static void load_mac_fonts(void) CFStringRef path; desc = CFArrayGetValueAtIndex(descs, i); - -#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 url = CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute); -#else - /* CTFontDescriptor doesn't support kCTFontURLAttribute prior to 10.6, so - we have to go CFFontDescriptor -> CTFont -> ATSFont -> FSRef -> CFURL. */ - { - CTFontRef font; - ATSFontRef atsFont; - OSStatus status; - FSRef fsref; - - font = CTFontCreateWithFontDescriptor(desc, 0, NULL); - if (!font) continue; - - atsFont = CTFontGetPlatformFont(font, NULL); - if (!atsFont) - { - CFRelease(font); - continue; - } - - status = ATSFontGetFileReference(atsFont, &fsref); - CFRelease(font); - if (status != noErr) continue; - - url = CFURLCreateFromFSRef(NULL, &fsref); - } -#endif if (!url) continue; ext = CFURLCopyPathExtension(url); -- 2.32.0 (Apple Git-132)

2 1

[PATCH 6/6] winealsa: Pass the time relative to the start time to the callback.
by Huw Davies 18 Mar '22

18 Mar '22

This is equivalent to commit 01ad503004cf8ea6b0bd8f544ee131fc86abc580 in the coreaudio driver. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 3665b557d03..72649eca89c 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -477,7 +477,7 @@ static DWORD midReset(WORD wDevID) MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime); } in_buffer_unlock(); -- 2.25.1

1 0

[PATCH 5/6] winealsa: Move MIDM_ADDBUFFER to the unixlib.
by Huw Davies 18 Mar '22

18 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 35 +++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 38 ------------------------------------ 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 1ba674c234f..4e048f3d5b4 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -852,6 +852,38 @@ static UINT midi_out_reset(WORD dev_id) return MMSYSERR_NOERROR; } +static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + struct midi_src *src; + MIDIHDR **next; + + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + if (!hdr || hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr->dwBufferLength) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING; + if (!(hdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; + + hdr->dwFlags &= ~WHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + hdr->dwBytesRecorded = 0; + hdr->lpNext = NULL; + + in_buffer_lock(); + + next = &src->lpQueueHdr; + while (*next) next = &(*next)->lpNext; + *next = hdr; + + in_buffer_unlock(); + + return MMSYSERR_NOERROR; +} + static UINT midi_in_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) { TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); @@ -963,6 +995,9 @@ NTSTATUS midi_in_message(void *args) /* FIXME: Pretend this is supported */ *params->err = MMSYSERR_NOERROR; break; + case MIDM_ADDBUFFER: + *params->err = midi_in_add_buffer(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; case MIDM_PREPARE: *params->err = midi_in_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 70e6caebfc7..3665b557d03 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -459,42 +459,6 @@ static DWORD midClose(WORD wDevID) return ret; } - -/************************************************************************** - * midAddBuffer [internal] - */ -static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - if (lpMidiHdr == NULL) return MMSYSERR_INVALPARAM; - if (dwSize < offsetof(MIDIHDR,dwOffset)) return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwBufferLength == 0) return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; - - in_buffer_lock(); - lpMidiHdr->dwFlags &= ~WHDR_DONE; - lpMidiHdr->dwFlags |= MHDR_INQUEUE; - lpMidiHdr->dwBytesRecorded = 0; - lpMidiHdr->lpNext = 0; - if (MidiInDev[wDevID].lpQueueHdr == 0) { - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr; - } else { - LPMIDIHDR ptr; - - for (ptr = MidiInDev[wDevID].lpQueueHdr; ptr->lpNext != 0; - ptr = ptr->lpNext); - ptr->lpNext = lpMidiHdr; - } - in_buffer_unlock(); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * midReset [internal] */ @@ -593,8 +557,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_ADDBUFFER: - return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_RESET: return midReset(wDevID); case MIDM_START: -- 2.25.1

1 0

[PATCH 4/6] winealsa: Move the midi in buffer lock to the unixlib.
by Huw Davies 18 Mar '22

18 Mar '22

The syscall itself is temporary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 1 + dlls/winealsa.drv/alsamidi.c | 19 +++++++++++++++++++ dlls/winealsa.drv/midi.c | 31 ++++++++++++++++--------------- dlls/winealsa.drv/unixlib.h | 2 ++ 4 files changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index b629cd8317a..eb16203dbf9 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2449,5 +2449,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_in_message, midi_seq_lock, /* temporary */ + midi_in_lock, midi_seq_open, }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 27ee17caa24..1ba674c234f 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -60,6 +60,7 @@ struct midi_dest }; static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t in_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; static unsigned int num_dests, num_srcs; static struct midi_dest dests[MAX_MIDIOUTDRV]; @@ -86,6 +87,24 @@ NTSTATUS midi_seq_lock(void *args) return STATUS_SUCCESS; } +static void in_buffer_lock(void) +{ + pthread_mutex_lock(&in_buffer_mutex); +} + +static void in_buffer_unlock(void) +{ + pthread_mutex_unlock(&in_buffer_mutex); +} + +NTSTATUS midi_in_lock(void *args) +{ + if (args) in_buffer_lock(); + else in_buffer_unlock(); + + return STATUS_SUCCESS; +} + static snd_seq_t *seq_open(int *port_in_ret) { static int midi_warn; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index bd73c1f5db2..70e6caebfc7 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -54,15 +54,6 @@ static int MIDM_NumDevs = 0; static int numStartedMidiIn = 0; -static CRITICAL_SECTION crit_sect; /* protects all MidiIn buffer queues */ -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &crit_sect, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": crit_sect") } -}; -static CRITICAL_SECTION crit_sect = { &critsect_debug, -1, 0, 0, 0, 0 }; - static int end_thread; static HANDLE hThread; @@ -76,6 +67,16 @@ static void seq_unlock(void) ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)0); } +static void in_buffer_lock(void) +{ + ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)1); +} + +static void in_buffer_unlock(void) +{ + ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)0); +} + static void notify_client(struct notify_context *notify) { TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -240,7 +241,7 @@ static void handle_midi_event(snd_seq_event_t *ev) LPBYTE ptr = ev->data.ext.ptr; LPMIDIHDR lpMidiHdr; - EnterCriticalSection(&crit_sect); + in_buffer_lock(); while (len) { if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); @@ -262,7 +263,7 @@ static void handle_midi_event(snd_seq_event_t *ev) break; } } - LeaveCriticalSection(&crit_sect); + in_buffer_unlock(); } break; case SND_SEQ_EVENT_SENSING: @@ -475,7 +476,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (lpMidiHdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING; if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; - EnterCriticalSection(&crit_sect); + in_buffer_lock(); lpMidiHdr->dwFlags &= ~WHDR_DONE; lpMidiHdr->dwFlags |= MHDR_INQUEUE; lpMidiHdr->dwBytesRecorded = 0; @@ -489,7 +490,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ptr = ptr->lpNext); ptr->lpNext = lpMidiHdr; } - LeaveCriticalSection(&crit_sect); + in_buffer_unlock(); return MMSYSERR_NOERROR; } @@ -506,7 +507,7 @@ static DWORD midReset(WORD wDevID) if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - EnterCriticalSection(&crit_sect); + in_buffer_lock(); while (MidiInDev[wDevID].lpQueueHdr) { LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; @@ -514,7 +515,7 @@ static DWORD midReset(WORD wDevID) lpMidiHdr->dwFlags |= MHDR_DONE; MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } - LeaveCriticalSection(&crit_sect); + in_buffer_unlock(); return MMSYSERR_NOERROR; } diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 7907ad24efa..263e83eda57 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -301,6 +301,7 @@ enum alsa_funcs alsa_midi_in_message, alsa_midi_seq_lock, /* temporary */ + alsa_midi_in_lock, alsa_midi_seq_open, }; @@ -309,6 +310,7 @@ NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_in_lock(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t alsa_handle; -- 2.25.1

1 0

[PATCH 3/6] winealsa: Move MIDM_GETNUMDEVS to the unixlib.
by Huw Davies 18 Mar '22

18 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 3 +++ dlls/winealsa.drv/midi.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 550362a95ce..27ee17caa24 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -953,6 +953,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETDEVCAPS: *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2); break; + case MIDM_GETNUMDEVS: + *params->err = num_srcs; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4903b46089d..bd73c1f5db2 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -594,8 +594,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midClose(wDevID); case MIDM_ADDBUFFER: return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_GETNUMDEVS: - return MIDM_NumDevs; case MIDM_RESET: return midReset(wDevID); case MIDM_START: -- 2.25.1

1 0

[PATCH 2/6] winealsa: Move MIDM_GETDEVCAPS to the unixlib.
by Huw Davies 18 Mar '22

18 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 15 +++++++++++++++ dlls/winealsa.drv/midi.c | 18 ------------------ 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 1eb5d7db33f..550362a95ce 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -865,6 +865,18 @@ static UINT midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) return MMSYSERR_NOERROR; } +static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) +{ + TRACE("(%04X, %p, %08X);\n", dev_id, caps, size); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + if (!caps) return MMSYSERR_INVALPARAM; + + memcpy(caps, &srcs[dev_id].caps, min(size, sizeof(*caps))); + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -938,6 +950,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_UNPREPARE: *params->err = midi_in_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; + case MIDM_GETDEVCAPS: + *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 94de37d6176..4903b46089d 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -332,22 +332,6 @@ static DWORD WINAPI midRecThread(void *arg) return 0; } -/************************************************************************** - * midGetDevCaps [internal] - */ -static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) -{ - TRACE("(%04X, %p, %08X);\n", wDevID, lpCaps, dwSize); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - - memcpy(lpCaps, &MidiInDev[wDevID].caps, min(dwSize, sizeof(*lpCaps))); - - return MMSYSERR_NOERROR; -} - - /************************************************************************** * midOpen [internal] */ @@ -610,8 +594,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midClose(wDevID); case MIDM_ADDBUFFER: return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_GETDEVCAPS: - return midGetDevCaps(wDevID, (LPMIDIINCAPSW)dwParam1,dwParam2); case MIDM_GETNUMDEVS: return MIDM_NumDevs; case MIDM_RESET: -- 2.25.1

1 0

[PATCH 1/6] winealsa: Move MIDM_PREPARE and MIDM_UNPREPARE to the unixlib.
by Huw Davies 18 Mar '22

18 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 1 + dlls/winealsa.drv/alsamidi.c | 57 ++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 64 ++++++++---------------------------- dlls/winealsa.drv/unixlib.h | 12 +++++++ 4 files changed, 84 insertions(+), 50 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 6d307eb84bf..b629cd8317a 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2446,6 +2446,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_prop_value, midi_init, midi_out_message, + midi_in_message, midi_seq_lock, /* temporary */ midi_seq_open, diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index b99c3aedd33..1eb5d7db33f 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -833,6 +833,37 @@ static UINT midi_out_reset(WORD dev_id) return MMSYSERR_NOERROR; } +static UINT midi_in_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + + return MMSYSERR_NOERROR; +} + +static UINT midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr == 0 || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + + return MMSYSERR_NOERROR; +} NTSTATUS midi_out_message(void *args) { @@ -888,3 +919,29 @@ NTSTATUS midi_out_message(void *args) return STATUS_SUCCESS; } + +NTSTATUS midi_in_message(void *args) +{ + struct midi_in_message_params *params = args; + + switch (params->msg) + { + case DRVM_EXIT: + case DRVM_ENABLE: + case DRVM_DISABLE: + /* FIXME: Pretend this is supported */ + *params->err = MMSYSERR_NOERROR; + break; + case MIDM_PREPARE: + *params->err = midi_in_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; + case MIDM_UNPREPARE: + *params->err = midi_in_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; + default: + TRACE("Unsupported message\n"); + *params->err = MMSYSERR_NOTSUPPORTED; + } + + return STATUS_SUCCESS; +} diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 53b683f59c8..94de37d6176 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -510,44 +510,6 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * midPrepare [internal] - */ -static DWORD midPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwFlags & MHDR_PREPARED) - return MMSYSERR_NOERROR; - - lpMidiHdr->lpNext = 0; - lpMidiHdr->dwFlags |= MHDR_PREPARED; - lpMidiHdr->dwFlags &= ~(MHDR_DONE|MHDR_INQUEUE); /* flags cleared since w2k */ - - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * midUnprepare [internal] - */ -static DWORD midUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MMSYSERR_NOERROR; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - - lpMidiHdr->dwFlags &= ~MHDR_PREPARED; - - return MMSYSERR_NOERROR; -} - /************************************************************************** * midReset [internal] */ @@ -633,27 +595,21 @@ static BOOL ALSA_MidiInit(void) DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + struct midi_in_message_params params; + UINT err; + TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { case DRVM_INIT: ALSA_MidiInit(); return 0; - case DRVM_EXIT: - case DRVM_ENABLE: - case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - return 0; case MIDM_OPEN: return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); case MIDM_ADDBUFFER: return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_PREPARE: - return midPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_UNPREPARE: - return midUnprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_GETDEVCAPS: return midGetDevCaps(wDevID, (LPMIDIINCAPSW)dwParam1,dwParam2); case MIDM_GETNUMDEVS: @@ -664,10 +620,18 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); - default: - TRACE("Unsupported message\n"); } - return MMSYSERR_NOTSUPPORTED; + + params.dev_id = wDevID; + params.msg = wMsg; + params.user = dwUser; + params.param_1 = dwParam1; + params.param_2 = dwParam2; + params.err = &err; + + ALSA_CALL(midi_in_message, &params); + + return err; } /************************************************************************** diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index c1dbd83b84e..7907ad24efa 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -254,6 +254,16 @@ struct midi_out_message_params struct notify_context *notify; }; +struct midi_in_message_params +{ + UINT dev_id; + UINT msg; + UINT_PTR user; + UINT_PTR param_1; + UINT_PTR param_2; + UINT *err; +}; + struct midi_seq_open_params { int close; @@ -288,6 +298,7 @@ enum alsa_funcs alsa_get_prop_value, alsa_midi_init, alsa_midi_out_message, + alsa_midi_in_message, alsa_midi_seq_lock, /* temporary */ alsa_midi_seq_open, @@ -295,6 +306,7 @@ enum alsa_funcs NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH] winebus.sys: Assume SDL device effects are running by default.
by Rémi Bernon 18 Mar '22

18 Mar '22

If we cannot read their status with SDL_HapticGetEffectStatus. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 07fdd9d3fa2..a1e7942fe59 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -752,12 +752,13 @@ static void check_device_effects_state(struct sdl_device *impl) unsigned int i, ret; if (!impl->sdl_haptic) return; - if (!(impl->effect_support & SDL_HAPTIC_STATUS)) return; + if (!(impl->effect_support & EFFECT_SUPPORT_PHYSICAL)) return; for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) { if (impl->effect_ids[i] == -1) continue; - ret = pSDL_HapticGetEffectStatus(impl->sdl_haptic, impl->effect_ids[i]); + if (!(impl->effect_support & SDL_HAPTIC_STATUS)) ret = 1; + else ret = pSDL_HapticGetEffectStatus(impl->sdl_haptic, impl->effect_ids[i]); if (impl->effect_state[i] == ret) continue; impl->effect_state[i] = ret; hid_device_set_effect_state(iface, i, effect_flags | (ret == 1 ? EFFECT_STATE_EFFECT_PLAYING : 0)); -- 2.35.1

1 0

[PATCH] dinput: Allow setting DIPROP_AUTOCENTER when exclusively acquired.
by Rémi Bernon 18 Mar '22

18 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 2 ++ dlls/dinput/tests/force_feedback.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6cc190ee7fb..d881669c06f 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1009,6 +1009,8 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_AUTOCENTER: + if (impl->status == STATUS_ACQUIRED && !is_exclusively_acquired( impl )) return DIERR_ACQUIRED; + break; case (DWORD_PTR)DIPROP_AXISMODE: case (DWORD_PTR)DIPROP_BUFFERSIZE: case (DWORD_PTR)DIPROP_PHYSICALRANGE: diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 97aed4c993b..ce460147f9d 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -2924,6 +2924,9 @@ static BOOL test_force_feedback_joystick( DWORD version ) ok( hr == DI_OK, "Unacquire returned: %#lx\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); ok( hr == DI_OK, "SetCooperativeLevel returned: %#lx\n", hr ); + prop_dword.dwData = DIPROPAUTOCENTER_ON; + hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); + ok( hr == DI_OK, "SetProperty DIPROP_AUTOCENTER returned %#lx\n", hr ); set_hid_expect( file, expect_acquire, sizeof(expect_acquire) ); hr = IDirectInputDevice8_Acquire( device ); -- 2.35.1

1 0

[PATCH] windows.gaming.input: Fix vector InsertAt / RemoveAt copy sizes.
by Rémi Bernon 18 Mar '22

18 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.input/vector.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index c98c89195d1..db1a9057682 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -515,7 +515,7 @@ static HRESULT WINAPI vector_InsertAt( IVector_IInspectable *iface, UINT32 index } } - memmove( impl->elements + index + 1, impl->elements + index, impl->size++ * sizeof(*impl->elements) ); + memmove( impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements) ); IInspectable_AddRef( (impl->elements[index] = value) ); return S_OK; } @@ -528,7 +528,7 @@ static HRESULT WINAPI vector_RemoveAt( IVector_IInspectable *iface, UINT32 index if (index >= impl->size) return E_BOUNDS; IInspectable_Release( impl->elements[index] ); - memmove( impl->elements + index, impl->elements + index + 1, --impl->size * sizeof(*impl->elements) ); + memmove( impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements) ); return S_OK; } -- 2.35.1

1 0

[PATCH] dlls/ntdll/tests/exception.c: enable compilation with long types
by Eric Pouech 18 Mar '22

18 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/exception.c | 1307 +++++++++++++++++++++--------------------- 1 file changed, 654 insertions(+), 653 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 442aadfd784..c4413d4d66e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> #include <stdio.h> @@ -217,19 +218,19 @@ static void test_debugger_xstate(HANDLE thread, CONTEXT *ctx, int stage) length = sizeof(context_buffer); bret = pInitializeContext(context_buffer, ctx->ContextFlags | CONTEXT_XSTATE, &xctx, &length); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); ymm = pLocateXStateFeature(xctx, XSTATE_AVX, &length); ok(!!ymm, "Got zero ymm.\n"); memset(ymm, 0xcc, sizeof(*ymm)); xmm = pLocateXStateFeature(xctx, XSTATE_LEGACY_SSE, &length); - ok(length == sizeof(*xmm) * (sizeof(void *) == 8 ? 16 : 8), "Got unexpected length %#x.\n", length); + ok(length == sizeof(*xmm) * (sizeof(void *) == 8 ? 16 : 8), "Got unexpected length %#lx.\n", length); ok(!!xmm, "Got zero xmm.\n"); memset(xmm, 0xcc, length); status = pNtGetContextThread(thread, xctx); - ok(!status, "NtSetContextThread failed with 0x%x\n", status); + ok(!status, "NtSetContextThread failed with 0x%lx\n", status); c_ex = (CONTEXT_EX *)(xctx + 1); xs = (XSTATE *)((char *)c_ex + c_ex->XState.Offset); @@ -253,7 +254,7 @@ static void test_debugger_xstate(HANDLE thread, CONTEXT *ctx, int stage) ymm->Ymm0.High = ymm->Ymm0.Low; status = pNtSetContextThread(thread, xctx); - ok(!status, "NtSetContextThread failed with 0x%x\n", status); + ok(!status, "NtSetContextThread failed with 0x%lx\n", status); } #endif @@ -451,7 +452,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce { PCONTEXT context = ExceptionInfo->ContextRecord; PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; - trace("vect. handler %08x addr:%p context.Eip:%x\n", rec->ExceptionCode, + trace("vect. handler %08lx addr:%p context.Eip:%lx\n", rec->ExceptionCode, rec->ExceptionAddress, context->Eip); ok(rec->ExceptionAddress == (char *)code_mem + 0xb @@ -461,7 +462,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce if (NtCurrentTeb()->Peb->BeingDebugged) ok((void *)context->Eax == pRtlRaiseException || broken( is_wow64 && context->Eax == 0xf00f00f1 ), /* broken on vista */ - "debugger managed to modify Eax to %x should be %p\n", + "debugger managed to modify Eax to %lx should be %p\n", context->Eax, pRtlRaiseException); /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT @@ -472,14 +473,14 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce ok(context->Eip == (DWORD)code_mem + 0xa || (is_wow64 && context->Eip == (DWORD)code_mem + 0xb) || broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, - "Eip at %x instead of %x or %x\n", context->Eip, + "Eip at %lx instead of %lx or %lx\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } else { ok(context->Eip == (DWORD)code_mem + 0xb || broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, - "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xb); + "Eip at %lx instead of %lx\n", context->Eip, (DWORD)code_mem + 0xb); } /* test if context change is preserved from vectored handler to stack handlers */ @@ -490,7 +491,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - trace( "exception: %08x flags:%x addr:%p context: Eip:%x\n", + trace( "exception: %08lx flags:%lx addr:%p context: Eip:%lx\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip ); ok(rec->ExceptionAddress == (char *)code_mem + 0xb @@ -499,7 +500,7 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE) || broken(context->ContextFlags == CONTEXT_FULL), /* win2003 */ - "wrong context flags %x\n", context->ContextFlags ); + "wrong context flags %lx\n", context->ContextFlags ); /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT * even if raised by RtlRaiseException @@ -509,18 +510,18 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR ok(context->Eip == (DWORD)code_mem + 0xa || (is_wow64 && context->Eip == (DWORD)code_mem + 0xb) || broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, - "Eip at %x instead of %x or %x\n", context->Eip, + "Eip at %lx instead of %lx or %lx\n", context->Eip, (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } else { ok(context->Eip == (DWORD)code_mem + 0xb || broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */, - "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xb); + "Eip at %lx instead of %lx\n", context->Eip, (DWORD)code_mem + 0xb); } if(have_vectored_api) - ok(context->Eax == 0xf00f00f0, "Eax is %x, should have been set to 0xf00f00f0 in vectored handler\n", + ok(context->Eax == 0xf00f00f0, "Eax is %lx, should have been set to 0xf00f00f0 in vectored handler\n", context->Eax); /* give the debugger a chance to examine the state a second time */ @@ -603,16 +604,16 @@ static DWORD unwind_expected_eax; static DWORD unwind_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - trace("exception: %08x flags:%x addr:%p context: Eip:%x\n", + trace("exception: %08lx flags:%lx addr:%p context: Eip:%lx\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip); - ok(rec->ExceptionCode == STATUS_UNWIND, "ExceptionCode is %08x instead of %08x\n", + ok(rec->ExceptionCode == STATUS_UNWIND, "ExceptionCode is %08lx instead of %08lx\n", rec->ExceptionCode, STATUS_UNWIND); ok(rec->ExceptionAddress == (char *)code_mem + 0x22 || broken(TRUE) /* Win10 1709 */, "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0x22); - ok(context->Eip == (DWORD)code_mem + 0x22, "context->Eip is %08x instead of %08x\n", + ok(context->Eip == (DWORD)code_mem + 0x22, "context->Eip is %08lx instead of %08lx\n", context->Eip, (DWORD)code_mem + 0x22); - ok(context->Eax == unwind_expected_eax, "context->Eax is %08x instead of %08x\n", + ok(context->Eax == unwind_expected_eax, "context->Eax is %08lx instead of %08lx\n", context->Eax, unwind_expected_eax); context->Eax += 1; @@ -662,14 +663,14 @@ static void test_unwind(void) /* test unwind to current frame */ unwind_expected_eax = 0xDEAD0000; retval = func(pRtlUnwind, frame2, NULL, 0xDEAD0000); - ok(retval == 0xDEAD0000, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0000); + ok(retval == 0xDEAD0000, "RtlUnwind returned eax %08lx instead of %08x\n", retval, 0xDEAD0000); ok(NtCurrentTeb()->Tib.ExceptionList == frame2, "Exception record points to %p instead of %p\n", NtCurrentTeb()->Tib.ExceptionList, frame2); /* unwind to frame1 */ unwind_expected_eax = 0xDEAD0000; retval = func(pRtlUnwind, frame1, NULL, 0xDEAD0000); - ok(retval == 0xDEAD0001, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0001); + ok(retval == 0xDEAD0001, "RtlUnwind returned eax %08lx instead of %08x\n", retval, 0xDEAD0001); ok(NtCurrentTeb()->Tib.ExceptionList == frame1, "Exception record points to %p instead of %p\n", NtCurrentTeb()->Tib.ExceptionList, frame1); @@ -684,14 +685,14 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram unsigned int i, parameter_count, entry = except - exceptions; got_exception++; - trace( "exception %u: %x flags:%x addr:%p\n", + trace( "exception %u: %lx flags:%lx addr:%p\n", entry, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); ok( rec->ExceptionCode == except->status || (except->alt_status != 0 && rec->ExceptionCode == except->alt_status), - "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status ); + "%u: Wrong exception code %lx/%lx\n", entry, rec->ExceptionCode, except->status ); ok( context->Eip == (DWORD_PTR)code_mem + except->offset, - "%u: Unexpected eip %#x/%#lx\n", entry, + "%u: Unexpected eip %#lx/%#lx\n", entry, context->Eip, (DWORD_PTR)code_mem + except->offset ); ok( rec->ExceptionAddress == (char*)context->Eip || (rec->ExceptionCode == STATUS_BREAKPOINT && rec->ExceptionAddress == (char*)context->Eip + 1), @@ -706,7 +707,7 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram parameter_count = except->alt_nb_params; ok( rec->NumberParameters == parameter_count, - "%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count ); + "%u: Unexpected parameter count %lu/%u\n", entry, rec->NumberParameters, parameter_count ); /* Most CPUs (except Intel Core apparently) report a segment limit violation */ /* instead of page faults for accesses beyond 0xffffffff */ @@ -728,14 +729,14 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram { for (i = 0; i < rec->NumberParameters; i++) ok( rec->ExceptionInformation[i] == except->params[i], - "%u: Wrong parameter %d: %lx/%x\n", + "%u: Wrong parameter %d: %lx/%lx\n", entry, i, rec->ExceptionInformation[i], except->params[i] ); } else { for (i = 0; i < rec->NumberParameters; i++) ok( rec->ExceptionInformation[i] == except->alt_params[i], - "%u: Wrong parameter %d: %lx/%x\n", + "%u: Wrong parameter %d: %lx/%lx\n", entry, i, rec->ExceptionInformation[i], except->alt_params[i] ); } @@ -792,7 +793,7 @@ static DWORD dreg_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD } #define CHECK_DEBUG_REG(n, m) \ - ok((ctx.Dr##n & m) == test->dr##n, "(%d) failed to set debug register " #n " to %x, got %x\n", \ + ok((ctx.Dr##n & m) == test->dr##n, "(%d) failed to set debug register " #n " to %lx, got %lx\n", \ test_num, test->dr##n, ctx.Dr##n) static void check_debug_registers(int test_num, const struct dbgreg_test *test) @@ -802,7 +803,7 @@ static void check_debug_registers(int test_num, const struct dbgreg_test *test) ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; status = pNtGetContextThread(GetCurrentThread(), &ctx); - ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status); CHECK_DEBUG_REG(0, ~0); CHECK_DEBUG_REG(1, ~0); @@ -831,7 +832,7 @@ static DWORD single_step_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_ /* show that the last single step exception on the popf instruction * (which removed the TF bit), still is a EXCEPTION_SINGLE_STEP exception */ ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP, - "exception is not EXCEPTION_SINGLE_STEP: %x\n", rec->ExceptionCode); + "exception is not EXCEPTION_SINGLE_STEP: %lx\n", rec->ExceptionCode); } return ExceptionContinueExecution; @@ -906,11 +907,11 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD * { got_exception++; ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP, - "wrong exception code: %x\n", rec->ExceptionCode); + "wrong exception code: %lx\n", rec->ExceptionCode); if(got_exception == 1) { /* hw bp exception on first nop */ - ok( context->Eip == (DWORD)code_mem, "eip is wrong: %x instead of %x\n", + ok( context->Eip == (DWORD)code_mem, "eip is wrong: %lx instead of %lx\n", context->Eip, (DWORD)code_mem); ok( (context->Dr6 & 0xf) == 1, "B0 flag is not set in Dr6\n"); ok( !(context->Dr6 & 0x4000), "BS flag is set in Dr6\n"); @@ -918,7 +919,7 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD * context->EFlags |= 0x100; /* enable single stepping */ } else if( got_exception == 2) { /* single step exception on second nop */ - ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %x instead of %x\n", + ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %lx instead of %lx\n", context->Eip, (DWORD)code_mem + 1); ok( (context->Dr6 & 0x4000), "BS flag is not set in Dr6\n"); /* depending on the win version the B0 bit is already set here as well @@ -926,7 +927,7 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD * context->EFlags |= 0x100; } else if( got_exception == 3) { /* hw bp exception on second nop */ - ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %x instead of %x\n", + ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %lx instead of %lx\n", context->Eip, (DWORD)code_mem + 1); ok( (context->Dr6 & 0xf) == 1, "B0 flag is not set in Dr6\n"); ok( !(context->Dr6 & 0x4000), "BS flag is set in Dr6\n"); @@ -934,7 +935,7 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD * context->EFlags |= 0x100; } else { /* single step exception on ret */ - ok( context->Eip == (DWORD)code_mem + 2, "eip is wrong: %x instead of %x\n", + ok( context->Eip == (DWORD)code_mem + 2, "eip is wrong: %lx instead of %lx\n", context->Eip, (DWORD)code_mem + 2); ok( (context->Dr6 & 0xf) == 0, "B0...3 flags in Dr6 shouldn't be set\n"); ok( (context->Dr6 & 0x4000), "BS flag is not set in Dr6\n"); @@ -952,7 +953,7 @@ static DWORD int3_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD { ok( rec->ExceptionAddress == code_mem, "exception address not at: %p, but at %p\n", code_mem, rec->ExceptionAddress); - ok( context->Eip == (DWORD)code_mem, "eip not at: %p, but at %#x\n", code_mem, context->Eip); + ok( context->Eip == (DWORD)code_mem, "eip not at: %p, but at %#lx\n", code_mem, context->Eip); if(context->Eip == (DWORD)code_mem) context->Eip++; /* skip breakpoint */ return ExceptionContinueExecution; @@ -1020,7 +1021,7 @@ static void test_exceptions(void) ctx.Dr7 = 3; ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; res = pNtSetContextThread( GetCurrentThread(), &ctx); - ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res); + ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", res); got_exception = 0; run_exception_test(bpx_handler, NULL, dummy_code, sizeof(dummy_code), 0); @@ -1031,7 +1032,7 @@ static void test_exceptions(void) /* test that hardware breakpoints are not inherited by created threads */ res = pNtSetContextThread( GetCurrentThread(), &ctx ); - ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res ); + ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", res ); h = CreateThread( NULL, 0, hw_reg_exception_thread, 0, 0, NULL ); WaitForSingleObject( h, 10000 ); @@ -1040,13 +1041,13 @@ static void test_exceptions(void) h = CreateThread( NULL, 0, hw_reg_exception_thread, (void *)4, CREATE_SUSPENDED, NULL ); ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; res = pNtGetContextThread( h, &ctx ); - ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", res ); - ok( ctx.Dr0 == 0, "dr0 %x\n", ctx.Dr0 ); - ok( ctx.Dr7 == 0, "dr7 %x\n", ctx.Dr7 ); + ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", res ); + ok( ctx.Dr0 == 0, "dr0 %lx\n", ctx.Dr0 ); + ok( ctx.Dr7 == 0, "dr7 %lx\n", ctx.Dr7 ); ctx.Dr0 = (DWORD)code_mem; ctx.Dr7 = 3; res = pNtSetContextThread( h, &ctx ); - ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res ); + ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", res ); ResumeThread( h ); WaitForSingleObject( h, 10000 ); CloseHandle( h ); @@ -1054,7 +1055,7 @@ static void test_exceptions(void) ctx.Dr0 = 0; ctx.Dr7 = 0; res = pNtSetContextThread( GetCurrentThread(), &ctx ); - ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res ); + ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", res ); } static void test_debugger(DWORD cont_status) @@ -1079,7 +1080,7 @@ static void test_debugger(DWORD cont_status) sprintf(cmdline, "%s %s %s %p", my_argv[0], my_argv[1], "debuggee", &test_stage); ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); - ok(ret, "could not create child process error: %u\n", GetLastError()); + ok(ret, "could not create child process error: %lu\n", GetLastError()); if (!ret) return; @@ -1090,11 +1091,11 @@ static void test_debugger(DWORD cont_status) ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); ok(!ret, "ContinueDebugEvent unexpectedly succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected last error: %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected last error: %lu\n", GetLastError()); if (de.dwThreadId != pi.dwThreadId) { - trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); + trace("event %ld not coming from main thread, ignoring\n", de.dwDebugEventCode); ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -1115,16 +1116,16 @@ static void test_debugger(DWORD cont_status) counter++; status = pNtReadVirtualMemory(pi.hProcess, &code_mem, &code_mem_address, sizeof(code_mem_address), &size_read); - ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status); status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, sizeof(stage), &size_read); - ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status); ctx.ContextFlags = CONTEXT_FULL | CONTEXT_EXTENDED_REGISTERS; status = pNtGetContextThread(pi.hThread, &ctx); - ok(!status, "NtGetContextThread failed with 0x%x\n", status); + ok(!status, "NtGetContextThread failed with 0x%lx\n", status); - trace("exception 0x%x at %p firstchance=%d Eip=0x%x, Eax=0x%x\n", + trace("exception 0x%lx at %p firstchance=%ld Eip=0x%lx, Eax=0x%lx\n", de.u.Exception.ExceptionRecord.ExceptionCode, de.u.Exception.ExceptionRecord.ExceptionAddress, de.u.Exception.dwFirstChance, ctx.Eip, ctx.Eax); @@ -1148,7 +1149,7 @@ static void test_debugger(DWORD cont_status) { if (stage == 1) { - ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at %x instead of %p\n", + ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at %lx instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xb); /* setting the context from debugger does not affect the context that the * exception handler gets, except on w2008 */ @@ -1162,7 +1163,7 @@ static void test_debugger(DWORD cont_status) if (de.u.Exception.dwFirstChance) { /* debugger gets first chance exception with unmodified ctx.Eip */ - ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%x instead of %p\n", + ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%lx instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xb); ctx.Eip = (UINT_PTR)code_mem_address + 0xd; ctx.Eax = 0xf00f00f1; @@ -1179,7 +1180,7 @@ static void test_debugger(DWORD cont_status) ok((char *)ctx.Eip == (char *)code_mem_address + 0xa || (is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb) || broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */, - "Eip at 0x%x instead of %p\n", + "Eip at 0x%lx instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xa); /* need to fixup Eip for debuggee */ if ((char *)ctx.Eip == (char *)code_mem_address + 0xa) @@ -1188,7 +1189,7 @@ static void test_debugger(DWORD cont_status) else ok((char *)ctx.Eip == (char *)code_mem_address + 0xb || broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */, - "Eip at 0x%x instead of %p\n", + "Eip at 0x%lx instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xb); /* here we handle exception */ } @@ -1196,28 +1197,28 @@ static void test_debugger(DWORD cont_status) else if (stage == 7 || stage == 8) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, - "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode); + "expected EXCEPTION_BREAKPOINT, got %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode); ok((char *)ctx.Eip == (char *)code_mem_address + 0x1d, - "expected Eip = %p, got 0x%x\n", (char *)code_mem_address + 0x1d, ctx.Eip); + "expected Eip = %p, got 0x%lx\n", (char *)code_mem_address + 0x1d, ctx.Eip); if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } else if (stage == 9 || stage == 10) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, - "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode); + "expected EXCEPTION_BREAKPOINT, got %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode); ok((char *)ctx.Eip == (char *)code_mem_address + 2, - "expected Eip = %p, got 0x%x\n", (char *)code_mem_address + 2, ctx.Eip); + "expected Eip = %p, got 0x%lx\n", (char *)code_mem_address + 2, ctx.Eip); if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } else if (stage == 11 || stage == 12 || stage == 13) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, - "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode, + "unexpected exception code %08lx, expected %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode, EXCEPTION_INVALID_HANDLE); ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, - "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); + "unexpected number of parameters %ld, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } @@ -1229,26 +1230,26 @@ static void test_debugger(DWORD cont_status) { USHORT ss; __asm__( "movw %%ss,%0" : "=r" (ss) ); - ok( ctx.SegSs == ss, "wrong ss %04x / %04x\n", ctx.SegSs, ss ); - ok( ctx.SegFs != ctx.SegSs, "wrong fs %04x / %04x\n", ctx.SegFs, ctx.SegSs ); + ok( ctx.SegSs == ss, "wrong ss %04lx / %04x\n", ctx.SegSs, ss ); + ok( ctx.SegFs != ctx.SegSs, "wrong fs %04lx / %04lx\n", ctx.SegFs, ctx.SegSs ); if (is_wow64) todo_wine { - ok( ctx.SegDs == ctx.SegSs, "wrong ds %04x / %04x\n", ctx.SegDs, ctx.SegSs ); - ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs ); - ok( ctx.SegGs == ctx.SegSs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs ); + ok( ctx.SegDs == ctx.SegSs, "wrong ds %04lx / %04lx\n", ctx.SegDs, ctx.SegSs ); + ok( ctx.SegEs == ctx.SegSs, "wrong es %04lx / %04lx\n", ctx.SegEs, ctx.SegSs ); + ok( ctx.SegGs == ctx.SegSs, "wrong gs %04lx / %04lx\n", ctx.SegGs, ctx.SegSs ); } else { - ok( !ctx.SegDs, "wrong ds %04x / %04x\n", ctx.SegDs, ctx.SegSs ); - ok( !ctx.SegEs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs ); - ok( !ctx.SegGs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs ); + ok( !ctx.SegDs, "wrong ds %04lx / %04lx\n", ctx.SegDs, ctx.SegSs ); + ok( !ctx.SegEs, "wrong es %04lx / %04lx\n", ctx.SegEs, ctx.SegSs ); + ok( !ctx.SegGs, "wrong gs %04lx / %04lx\n", ctx.SegGs, ctx.SegSs ); } } else ok(FALSE, "unexpected stage %u\n", stage); status = pNtSetContextThread(pi.hThread, &ctx); - ok(!status, "NtSetContextThread failed with 0x%x\n", status); + ok(!status, "NtSetContextThread failed with 0x%lx\n", status); } } else if (de.dwDebugEventCode == OUTPUT_DEBUG_STRING_EVENT) @@ -1258,7 +1259,7 @@ static void test_debugger(DWORD cont_status) status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, sizeof(stage), &size_read); - ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status); ok(!de.u.DebugString.fUnicode, "unexpected unicode debug string event\n"); ok(de.u.DebugString.nDebugStringLength < sizeof(buffer) - 1, "buffer not large enough to hold %d bytes\n", @@ -1267,7 +1268,7 @@ static void test_debugger(DWORD cont_status) memset(buffer, 0, sizeof(buffer)); status = pNtReadVirtualMemory(pi.hProcess, de.u.DebugString.lpDebugStringData, buffer, de.u.DebugString.nDebugStringLength, &size_read); - ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status); if (stage == 3 || stage == 4) ok(!strcmp(buffer, "Hello World"), "got unexpected debug string '%s'\n", buffer); @@ -1282,13 +1283,13 @@ static void test_debugger(DWORD cont_status) status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, sizeof(stage), &size_read); - ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status); if (stage == 5 || stage == 6) { - ok(de.u.RipInfo.dwError == 0x11223344, "got unexpected rip error code %08x, expected %08x\n", + ok(de.u.RipInfo.dwError == 0x11223344, "got unexpected rip error code %08lx, expected %08x\n", de.u.RipInfo.dwError, 0x11223344); - ok(de.u.RipInfo.dwType == 0x55667788, "got unexpected rip type %08x, expected %08x\n", + ok(de.u.RipInfo.dwType == 0x55667788, "got unexpected rip type %08lx, expected %08x\n", de.u.RipInfo.dwType, 0x55667788); } else @@ -1303,9 +1304,9 @@ static void test_debugger(DWORD cont_status) wait_child_process( pi.hProcess ); ret = CloseHandle(pi.hThread); - ok(ret, "error %u\n", GetLastError()); + ok(ret, "error %lu\n", GetLastError()); ret = CloseHandle(pi.hProcess); - ok(ret, "error %u\n", GetLastError()); + ok(ret, "error %lu\n", GetLastError()); return; } @@ -1329,13 +1330,13 @@ static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R skip("system doesn't support SIMD exceptions\n"); else { ok( rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS, - "exception code: %#x, should be %#x\n", + "exception code: %#lx, should be %#lx\n", rec->ExceptionCode, STATUS_FLOAT_MULTIPLE_TRAPS); - ok( rec->NumberParameters == is_wow64 ? 2 : 1, "# of params: %i\n", rec->NumberParameters); + ok( rec->NumberParameters == is_wow64 ? 2 : 1, "# of params: %li\n", rec->NumberParameters); ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]); if (rec->NumberParameters == 2) ok( rec->ExceptionInformation[1] == ((XSAVE_FORMAT *)context->ExtendedRegisters)->MxCsr, - "param #1: %lx / %x\n", rec->ExceptionInformation[1], + "param #1: %lx / %lx\n", rec->ExceptionInformation[1], ((XSAVE_FORMAT *)context->ExtendedRegisters)->MxCsr); } context->Eip += 3; /* skip divps */ @@ -1478,18 +1479,18 @@ static void test_fpu_exceptions(void) memset(&info, 0, sizeof(info)); run_exception_test(fpu_exception_handler, &info, fpu_exception_test_ie, sizeof(fpu_exception_test_ie), 0); ok(info.exception_code == EXCEPTION_FLT_STACK_CHECK, - "Got exception code %#x, expected EXCEPTION_FLT_STACK_CHECK\n", info.exception_code); + "Got exception code %#lx, expected EXCEPTION_FLT_STACK_CHECK\n", info.exception_code); ok(info.exception_offset == 0x19 || info.exception_offset == info.eip_offset, - "Got exception offset %#x, expected 0x19\n", info.exception_offset); - ok(info.eip_offset == 0x1b, "Got EIP offset %#x, expected 0x1b\n", info.eip_offset); + "Got exception offset %#lx, expected 0x19\n", info.exception_offset); + ok(info.eip_offset == 0x1b, "Got EIP offset %#lx, expected 0x1b\n", info.eip_offset); memset(&info, 0, sizeof(info)); run_exception_test(fpu_exception_handler, &info, fpu_exception_test_de, sizeof(fpu_exception_test_de), 0); ok(info.exception_code == EXCEPTION_FLT_DIVIDE_BY_ZERO, - "Got exception code %#x, expected EXCEPTION_FLT_DIVIDE_BY_ZERO\n", info.exception_code); + "Got exception code %#lx, expected EXCEPTION_FLT_DIVIDE_BY_ZERO\n", info.exception_code); ok(info.exception_offset == 0x17 || info.exception_offset == info.eip_offset, - "Got exception offset %#x, expected 0x17\n", info.exception_offset); - ok(info.eip_offset == 0x19, "Got EIP offset %#x, expected 0x19\n", info.eip_offset); + "Got exception offset %#lx, expected 0x17\n", info.exception_offset); + ok(info.eip_offset == 0x19, "Got EIP offset %#lx, expected 0x19\n", info.eip_offset); } struct dpe_exception_info { @@ -1504,9 +1505,9 @@ static DWORD dpe_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION struct dpe_exception_info *info = *(struct dpe_exception_info **)(frame + 1); ok(rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION, - "Exception code %08x\n", rec->ExceptionCode); + "Exception code %08lx\n", rec->ExceptionCode); ok(rec->NumberParameters == 2, - "Parameter count: %d\n", rec->NumberParameters); + "Parameter count: %ld\n", rec->NumberParameters); ok((LPVOID)rec->ExceptionInformation[1] == code_mem, "Exception address: %p, expected %p\n", (LPVOID)rec->ExceptionInformation[1], code_mem); @@ -1535,14 +1536,14 @@ static void test_dpe_exceptions(void) skip("This software platform does not support DEP\n"); return; } - ok(stat == STATUS_INFO_LENGTH_MISMATCH, "buffer too small: %08x\n", stat); + ok(stat == STATUS_INFO_LENGTH_MISMATCH, "buffer too small: %08lx\n", stat); /* Query DEP */ stat = pNtQueryInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val, &len); - ok(stat == STATUS_SUCCESS, "querying DEP: status %08x\n", stat); + ok(stat == STATUS_SUCCESS, "querying DEP: status %08lx\n", stat); if(stat == STATUS_SUCCESS) { - ok(len == sizeof val, "returned length: %d\n", len); + ok(len == sizeof val, "returned length: %ld\n", len); if(val & MEM_EXECUTE_OPTION_PERMANENT) { skip("toggling DEP impossible - status locked\n"); @@ -1559,7 +1560,7 @@ static void test_dpe_exceptions(void) /* Enable DEP */ val = MEM_EXECUTE_OPTION_DISABLE; stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val); - ok(stat == STATUS_SUCCESS, "enabling DEP: status %08x\n", stat); + ok(stat == STATUS_SUCCESS, "enabling DEP: status %08lx\n", stat); } if(can_test_with) @@ -1594,7 +1595,7 @@ static void test_dpe_exceptions(void) /* Disable DEP */ val = MEM_EXECUTE_OPTION_ENABLE; stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val); - ok(stat == STATUS_SUCCESS, "disabling DEP: status %08x\n", stat); + ok(stat == STATUS_SUCCESS, "disabling DEP: status %08lx\n", stat); } /* page is read without exec here */ @@ -1621,18 +1622,18 @@ static void test_dpe_exceptions(void) /* Turn off DEP permanently */ val = MEM_EXECUTE_OPTION_ENABLE | MEM_EXECUTE_OPTION_PERMANENT; stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val); - ok(stat == STATUS_SUCCESS, "disabling DEP permanently: status %08x\n", stat); + ok(stat == STATUS_SUCCESS, "disabling DEP permanently: status %08lx\n", stat); } /* Try to turn off DEP */ val = MEM_EXECUTE_OPTION_ENABLE; stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val); - ok(stat == STATUS_ACCESS_DENIED, "disabling DEP while permanent: status %08x\n", stat); + ok(stat == STATUS_ACCESS_DENIED, "disabling DEP while permanent: status %08lx\n", stat); /* Try to turn on DEP */ val = MEM_EXECUTE_OPTION_DISABLE; stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val); - ok(stat == STATUS_ACCESS_DENIED, "enabling DEP while permanent: status %08x\n", stat); + ok(stat == STATUS_ACCESS_DENIED, "enabling DEP while permanent: status %08lx\n", stat); } static void test_thread_context(void) @@ -1699,25 +1700,25 @@ static void test_thread_context(void) memcpy( func_ptr, call_func, sizeof(call_func) ); #define COMPARE(reg) \ - ok( context.reg == expect.reg, "wrong " #reg " %08x/%08x\n", context.reg, expect.reg ) + ok( context.reg == expect.reg, "wrong " #reg " %08lx/%08lx\n", context.reg, expect.reg ) memset( &context, 0xcc, sizeof(context) ); memset( &expect, 0xcc, sizeof(expect) ); func_ptr( &expect, pRtlCaptureContext, &context, 0, &new_x87_control ); - trace( "expect: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x " - "eip=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n", + trace( "expect: eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx " + "eip=%08lx cs=%04lx ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx prev=%08lx\n", expect.Eax, expect.Ebx, expect.Ecx, expect.Edx, expect.Esi, expect.Edi, expect.Ebp, expect.Esp, expect.Eip, expect.SegCs, expect.SegDs, expect.SegEs, expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, expect.prev_frame ); - trace( "actual: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x " - "eip=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n", + trace( "actual: eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx " + "eip=%08lx cs=%04lx ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx\n", context.Eax, context.Ebx, context.Ecx, context.Edx, context.Esi, context.Edi, context.Ebp, context.Esp, context.Eip, context.SegCs, context.SegDs, context.SegEs, context.SegFs, context.SegGs, context.SegSs, context.EFlags ); ok( context.ContextFlags == (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS) || broken( context.ContextFlags == 0xcccccccc ), /* <= vista */ - "wrong flags %08x\n", context.ContextFlags ); + "wrong flags %08lx\n", context.ContextFlags ); COMPARE( Eax ); COMPARE( Ebx ); COMPARE( Ecx ); @@ -1733,23 +1734,23 @@ static void test_thread_context(void) COMPARE( SegSs ); COMPARE( EFlags ); /* Ebp is from the previous stackframe */ - ok( context.Ebp == expect.prev_frame, "wrong Ebp %08x/%08x\n", context.Ebp, expect.prev_frame ); + ok( context.Ebp == expect.prev_frame, "wrong Ebp %08lx/%08lx\n", context.Ebp, expect.prev_frame ); /* Esp is the value on entry to the previous stackframe */ - ok( context.Esp == expect.Ebp + 8, "wrong Esp %08x/%08x\n", context.Esp, expect.Ebp + 8 ); + ok( context.Esp == expect.Ebp + 8, "wrong Esp %08lx/%08lx\n", context.Esp, expect.Ebp + 8 ); memset( &context, 0xcc, sizeof(context) ); memset( &expect, 0xcc, sizeof(expect) ); context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT; status = func_ptr( &expect, pNtGetContextThread, (void *)GetCurrentThread(), &context, &new_x87_control ); - ok( status == STATUS_SUCCESS, "NtGetContextThread failed %08x\n", status ); - trace( "expect: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x " - "eip=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n", + ok( status == STATUS_SUCCESS, "NtGetContextThread failed %08lx\n", status ); + trace( "expect: eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx " + "eip=%08lx cs=%04lx ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx prev=%08lx\n", expect.Eax, expect.Ebx, expect.Ecx, expect.Edx, expect.Esi, expect.Edi, expect.Ebp, expect.Esp, expect.Eip, expect.SegCs, expect.SegDs, expect.SegEs, expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, expect.prev_frame ); - trace( "actual: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x " - "eip=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n", + trace( "actual: eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx " + "eip=%08lx cs=%04lx ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx\n", context.Eax, context.Ebx, context.Ecx, context.Edx, context.Esi, context.Edi, context.Ebp, context.Esp, context.Eip, context.SegCs, context.SegDs, context.SegEs, context.SegFs, context.SegGs, context.SegSs, context.EFlags ); @@ -1760,21 +1761,21 @@ static void test_thread_context(void) COMPARE( Ebp ); /* Esp is the stack upon entry to NtGetContextThread */ ok( context.Esp == expect.Esp - 12 || context.Esp == expect.Esp - 16, - "wrong Esp %08x/%08x\n", context.Esp, expect.Esp ); + "wrong Esp %08lx/%08lx\n", context.Esp, expect.Esp ); /* Eip is somewhere close to the NtGetContextThread implementation */ ok( (char *)context.Eip >= (char *)pNtGetContextThread - 0x40000 && (char *)context.Eip <= (char *)pNtGetContextThread + 0x40000, - "wrong Eip %08x/%08x\n", context.Eip, (DWORD)pNtGetContextThread ); + "wrong Eip %08lx/%08lx\n", context.Eip, (DWORD)pNtGetContextThread ); /* segment registers clear the high word */ - ok( context.SegCs == LOWORD(expect.SegCs), "wrong SegCs %08x/%08x\n", context.SegCs, expect.SegCs ); - ok( context.SegDs == LOWORD(expect.SegDs), "wrong SegDs %08x/%08x\n", context.SegDs, expect.SegDs ); - ok( context.SegEs == LOWORD(expect.SegEs), "wrong SegEs %08x/%08x\n", context.SegEs, expect.SegEs ); - ok( context.SegFs == LOWORD(expect.SegFs), "wrong SegFs %08x/%08x\n", context.SegFs, expect.SegFs ); - ok( context.SegGs == LOWORD(expect.SegGs), "wrong SegGs %08x/%08x\n", context.SegGs, expect.SegGs ); - ok( context.SegSs == LOWORD(expect.SegSs), "wrong SegSs %08x/%08x\n", context.SegSs, expect.SegGs ); + ok( context.SegCs == LOWORD(expect.SegCs), "wrong SegCs %08lx/%08lx\n", context.SegCs, expect.SegCs ); + ok( context.SegDs == LOWORD(expect.SegDs), "wrong SegDs %08lx/%08lx\n", context.SegDs, expect.SegDs ); + ok( context.SegEs == LOWORD(expect.SegEs), "wrong SegEs %08lx/%08lx\n", context.SegEs, expect.SegEs ); + ok( context.SegFs == LOWORD(expect.SegFs), "wrong SegFs %08lx/%08lx\n", context.SegFs, expect.SegFs ); + ok( context.SegGs == LOWORD(expect.SegGs), "wrong SegGs %08lx/%08lx\n", context.SegGs, expect.SegGs ); + ok( context.SegSs == LOWORD(expect.SegSs), "wrong SegSs %08lx/%08lx\n", context.SegSs, expect.SegGs ); ok( LOWORD(context.FloatSave.ControlWord) == LOWORD(expect.x87_control), - "wrong x87 control word %#x/%#x.\n", context.FloatSave.ControlWord, expect.x87_control ); + "wrong x87 control word %#lx/%#lx.\n", context.FloatSave.ControlWord, expect.x87_control ); ok( LOWORD(expect.x87_control) == LOWORD(new_x87_control), "x87 control word changed in NtGetContextThread() %#x/%#x.\n", LOWORD(expect.x87_control), LOWORD(new_x87_control) ); @@ -1811,7 +1812,7 @@ static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGIST { ok(hook_called, "Hook was not called.\n"); - ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); + ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#lx.\n", rec->ExceptionCode); got_exception = 1; dbg_except_continue_handler_eip = (void *)context->Eip; @@ -1829,10 +1830,10 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE EXCEPTION_RECORD *rec = e->ExceptionRecord; CONTEXT *context = e->ContextRecord; - trace("dbg_except_continue_vectored_handler, code %#x, eip %#x, ExceptionAddress %p.\n", + trace("dbg_except_continue_vectored_handler, code %#lx, eip %#lx, ExceptionAddress %p.\n", rec->ExceptionCode, context->Eip, rec->ExceptionAddress); - ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); + ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#lx.\n", rec->ExceptionCode); got_exception = 1; @@ -1853,13 +1854,13 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE static void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) { trace("rec %p, context %p.\n", rec, context); - trace("context->Eip %#x, context->Esp %#x, ContextFlags %#x.\n", + trace("context->Eip %#lx, context->Esp %#lx, ContextFlags %#lx.\n", context->Eip, context->Esp, context->ContextFlags); hook_called = TRUE; /* Broken on Win2008, probably rec offset in stack is different. */ ok(rec->ExceptionCode == 0x80000003 || broken(!rec->ExceptionCode), - "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); + "Got unexpected ExceptionCode %#lx.\n", rec->ExceptionCode); hook_KiUserExceptionDispatcher_eip = (void *)context->Eip; hook_exception_address = rec->ExceptionAddress; @@ -1945,11 +1946,11 @@ static void test_kiuserexceptiondispatcher(void) *(unsigned int *)(hook_trampoline + 8) = (ULONG_PTR)&pKiUserExceptionDispatcher; ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1); - ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), PAGE_EXECUTE_READWRITE, &old_protect2); - ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes)); @@ -1972,9 +1973,9 @@ static void test_kiuserexceptiondispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); - ok(test_kiuserexceptiondispatcher_regs.new_eax == 0xdeadbeef, "Got unexpected eax %#x.\n", + ok(test_kiuserexceptiondispatcher_regs.new_eax == 0xdeadbeef, "Got unexpected eax %#lx.\n", test_kiuserexceptiondispatcher_regs.new_eax); - ok(test_kiuserexceptiondispatcher_regs.new_esi == 0xdeadbeef, "Got unexpected esi %#x.\n", + ok(test_kiuserexceptiondispatcher_regs.new_esi == 0xdeadbeef, "Got unexpected esi %#lx.\n", test_kiuserexceptiondispatcher_regs.new_esi); ok(test_kiuserexceptiondispatcher_regs.old_edi == test_kiuserexceptiondispatcher_regs.new_edi, "edi does not match.\n"); @@ -2015,9 +2016,9 @@ static void test_kiuserexceptiondispatcher(void) RemoveVectoredExceptionHandler(vectored_handler); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), old_protect2, &old_protect2); - ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), old_protect1, &old_protect1); - ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); } #elif defined(__x86_64__) @@ -2186,7 +2187,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) if (ctx_ptr.IntegerContext[j]) { - ok( k < nb_regs || broken( broken_k < nb_regs ), "%u/%u: register %s should not be set to %lx\n", + ok( k < nb_regs || broken( broken_k < nb_regs ), "%u/%u: register %s should not be set to %Ix\n", testnum, i, reg_names[j], *(&context.Rax + j) ); ok( k == nb_regs || *(&context.Rax + j) == test->results[i].regs[k][1] || broken( broken_k == nb_regs || *(&context.Rax + j) @@ -2415,7 +2416,7 @@ static PVOID CALLBACK test_consolidate_dummy(EXCEPTION_RECORD *rec) { CONTEXT *ctx = (CONTEXT *)rec->ExceptionInformation[1]; consolidate_dummy_called = 1; - ok(ctx->Rip == 0xdeadbeef, "test_consolidate_dummy failed for Rip, expected: 0xdeadbeef, got: %lx\n", ctx->Rip); + ok(ctx->Rip == 0xdeadbeef, "test_consolidate_dummy failed for Rip, expected: 0xdeadbeef, got: %Ix\n", ctx->Rip); return (PVOID)rec->ExceptionInformation[2]; } @@ -2446,7 +2447,7 @@ static void test_restore_context(void) ok(0, "shouldn't be reached\n"); } else - ok(pass < 4, "unexpected pass %d\n", pass); + ok(pass < 4, "unexpected pass %ld\n", pass); /* test with jmp using RltRestoreContext */ pass = 0; @@ -2461,7 +2462,7 @@ static void test_restore_context(void) rec.NumberParameters = 1; rec.ExceptionInformation[0] = (DWORD64)&buf; - ok(buf.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", buf.MxCsr); + ok(buf.MxCsr == 0x1f80, "Got unexpected MxCsr %#lx.\n", buf.MxCsr); ok(buf.FpCsr == 0x27f, "Got unexpected FpCsr %#x.\n", buf.FpCsr); buf.FpCsr = 0x7f; buf.MxCsr = 0x3f80; @@ -2471,30 +2472,30 @@ static void test_restore_context(void) } else if (pass == 4) { - ok(buf.Rbx == ctx.Rbx, "longjmp failed for Rbx, expected: %lx, got: %lx\n", buf.Rbx, ctx.Rbx); - ok(buf.Rsp == ctx.Rsp, "longjmp failed for Rsp, expected: %lx, got: %lx\n", buf.Rsp, ctx.Rsp); - ok(buf.Rbp == ctx.Rbp, "longjmp failed for Rbp, expected: %lx, got: %lx\n", buf.Rbp, ctx.Rbp); - ok(buf.Rsi == ctx.Rsi, "longjmp failed for Rsi, expected: %lx, got: %lx\n", buf.Rsi, ctx.Rsi); - ok(buf.Rdi == ctx.Rdi, "longjmp failed for Rdi, expected: %lx, got: %lx\n", buf.Rdi, ctx.Rdi); - ok(buf.R12 == ctx.R12, "longjmp failed for R12, expected: %lx, got: %lx\n", buf.R12, ctx.R12); - ok(buf.R13 == ctx.R13, "longjmp failed for R13, expected: %lx, got: %lx\n", buf.R13, ctx.R13); - ok(buf.R14 == ctx.R14, "longjmp failed for R14, expected: %lx, got: %lx\n", buf.R14, ctx.R14); - ok(buf.R15 == ctx.R15, "longjmp failed for R15, expected: %lx, got: %lx\n", buf.R15, ctx.R15); + ok(buf.Rbx == ctx.Rbx, "longjmp failed for Rbx, expected: %Ix, got: %Ix\n", buf.Rbx, ctx.Rbx); + ok(buf.Rsp == ctx.Rsp, "longjmp failed for Rsp, expected: %Ix, got: %Ix\n", buf.Rsp, ctx.Rsp); + ok(buf.Rbp == ctx.Rbp, "longjmp failed for Rbp, expected: %Ix, got: %Ix\n", buf.Rbp, ctx.Rbp); + ok(buf.Rsi == ctx.Rsi, "longjmp failed for Rsi, expected: %Ix, got: %Ix\n", buf.Rsi, ctx.Rsi); + ok(buf.Rdi == ctx.Rdi, "longjmp failed for Rdi, expected: %Ix, got: %Ix\n", buf.Rdi, ctx.Rdi); + ok(buf.R12 == ctx.R12, "longjmp failed for R12, expected: %Ix, got: %Ix\n", buf.R12, ctx.R12); + ok(buf.R13 == ctx.R13, "longjmp failed for R13, expected: %Ix, got: %Ix\n", buf.R13, ctx.R13); + ok(buf.R14 == ctx.R14, "longjmp failed for R14, expected: %Ix, got: %Ix\n", buf.R14, ctx.R14); + ok(buf.R15 == ctx.R15, "longjmp failed for R15, expected: %Ix, got: %Ix\n", buf.R15, ctx.R15); fltsave = &buf.Xmm6; for (i = 0; i < 10; i++) { ok(fltsave[i].Part[0] == ctx.FltSave.XmmRegisters[i + 6].Low, - "longjmp failed for Xmm%d, expected %lx, got %lx\n", i + 6, + "longjmp failed for Xmm%d, expected %Ix, got %Ix\n", i + 6, fltsave[i].Part[0], ctx.FltSave.XmmRegisters[i + 6].Low); ok(fltsave[i].Part[1] == ctx.FltSave.XmmRegisters[i + 6].High, - "longjmp failed for Xmm%d, expected %lx, got %lx\n", i + 6, + "longjmp failed for Xmm%d, expected %Ix, got %Ix\n", i + 6, fltsave[i].Part[1], ctx.FltSave.XmmRegisters[i + 6].High); } ok(ctx.FltSave.ControlWord == 0x7f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord); - ok(ctx.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr); - ok(ctx.FltSave.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.FltSave.MxCsr); + ok(ctx.MxCsr == 0x3f80, "Got unexpected MxCsr %#lx.\n", ctx.MxCsr); + ok(ctx.FltSave.MxCsr == 0x3f80, "Got unexpected MxCsr %#lx.\n", ctx.FltSave.MxCsr); buf.FpCsr = 0x27f; buf.MxCsr = 0x1f80; pRtlRestoreContext(&ctx, &rec); @@ -2503,10 +2504,10 @@ static void test_restore_context(void) else if (pass == 5) { ok(ctx.FltSave.ControlWord == 0x27f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord); - ok(ctx.FltSave.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr); + ok(ctx.FltSave.MxCsr == 0x1f80, "Got unexpected MxCsr %#lx.\n", ctx.MxCsr); } else - ok(0, "unexpected pass %d\n", pass); + ok(0, "unexpected pass %ld\n", pass); /* test with jmp through RtlUnwindEx */ pass = 0; @@ -2526,7 +2527,7 @@ static void test_restore_context(void) ok(0, "shouldn't be reached\n"); } else - ok(pass == 4, "unexpected pass %d\n", pass); + ok(pass == 4, "unexpected pass %ld\n", pass); /* test with consolidate */ @@ -2549,7 +2550,7 @@ static void test_restore_context(void) else if (pass == 3) ok(consolidate_dummy_called, "test_consolidate_dummy not called\n"); else - ok(0, "unexpected pass %d\n", pass); + ok(0, "unexpected pass %ld\n", pass); } static RUNTIME_FUNCTION* CALLBACK dynamic_unwind_callback( DWORD64 pc, PVOID context ) @@ -2588,7 +2589,7 @@ static void test_dynamic_unwind(void) ok( func == NULL, "RtlLookupFunctionEntry returned unexpected function, expected: NULL, got: %p\n", func ); ok( !base || broken(base == 0xdeadbeef), - "RtlLookupFunctionEntry modified base address, expected: 0, got: %lx\n", base ); + "RtlLookupFunctionEntry modified base address, expected: 0, got: %Ix\n", base ); /* Test with pointer inside of our function */ base = 0xdeadbeef; @@ -2596,7 +2597,7 @@ static void test_dynamic_unwind(void) ok( func == runtime_func, "RtlLookupFunctionEntry didn't return expected function, expected: %p, got: %p\n", runtime_func, func ); ok( base == (ULONG_PTR)code_mem, - "RtlLookupFunctionEntry returned invalid base, expected: %lx, got: %lx\n", (ULONG_PTR)code_mem, base ); + "RtlLookupFunctionEntry returned invalid base, expected: %Ix, got: %Ix\n", (ULONG_PTR)code_mem, base ); /* Test RtlDeleteFunctionTable */ ok( pRtlDeleteFunctionTable( runtime_func ), @@ -2641,12 +2642,12 @@ static void test_dynamic_unwind(void) /* Test RtlInstallFunctionTableCallback with both low bits unset */ table = (ULONG_PTR)code_mem; ok( !pRtlInstallFunctionTableCallback( table, (ULONG_PTR)code_mem, code_offset + 32, &dynamic_unwind_callback, (PVOID*)&count, NULL ), - "RtlInstallFunctionTableCallback returned success for table = %lx\n", table ); + "RtlInstallFunctionTableCallback returned success for table = %Ix\n", table ); /* Test RtlInstallFunctionTableCallback with both low bits set */ table = (ULONG_PTR)code_mem | 0x3; ok( pRtlInstallFunctionTableCallback( table, (ULONG_PTR)code_mem, code_offset + 32, &dynamic_unwind_callback, (PVOID*)&count, NULL ), - "RtlInstallFunctionTableCallback failed for table = %lx\n", table ); + "RtlInstallFunctionTableCallback failed for table = %Ix\n", table ); /* Lookup function outside of any function table */ count = 0; @@ -2655,9 +2656,9 @@ static void test_dynamic_unwind(void) ok( func == NULL, "RtlLookupFunctionEntry returned unexpected function, expected: NULL, got: %p\n", func ); ok( !base || broken(base == 0xdeadbeef), - "RtlLookupFunctionEntry modified base address, expected: 0, got: %lx\n", base ); + "RtlLookupFunctionEntry modified base address, expected: 0, got: %Ix\n", base ); ok( !count, - "RtlLookupFunctionEntry issued %d unexpected calls to dynamic_unwind_callback\n", count ); + "RtlLookupFunctionEntry issued %ld unexpected calls to dynamic_unwind_callback\n", count ); /* Test with pointer inside of our function */ count = 0; @@ -2666,9 +2667,9 @@ static void test_dynamic_unwind(void) ok( func != NULL && func->BeginAddress == code_offset + 16 && func->EndAddress == code_offset + 32, "RtlLookupFunctionEntry didn't return expected function, got: %p\n", func ); ok( base == (ULONG_PTR)code_mem, - "RtlLookupFunctionEntry returned invalid base, expected: %lx, got: %lx\n", (ULONG_PTR)code_mem, base ); + "RtlLookupFunctionEntry returned invalid base, expected: %Ix, got: %Ix\n", (ULONG_PTR)code_mem, base ); ok( count == 1, - "RtlLookupFunctionEntry issued %d calls to dynamic_unwind_callback, expected: 1\n", count ); + "RtlLookupFunctionEntry issued %ld calls to dynamic_unwind_callback, expected: 1\n", count ); /* Clean up again */ ok( pRtlDeleteFunctionTable( (PRUNTIME_FUNCTION)table ), @@ -2694,26 +2695,26 @@ static void test_dynamic_unwind(void) growable_table = NULL; status = pRtlAddGrowableFunctionTable( &growable_table, runtime_func, 1, 1, (ULONG_PTR)code_mem, (ULONG_PTR)code_mem + 64 ); - ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#x.\n", runtime_func, status ); + ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#lx.\n", runtime_func, status ); ok(growable_table != 0, "Unexpected table value.\n"); pRtlDeleteGrowableFunctionTable( growable_table ); growable_table = NULL; status = pRtlAddGrowableFunctionTable( &growable_table, runtime_func, 2, 2, (ULONG_PTR)code_mem, (ULONG_PTR)code_mem + 64 ); - ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#x.\n", runtime_func, status ); + ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#lx.\n", runtime_func, status ); ok(growable_table != 0, "Unexpected table value.\n"); pRtlDeleteGrowableFunctionTable( growable_table ); growable_table = NULL; status = pRtlAddGrowableFunctionTable( &growable_table, runtime_func, 1, 2, (ULONG_PTR)code_mem, (ULONG_PTR)code_mem + 64 ); - ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#x.\n", runtime_func, status ); + ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#lx.\n", runtime_func, status ); ok(growable_table != 0, "Unexpected table value.\n"); pRtlDeleteGrowableFunctionTable( growable_table ); growable_table = NULL; status = pRtlAddGrowableFunctionTable( &growable_table, runtime_func, 0, 2, (ULONG_PTR)code_mem, (ULONG_PTR)code_mem + code_offset + 64 ); - ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#x.\n", runtime_func, status ); + ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#lx.\n", runtime_func, status ); ok(growable_table != 0, "Unexpected table value.\n"); /* Current count is 0. */ @@ -2728,7 +2729,7 @@ static void test_dynamic_unwind(void) ok( func == runtime_func, "RtlLookupFunctionEntry didn't return expected function, expected: %p, got: %p\n", runtime_func, func ); ok( base == (ULONG_PTR)code_mem, - "RtlLookupFunctionEntry returned invalid base, expected: %lx, got: %lx\n", (ULONG_PTR)code_mem, base ); + "RtlLookupFunctionEntry returned invalid base, expected: %Ix, got: %Ix\n", (ULONG_PTR)code_mem, base ); /* Second function is inaccessible yet. */ base = 0xdeadbeef; @@ -2743,7 +2744,7 @@ static void test_dynamic_unwind(void) ok( func == runtime_func + 1, "RtlLookupFunctionEntry didn't return expected function, expected: %p, got: %p\n", runtime_func, func ); ok( base == (ULONG_PTR)code_mem, - "RtlLookupFunctionEntry returned invalid base, expected: %lx, got: %lx\n", (ULONG_PTR)code_mem, base ); + "RtlLookupFunctionEntry returned invalid base, expected: %Ix, got: %Ix\n", (ULONG_PTR)code_mem, base ); pRtlDeleteGrowableFunctionTable( growable_table ); } @@ -2753,7 +2754,7 @@ static void WINAPI termination_handler(ULONG flags, ULONG64 frame) { termination_handler_called++; - ok(flags == 1 || broken(flags == 0x401), "flags = %x\n", flags); + ok(flags == 1 || broken(flags == 0x401), "flags = %lx\n", flags); ok(frame == 0x1234, "frame = %p\n", (void*)frame); } @@ -2792,13 +2793,13 @@ static void test___C_specific_handler(void) ok(ret == ExceptionContinueSearch, "__C_specific_handler returned %x\n", ret); ok(termination_handler_called == 1, "termination_handler_called = %d\n", termination_handler_called); - ok(dispatch.ScopeIndex == 1, "dispatch.ScopeIndex = %d\n", dispatch.ScopeIndex); + ok(dispatch.ScopeIndex == 1, "dispatch.ScopeIndex = %ld\n", dispatch.ScopeIndex); ret = p__C_specific_handler(&rec, frame, &context, &dispatch); ok(ret == ExceptionContinueSearch, "__C_specific_handler returned %x\n", ret); ok(termination_handler_called == 1, "termination_handler_called = %d\n", termination_handler_called); - ok(dispatch.ScopeIndex == 1, "dispatch.ScopeIndex = %d\n", dispatch.ScopeIndex); + ok(dispatch.ScopeIndex == 1, "dispatch.ScopeIndex = %ld\n", dispatch.ScopeIndex); } /* This is heavily based on the i386 exception tests. */ @@ -3016,14 +3017,14 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, USHORT ds, es, fs, gs, ss; got_exception++; - trace( "exception %u: %x flags:%x addr:%p\n", + trace( "exception %u: %lx flags:%lx addr:%p\n", entry, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); ok( rec->ExceptionCode == except->status || (except->alt_status != 0 && rec->ExceptionCode == except->alt_status), - "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status ); + "%u: Wrong exception code %lx/%lx\n", entry, rec->ExceptionCode, except->status ); ok( context->Rip == (DWORD_PTR)code_mem + except->offset, - "%u: Unexpected eip %#lx/%#lx\n", entry, + "%u: Unexpected eip %#Ix/%#Ix\n", entry, context->Rip, (DWORD_PTR)code_mem + except->offset ); ok( rec->ExceptionAddress == (char*)context->Rip || (rec->ExceptionCode == STATUS_BREAKPOINT && rec->ExceptionAddress == (char*)context->Rip + 1), @@ -3057,7 +3058,7 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, parameter_count = except->alt_nb_params; ok( rec->NumberParameters == parameter_count, - "%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count ); + "%u: Unexpected parameter count %lu/%u\n", entry, rec->NumberParameters, parameter_count ); /* Most CPUs (except Intel Core apparently) report a segment limit violation */ /* instead of page faults for accesses beyond 0xffffffffffffffff */ @@ -3079,14 +3080,14 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, { for (i = 0; i < rec->NumberParameters; i++) ok( rec->ExceptionInformation[i] == except->params[i], - "%u: Wrong parameter %d: %lx/%lx\n", + "%u: Wrong parameter %d: %Ix/%Ix\n", entry, i, rec->ExceptionInformation[i], except->params[i] ); } else { for (i = 0; i < rec->NumberParameters; i++) ok( rec->ExceptionInformation[i] == except->alt_params[i], - "%u: Wrong parameter %d: %lx/%lx\n", + "%u: Wrong parameter %d: %Ix/%Ix\n", entry, i, rec->ExceptionInformation[i], except->alt_params[i] ); } @@ -3136,7 +3137,7 @@ static int check_debug_registers(int test_num, const struct dbgreg_test *test) ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; status = pNtGetContextThread(GetCurrentThread(), &ctx); - ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status); if (!ctx.Dr0 && !ctx.Dr1 && !ctx.Dr2 && !ctx.Dr3 && !ctx.Dr6 && !ctx.Dr7) { @@ -3179,7 +3180,7 @@ static DWORD WINAPI single_step_handler( EXCEPTION_RECORD *rec, ULONG64 frame, /* show that the last single step exception on the popf instruction * (which removed the TF bit), still is a EXCEPTION_SINGLE_STEP exception */ ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP, - "exception is not EXCEPTION_SINGLE_STEP: %x\n", rec->ExceptionCode); + "exception is not EXCEPTION_SINGLE_STEP: %lx\n", rec->ExceptionCode); } return ExceptionContinueExecution; } @@ -3245,7 +3246,7 @@ static DWORD WINAPI bpx_handler( EXCEPTION_RECORD *rec, ULONG64 frame, { got_exception++; ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP, - "wrong exception code: %x\n", rec->ExceptionCode); + "wrong exception code: %lx\n", rec->ExceptionCode); if(got_exception == 1) { /* hw bp exception on first nop */ @@ -3298,7 +3299,7 @@ static DWORD WINAPI int3_handler( EXCEPTION_RECORD *rec, ULONG64 frame, /* trap unhandled exceptions */ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) { - printf( "%04x unhandled exception %08x at %p rip %p eflags %x\n", + printf( "%04lx unhandled exception %08lx at %p rip %p eflags %lx\n", GetCurrentProcessId(), ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress, (void *)ptrs->ContextRecord->Rip, ptrs->ContextRecord->EFlags ); @@ -3336,7 +3337,7 @@ static void test_exceptions(void) ctx.Dr7 = 1; ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; res = pNtSetContextThread( GetCurrentThread(), &ctx ); - ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res); + ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", res); got_exception = 0; run_exception_test(bpx_handler, NULL, dummy_code, sizeof(dummy_code), 0); @@ -3368,7 +3369,7 @@ static void test_exceptions(void) /* test segment registers */ ctx.ContextFlags = CONTEXT_CONTROL | CONTEXT_SEGMENTS; res = pNtGetContextThread( GetCurrentThread(), &ctx ); - ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", res ); + ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", res ); __asm__ volatile( "movw %%ds,%0" : "=g" (ds) ); __asm__ volatile( "movw %%es,%0" : "=g" (es) ); __asm__ volatile( "movw %%fs,%0" : "=g" (fs) ); @@ -3389,14 +3390,14 @@ static void test_exceptions(void) ctx.SegEs = ctx.SegFs; ctx.SegFs = ctx.SegSs; res = pNtSetContextThread( GetCurrentThread(), &ctx ); - ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", res ); + ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", res ); __asm__ volatile( "movw %%ds,%0" : "=g" (ds) ); __asm__ volatile( "movw %%es,%0" : "=g" (es) ); __asm__ volatile( "movw %%fs,%0" : "=g" (fs) ); __asm__ volatile( "movw %%gs,%0" : "=g" (gs) ); __asm__ volatile( "movw %%ss,%0" : "=g" (ss) ); res = pNtGetContextThread( GetCurrentThread(), &ctx ); - ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", res ); + ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", res ); ok( ctx.SegDs == ds, "wrong ds %04x / %04x\n", ctx.SegDs, ds ); ok( ctx.SegEs == es, "wrong es %04x / %04x\n", ctx.SegEs, es ); ok( ctx.SegFs == fs, "wrong fs %04x / %04x\n", ctx.SegFs, fs ); @@ -3431,11 +3432,11 @@ static DWORD WINAPI simd_fault_handler( EXCEPTION_RECORD *rec, ULONG64 frame, else { ULONG expect = *stage == 2 ? EXCEPTION_FLT_DIVIDE_BY_ZERO : EXCEPTION_FLT_INVALID_OPERATION; - ok( rec->ExceptionCode == expect, "exception code: %#x, should be %#x\n", + ok( rec->ExceptionCode == expect, "exception code: %#lx, should be %#lx\n", rec->ExceptionCode, expect ); - ok( rec->NumberParameters == 2, "# of params: %i, should be 2\n", rec->NumberParameters); - ok( rec->ExceptionInformation[0] == 0, "param #0: %lx\n", rec->ExceptionInformation[0]); - ok( rec->ExceptionInformation[1] == context->MxCsr, "param #1: %lx / %lx\n", + ok( rec->NumberParameters == 2, "# of params: %li, should be 2\n", rec->NumberParameters); + ok( rec->ExceptionInformation[0] == 0, "param #0: %Ix\n", rec->ExceptionInformation[0]); + ok( rec->ExceptionInformation[1] == context->MxCsr, "param #1: %Ix / %lx\n", rec->ExceptionInformation[1], context->MxCsr); } context->Rip += 3; /* skip divps */ @@ -3532,15 +3533,15 @@ static LONG CALLBACK dpe_handler(EXCEPTION_POINTERS *info) EXCEPTION_RECORD *rec = info->ExceptionRecord; DWORD old_prot; - trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); got_exception++; ok(rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION, - "got %#x\n", rec->ExceptionCode); - ok(rec->NumberParameters == 2, "got %u params\n", rec->NumberParameters); + "got %#lx\n", rec->ExceptionCode); + ok(rec->NumberParameters == 2, "got %lu params\n", rec->NumberParameters); ok(rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT, - "got %#lx\n", rec->ExceptionInformation[0]); + "got %#Ix\n", rec->ExceptionInformation[0]); ok((void *)rec->ExceptionInformation[1] == code_mem, "got %p\n", (void *)rec->ExceptionInformation[1]); @@ -3558,19 +3559,19 @@ static void test_dpe_exceptions(void) void *handler; status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val, &len ); - ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "got status %08x\n", status ); + ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "got status %08lx\n", status ); if (!status) { - ok( len == sizeof(val), "wrong len %u\n", len ); + ok( len == sizeof(val), "wrong len %lu\n", len ); ok( val == (MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_PERMANENT | MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION), - "wrong val %08x\n", val ); + "wrong val %08lx\n", val ); } - else ok( len == 0xdeadbeef, "wrong len %u\n", len ); + else ok( len == 0xdeadbeef, "wrong len %lu\n", len ); val = MEM_EXECUTE_OPTION_DISABLE; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val ); - ok( status == STATUS_INVALID_PARAMETER, "got status %08x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "got status %08lx\n", status ); memcpy(code_mem, ret, sizeof(ret)); @@ -3622,7 +3623,7 @@ static void rtlraiseexception_handler_( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR if (unhandled_handler) rtlraiseexception_unhandled_handler_called = 1; else rtlraiseexception_handler_called = 1; - trace( "exception: %08x flags:%x addr:%p context: Rip:%p\n", + trace( "exception: %08lx flags:%lx addr:%p context: Rip:%p\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, (void *)context->Rip ); ok( rec->ExceptionAddress == (char *)code_mem + 0x10 @@ -3632,7 +3633,7 @@ static void rtlraiseexception_handler_( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE) || context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS) || context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS | CONTEXT_XSTATE), - "wrong context flags %x\n", context->ContextFlags ); + "wrong context flags %lx\n", context->ContextFlags ); /* check that pc is fixed up only for EXCEPTION_BREAKPOINT * even if raised by RtlRaiseException @@ -3679,7 +3680,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce PCONTEXT context = ExceptionInfo->ContextRecord; PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; - trace( "vect. handler %08x addr:%p Rip:%p\n", rec->ExceptionCode, rec->ExceptionAddress, (void *)context->Rip ); + trace( "vect. handler %08lx addr:%p Rip:%p\n", rec->ExceptionCode, rec->ExceptionAddress, (void *)context->Rip ); ok( rec->ExceptionAddress == (char *)code_mem + 0x10 || broken(rec->ExceptionAddress == code_mem || !rec->ExceptionAddress ) /* 2008 */, @@ -3782,7 +3783,7 @@ static void test_debugger(DWORD cont_status) sprintf(cmdline, "%s %s %s %p", my_argv[0], my_argv[1], "debuggee", &test_stage); ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); - ok(ret, "could not create child process error: %u\n", GetLastError()); + ok(ret, "could not create child process error: %lu\n", GetLastError()); if (!ret) return; @@ -3793,11 +3794,11 @@ static void test_debugger(DWORD cont_status) ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); ok(!ret, "ContinueDebugEvent unexpectedly succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected last error: %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected last error: %lu\n", GetLastError()); if (de.dwThreadId != pi.dwThreadId) { - trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); + trace("event %ld not coming from main thread, ignoring\n", de.dwDebugEventCode); ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -3818,16 +3819,16 @@ static void test_debugger(DWORD cont_status) counter++; status = pNtReadVirtualMemory(pi.hProcess, &code_mem, &code_mem_address, sizeof(code_mem_address), &size_read); - ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status); status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, sizeof(stage), &size_read); - ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status); ctx.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS; status = pNtGetContextThread(pi.hThread, &ctx); - ok(!status, "NtGetContextThread failed with 0x%x\n", status); + ok(!status, "NtGetContextThread failed with 0x%lx\n", status); - trace("exception 0x%x at %p firstchance=%d Rip=%p, Rax=%p\n", + trace("exception 0x%lx at %p firstchance=%ld Rip=%p, Rax=%p\n", de.u.Exception.ExceptionRecord.ExceptionCode, de.u.Exception.ExceptionRecord.ExceptionAddress, de.u.Exception.dwFirstChance, (char *)ctx.Rip, (char *)ctx.Rax); @@ -3884,7 +3885,7 @@ static void test_debugger(DWORD cont_status) (char *)ctx.Rip, (char *)code_mem_address + 0xf); ctx.Rip += 1; } - else ok((char *)ctx.Rip == (char *)code_mem_address + 0x10, "Rip at 0x%x instead of %p\n", + else ok((char *)ctx.Rip == (char *)code_mem_address + 0x10, "Rip at 0x%I64x instead of %p\n", ctx.Rip, (char *)code_mem_address + 0x10); /* here we handle exception */ } @@ -3892,7 +3893,7 @@ static void test_debugger(DWORD cont_status) else if (stage == 7 || stage == 8) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, - "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode); + "expected EXCEPTION_BREAKPOINT, got %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode); ok((char *)ctx.Rip == (char *)code_mem_address + 0x30, "expected Rip = %p, got %p\n", (char *)code_mem_address + 0x30, (char *)ctx.Rip); if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -3900,7 +3901,7 @@ static void test_debugger(DWORD cont_status) else if (stage == 9 || stage == 10) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, - "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode); + "expected EXCEPTION_BREAKPOINT, got %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode); ok((char *)ctx.Rip == (char *)code_mem_address + 2, "expected Rip = %p, got %p\n", (char *)code_mem_address + 2, (char *)ctx.Rip); if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; @@ -3908,10 +3909,10 @@ static void test_debugger(DWORD cont_status) else if (stage == 11 || stage == 12 || stage == 13) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, - "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode, + "unexpected exception code %08lx, expected %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode, EXCEPTION_INVALID_HANDLE); ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, - "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); + "unexpected number of parameters %ld, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } @@ -3933,9 +3934,9 @@ static void test_debugger(DWORD cont_status) ctx.SegEs = ctx.SegFs; ctx.SegGs = 0; status = pNtSetContextThread( pi.hThread, &ctx ); - ok( status == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", status ); + ok( status == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", status ); status = pNtGetContextThread( pi.hThread, &ctx ); - ok( status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status ); + ok( status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status ); todo_wine ok( ctx.SegSs == ss, "wrong ss %04x / %04x\n", ctx.SegSs, ss ); ok( ctx.SegDs == ctx.SegSs, "wrong ds %04x / %04x\n", ctx.SegDs, ctx.SegSs ); ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs ); @@ -3946,7 +3947,7 @@ static void test_debugger(DWORD cont_status) ok(FALSE, "unexpected stage %u\n", stage); status = pNtSetContextThread(pi.hThread, &ctx); - ok(!status, "NtSetContextThread failed with 0x%x\n", status); + ok(!status, "NtSetContextThread failed with 0x%lx\n", status); } } else if (de.dwDebugEventCode == OUTPUT_DEBUG_STRING_EVENT) @@ -3956,7 +3957,7 @@ static void test_debugger(DWORD cont_status) status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, sizeof(stage), &size_read); - ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status); ok(!de.u.DebugString.fUnicode, "unexpected unicode debug string event\n"); ok(de.u.DebugString.nDebugStringLength < sizeof(buffer) - 1, "buffer not large enough to hold %d bytes\n", @@ -3965,7 +3966,7 @@ static void test_debugger(DWORD cont_status) memset(buffer, 0, sizeof(buffer)); status = pNtReadVirtualMemory(pi.hProcess, de.u.DebugString.lpDebugStringData, buffer, de.u.DebugString.nDebugStringLength, &size_read); - ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status); if (stage == 3 || stage == 4) ok(!strcmp(buffer, "Hello World"), "got unexpected debug string '%s'\n", buffer); @@ -3980,13 +3981,13 @@ static void test_debugger(DWORD cont_status) status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, sizeof(stage), &size_read); - ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status); if (stage == 5 || stage == 6) { - ok(de.u.RipInfo.dwError == 0x11223344, "got unexpected rip error code %08x, expected %08x\n", + ok(de.u.RipInfo.dwError == 0x11223344, "got unexpected rip error code %08lx, expected %08x\n", de.u.RipInfo.dwError, 0x11223344); - ok(de.u.RipInfo.dwType == 0x55667788, "got unexpected rip type %08x, expected %08x\n", + ok(de.u.RipInfo.dwType == 0x55667788, "got unexpected rip type %08lx, expected %08x\n", de.u.RipInfo.dwType, 0x55667788); } else @@ -4001,9 +4002,9 @@ static void test_debugger(DWORD cont_status) wait_child_process( pi.hProcess ); ret = CloseHandle(pi.hThread); - ok(ret, "error %u\n", GetLastError()); + ok(ret, "error %lu\n", GetLastError()); ret = CloseHandle(pi.hProcess); - ok(ret, "error %u\n", GetLastError()); + ok(ret, "error %lu\n", GetLastError()); } static void test_thread_context(void) @@ -4087,16 +4088,16 @@ static void test_thread_context(void) func_ptr( &context, 0, &expect, pRtlCaptureContext ); trace( "expect: rax=%p rbx=%p rcx=%p rdx=%p rsi=%p rdi=%p " "r8=%p r9=%p r10=%p r11=%p r12=%p r13=%p r14=%p r15=%p " - "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n", + "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08I64x prev=%p\n", (void *)expect.Rax, (void *)expect.Rbx, (void *)expect.Rcx, (void *)expect.Rdx, (void *)expect.Rsi, (void *)expect.Rdi, (void *)expect.R8, (void *)expect.R9, (void *)expect.R10, (void *)expect.R11, (void *)expect.R12, (void *)expect.R13, (void *)expect.R14, (void *)expect.R15, (void *)expect.Rbp, (void *)expect.Rsp, (void *)expect.Rip, expect.SegCs, expect.SegDs, expect.SegEs, - expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, expect.prev_frame ); + expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, (void*)expect.prev_frame ); trace( "actual: rax=%p rbx=%p rcx=%p rdx=%p rsi=%p rdi=%p " "r8=%p r9=%p r10=%p r11=%p r12=%p r13=%p r14=%p r15=%p " - "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n", + "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08lx\n", (void *)context.Rax, (void *)context.Rbx, (void *)context.Rcx, (void *)context.Rdx, (void *)context.Rsi, (void *)context.Rdi, (void *)context.R8, (void *)context.R9, (void *)context.R10, (void *)context.R11, (void *)context.R12, (void *)context.R13, @@ -4105,7 +4106,7 @@ static void test_thread_context(void) context.SegFs, context.SegGs, context.SegSs, context.EFlags ); ok( context.ContextFlags == (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT), - "wrong flags %08x\n", context.ContextFlags ); + "wrong flags %08lx\n", context.ContextFlags ); COMPARE( Rax ); COMPARE( Rbx ); COMPARE( Rcx ); @@ -4144,19 +4145,19 @@ static void test_thread_context(void) context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT; status = func_ptr( GetCurrentThread(), &context, &expect, pNtGetContextThread ); - ok( status == STATUS_SUCCESS, "NtGetContextThread failed %08x\n", status ); + ok( status == STATUS_SUCCESS, "NtGetContextThread failed %08lx\n", status ); trace( "expect: rax=%p rbx=%p rcx=%p rdx=%p rsi=%p rdi=%p " "r8=%p r9=%p r10=%p r11=%p r12=%p r13=%p r14=%p r15=%p " - "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n", + "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08I64x prev=%p\n", (void *)expect.Rax, (void *)expect.Rbx, (void *)expect.Rcx, (void *)expect.Rdx, (void *)expect.Rsi, (void *)expect.Rdi, (void *)expect.R8, (void *)expect.R9, (void *)expect.R10, (void *)expect.R11, (void *)expect.R12, (void *)expect.R13, (void *)expect.R14, (void *)expect.R15, (void *)expect.Rbp, (void *)expect.Rsp, (void *)expect.Rip, expect.SegCs, expect.SegDs, expect.SegEs, - expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, expect.prev_frame ); + expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, (void*)expect.prev_frame ); trace( "actual: rax=%p rbx=%p rcx=%p rdx=%p rsi=%p rdi=%p " "r8=%p r9=%p r10=%p r11=%p r12=%p r13=%p r14=%p r15=%p " - "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n", + "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08lx\n", (void *)context.Rax, (void *)context.Rbx, (void *)context.Rcx, (void *)context.Rdx, (void *)context.Rsi, (void *)context.Rdi, (void *)context.R8, (void *)context.R9, (void *)context.R10, (void *)context.R11, (void *)context.R12, (void *)context.R13, @@ -4221,45 +4222,45 @@ static void test_wow64_context(void) memset(&ctx, 0x55, sizeof(ctx)); ctx.ContextFlags = WOW64_CONTEXT_ALL; ret = pRtlWow64GetThreadContext( GetCurrentThread(), &ctx ); - ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_PARTIAL_COPY), "got %#x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_PARTIAL_COPY), "got %#lx\n", ret); sprintf( cmdline, "\"%s\" /c for /l %%n in () do @echo >nul", appname ); r = CreateProcessA( appname, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); - ok( r, "failed to start %s err %u\n", appname, GetLastError() ); + ok( r, "failed to start %s err %lu\n", appname, GetLastError() ); ret = pRtlWow64GetThreadContext( pi.hThread, &ctx ); - ok(ret == STATUS_SUCCESS, "got %#x\n", ret); - ok(ctx.ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#x\n", ctx.ContextFlags); - ok(!ctx.Ebp, "got ebp %08x\n", ctx.Ebp); - ok(!ctx.Ecx, "got ecx %08x\n", ctx.Ecx); - ok(!ctx.Edx, "got edx %08x\n", ctx.Edx); - ok(!ctx.Esi, "got esi %08x\n", ctx.Esi); - ok(!ctx.Edi, "got edi %08x\n", ctx.Edi); - ok((ctx.EFlags & ~2) == 0x200, "got eflags %08x\n", ctx.EFlags); - ok((WORD) ctx.FloatSave.ControlWord == 0x27f, "got control word %08x\n", + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok(ctx.ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#lx\n", ctx.ContextFlags); + ok(!ctx.Ebp, "got ebp %08lx\n", ctx.Ebp); + ok(!ctx.Ecx, "got ecx %08lx\n", ctx.Ecx); + ok(!ctx.Edx, "got edx %08lx\n", ctx.Edx); + ok(!ctx.Esi, "got esi %08lx\n", ctx.Esi); + ok(!ctx.Edi, "got edi %08lx\n", ctx.Edi); + ok((ctx.EFlags & ~2) == 0x200, "got eflags %08lx\n", ctx.EFlags); + ok((WORD) ctx.FloatSave.ControlWord == 0x27f, "got control word %08lx\n", ctx.FloatSave.ControlWord); ok(*(WORD *)ctx.ExtendedRegisters == 0x27f, "got SSE control word %04x\n", *(WORD *)ctx.ExtendedRegisters); ret = pRtlWow64SetThreadContext( pi.hThread, &ctx ); - ok(ret == STATUS_SUCCESS, "got %#x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); pNtQueryInformationThread( pi.hThread, ThreadBasicInformation, &info, sizeof(info), NULL ); if (!ReadProcessMemory( pi.hProcess, info.TebBaseAddress, &teb, sizeof(teb), &res )) res = 0; - ok( res == sizeof(teb), "wrong len %lx\n", res ); + ok( res == sizeof(teb), "wrong len %Ix\n", res ); memset( &teb32, 0, sizeof(teb32) ); if (teb.WowTebOffset > 1) { if (!ReadProcessMemory( pi.hProcess, (char *)info.TebBaseAddress + teb.WowTebOffset, &teb32, sizeof(teb32), &res )) res = 0; - ok( res == sizeof(teb32), "wrong len %lx\n", res ); + ok( res == sizeof(teb32), "wrong len %Ix\n", res ); ok( ((ctx.Esp + 0xfff) & ~0xfff) == teb32.Tib.StackBase, - "esp is not at top of stack: %08x / %08x\n", ctx.Esp, teb32.Tib.StackBase ); + "esp is not at top of stack: %08lx / %08lx\n", ctx.Esp, teb32.Tib.StackBase ); ok( ULongToPtr( teb32.Tib.StackBase ) <= teb.DeallocationStack || ULongToPtr( teb32.DeallocationStack ) >= teb.Tib.StackBase, - "stacks overlap %08x-%08x / %p-%p\n", teb32.DeallocationStack, teb32.Tib.StackBase, + "stacks overlap %08lx-%08lx / %p-%p\n", teb32.DeallocationStack, teb32.Tib.StackBase, teb.DeallocationStack, teb.Tib.StackBase ); } @@ -4270,29 +4271,29 @@ static void test_wow64_context(void) cpu_size = 0x1000 - ((ULONG_PTR)teb.TlsSlots[WOW64_TLS_CPURESERVED] & 0xfff); cpu = malloc( cpu_size ); if (!ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res )) res = 0; - ok( res == cpu_size, "wrong len %lx\n", res ); + ok( res == cpu_size, "wrong len %Ix\n", res ); ok( cpu->Machine == IMAGE_FILE_MACHINE_I386, "wrong machine %04x\n", cpu->Machine ); ret = pRtlWow64GetCpuAreaInfo( cpu, 0, &cpu_info ); - ok( !ret, "RtlWow64GetCpuAreaInfo failed %x\n", ret ); + ok( !ret, "RtlWow64GetCpuAreaInfo failed %lx\n", ret ); ctx_ptr = (WOW64_CONTEXT *)cpu_info.Context; ok(!*(void **)cpu_info.ContextEx, "got context_ex %p\n", *(void **)cpu_info.ContextEx); - ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#x\n", ctx_ptr->ContextFlags); - ok(ctx_ptr->Eax == ctx.Eax, "got eax %08x / %08x\n", ctx_ptr->Eax, ctx.Eax); - ok(ctx_ptr->Ebx == ctx.Ebx, "got ebx %08x / %08x\n", ctx_ptr->Ebx, ctx.Ebx); - ok(ctx_ptr->Ecx == ctx.Ecx, "got ecx %08x / %08x\n", ctx_ptr->Ecx, ctx.Ecx); - ok(ctx_ptr->Edx == ctx.Edx, "got edx %08x / %08x\n", ctx_ptr->Edx, ctx.Edx); - ok(ctx_ptr->Ebp == ctx.Ebp, "got ebp %08x / %08x\n", ctx_ptr->Ebp, ctx.Ebp); - ok(ctx_ptr->Esi == ctx.Esi, "got esi %08x / %08x\n", ctx_ptr->Esi, ctx.Esi); - ok(ctx_ptr->Edi == ctx.Edi, "got edi %08x / %08x\n", ctx_ptr->Edi, ctx.Edi); - ok(ctx_ptr->SegCs == ctx.SegCs, "got cs %04x / %04x\n", ctx_ptr->SegCs, ctx.SegCs); - ok(ctx_ptr->SegDs == ctx.SegDs, "got ds %04x / %04x\n", ctx_ptr->SegDs, ctx.SegDs); - ok(ctx_ptr->SegEs == ctx.SegEs, "got es %04x / %04x\n", ctx_ptr->SegEs, ctx.SegEs); - ok(ctx_ptr->SegFs == ctx.SegFs, "got fs %04x / %04x\n", ctx_ptr->SegFs, ctx.SegFs); - ok(ctx_ptr->SegGs == ctx.SegGs, "got gs %04x / %04x\n", ctx_ptr->SegGs, ctx.SegGs); - ok(ctx_ptr->SegSs == ctx.SegSs, "got ss %04x / %04x\n", ctx_ptr->SegSs, ctx.SegSs); - ok(ctx_ptr->EFlags == ctx.EFlags, "got eflags %08x / %08x\n", ctx_ptr->EFlags, ctx.EFlags); + ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#lx\n", ctx_ptr->ContextFlags); + ok(ctx_ptr->Eax == ctx.Eax, "got eax %08lx / %08lx\n", ctx_ptr->Eax, ctx.Eax); + ok(ctx_ptr->Ebx == ctx.Ebx, "got ebx %08lx / %08lx\n", ctx_ptr->Ebx, ctx.Ebx); + ok(ctx_ptr->Ecx == ctx.Ecx, "got ecx %08lx / %08lx\n", ctx_ptr->Ecx, ctx.Ecx); + ok(ctx_ptr->Edx == ctx.Edx, "got edx %08lx / %08lx\n", ctx_ptr->Edx, ctx.Edx); + ok(ctx_ptr->Ebp == ctx.Ebp, "got ebp %08lx / %08lx\n", ctx_ptr->Ebp, ctx.Ebp); + ok(ctx_ptr->Esi == ctx.Esi, "got esi %08lx / %08lx\n", ctx_ptr->Esi, ctx.Esi); + ok(ctx_ptr->Edi == ctx.Edi, "got edi %08lx / %08lx\n", ctx_ptr->Edi, ctx.Edi); + ok(ctx_ptr->SegCs == ctx.SegCs, "got cs %04lx / %04lx\n", ctx_ptr->SegCs, ctx.SegCs); + ok(ctx_ptr->SegDs == ctx.SegDs, "got ds %04lx / %04lx\n", ctx_ptr->SegDs, ctx.SegDs); + ok(ctx_ptr->SegEs == ctx.SegEs, "got es %04lx / %04lx\n", ctx_ptr->SegEs, ctx.SegEs); + ok(ctx_ptr->SegFs == ctx.SegFs, "got fs %04lx / %04lx\n", ctx_ptr->SegFs, ctx.SegFs); + ok(ctx_ptr->SegGs == ctx.SegGs, "got gs %04lx / %04lx\n", ctx_ptr->SegGs, ctx.SegGs); + ok(ctx_ptr->SegSs == ctx.SegSs, "got ss %04lx / %04lx\n", ctx_ptr->SegSs, ctx.SegSs); + ok(ctx_ptr->EFlags == ctx.EFlags, "got eflags %08lx / %08lx\n", ctx_ptr->EFlags, ctx.EFlags); ok((WORD)ctx_ptr->FloatSave.ControlWord == ctx.FloatSave.ControlWord, - "got control word %08x / %08x\n", ctx_ptr->FloatSave.ControlWord, ctx.FloatSave.ControlWord); + "got control word %08lx / %08lx\n", ctx_ptr->FloatSave.ControlWord, ctx.FloatSave.ControlWord); ok(*(WORD *)ctx_ptr->ExtendedRegisters == *(WORD *)ctx.ExtendedRegisters, "got SSE control word %04x / %04x\n", *(WORD *)ctx_ptr->ExtendedRegisters, *(WORD *)ctx.ExtendedRegisters); @@ -4300,11 +4301,11 @@ static void test_wow64_context(void) ecx = ctx.Ecx; ctx.Ecx = 0x12345678; ret = pRtlWow64SetThreadContext( pi.hThread, &ctx ); - ok(ret == STATUS_SUCCESS, "got %#x\n", ret); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); if (!ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res )) res = 0; - ok( res == cpu_size, "wrong len %lx\n", res ); + ok( res == cpu_size, "wrong len %Ix\n", res ); todo_wine - ok( ctx_ptr->Ecx == 0x12345678, "got ecx %08x\n", ctx_ptr->Ecx ); + ok( ctx_ptr->Ecx == 0x12345678, "got ecx %08lx\n", ctx_ptr->Ecx ); ctx.Ecx = ecx; pRtlWow64SetThreadContext( pi.hThread, &ctx ); } @@ -4313,37 +4314,37 @@ static void test_wow64_context(void) memset( &context, 0x55, sizeof(context) ); context.ContextFlags = CONTEXT_ALL; ret = pNtGetContextThread( pi.hThread, &context ); - ok(ret == STATUS_SUCCESS, "got %#x\n", ret); - ok( context.ContextFlags == CONTEXT_ALL, "got context flags %#x\n", context.ContextFlags ); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok( context.ContextFlags == CONTEXT_ALL, "got context flags %#lx\n", context.ContextFlags ); todo_wine - ok( !context.Rax, "rax is not zero %lx\n", context.Rax ); + ok( !context.Rax, "rax is not zero %Ix\n", context.Rax ); todo_wine - ok( !context.Rbx, "rbx is not zero %lx\n", context.Rbx ); - ok( !context.Rsi, "rsi is not zero %lx\n", context.Rsi ); - ok( !context.Rdi, "rdi is not zero %lx\n", context.Rdi ); - ok( !context.Rbp, "rbp is not zero %lx\n", context.Rbp ); - ok( !context.R8, "r8 is not zero %lx\n", context.R8 ); - ok( !context.R9, "r9 is not zero %lx\n", context.R9 ); - ok( !context.R10, "r10 is not zero %lx\n", context.R10 ); - ok( !context.R11, "r11 is not zero %lx\n", context.R11 ); - ok( !context.R12, "r12 is not zero %lx\n", context.R12 ); - ok( !context.R13, "r13 is not zero %lx\n", context.R13 ); - ok( !context.R14, "r14 is not zero %lx\n", context.R14 ); - ok( !context.R15, "r15 is not zero %lx\n", context.R15 ); + ok( !context.Rbx, "rbx is not zero %Ix\n", context.Rbx ); + ok( !context.Rsi, "rsi is not zero %Ix\n", context.Rsi ); + ok( !context.Rdi, "rdi is not zero %Ix\n", context.Rdi ); + ok( !context.Rbp, "rbp is not zero %Ix\n", context.Rbp ); + ok( !context.R8, "r8 is not zero %Ix\n", context.R8 ); + ok( !context.R9, "r9 is not zero %Ix\n", context.R9 ); + ok( !context.R10, "r10 is not zero %Ix\n", context.R10 ); + ok( !context.R11, "r11 is not zero %Ix\n", context.R11 ); + ok( !context.R12, "r12 is not zero %Ix\n", context.R12 ); + ok( !context.R13, "r13 is not zero %Ix\n", context.R13 ); + ok( !context.R14, "r14 is not zero %Ix\n", context.R14 ); + ok( !context.R15, "r15 is not zero %Ix\n", context.R15 ); todo_wine ok( ((ULONG_PTR)context.Rsp & ~0xfff) == ((ULONG_PTR)teb.Tib.StackBase & ~0xfff), "rsp is not at top of stack %p / %p\n", (void *)context.Rsp, teb.Tib.StackBase ); todo_wine - ok( context.EFlags == 0x200, "wrong flags %08x\n", context.EFlags ); - ok( context.MxCsr == 0x1f80, "wrong mxcsr %08x\n", context.MxCsr ); + ok( context.EFlags == 0x200, "wrong flags %08lx\n", context.EFlags ); + ok( context.MxCsr == 0x1f80, "wrong mxcsr %08lx\n", context.MxCsr ); ok( context.FltSave.ControlWord == 0x27f, "wrong control %08x\n", context.FltSave.ControlWord ); todo_wine ok( context.SegCs != ctx.SegCs, "wrong cs %04x\n", context.SegCs ); - ok( context.SegDs == ctx.SegDs, "wrong ds %04x / %04x\n", context.SegDs, ctx.SegDs ); - ok( context.SegEs == ctx.SegEs, "wrong es %04x / %04x\n", context.SegEs, ctx.SegEs ); - ok( context.SegFs == ctx.SegFs, "wrong fs %04x / %04x\n", context.SegFs, ctx.SegFs ); - ok( context.SegGs == ctx.SegGs, "wrong gs %04x / %04x\n", context.SegGs, ctx.SegGs ); - ok( context.SegSs == ctx.SegSs, "wrong ss %04x / %04x\n", context.SegSs, ctx.SegSs ); + ok( context.SegDs == ctx.SegDs, "wrong ds %04x / %04lx\n", context.SegDs, ctx.SegDs ); + ok( context.SegEs == ctx.SegEs, "wrong es %04x / %04lx\n", context.SegEs, ctx.SegEs ); + ok( context.SegFs == ctx.SegFs, "wrong fs %04x / %04lx\n", context.SegFs, ctx.SegFs ); + ok( context.SegGs == ctx.SegGs, "wrong gs %04x / %04lx\n", context.SegGs, ctx.SegGs ); + ok( context.SegSs == ctx.SegSs, "wrong ss %04x / %04lx\n", context.SegSs, ctx.SegSs ); cs32 = ctx.SegCs; cs64 = context.SegCs; @@ -4361,7 +4362,7 @@ static void test_wow64_context(void) memset( &context, 0x55, sizeof(context) ); context.ContextFlags = CONTEXT_ALL; ret = pNtGetContextThread( pi.hThread, &context ); - ok( ret == STATUS_SUCCESS, "got %#x\n", ret ); + ok( ret == STATUS_SUCCESS, "got %#lx\n", ret ); if (ret) break; if (context.SegCs == cs32 && got32) continue; if (context.SegCs == cs64 && got64) continue; @@ -4374,30 +4375,30 @@ static void test_wow64_context(void) memset( &ctx, 0x55, sizeof(ctx) ); ctx.ContextFlags = WOW64_CONTEXT_ALL; ret = pRtlWow64GetThreadContext( pi.hThread, &ctx ); - ok(ret == STATUS_SUCCESS, "got %#x\n", ret); - ok( ctx.ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#x\n", ctx.ContextFlags ); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ok( ctx.ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#lx\n", ctx.ContextFlags ); if (context.SegCs == cs32) { trace( "in 32-bit mode %04x\n", context.SegCs ); - ok( ctx.Eip == context.Rip, "cs32: eip %08x / %p\n", ctx.Eip, (void *)context.Rip ); - ok( ctx.Ebp == context.Rbp, "cs32: ebp %08x / %p\n", ctx.Ebp, (void *)context.Rbp ); - ok( ctx.Esp == context.Rsp, "cs32: esp %08x / %p\n", ctx.Esp, (void *)context.Rsp ); - ok( ctx.Eax == context.Rax, "cs32: eax %08x / %p\n", ctx.Eax, (void *)context.Rax ); - ok( ctx.Ebx == context.Rbx, "cs32: ebx %08x / %p\n", ctx.Ebx, (void *)context.Rbx ); + ok( ctx.Eip == context.Rip, "cs32: eip %08lx / %p\n", ctx.Eip, (void *)context.Rip ); + ok( ctx.Ebp == context.Rbp, "cs32: ebp %08lx / %p\n", ctx.Ebp, (void *)context.Rbp ); + ok( ctx.Esp == context.Rsp, "cs32: esp %08lx / %p\n", ctx.Esp, (void *)context.Rsp ); + ok( ctx.Eax == context.Rax, "cs32: eax %08lx / %p\n", ctx.Eax, (void *)context.Rax ); + ok( ctx.Ebx == context.Rbx, "cs32: ebx %08lx / %p\n", ctx.Ebx, (void *)context.Rbx ); ok( ctx.Ecx == context.Rcx || broken(ctx.Ecx == (ULONG)context.Rcx), - "cs32: ecx %08x / %p\n", ctx.Ecx, (void *)context.Rcx ); - ok( ctx.Edx == context.Rdx, "cs32: edx %08x / %p\n", ctx.Edx, (void *)context.Rdx ); - ok( ctx.Esi == context.Rsi, "cs32: esi %08x / %p\n", ctx.Esi, (void *)context.Rsi ); - ok( ctx.Edi == context.Rdi, "cs32: edi %08x / %p\n", ctx.Edi, (void *)context.Rdi ); - ok( ctx.SegCs == cs32, "cs32: wrong cs %04x / %04x\n", ctx.SegCs, cs32 ); - ok( ctx.SegDs == context.SegDs, "cs32: wrong ds %04x / %04x\n", ctx.SegDs, context.SegDs ); - ok( ctx.SegEs == context.SegEs, "cs32: wrong es %04x / %04x\n", ctx.SegEs, context.SegEs ); - ok( ctx.SegFs == context.SegFs, "cs32: wrong fs %04x / %04x\n", ctx.SegFs, context.SegFs ); - ok( ctx.SegGs == context.SegGs, "cs32: wrong gs %04x / %04x\n", ctx.SegGs, context.SegGs ); - ok( ctx.SegSs == context.SegSs, "cs32: wrong ss %04x / %04x\n", ctx.SegSs, context.SegSs ); + "cs32: ecx %08lx / %p\n", ctx.Ecx, (void *)context.Rcx ); + ok( ctx.Edx == context.Rdx, "cs32: edx %08lx / %p\n", ctx.Edx, (void *)context.Rdx ); + ok( ctx.Esi == context.Rsi, "cs32: esi %08lx / %p\n", ctx.Esi, (void *)context.Rsi ); + ok( ctx.Edi == context.Rdi, "cs32: edi %08lx / %p\n", ctx.Edi, (void *)context.Rdi ); + ok( ctx.SegCs == cs32, "cs32: wrong cs %04lx / %04x\n", ctx.SegCs, cs32 ); + ok( ctx.SegDs == context.SegDs, "cs32: wrong ds %04lx / %04x\n", ctx.SegDs, context.SegDs ); + ok( ctx.SegEs == context.SegEs, "cs32: wrong es %04lx / %04x\n", ctx.SegEs, context.SegEs ); + ok( ctx.SegFs == context.SegFs, "cs32: wrong fs %04lx / %04x\n", ctx.SegFs, context.SegFs ); + ok( ctx.SegGs == context.SegGs, "cs32: wrong gs %04lx / %04x\n", ctx.SegGs, context.SegGs ); + ok( ctx.SegSs == context.SegSs, "cs32: wrong ss %04lx / %04x\n", ctx.SegSs, context.SegSs ); if (teb32.DeallocationStack) ok( ctx.Esp >= teb32.DeallocationStack && ctx.Esp <= teb32.Tib.StackBase, - "cs32: esp not inside 32-bit stack %08x / %08x-%08x\n", ctx.Esp, + "cs32: esp not inside 32-bit stack %08lx / %08lx-%08lx\n", ctx.Esp, teb32.DeallocationStack, teb32.Tib.StackBase ); /* r12 points to the TEB */ ok( (void *)context.R12 == info.TebBaseAddress, @@ -4417,9 +4418,9 @@ static void test_wow64_context(void) /* in 32-bit mode, the 32-bit context is the current cpu context, not the stored one */ if (!ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res )) res = 0; - ok( res == cpu_size, "wrong len %lx\n", res ); + ok( res == cpu_size, "wrong len %Ix\n", res ); ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, - "cs32: got context flags %#x\n", ctx_ptr->ContextFlags); + "cs32: got context flags %#lx\n", ctx_ptr->ContextFlags); /* changing either context changes the actual cpu context */ rcx = context.Rcx; @@ -4429,17 +4430,17 @@ static void test_wow64_context(void) memset( &ctx, 0x55, sizeof(ctx) ); ctx.ContextFlags = WOW64_CONTEXT_ALL; pRtlWow64GetThreadContext( pi.hThread, &ctx ); - ok( ctx.Ecx == 0x87654321, "cs64: ecx set to %08x\n", ctx.Ecx ); + ok( ctx.Ecx == 0x87654321, "cs64: ecx set to %08lx\n", ctx.Ecx ); ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res ); - ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08x\n", ctx_ptr->Ecx ); + ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08lx\n", ctx_ptr->Ecx ); ctx.Ecx = 0x33334444; pRtlWow64SetThreadContext( pi.hThread, &ctx ); memset( &ctx, 0x55, sizeof(ctx) ); ctx.ContextFlags = WOW64_CONTEXT_ALL; pRtlWow64GetThreadContext( pi.hThread, &ctx ); - ok( ctx.Ecx == 0x33334444, "cs64: ecx set to %08x\n", ctx.Ecx ); + ok( ctx.Ecx == 0x33334444, "cs64: ecx set to %08lx\n", ctx.Ecx ); ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res ); - ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08x\n", ctx_ptr->Ecx ); + ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08lx\n", ctx_ptr->Ecx ); memset( &context, 0x55, sizeof(context) ); context.ContextFlags = CONTEXT_ALL; pNtGetContextThread( pi.hThread, &context ); @@ -4453,16 +4454,16 @@ static void test_wow64_context(void) else { trace( "in 64-bit mode %04x\n", context.SegCs ); - ok( ctx.Eip != context.Rip, "cs64: eip %08x / %p\n", ctx.Eip, (void *)context.Rip); - ok( ctx.SegCs == cs32, "cs64: wrong cs %04x / %04x\n", ctx.SegCs, cs32 ); - ok( ctx.SegDs == context.SegDs, "cs64: wrong ds %04x / %04x\n", ctx.SegDs, context.SegDs ); - ok( ctx.SegEs == context.SegEs, "cs64: wrong es %04x / %04x\n", ctx.SegEs, context.SegEs ); - ok( ctx.SegFs == context.SegFs, "cs64: wrong fs %04x / %04x\n", ctx.SegFs, context.SegFs ); - ok( ctx.SegGs == context.SegGs, "cs64: wrong gs %04x / %04x\n", ctx.SegGs, context.SegGs ); - ok( ctx.SegSs == context.SegSs, "cs64: wrong ss %04x / %04x\n", ctx.SegSs, context.SegSs ); + ok( ctx.Eip != context.Rip, "cs64: eip %08lx / %p\n", ctx.Eip, (void *)context.Rip); + ok( ctx.SegCs == cs32, "cs64: wrong cs %04lx / %04x\n", ctx.SegCs, cs32 ); + ok( ctx.SegDs == context.SegDs, "cs64: wrong ds %04lx / %04x\n", ctx.SegDs, context.SegDs ); + ok( ctx.SegEs == context.SegEs, "cs64: wrong es %04lx / %04x\n", ctx.SegEs, context.SegEs ); + ok( ctx.SegFs == context.SegFs, "cs64: wrong fs %04lx / %04x\n", ctx.SegFs, context.SegFs ); + ok( ctx.SegGs == context.SegGs, "cs64: wrong gs %04lx / %04x\n", ctx.SegGs, context.SegGs ); + ok( ctx.SegSs == context.SegSs, "cs64: wrong ss %04lx / %04x\n", ctx.SegSs, context.SegSs ); if (teb32.DeallocationStack) ok( ctx.Esp >= teb32.DeallocationStack && ctx.Esp <= teb32.Tib.StackBase, - "cs64: esp not inside 32-bit stack %08x / %08x-%08x\n", ctx.Esp, + "cs64: esp not inside 32-bit stack %08lx / %08lx-%08lx\n", ctx.Esp, teb32.DeallocationStack, teb32.Tib.StackBase ); ok( ((void *)context.Rsp >= teb.DeallocationStack && (void *)context.Rsp <= teb.Tib.StackBase) || (context.Rsp >= teb32.DeallocationStack && context.Rsp <= teb32.Tib.StackBase), @@ -4475,18 +4476,18 @@ static void test_wow64_context(void) /* in 64-bit mode, the 32-bit context is stored in the cpu area */ if (!ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res )) res = 0; - ok( res == cpu_size, "wrong len %lx\n", res ); + ok( res == cpu_size, "wrong len %Ix\n", res ); ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, - "cs64: got context flags %#x\n", ctx_ptr->ContextFlags); - ok(ctx_ptr->Eip == ctx.Eip, "cs64: got eip %08x / %08x\n", ctx_ptr->Eip, ctx.Eip); - ok(ctx_ptr->Eax == ctx.Eax, "cs64: got eax %08x / %08x\n", ctx_ptr->Eax, ctx.Eax); - ok(ctx_ptr->Ebx == ctx.Ebx, "cs64: got ebx %08x / %08x\n", ctx_ptr->Ebx, ctx.Ebx); - ok(ctx_ptr->Ecx == ctx.Ecx, "cs64: got ecx %08x / %08x\n", ctx_ptr->Ecx, ctx.Ecx); - ok(ctx_ptr->Edx == ctx.Edx, "cs64: got edx %08x / %08x\n", ctx_ptr->Edx, ctx.Edx); - ok(ctx_ptr->Ebp == ctx.Ebp, "cs64: got ebp %08x / %08x\n", ctx_ptr->Ebp, ctx.Ebp); - ok(ctx_ptr->Esi == ctx.Esi, "cs64: got esi %08x / %08x\n", ctx_ptr->Esi, ctx.Esi); - ok(ctx_ptr->Edi == ctx.Edi, "cs64: got edi %08x / %08x\n", ctx_ptr->Edi, ctx.Edi); - ok(ctx_ptr->EFlags == ctx.EFlags, "cs64: got eflags %08x / %08x\n", ctx_ptr->EFlags, ctx.EFlags); + "cs64: got context flags %#lx\n", ctx_ptr->ContextFlags); + ok(ctx_ptr->Eip == ctx.Eip, "cs64: got eip %08lx / %08lx\n", ctx_ptr->Eip, ctx.Eip); + ok(ctx_ptr->Eax == ctx.Eax, "cs64: got eax %08lx / %08lx\n", ctx_ptr->Eax, ctx.Eax); + ok(ctx_ptr->Ebx == ctx.Ebx, "cs64: got ebx %08lx / %08lx\n", ctx_ptr->Ebx, ctx.Ebx); + ok(ctx_ptr->Ecx == ctx.Ecx, "cs64: got ecx %08lx / %08lx\n", ctx_ptr->Ecx, ctx.Ecx); + ok(ctx_ptr->Edx == ctx.Edx, "cs64: got edx %08lx / %08lx\n", ctx_ptr->Edx, ctx.Edx); + ok(ctx_ptr->Ebp == ctx.Ebp, "cs64: got ebp %08lx / %08lx\n", ctx_ptr->Ebp, ctx.Ebp); + ok(ctx_ptr->Esi == ctx.Esi, "cs64: got esi %08lx / %08lx\n", ctx_ptr->Esi, ctx.Esi); + ok(ctx_ptr->Edi == ctx.Edi, "cs64: got edi %08lx / %08lx\n", ctx_ptr->Edi, ctx.Edi); + ok(ctx_ptr->EFlags == ctx.EFlags, "cs64: got eflags %08lx / %08lx\n", ctx_ptr->EFlags, ctx.EFlags); /* changing one context doesn't change the other one */ rcx = context.Rcx; @@ -4496,17 +4497,17 @@ static void test_wow64_context(void) memset( &ctx, 0x55, sizeof(ctx) ); ctx.ContextFlags = WOW64_CONTEXT_ALL; pRtlWow64GetThreadContext( pi.hThread, &ctx ); - ok( ctx.Ecx == ecx, "cs64: ecx set to %08x\n", ctx.Ecx ); + ok( ctx.Ecx == ecx, "cs64: ecx set to %08lx\n", ctx.Ecx ); ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res ); - ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08x\n", ctx_ptr->Ecx ); + ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08lx\n", ctx_ptr->Ecx ); ctx.Ecx = 0x22223333; pRtlWow64SetThreadContext( pi.hThread, &ctx ); memset( &ctx, 0x55, sizeof(ctx) ); ctx.ContextFlags = WOW64_CONTEXT_ALL; pRtlWow64GetThreadContext( pi.hThread, &ctx ); - ok( ctx.Ecx == 0x22223333, "cs64: ecx set to %08x\n", ctx.Ecx ); + ok( ctx.Ecx == 0x22223333, "cs64: ecx set to %08lx\n", ctx.Ecx ); ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res ); - ok( ctx_ptr->Ecx == 0x22223333, "cs64: ecx set to %08x\n", ctx_ptr->Ecx ); + ok( ctx_ptr->Ecx == 0x22223333, "cs64: ecx set to %08lx\n", ctx_ptr->Ecx ); memset( &context, 0x55, sizeof(context) ); context.ContextFlags = CONTEXT_ALL; pNtGetContextThread( pi.hThread, &context ); @@ -4556,7 +4557,7 @@ static ULONG64 test_kiuserexceptiondispatcher_saved_r12; static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) { - trace("handler context->Rip %#lx, codemem %p.\n", context->Rip, code_mem); + trace("handler context->Rip %#Ix, codemem %p.\n", context->Rip, code_mem); got_exception = 1; dbg_except_continue_handler_rip = (void *)context->Rip; ++context->Rip; @@ -4573,16 +4574,16 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE EXCEPTION_RECORD *rec = e->ExceptionRecord; CONTEXT *context = e->ContextRecord; - trace("dbg_except_continue_vectored_handler, code %#x, Rip %#lx.\n", rec->ExceptionCode, context->Rip); + trace("dbg_except_continue_vectored_handler, code %#lx, Rip %#Ix.\n", rec->ExceptionCode, context->Rip); if (rec->ExceptionCode == 0xceadbeef) { - ok(context->P1Home == (ULONG64)0xdeadbeeffeedcafe, "Got unexpected context->P1Home %#lx.\n", context->P1Home); + ok(context->P1Home == (ULONG64)0xdeadbeeffeedcafe, "Got unexpected context->P1Home %#Ix.\n", context->P1Home); context->R12 = test_kiuserexceptiondispatcher_saved_r12; return EXCEPTION_CONTINUE_EXECUTION; } - ok(rec->ExceptionCode == 0x80000003, "Got unexpected exception code %#x.\n", rec->ExceptionCode); + ok(rec->ExceptionCode == 0x80000003, "Got unexpected exception code %#lx.\n", rec->ExceptionCode); got_exception = 1; dbg_except_continue_handler_rip = (void *)context->Rip; @@ -4599,13 +4600,13 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE static void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) { trace("rec %p, context %p.\n", rec, context); - trace("context->Rip %#lx, context->Rsp %#lx, ContextFlags %#lx.\n", + trace("context->Rip %#Ix, context->Rsp %#Ix, ContextFlags %#lx.\n", context->Rip, context->Rsp, context->ContextFlags); hook_called = TRUE; /* Broken on Win2008, probably rec offset in stack is different. */ ok(rec->ExceptionCode == 0x80000003 || rec->ExceptionCode == 0xceadbeef || broken(!rec->ExceptionCode), - "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); + "Got unexpected ExceptionCode %#lx.\n", rec->ExceptionCode); hook_KiUserExceptionDispatcher_rip = (void *)context->Rip; hook_exception_address = rec->ExceptionAddress; @@ -4691,7 +4692,7 @@ static void test_kiuserexceptiondispatcher(void) ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), PAGE_EXECUTE_READWRITE, &old_protect); - ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes)); @@ -4712,7 +4713,7 @@ static void test_kiuserexceptiondispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); - ok(test_kiuserexceptiondispatcher_regs.new_rax == 0xdeadbeef, "Got unexpected rax %#lx.\n", + ok(test_kiuserexceptiondispatcher_regs.new_rax == 0xdeadbeef, "Got unexpected rax %#Ix.\n", test_kiuserexceptiondispatcher_regs.new_rax); ok(test_kiuserexceptiondispatcher_regs.old_rsi == test_kiuserexceptiondispatcher_regs.new_rsi, "rsi does not match.\n"); @@ -4781,7 +4782,7 @@ static void test_kiuserexceptiondispatcher(void) ok(dbg_except_continue_handler_rip == bpt_address, "Got unexpected exception address %p, expected %p.\n", dbg_except_continue_handler_rip, bpt_address); - ok(test_kiuserexceptiondispatcher_regs.new_rax == 0xdeadbeef, "Got unexpected rax %#lx.\n", + ok(test_kiuserexceptiondispatcher_regs.new_rax == 0xdeadbeef, "Got unexpected rax %#Ix.\n", test_kiuserexceptiondispatcher_regs.new_rax); ok(test_kiuserexceptiondispatcher_regs.old_rsi == test_kiuserexceptiondispatcher_regs.new_rsi, "rsi does not match.\n"); @@ -4816,14 +4817,14 @@ static void test_kiuserexceptiondispatcher(void) } else { - ok(pass == 3, "Got unexpected pass %d.\n", pass); + ok(pass == 3, "Got unexpected pass %ld.\n", pass); } ok(hook_called, "Hook was not called.\n"); RemoveVectoredExceptionHandler(vectored_handler); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), old_protect, &old_protect); - ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); } static BOOL got_nested_exception, got_prev_frame_exception; @@ -4832,16 +4833,16 @@ static void *nested_exception_initial_frame; static DWORD nested_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) { - trace("nested_exception_handler Rip %p, Rsp %p, code %#x, flags %#x, ExceptionAddress %p.\n", + trace("nested_exception_handler Rip %p, Rsp %p, code %#lx, flags %#lx, ExceptionAddress %p.\n", (void *)context->Rip, (void *)context->Rsp, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress); if (rec->ExceptionCode == 0x80000003 && !(rec->ExceptionFlags & EH_NESTED_CALL)) { - ok(rec->NumberParameters == 1, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters); + ok(rec->NumberParameters == 1, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters); ok((void *)context->Rsp == frame, "Got unexpected frame %p.\n", frame); ok(*(void **)frame == (char *)code_mem + 5, "Got unexpected *frame %p.\n", *(void **)frame); - ok(context->Rip == (ULONG_PTR)((char *)code_mem + 7), "Got unexpected Rip %#lx.\n", context->Rip); + ok(context->Rip == (ULONG_PTR)((char *)code_mem + 7), "Got unexpected Rip %#Ix.\n", context->Rip); nested_exception_initial_frame = frame; RaiseException(0xdeadbeef, 0, 0, 0); @@ -4851,15 +4852,15 @@ static DWORD nested_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRAT if (rec->ExceptionCode == 0xdeadbeef && rec->ExceptionFlags == EH_NESTED_CALL) { - ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters); + ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters); got_nested_exception = TRUE; ok(frame == nested_exception_initial_frame, "Got unexpected frame %p.\n", frame); return ExceptionContinueSearch; } ok(rec->ExceptionCode == 0xdeadbeef && !rec->ExceptionFlags, - "Got unexpected exception code %#x, flags %#x.\n", rec->ExceptionCode, rec->ExceptionFlags); - ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters); + "Got unexpected exception code %#lx, flags %#lx.\n", rec->ExceptionCode, rec->ExceptionFlags); + ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters); ok(frame == (void *)((BYTE *)nested_exception_initial_frame + 8), "Got unexpected frame %p.\n", frame); got_prev_frame_exception = TRUE; @@ -4918,7 +4919,7 @@ static void test_unwind_from_apc(void) { test_unwind_apc_called = FALSE; status = pNtQueueApcThread(GetCurrentThread(), test_unwind_apc, 0, 0, 0); - ok(!status, "Got unexpected status %#x.\n", status); + ok(!status, "Got unexpected status %#lx.\n", status); SleepEx(0, TRUE); ok(0, "Should not get here.\n"); } @@ -4927,11 +4928,11 @@ static void test_unwind_from_apc(void) ok(test_unwind_apc_called, "Test user APC was not called.\n"); test_unwind_apc_called = FALSE; status = pNtQueueApcThread(GetCurrentThread(), test_unwind_apc, 0, 0, 0); - ok(!status, "Got unexpected status %#x.\n", status); + ok(!status, "Got unexpected status %#lx.\n", status); NtContinue(&test_unwind_apc_context, TRUE ); ok(0, "Should not get here.\n"); } - ok(pass == 4, "Got unexpected pass %d.\n", pass); + ok(pass == 4, "Got unexpected pass %ld.\n", pass); ok(test_unwind_apc_called, "Test user APC was not called.\n"); } @@ -4975,36 +4976,36 @@ static void test_syscall_clobbered_regs(void) func = code_mem; memset(&regs, 0, sizeof(regs)); status = func((HANDLE)0xdeadbeef, NULL, &regs, pNtCancelTimer); - ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#lx.\n", status); /* After the syscall instruction rcx contains the address of the instruction next after syscall. */ ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); status = func((HANDLE)0xdeadbeef, (BOOLEAN *)0xdeadbeef, &regs, pNtCancelTimer); - ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#lx.\n", status); ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); context.ContextFlags = CONTEXT_CONTROL; status = func(GetCurrentThread(), &context, &regs, pNtGetContextThread); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); status = func(GetCurrentThread(), &context, &regs, pNtSetContextThread); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); context.ContextFlags = CONTEXT_INTEGER; status = func(GetCurrentThread(), &context, &regs, pNtGetContextThread); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); status = func(GetCurrentThread(), &context, &regs, pNtSetContextThread); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); ok((BYTE *)regs.rcx > (BYTE *)pNtSetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtSetContextThread + 0x20, "Got unexpected rcx %s, pNtSetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtSetContextThread); @@ -7944,13 +7945,13 @@ static DWORD WINAPI register_check_thread(void *arg) ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; status = pNtGetContextThread(GetCurrentThread(), &ctx); - ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status); - ok(!ctx.Dr0, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr0); - ok(!ctx.Dr1, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr1); - ok(!ctx.Dr2, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr2); - ok(!ctx.Dr3, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr3); - ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); - ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status); + ok(!ctx.Dr0, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr0); + ok(!ctx.Dr1, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr1); + ok(!ctx.Dr2, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr2); + ok(!ctx.Dr3, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr3); + ok(!ctx.Dr6, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr6); + ok(!ctx.Dr7, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr7); return 0; } @@ -7983,19 +7984,19 @@ static void test_debug_registers(void) ctx.Dr7 = tests[i].dr7; status = pNtSetContextThread(GetCurrentThread(), &ctx); - ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %08x\n", status); + ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %08lx\n", status); memset(&ctx, 0, sizeof(ctx)); ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; status = pNtGetContextThread(GetCurrentThread(), &ctx); - ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %08x\n", status); - ok(ctx.Dr0 == tests[i].dr0, "test %d: expected %lx, got %lx\n", i, tests[i].dr0, (DWORD_PTR)ctx.Dr0); - ok(ctx.Dr1 == tests[i].dr1, "test %d: expected %lx, got %lx\n", i, tests[i].dr1, (DWORD_PTR)ctx.Dr1); - ok(ctx.Dr2 == tests[i].dr2, "test %d: expected %lx, got %lx\n", i, tests[i].dr2, (DWORD_PTR)ctx.Dr2); - ok(ctx.Dr3 == tests[i].dr3, "test %d: expected %lx, got %lx\n", i, tests[i].dr3, (DWORD_PTR)ctx.Dr3); - ok((ctx.Dr6 & 0xf00f) == tests[i].dr6, "test %d: expected %lx, got %lx\n", i, tests[i].dr6, (DWORD_PTR)ctx.Dr6); - ok((ctx.Dr7 & ~0xdc00) == tests[i].dr7, "test %d: expected %lx, got %lx\n", i, tests[i].dr7, (DWORD_PTR)ctx.Dr7); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %08lx\n", status); + ok(ctx.Dr0 == tests[i].dr0, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr0, (DWORD_PTR)ctx.Dr0); + ok(ctx.Dr1 == tests[i].dr1, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr1, (DWORD_PTR)ctx.Dr1); + ok(ctx.Dr2 == tests[i].dr2, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr2, (DWORD_PTR)ctx.Dr2); + ok(ctx.Dr3 == tests[i].dr3, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr3, (DWORD_PTR)ctx.Dr3); + ok((ctx.Dr6 & 0xf00f) == tests[i].dr6, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr6, (DWORD_PTR)ctx.Dr6); + ok((ctx.Dr7 & ~0xdc00) == tests[i].dr7, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr7, (DWORD_PTR)ctx.Dr7); } memset(&ctx, 0, sizeof(ctx)); @@ -8007,20 +8008,20 @@ static void test_debug_registers(void) ctx.Dr6 = 0xffffffff; ctx.Dr7 = 0x00000400; status = pNtSetContextThread(GetCurrentThread(), &ctx); - ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", status); + ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", status); thread = CreateThread(NULL, 0, register_check_thread, NULL, CREATE_SUSPENDED, NULL); - ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError()); + ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %ld\n", GetLastError()); ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; status = pNtGetContextThread(thread, &ctx); - ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status); - ok(!ctx.Dr0, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr0); - ok(!ctx.Dr1, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr1); - ok(!ctx.Dr2, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr2); - ok(!ctx.Dr3, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr3); - ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); - ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status); + ok(!ctx.Dr0, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr0); + ok(!ctx.Dr1, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr1); + ok(!ctx.Dr2, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr2); + ok(!ctx.Dr3, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr3); + ok(!ctx.Dr6, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr6); + ok(!ctx.Dr7, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr7); ResumeThread(thread); WaitForSingleObject(thread, 10000); @@ -8069,11 +8070,11 @@ static void test_debug_registers_wow64(void) ok(bret, "GetThreadContext failed\n"); if (bret) { - ok(ctx.Dr0 == 0x12340000, "expected 0x12340000, got %lx\n", ctx.Dr0); - ok(ctx.Dr1 == 0x12340001, "expected 0x12340001, got %lx\n", ctx.Dr1); - ok(ctx.Dr2 == 0x12340002, "expected 0x12340002, got %lx\n", ctx.Dr2); - ok(ctx.Dr3 == 0x12340003, "expected 0x12340003, got %lx\n", ctx.Dr3); - ok(ctx.Dr7 == 0x155, "expected 0x155, got %lx\n", ctx.Dr7); + ok(ctx.Dr0 == 0x12340000, "expected 0x12340000, got %Ix\n", ctx.Dr0); + ok(ctx.Dr1 == 0x12340001, "expected 0x12340001, got %Ix\n", ctx.Dr1); + ok(ctx.Dr2 == 0x12340002, "expected 0x12340002, got %Ix\n", ctx.Dr2); + ok(ctx.Dr3 == 0x12340003, "expected 0x12340003, got %Ix\n", ctx.Dr3); + ok(ctx.Dr7 == 0x155, "expected 0x155, got %Ix\n", ctx.Dr7); } ZeroMemory(&wow64_ctx, sizeof(wow64_ctx)); @@ -8117,11 +8118,11 @@ static void test_debug_registers_wow64(void) ok(bret, "GetThreadContext failed\n"); if (bret) { - ok(ctx.Dr0 == 0x56780000, "expected 0x56780000, got %lx\n", ctx.Dr0); - ok(ctx.Dr1 == 0x56780001, "expected 0x56780001, got %lx\n", ctx.Dr1); - ok(ctx.Dr2 == 0x56780002, "expected 0x56780002, got %lx\n", ctx.Dr2); - ok(ctx.Dr3 == 0x56780003, "expected 0x56780003, got %lx\n", ctx.Dr3); - ok(ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", ctx.Dr7); + ok(ctx.Dr0 == 0x56780000, "expected 0x56780000, got %Ix\n", ctx.Dr0); + ok(ctx.Dr1 == 0x56780001, "expected 0x56780001, got %Ix\n", ctx.Dr1); + ok(ctx.Dr2 == 0x56780002, "expected 0x56780002, got %Ix\n", ctx.Dr2); + ok(ctx.Dr3 == 0x56780003, "expected 0x56780003, got %Ix\n", ctx.Dr3); + ok(ctx.Dr7 == 0x101, "expected 0x101, got %Ix\n", ctx.Dr7); } ResumeThread(pi.hThread); @@ -8137,18 +8138,18 @@ static DWORD debug_service_exceptions; static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) { EXCEPTION_RECORD *rec = ExceptionInfo->ExceptionRecord; - trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); - ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08x instead of %08x\n", + ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08lx instead of %08lx\n", rec->ExceptionCode, EXCEPTION_BREAKPOINT); #ifdef __i386__ ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 0x1c, - "expected Eip = %x, got %x\n", (DWORD)code_mem + 0x1c, ExceptionInfo->ContextRecord->Eip); + "expected Eip = %lx, got %lx\n", (DWORD)code_mem + 0x1c, ExceptionInfo->ContextRecord->Eip); ok(rec->NumberParameters == (is_wow64 ? 1 : 3), - "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); + "ExceptionParameters is %ld instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Eax, - "expected ExceptionInformation[0] = %x, got %lx\n", + "expected ExceptionInformation[0] = %lx, got %lx\n", ExceptionInfo->ContextRecord->Eax, rec->ExceptionInformation[0]); if (!is_wow64) { @@ -8159,11 +8160,11 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) } #else ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 0x2f, - "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 0x2f, ExceptionInfo->ContextRecord->Rip); + "expected Rip = %Ix, got %Ix\n", (DWORD_PTR)code_mem + 0x2f, ExceptionInfo->ContextRecord->Rip); ok(rec->NumberParameters == 1, - "ExceptionParameters is %d instead of 1\n", rec->NumberParameters); + "ExceptionParameters is %ld instead of 1\n", rec->NumberParameters); ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Rax, - "expected ExceptionInformation[0] = %lx, got %lx\n", + "expected ExceptionInformation[0] = %Ix, got %Ix\n", ExceptionInfo->ContextRecord->Rax, rec->ExceptionInformation[0]); #endif @@ -8242,28 +8243,28 @@ static void test_debug_service(DWORD numexc) debug_service_exceptions = 0; ret = func(0); ok(debug_service_exceptions == expected_exc, - "BREAKPOINT_BREAK generated %u exceptions, expected %u\n", + "BREAKPOINT_BREAK generated %lu exceptions, expected %lu\n", debug_service_exceptions, expected_exc); ok(ret == expected_ret, - "BREAKPOINT_BREAK returned %u, expected %u\n", ret, expected_ret); + "BREAKPOINT_BREAK returned %lu, expected %lu\n", ret, expected_ret); /* BREAKPOINT_PROMPT */ debug_service_exceptions = 0; ret = func(2); ok(debug_service_exceptions == expected_exc, - "BREAKPOINT_PROMPT generated %u exceptions, expected %u\n", + "BREAKPOINT_PROMPT generated %lu exceptions, expected %lu\n", debug_service_exceptions, expected_exc); ok(ret == expected_ret, - "BREAKPOINT_PROMPT returned %u, expected %u\n", ret, expected_ret); + "BREAKPOINT_PROMPT returned %lu, expected %lu\n", ret, expected_ret); /* invalid debug service */ debug_service_exceptions = 0; ret = func(6); ok(debug_service_exceptions == expected_exc, - "invalid debug service generated %u exceptions, expected %u\n", + "invalid debug service generated %lu exceptions, expected %lu\n", debug_service_exceptions, expected_exc); ok(ret == expected_ret, - "invalid debug service returned %u, expected %u\n", ret, expected_ret); + "invalid debug service returned %lu, expected %lu\n", ret, expected_ret); expected_exc = (is_wow64 ? numexc : 0); expected_ret = (is_wow64 && numexc); @@ -8272,37 +8273,37 @@ static void test_debug_service(DWORD numexc) debug_service_exceptions = 0; ret = func(1); ok(debug_service_exceptions == expected_exc, - "BREAKPOINT_PRINT generated %u exceptions, expected %u\n", + "BREAKPOINT_PRINT generated %lu exceptions, expected %lu\n", debug_service_exceptions, expected_exc); ok(ret == expected_ret, - "BREAKPOINT_PRINT returned %u, expected %u\n", ret, expected_ret); + "BREAKPOINT_PRINT returned %lu, expected %lu\n", ret, expected_ret); /* BREAKPOINT_LOAD_SYMBOLS */ debug_service_exceptions = 0; ret = func(3); ok(debug_service_exceptions == expected_exc, - "BREAKPOINT_LOAD_SYMBOLS generated %u exceptions, expected %u\n", + "BREAKPOINT_LOAD_SYMBOLS generated %lu exceptions, expected %lu\n", debug_service_exceptions, expected_exc); ok(ret == expected_ret, - "BREAKPOINT_LOAD_SYMBOLS returned %u, expected %u\n", ret, expected_ret); + "BREAKPOINT_LOAD_SYMBOLS returned %lu, expected %lu\n", ret, expected_ret); /* BREAKPOINT_UNLOAD_SYMBOLS */ debug_service_exceptions = 0; ret = func(4); ok(debug_service_exceptions == expected_exc, - "BREAKPOINT_UNLOAD_SYMBOLS generated %u exceptions, expected %u\n", + "BREAKPOINT_UNLOAD_SYMBOLS generated %lu exceptions, expected %lu\n", debug_service_exceptions, expected_exc); ok(ret == expected_ret, - "BREAKPOINT_UNLOAD_SYMBOLS returned %u, expected %u\n", ret, expected_ret); + "BREAKPOINT_UNLOAD_SYMBOLS returned %lu, expected %lu\n", ret, expected_ret); /* BREAKPOINT_COMMAND_STRING */ debug_service_exceptions = 0; ret = func(5); ok(debug_service_exceptions == expected_exc || broken(debug_service_exceptions == numexc), - "BREAKPOINT_COMMAND_STRING generated %u exceptions, expected %u\n", + "BREAKPOINT_COMMAND_STRING generated %lu exceptions, expected %lu\n", debug_service_exceptions, expected_exc); ok(ret == expected_ret || broken(ret == (numexc != 0)), - "BREAKPOINT_COMMAND_STRING returned %u, expected %u\n", ret, expected_ret); + "BREAKPOINT_COMMAND_STRING returned %lu, expected %lu\n", ret, expected_ret); pRtlRemoveVectoredExceptionHandler(vectored_handler); } @@ -8313,12 +8314,12 @@ static DWORD outputdebugstring_exceptions; static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) { PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; - trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); - ok(rec->ExceptionCode == DBG_PRINTEXCEPTION_C, "ExceptionCode is %08x instead of %08x\n", + ok(rec->ExceptionCode == DBG_PRINTEXCEPTION_C, "ExceptionCode is %08lx instead of %08lx\n", rec->ExceptionCode, DBG_PRINTEXCEPTION_C); - ok(rec->NumberParameters == 2, "ExceptionParameters is %d instead of 2\n", rec->NumberParameters); - ok(rec->ExceptionInformation[0] == 12, "ExceptionInformation[0] = %d instead of 12\n", (DWORD)rec->ExceptionInformation[0]); + ok(rec->NumberParameters == 2, "ExceptionParameters is %ld instead of 2\n", rec->NumberParameters); + ok(rec->ExceptionInformation[0] == 12, "ExceptionInformation[0] = %ld instead of 12\n", (DWORD)rec->ExceptionInformation[0]); ok(!strcmp((char *)rec->ExceptionInformation[1], "Hello World"), "ExceptionInformation[1] = '%s' instead of 'Hello World'\n", (char *)rec->ExceptionInformation[1]); @@ -8343,7 +8344,7 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo) OutputDebugStringA("Hello World"); todo_wine_if(todo) - ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %ld exceptions, expected %ld\n", outputdebugstring_exceptions, numexc); pRtlRemoveVectoredExceptionHandler(vectored_handler); @@ -8354,14 +8355,14 @@ static DWORD ripevent_exceptions; static LONG CALLBACK ripevent_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) { PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; - trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); - ok(rec->ExceptionCode == DBG_RIPEXCEPTION, "ExceptionCode is %08x instead of %08x\n", + ok(rec->ExceptionCode == DBG_RIPEXCEPTION, "ExceptionCode is %08lx instead of %08lx\n", rec->ExceptionCode, DBG_RIPEXCEPTION); - ok(rec->NumberParameters == 2, "ExceptionParameters is %d instead of 2\n", rec->NumberParameters); - ok(rec->ExceptionInformation[0] == 0x11223344, "ExceptionInformation[0] = %08x instead of %08x\n", + ok(rec->NumberParameters == 2, "ExceptionParameters is %ld instead of 2\n", rec->NumberParameters); + ok(rec->ExceptionInformation[0] == 0x11223344, "ExceptionInformation[0] = %08lx instead of %08x\n", (NTSTATUS)rec->ExceptionInformation[0], 0x11223344); - ok(rec->ExceptionInformation[1] == 0x55667788, "ExceptionInformation[1] = %08x instead of %08x\n", + ok(rec->ExceptionInformation[1] == 0x55667788, "ExceptionInformation[1] = %08lx instead of %08x\n", (NTSTATUS)rec->ExceptionInformation[1], 0x55667788); ripevent_exceptions++; @@ -8392,7 +8393,7 @@ static void test_ripevent(DWORD numexc) ripevent_exceptions = 0; pRtlRaiseException(&record); - ok(ripevent_exceptions == numexc, "RtlRaiseException generated %d exceptions, expected %d\n", + ok(ripevent_exceptions == numexc, "RtlRaiseException generated %ld exceptions, expected %ld\n", ripevent_exceptions, numexc); pRtlRemoveVectoredExceptionHandler(vectored_handler); @@ -8403,26 +8404,26 @@ static DWORD breakpoint_exceptions; static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo) { EXCEPTION_RECORD *rec = ExceptionInfo->ExceptionRecord; - trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); - ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08x instead of %08x\n", + ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08lx instead of %08lx\n", rec->ExceptionCode, EXCEPTION_BREAKPOINT); #ifdef __i386__ ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 1, - "expected Eip = %x, got %x\n", (DWORD)code_mem + 1, ExceptionInfo->ContextRecord->Eip); + "expected Eip = %lx, got %lx\n", (DWORD)code_mem + 1, ExceptionInfo->ContextRecord->Eip); ok(rec->NumberParameters == (is_wow64 ? 1 : 3), - "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); + "ExceptionParameters is %ld instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); ok(rec->ExceptionInformation[0] == 0, "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); ExceptionInfo->ContextRecord->Eip = (DWORD)code_mem + 2; #elif defined(__x86_64__) ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 1, - "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip); + "expected Rip = %Ix, got %Ix\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip); ok(rec->NumberParameters == 1, - "ExceptionParameters is %d instead of 1\n", rec->NumberParameters); + "ExceptionParameters is %ld instead of 1\n", rec->NumberParameters); ok(rec->ExceptionInformation[0] == 0, - "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); + "got ExceptionInformation[0] = %Ix\n", rec->ExceptionInformation[0]); ExceptionInfo->ContextRecord->Rip = (DWORD_PTR)code_mem + 2; #elif defined(__arm__) ok(ExceptionInfo->ContextRecord->Pc == (DWORD)code_mem + 1, @@ -8468,7 +8469,7 @@ static void test_breakpoint(DWORD numexc) breakpoint_exceptions = 0; func(); - ok(breakpoint_exceptions == numexc, "int $0x3 generated %u exceptions, expected %u\n", + ok(breakpoint_exceptions == numexc, "int $0x3 generated %lu exceptions, expected %lu\n", breakpoint_exceptions, numexc); pRtlRemoveVectoredExceptionHandler(vectored_handler); @@ -8565,11 +8566,11 @@ static DWORD invalid_handle_exceptions; static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) { PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; - trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); - ok(rec->ExceptionCode == EXCEPTION_INVALID_HANDLE, "ExceptionCode is %08x instead of %08x\n", + ok(rec->ExceptionCode == EXCEPTION_INVALID_HANDLE, "ExceptionCode is %08lx instead of %08lx\n", rec->ExceptionCode, EXCEPTION_INVALID_HANDLE); - ok(rec->NumberParameters == 0, "ExceptionParameters is %d instead of 0\n", rec->NumberParameters); + ok(rec->NumberParameters == 0, "ExceptionParameters is %ld instead of 0\n", rec->NumberParameters); invalid_handle_exceptions++; return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; @@ -8590,12 +8591,12 @@ static void test_closehandle(DWORD numexc, HANDLE handle) invalid_handle_exceptions = 0; CloseHandle(handle); - ok(invalid_handle_exceptions == numexc, "CloseHandle generated %d exceptions, expected %d\n", + ok(invalid_handle_exceptions == numexc, "CloseHandle generated %ld exceptions, expected %ld\n", invalid_handle_exceptions, numexc); invalid_handle_exceptions = 0; pNtClose(handle); - ok(invalid_handle_exceptions == numexc, "NtClose generated %d exceptions, expected %d\n", + ok(invalid_handle_exceptions == numexc, "NtClose generated %ld exceptions, expected %ld\n", invalid_handle_exceptions, numexc); pRtlRemoveVectoredExceptionHandler(vectored_handler); @@ -8671,26 +8672,26 @@ static void test_user_apc(void) test_apc_called = FALSE; status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0); - ok(!status, "Got unexpected status %#x.\n", status); + ok(!status, "Got unexpected status %#lx.\n", status); SleepEx(0, TRUE); ok(test_apc_called, "Test user APC was not called.\n"); test_apc_called = FALSE; status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0); - ok(!status, "Got unexpected status %#x.\n", status); + ok(!status, "Got unexpected status %#lx.\n", status); status = NtContinue(&c[0], TRUE ); /* Broken before Win7, in that case NtContinue returns here instead of restoring context after calling APC. */ - ok(broken(TRUE), "Should not get here, status %#x.\n", status); + ok(broken(TRUE), "Should not get here, status %#lx.\n", status); return; } - ok(pass == 3, "Got unexpected pass %d.\n", pass); + ok(pass == 3, "Got unexpected pass %ld.\n", pass); ok(test_apc_called, "Test user APC was not called.\n"); } static void test_user_callback(void) { NTSTATUS status = pNtCallbackReturn( NULL, 0, STATUS_SUCCESS ); - ok( status == STATUS_NO_CALLBACK_ACTIVE, "failed %x\n", status ); + ok( status == STATUS_NO_CALLBACK_ACTIVE, "failed %lx\n", status ); } static DWORD WINAPI suspend_thread_test( void *arg ) @@ -8718,8 +8719,8 @@ static void test_suspend_count(HANDLE hthread, ULONG expected_count, int line) return; } - ok_(__FILE__, line)(!status, "Failed to get suspend count, status %#x.\n", status); - ok_(__FILE__, line)(count == expected_count, "Unexpected suspend count %u.\n", count); + ok_(__FILE__, line)(!status, "Failed to get suspend count, status %#lx.\n", status); + ok_(__FILE__, line)(count == expected_count, "Unexpected suspend count %lu.\n", count); } static void test_suspend_thread(void) @@ -8731,10 +8732,10 @@ static void test_suspend_thread(void) DWORD ret; status = NtSuspendThread(0, NULL); - ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#lx.\n", status); status = NtResumeThread(0, NULL); - ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#lx.\n", status); event = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -8742,61 +8743,61 @@ static void test_suspend_thread(void) ok(thread != NULL, "Failed to create a thread.\n"); ret = WaitForSingleObject(thread, 0); - ok(ret == WAIT_TIMEOUT, "Unexpected status %d.\n", ret); + ok(ret == WAIT_TIMEOUT, "Unexpected status %ld.\n", ret); status = pNtQueryInformationThread(thread, ThreadSuspendCount, &count, sizeof(count), NULL); if (!status) { status = pNtQueryInformationThread(thread, ThreadSuspendCount, NULL, sizeof(count), NULL); - ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#lx.\n", status); status = pNtQueryInformationThread(thread, ThreadSuspendCount, &count, sizeof(count) / 2, NULL); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#lx.\n", status); len = 123; status = pNtQueryInformationThread(thread, ThreadSuspendCount, &count, sizeof(count) / 2, &len); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status); - ok(len == 123, "Unexpected info length %u.\n", len); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#lx.\n", status); + ok(len == 123, "Unexpected info length %lu.\n", len); len = 123; status = pNtQueryInformationThread(thread, ThreadSuspendCount, NULL, 0, &len); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status); - ok(len == 123, "Unexpected info length %u.\n", len); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#lx.\n", status); + ok(len == 123, "Unexpected info length %lu.\n", len); count = 10; status = pNtQueryInformationThread(0, ThreadSuspendCount, &count, sizeof(count), NULL); - ok(status, "Unexpected status %#x.\n", status); - ok(count == 10, "Unexpected suspend count %u.\n", count); + ok(status, "Unexpected status %#lx.\n", status); + ok(count == 10, "Unexpected suspend count %lu.\n", count); } status = NtResumeThread(thread, NULL); - ok(!status, "Unexpected status %#x.\n", status); + ok(!status, "Unexpected status %#lx.\n", status); status = NtResumeThread(thread, &count); - ok(!status, "Unexpected status %#x.\n", status); - ok(count == 0, "Unexpected suspended count %u.\n", count); + ok(!status, "Unexpected status %#lx.\n", status); + ok(count == 0, "Unexpected suspended count %lu.\n", count); TEST_SUSPEND_COUNT(thread, 0); status = NtSuspendThread(thread, NULL); - ok(!status, "Failed to suspend a thread, status %#x.\n", status); + ok(!status, "Failed to suspend a thread, status %#lx.\n", status); TEST_SUSPEND_COUNT(thread, 1); status = NtSuspendThread(thread, &count); - ok(!status, "Failed to suspend a thread, status %#x.\n", status); - ok(count == 1, "Unexpected suspended count %u.\n", count); + ok(!status, "Failed to suspend a thread, status %#lx.\n", status); + ok(count == 1, "Unexpected suspended count %lu.\n", count); TEST_SUSPEND_COUNT(thread, 2); status = NtResumeThread(thread, &count); - ok(!status, "Failed to resume a thread, status %#x.\n", status); - ok(count == 2, "Unexpected suspended count %u.\n", count); + ok(!status, "Failed to resume a thread, status %#lx.\n", status); + ok(count == 2, "Unexpected suspended count %lu.\n", count); TEST_SUSPEND_COUNT(thread, 1); status = NtResumeThread(thread, NULL); - ok(!status, "Failed to resume a thread, status %#x.\n", status); + ok(!status, "Failed to resume a thread, status %#lx.\n", status); TEST_SUSPEND_COUNT(thread, 0); @@ -8832,7 +8833,7 @@ static void suspend_process_proc(void) /* Suspend up to limit. */ while (!(status = NtSuspendThread(thread, NULL))) ; - ok(status == STATUS_SUSPEND_COUNT_EXCEEDED, "Unexpected status %#x.\n", status); + ok(status == STATUS_SUSPEND_COUNT_EXCEEDED, "Unexpected status %#lx.\n", status); for (;;) { @@ -8842,11 +8843,11 @@ static void suspend_process_proc(void) } status = NtSuspendThread(thread, &count); - ok(!status, "Failed to suspend a thread, status %#x.\n", status); - ok(count == 125, "Unexpected suspend count %u.\n", count); + ok(!status, "Failed to suspend a thread, status %#lx.\n", status); + ok(count == 125, "Unexpected suspend count %lu.\n", count); status = NtResumeThread(thread, NULL); - ok(!status, "Failed to resume a thread, status %#x.\n", status); + ok(!status, "Failed to resume a thread, status %#lx.\n", status); CloseHandle(event); CloseHandle(event2); @@ -8879,50 +8880,50 @@ static void test_suspend_process(void) /* New process signals this event. */ ResetEvent(event2); ret = WaitForSingleObject(event2, INFINITE); - ok(ret == WAIT_OBJECT_0, "Wait failed, %#x.\n", ret); + ok(ret == WAIT_OBJECT_0, "Wait failed, %#lx.\n", ret); /* Suspend main thread */ status = NtSuspendThread(info.hThread, &ret); - ok(!status && !ret, "Failed to suspend main thread, status %#x.\n", status); + ok(!status && !ret, "Failed to suspend main thread, status %#lx.\n", status); /* Process wasn't suspended yet. */ status = pNtResumeProcess(info.hProcess); - ok(!status, "Failed to resume a process, status %#x.\n", status); + ok(!status, "Failed to resume a process, status %#lx.\n", status); status = pNtSuspendProcess(0); - ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#lx.\n", status); status = pNtResumeProcess(info.hProcess); - ok(!status, "Failed to resume a process, status %#x.\n", status); + ok(!status, "Failed to resume a process, status %#lx.\n", status); ResetEvent(event2); ret = WaitForSingleObject(event2, 200); ok(ret == WAIT_OBJECT_0, "Wait failed.\n"); status = pNtSuspendProcess(info.hProcess); - ok(!status, "Failed to suspend a process, status %#x.\n", status); + ok(!status, "Failed to suspend a process, status %#lx.\n", status); status = NtSuspendThread(info.hThread, &ret); - ok(!status && ret == 1, "Failed to suspend main thread, status %#x.\n", status); + ok(!status && ret == 1, "Failed to suspend main thread, status %#lx.\n", status); status = NtResumeThread(info.hThread, &ret); - ok(!status && ret == 2, "Failed to resume main thread, status %#x.\n", status); + ok(!status && ret == 2, "Failed to resume main thread, status %#lx.\n", status); ResetEvent(event2); ret = WaitForSingleObject(event2, 200); ok(ret == WAIT_TIMEOUT, "Wait failed.\n"); status = pNtSuspendProcess(info.hProcess); - ok(!status, "Failed to suspend a process, status %#x.\n", status); + ok(!status, "Failed to suspend a process, status %#lx.\n", status); status = pNtResumeProcess(info.hProcess); - ok(!status, "Failed to resume a process, status %#x.\n", status); + ok(!status, "Failed to resume a process, status %#lx.\n", status); ResetEvent(event2); ret = WaitForSingleObject(event2, 200); ok(ret == WAIT_TIMEOUT, "Wait failed.\n"); status = pNtResumeProcess(info.hProcess); - ok(!status, "Failed to resume a process, status %#x.\n", status); + ok(!status, "Failed to resume a process, status %#lx.\n", status); ResetEvent(event2); ret = WaitForSingleObject(event2, 1000); @@ -8954,7 +8955,7 @@ static void test_unload_trace(void) { pRtlGetUnloadEventTraceEx(&element_size, &element_count, (void **)&unload_trace_ex); ok(*element_size >= sizeof(*ptr), "Unexpected element size.\n"); - ok(*element_count == RTL_UNLOAD_EVENT_TRACE_NUMBER, "Unexpected trace element count %u.\n", *element_count); + ok(*element_count == RTL_UNLOAD_EVENT_TRACE_NUMBER, "Unexpected trace element count %lu.\n", *element_count); ok(unload_trace_ex != NULL, "Unexpected pointer %p.\n", unload_trace_ex); size = *element_size; } @@ -9014,7 +9015,7 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI XSTATE *xs; ok((context->ContextFlags & (CONTEXT_FULL | CONTEXT_XSTATE)) == (CONTEXT_FULL | CONTEXT_XSTATE), - "Got unexpected ContextFlags %#x.\n", context->ContextFlags); + "Got unexpected ContextFlags %#lx.\n", context->ContextFlags); if ((context->ContextFlags & (CONTEXT_FULL | CONTEXT_XSTATE)) != (CONTEXT_FULL | CONTEXT_XSTATE)) goto done; @@ -9024,20 +9025,20 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI /* Unwind contexts do not inherit xstate information. */ DISPATCHER_CONTEXT *dispatch = (DISPATCHER_CONTEXT *)dispatcher; - ok(!(dispatch->ContextRecord->ContextFlags & 0x40), "Got unexpected ContextRecord->ContextFlags %#x.\n", + ok(!(dispatch->ContextRecord->ContextFlags & 0x40), "Got unexpected ContextRecord->ContextFlags %#lx.\n", dispatch->ContextRecord->ContextFlags); } #endif - ok(xctx->Legacy.Offset == -(int)(sizeof(CONTEXT)), "Got unexpected Legacy.Offset %d.\n", xctx->Legacy.Offset); - ok(xctx->Legacy.Length == sizeof(CONTEXT), "Got unexpected Legacy.Length %d.\n", xctx->Legacy.Length); - ok(xctx->All.Offset == -(int)sizeof(CONTEXT), "Got unexpected All.Offset %d.\n", xctx->All.Offset); + ok(xctx->Legacy.Offset == -(int)(sizeof(CONTEXT)), "Got unexpected Legacy.Offset %ld.\n", xctx->Legacy.Offset); + ok(xctx->Legacy.Length == sizeof(CONTEXT), "Got unexpected Legacy.Length %ld.\n", xctx->Legacy.Length); + ok(xctx->All.Offset == -(int)sizeof(CONTEXT), "Got unexpected All.Offset %ld.\n", xctx->All.Offset); ok(xctx->All.Length == sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length, - "Got unexpected All.Offset %d.\n", xctx->All.Offset); + "Got unexpected All.Offset %ld.\n", xctx->All.Offset); expected_min_offset = sizeof(void *) == 8 ? sizeof(CONTEXT_EX) + sizeof(EXCEPTION_RECORD) : sizeof(CONTEXT_EX); ok(xctx->XState.Offset >= expected_min_offset, - "Got unexpected XState.Offset %d.\n", xctx->XState.Offset); - ok(xctx->XState.Length >= sizeof(XSTATE), "Got unexpected XState.Length %d.\n", xctx->XState.Length); + "Got unexpected XState.Offset %ld.\n", xctx->XState.Offset); + ok(xctx->XState.Length >= sizeof(XSTATE), "Got unexpected XState.Length %ld.\n", xctx->XState.Length); xs = (XSTATE *)((char *)xctx + xctx->XState.Offset); context_ymm_data = (unsigned int *)&xs->YmmContext; @@ -9233,7 +9234,7 @@ static void wait_for_thread_next_suspend(HANDLE thread) DWORD result; result = ResumeThread(thread); - ok(result == 1, "Got unexpexted suspend count %u.\n", result); + ok(result == 1, "Got unexpexted suspend count %lu.\n", result); /* NtQueryInformationThread(ThreadSuspendCount, ...) is not supported on older Windows. */ while (!(result = SuspendThread(thread))) @@ -9241,9 +9242,9 @@ static void wait_for_thread_next_suspend(HANDLE thread) ResumeThread(thread); Sleep(1); } - ok(result == 1, "Got unexpexted suspend count %u.\n", result); + ok(result == 1, "Got unexpexted suspend count %lu.\n", result); result = ResumeThread(thread); - ok(result == 2, "Got unexpexted suspend count %u.\n", result); + ok(result == 2, "Got unexpexted suspend count %lu.\n", result); } #define CONTEXT_NATIVE (CONTEXT_XSTATE & CONTEXT_CONTROL) @@ -9350,7 +9351,7 @@ static void test_extended_context(void) /* Test context manipulation functions. */ length = 0xdeadbeef; ret = pRtlGetExtendedContextLength(0, &length); - ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#x, length %#x.\n", + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#lx, length %#lx.\n", ret, length); for (test = 0; test < ARRAY_SIZE(context_arch); ++test) @@ -9362,7 +9363,7 @@ static void test_extended_context(void) length = 0xdeadbeef; ret = pRtlGetExtendedContextLength(context_arch[test].flag, &length); - ok(!ret && length == expected_length, "Got unexpected result ret %#x, length %#x.\n", + ok(!ret && length == expected_length, "Got unexpected result ret %#lx, length %#lx.\n", ret, length); for (i = 0; i < 32; ++i) @@ -9379,20 +9380,20 @@ static void test_extended_context(void) ok((!ret && length == expected_length) || broken((context_arch[test].broken_flags & (1 << i)) && ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef), - "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", + "Got unexpected result ret %#lx, length %#lx, flags 0x%08lx.\n", ret, length, flags); } else { ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, - "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", ret, length, flags); + "Got unexpected result ret %#lx, length %#lx, flags 0x%08lx.\n", ret, length, flags); } SetLastError(0xdeadbeef); bret = pInitializeContext(NULL, flags, NULL, &length2); ok(!bret && length2 == length && GetLastError() == (!ret ? ERROR_INSUFFICIENT_BUFFER : ERROR_INVALID_PARAMETER), - "Got unexpected bret %#x, length2 %#x, GetLastError() %u, flags %#x.\n", + "Got unexpected bret %#x, length2 %#lx, GetLastError() %lu, flags %#lx.\n", bret, length2, GetLastError(), flags); if (GetLastError() == ERROR_INVALID_PARAMETER) @@ -9403,7 +9404,7 @@ static void test_extended_context(void) length2 = expected_length - 1; bret = pInitializeContext(context_buffer, flags, &context, &length2); ok(!bret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags); + "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); ok(context == (void *)0xdeadbeef, "Got unexpected context %p.\n", context); SetLastError(0xdeadbeef); @@ -9411,30 +9412,30 @@ static void test_extended_context(void) length2 = expected_length; bret = pInitializeContext(context_buffer, flags, &context, &length2); ok(bret && GetLastError() == 0xdeadbeef, - "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags); - ok(length2 == expected_length, "Got unexpexted length %#x.\n", length); - ok((BYTE *)context == context_buffer, "Got unexpected context %p, flags %#x.\n", context, flags); + "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); + ok(length2 == expected_length, "Got unexpexted length %#lx.\n", length); + ok((BYTE *)context == context_buffer, "Got unexpected context %p, flags %#lx.\n", context, flags); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); - ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags); context_ex = (CONTEXT_EX *)(context_buffer + context_arch[test].context_length); ok(context_ex->Legacy.Offset == -(int)context_arch[test].context_length, - "Got unexpected Offset %d, flags %#x.\n", context_ex->Legacy.Offset, flags); + "Got unexpected Offset %ld, flags %#lx.\n", context_ex->Legacy.Offset, flags); ok(context_ex->Legacy.Length == ((flags & 0x20) ? context_arch[test].context_length : context_arch[test].legacy_length), - "Got unexpected Length %#x, flags %#x.\n", context_ex->Legacy.Length, flags); + "Got unexpected Length %#lx, flags %#lx.\n", context_ex->Legacy.Length, flags); ok(context_ex->All.Offset == -(int)context_arch[test].context_length, - "Got unexpected Offset %d, flags %#x.\n", context_ex->All.Offset, flags); + "Got unexpected Offset %ld, flags %#lx.\n", context_ex->All.Offset, flags); /* No extra 8 bytes in x64 CONTEXT_EX here. */ ok(context_ex->All.Length == context_arch[test].context_length + context_arch[1].context_ex_length, - "Got unexpected Length %#x, flags %#x.\n", context_ex->All.Length, flags); + "Got unexpected Length %#lx, flags %#lx.\n", context_ex->All.Length, flags); ok(context_ex->XState.Offset == 25, - "Got unexpected Offset %d, flags %#x.\n", context_ex->XState.Offset, flags); + "Got unexpected Offset %ld, flags %#lx.\n", context_ex->XState.Offset, flags); ok(!context_ex->XState.Length, - "Got unexpected Length %#x, flags %#x.\n", context_ex->XState.Length, flags); + "Got unexpected Length %#lx, flags %#lx.\n", context_ex->XState.Length, flags); if (0) { @@ -9442,11 +9443,11 @@ static void test_extended_context(void) pRtlLocateLegacyContext(NULL, NULL); } p = pRtlLocateLegacyContext(context_ex, NULL); - ok(p == context, "Got unexpected p %p, flags %#x.\n", p, flags); + ok(p == context, "Got unexpected p %p, flags %#lx.\n", p, flags); length2 = 0xdeadbeef; p = pRtlLocateLegacyContext(context_ex, &length2); ok(p == context && length2 == context_ex->Legacy.Length, - "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); length2 = expected_length; if (0) @@ -9464,34 +9465,34 @@ static void test_extended_context(void) SetLastError(0xdeadbeef); if (flags & CONTEXT_NATIVE) ok(bret && mask == ((flags & flags_fpx) == flags_fpx ? 0x3 : 0), - "Got unexpected bret %#x, mask %s, flags %#x.\n", bret, wine_dbgstr_longlong(mask), flags); + "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags); else ok(!bret && mask == 0xdeadbeef && GetLastError() == 0xdeadbeef, - "Got unexpected bret %#x, mask %s, GetLastError() %#x, flags %#x.\n", + "Got unexpected bret %#x, mask %s, GetLastError() %#lx, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), GetLastError(), flags); bret = pSetXStateFeaturesMask(context, 0); - ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#x.\n", bret, flags); + ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#lx.\n", bret, flags); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); - ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags); bret = pSetXStateFeaturesMask(context, 1); - ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#x.\n", bret, flags); + ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#lx.\n", bret, flags); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); ok(context_flags == (bret ? flags_fpx : flags), - "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags); bret = pSetXStateFeaturesMask(context, 2); - ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#x.\n", bret, flags); + ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#lx.\n", bret, flags); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); ok(context_flags == (bret ? flags_fpx : flags), - "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags); bret = pSetXStateFeaturesMask(context, 4); ok(!bret, "Got unexpected bret %#x.\n", bret); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); ok(context_flags == (flags & CONTEXT_NATIVE ? flags_fpx : flags), - "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags); *(DWORD *)(context_buffer + context_arch[test].flags_offset) = flags; for (j = 0; j < context_arch[test].flags_offset; ++j) @@ -9523,49 +9524,49 @@ static void test_extended_context(void) memset(context_buffer2, 0xcc, sizeof(context_buffer2)); ret2 = pRtlInitializeExtendedContext(context_buffer2, flags, &context_ex); - ok(!ret2, "Got unexpected ret2 %#x, flags %#x.\n", ret2, flags); + ok(!ret2, "Got unexpected ret2 %#lx, flags %#lx.\n", ret2, flags); ok(!memcmp(context_buffer2, context_buffer, sizeof(context_buffer2)), - "Context data do not match, flags %#x.\n", flags); + "Context data do not match, flags %#lx.\n", flags); memset(context_buffer2, 0xcc, sizeof(context_buffer2)); ret2 = pRtlInitializeExtendedContext(context_buffer2 + 2, flags, &context_ex); - ok(!ret2, "Got unexpected ret2 %#x, flags %#x.\n", ret2, flags); + ok(!ret2, "Got unexpected ret2 %#lx, flags %#lx.\n", ret2, flags); /* Buffer gets aligned to 16 bytes on x64, while returned context length suggests it should be 8. */ align = test ? 4 : 16; ok(!memcmp(context_buffer2 + align, context_buffer, sizeof(context_buffer2) - align), - "Context data do not match, flags %#x.\n", flags); + "Context data do not match, flags %#lx.\n", flags); SetLastError(0xdeadbeef); memset(context_buffer2, 0xcc, sizeof(context_buffer2)); bret = pInitializeContext(context_buffer2 + 2, flags, &context, &length2); ok(bret && GetLastError() == 0xdeadbeef, - "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags); - ok(length2 == expected_length, "Got unexpexted length %#x.\n", length); + "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); + ok(length2 == expected_length, "Got unexpexted length %#lx.\n", length); ok(!memcmp(context_buffer2 + align, context_buffer, sizeof(context_buffer2) - align), - "Context data do not match, flags %#x.\n", flags); + "Context data do not match, flags %#lx.\n", flags); length2 = 0xdeadbeef; p = pLocateXStateFeature(context, 0, &length2); if (flags & CONTEXT_NATIVE) ok(p == (BYTE *)context + context_arch[test].xsavearea_offset && length2 == offsetof(XSAVE_FORMAT, XmmRegisters), - "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); else - ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); length2 = 0xdeadbeef; p = pLocateXStateFeature(context, 1, &length2); if (flags & CONTEXT_NATIVE) ok(p == (BYTE *)context + context_arch[test].xsavearea_offset + offsetof(XSAVE_FORMAT, XmmRegisters) && length2 == sizeof(M128A) * context_arch[test].vector_reg_count, - "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); else - ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); length2 = 0xdeadbeef; p = pLocateXStateFeature(context, 2, &length2); - ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); if (!pRtlInitializeExtendedContext2 || !pInitializeContext2) { @@ -9579,28 +9580,28 @@ static void test_extended_context(void) length2 = expected_length; memset(context_buffer2, 0xcc, sizeof(context_buffer2)); ret2 = pRtlInitializeExtendedContext2(context_buffer2 + 2, flags, &context_ex, ~(ULONG64)0); - ok(!ret2, "Got unexpected ret2 %#x, flags %#x.\n", ret2, flags); + ok(!ret2, "Got unexpected ret2 %#lx, flags %#lx.\n", ret2, flags); ok(!memcmp(context_buffer2 + align, context_buffer, sizeof(context_buffer2) - align), - "Context data do not match, flags %#x.\n", flags); + "Context data do not match, flags %#lx.\n", flags); memset(context_buffer2, 0xcc, sizeof(context_buffer2)); bret = pInitializeContext2(context_buffer2 + 2, flags, &context, &length2, 0); ok(bret && GetLastError() == 0xdeadbeef, - "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags); - ok(length2 == expected_length, "Got unexpexted length %#x.\n", length); + "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); + ok(length2 == expected_length, "Got unexpexted length %#lx.\n", length); ok(!memcmp(context_buffer2 + align, context_buffer, sizeof(context_buffer2) - align), - "Context data do not match, flags %#x.\n", flags); + "Context data do not match, flags %#lx.\n", flags); length2 = 0xdeadbeef; p = pLocateXStateFeature(context, 0, &length2); if (flags & CONTEXT_NATIVE) ok(p == (BYTE *)context + context_arch[test].xsavearea_offset && length2 == offsetof(XSAVE_FORMAT, XmmRegisters), - "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); else - ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); } flags = context_arch[test].flag | 0x40; @@ -9612,19 +9613,19 @@ static void test_extended_context(void) if (!enabled_features) { ok(ret == STATUS_NOT_SUPPORTED && length == 0xdeadbeef, - "Got unexpected result ret %#x, length %#x.\n", ret, length); + "Got unexpected result ret %#lx, length %#lx.\n", ret, length); context_ex = (void *)0xdeadbeef; ret2 = pRtlInitializeExtendedContext(context_buffer, flags, &context_ex); - ok(ret2 == STATUS_NOT_SUPPORTED, "Got unexpected result ret %#x, test %u.\n", ret2, test); + ok(ret2 == STATUS_NOT_SUPPORTED, "Got unexpected result ret %#lx, test %u.\n", ret2, test); SetLastError(0xdeadbeef); length2 = sizeof(context_buffer); bret = pInitializeContext(context_buffer, flags, &context, &length2); ok(bret && GetLastError() == 0xdeadbeef, - "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags); + "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); - ok(context_flags == (flags & ~0x40), "Got unexpected ContextFlags %#x, flags %#x.\n", + ok(context_flags == (flags & ~0x40), "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags); if (pInitializeContext2) @@ -9633,16 +9634,16 @@ static void test_extended_context(void) length2 = sizeof(context_buffer); bret = pInitializeContext2(context_buffer, flags, &context, &length2, ~(ULONG64)0); ok(bret && GetLastError() == 0xdeadbeef, - "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags); + "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); - ok(context_flags == (flags & ~0x40), "Got unexpected ContextFlags %#x, flags %#x.\n", + ok(context_flags == (flags & ~0x40), "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags); } continue; } ok(!ret && length >= expected_length_xstate, - "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test); if (!pRtlGetExtendedContextLength2) { @@ -9653,36 +9654,36 @@ static void test_extended_context(void) length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 7); ok(!ret && length == expected_length_xstate, - "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test); length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, ~0); ok(!ret && length >= expected_length_xstate, - "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test); length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 0); ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT)) || broken(!ret && length == expected_length_xstate) /* win10pro */, - "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test); length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 3); ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT)) || broken(!ret && length == expected_length_xstate) /* win10pro */, - "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test); length = 0xdeadbeef; ret = pRtlGetExtendedContextLength2(flags, &length, 4); ok(!ret && length == expected_length_xstate, - "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test); + "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test); } pRtlGetExtendedContextLength(flags, &length); SetLastError(0xdeadbeef); bret = pInitializeContext(NULL, flags, NULL, &length2); ok(!bret && length2 == length && GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Got unexpected bret %#x, length2 %#x, GetLastError() %u, flags %#x.\n", + "Got unexpected bret %#x, length2 %#lx, GetLastError() %lu, flags %#lx.\n", bret, length2, GetLastError(), flags); SetLastError(0xdeadbeef); @@ -9690,7 +9691,7 @@ static void test_extended_context(void) length2 = length - 1; bret = pInitializeContext(context_buffer, flags, &context, &length2); ok(!bret && GetLastError() == ERROR_INSUFFICIENT_BUFFER && length2 == length && context == (void *)0xdeadbeef, - "Got unexpected bret %#x, GetLastError() %u, length2 %#x, flags %#x.\n", + "Got unexpected bret %#x, GetLastError() %lu, length2 %#lx, flags %#lx.\n", bret, GetLastError(), length2, flags); SetLastError(0xdeadbeef); @@ -9698,45 +9699,45 @@ static void test_extended_context(void) length2 = length + 1; bret = pInitializeContext(context_buffer, flags, &context, &length2); ok(bret && GetLastError() == 0xdeadbeef, - "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags); - ok(length2 == length, "Got unexpexted length %#x.\n", length); + "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); + ok(length2 == length, "Got unexpexted length %#lx.\n", length); ok((BYTE *)context == context_buffer, "Got unexpected context %p.\n", context); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); - ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags); context_ex = (CONTEXT_EX *)(context_buffer + context_arch[test].context_length); ok(context_ex->Legacy.Offset == -(int)context_arch[test].context_length, - "Got unexpected Offset %d, flags %#x.\n", context_ex->Legacy.Offset, flags); + "Got unexpected Offset %ld, flags %#lx.\n", context_ex->Legacy.Offset, flags); ok(context_ex->Legacy.Length == ((flags & 0x20) ? context_arch[test].context_length : context_arch[test].legacy_length), - "Got unexpected Length %#x, flags %#x.\n", context_ex->Legacy.Length, flags); + "Got unexpected Length %#lx, flags %#lx.\n", context_ex->Legacy.Length, flags); expected_offset = (((ULONG_PTR)context + context_arch[test].context_length + context_arch[test].context_ex_length + 63) & ~(ULONG64)63) - (ULONG_PTR)context - context_arch[test].context_length; ok(context_ex->XState.Offset == expected_offset, - "Got unexpected Offset %d, flags %#x.\n", context_ex->XState.Offset, flags); + "Got unexpected Offset %ld, flags %#lx.\n", context_ex->XState.Offset, flags); ok(context_ex->XState.Length >= sizeof(XSTATE), - "Got unexpected Length %#x, flags %#x.\n", context_ex->XState.Length, flags); + "Got unexpected Length %#lx, flags %#lx.\n", context_ex->XState.Length, flags); ok(context_ex->All.Offset == -(int)context_arch[test].context_length, - "Got unexpected Offset %d, flags %#x.\n", context_ex->All.Offset, flags); + "Got unexpected Offset %ld, flags %#lx.\n", context_ex->All.Offset, flags); /* No extra 8 bytes in x64 CONTEXT_EX here. */ ok(context_ex->All.Length == context_arch[test].context_length + context_ex->XState.Offset + context_ex->XState.Length, - "Got unexpected Length %#x, flags %#x.\n", context_ex->All.Length, flags); + "Got unexpected Length %#lx, flags %#lx.\n", context_ex->All.Length, flags); xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset); length2 = 0xdeadbeef; for (i = 0; i < 2; ++i) { p = pRtlLocateExtendedFeature(context_ex, i, &length2); - ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x.\n", p, length2); + ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx.\n", p, length2); } p = pRtlLocateExtendedFeature(context_ex, XSTATE_AVX, &length2); - ok(length2 == sizeof(YMMCONTEXT), "Got unexpected length %#x.\n", length2); + ok(length2 == sizeof(YMMCONTEXT), "Got unexpected length %#lx.\n", length2); ok(p == &xs->YmmContext, "Got unexpected p %p.\n", p); p = pRtlLocateExtendedFeature(context_ex, XSTATE_AVX, NULL); ok(p == &xs->YmmContext, "Got unexpected p %p.\n", p); @@ -9746,35 +9747,35 @@ static void test_extended_context(void) if (flags & CONTEXT_NATIVE) ok(p == (BYTE *)context + context_arch[test].xsavearea_offset && length2 == offsetof(XSAVE_FORMAT, XmmRegisters), - "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); else - ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); length2 = 0xdeadbeef; p = pLocateXStateFeature(context, 1, &length2); if (flags & CONTEXT_NATIVE) ok(p == (BYTE *)context + context_arch[test].xsavearea_offset + offsetof(XSAVE_FORMAT, XmmRegisters) && length2 == sizeof(M128A) * context_arch[test].vector_reg_count, - "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); else - ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); length2 = 0xdeadbeef; p = pLocateXStateFeature(context, 2, &length2); if (flags & CONTEXT_NATIVE) ok(p == &xs->YmmContext && length2 == sizeof(YMMCONTEXT), - "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); else - ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); mask = 0xdeadbeef; bret = pGetXStateFeaturesMask(context, &mask); if (flags & CONTEXT_NATIVE) ok(bret && !mask, - "Got unexpected bret %#x, mask %s, flags %#x.\n", bret, wine_dbgstr_longlong(mask), flags); + "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags); else ok(!bret && mask == 0xdeadbeef, - "Got unexpected bret %#x, mask %s, flags %#x.\n", bret, wine_dbgstr_longlong(mask), flags); + "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags); expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | enabled_features : 0; ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); @@ -9792,7 +9793,7 @@ static void test_extended_context(void) ok(mask == (xs->Mask & ~(ULONG64)3), "Got unexpected mask %s.\n", wine_dbgstr_longlong(mask)); ok(xs->CompactionMask == 0xdeadbeef, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); - ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context->ContextFlags, flags); + ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context->ContextFlags, flags); xs->Mask = 0xdeadbeef; xs->CompactionMask = 0; @@ -9803,7 +9804,7 @@ static void test_extended_context(void) ok(!xs->CompactionMask, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); - ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context->ContextFlags, flags); + ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context->ContextFlags, flags); xs->Mask = 0xdeadbeef; xs->CompactionMask = 0xdeadbeef; @@ -9811,7 +9812,7 @@ static void test_extended_context(void) ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x.\n", bret); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); ok(context_flags == (bret ? flags_fpx : flags), - "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags); ok(xs->Mask == bret ? 4 : 0xdeadbeef, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); mask = pRtlGetExtendedFeaturesMask(context_ex); ok(mask == (xs->Mask & ~(ULONG64)3), "Got unexpected mask %s.\n", wine_dbgstr_longlong(mask)); @@ -9822,10 +9823,10 @@ static void test_extended_context(void) bret = pGetXStateFeaturesMask(context, &mask); if (flags & CONTEXT_NATIVE) ok(bret && mask == enabled_features, - "Got unexpected bret %#x, mask %s, flags %#x.\n", bret, wine_dbgstr_longlong(mask), flags); + "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags); else ok(!bret && mask == 0xdeadbeef, - "Got unexpected bret %#x, mask %s, flags %#x.\n", bret, wine_dbgstr_longlong(mask), flags); + "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags); if (pRtlGetExtendedContextLength2) { @@ -9836,8 +9837,8 @@ static void test_extended_context(void) length2 = length; bret = pInitializeContext2(context_buffer, flags, &context, &length2, 0); ok(bret && GetLastError() == 0xdeadbeef, - "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags); - ok(length2 == length, "Got unexpexted length %#x.\n", length); + "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); + ok(length2 == length, "Got unexpexted length %#lx.\n", length); ok((BYTE *)context == context_buffer, "Got unexpected context %p.\n", context); length2 = 0xdeadbeef; @@ -9845,46 +9846,46 @@ static void test_extended_context(void) if (flags & CONTEXT_NATIVE) ok(p == (BYTE *)context + context_arch[test].xsavearea_offset && length2 == offsetof(XSAVE_FORMAT, XmmRegisters), - "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); else - ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); length2 = 0xdeadbeef; p = pRtlLocateExtendedFeature(context_ex, 2, &length2); ok((!p && length2 == sizeof(YMMCONTEXT)) || broken(p && length2 == sizeof(YMMCONTEXT)) /* win10pro */, - "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); length2 = 0xdeadbeef; p = pLocateXStateFeature(context, 2, &length2); ok(!p && length2 == (flags & CONTEXT_NATIVE) ? sizeof(YMMCONTEXT) : 0xdeadbeef, - "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags); + "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); - ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags); + ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags); context_ex = (CONTEXT_EX *)(context_buffer + context_arch[test].context_length); ok(context_ex->Legacy.Offset == -(int)context_arch[test].context_length, - "Got unexpected Offset %d, flags %#x.\n", context_ex->Legacy.Offset, flags); + "Got unexpected Offset %ld, flags %#lx.\n", context_ex->Legacy.Offset, flags); ok(context_ex->Legacy.Length == ((flags & 0x20) ? context_arch[test].context_length : context_arch[test].legacy_length), - "Got unexpected Length %#x, flags %#x.\n", context_ex->Legacy.Length, flags); + "Got unexpected Length %#lx, flags %#lx.\n", context_ex->Legacy.Length, flags); expected_offset = (((ULONG_PTR)context + context_arch[test].context_length + context_arch[test].context_ex_length + 63) & ~(ULONG64)63) - (ULONG_PTR)context - context_arch[test].context_length; ok(context_ex->XState.Offset == expected_offset, - "Got unexpected Offset %d, flags %#x.\n", context_ex->XState.Offset, flags); + "Got unexpected Offset %ld, flags %#lx.\n", context_ex->XState.Offset, flags); ok(context_ex->XState.Length == sizeof(XSTATE) - sizeof(YMMCONTEXT) || broken(context_ex->XState.Length == sizeof(XSTATE)) /* win10pro */, - "Got unexpected Length %#x, flags %#x.\n", context_ex->XState.Length, flags); + "Got unexpected Length %#lx, flags %#lx.\n", context_ex->XState.Length, flags); ok(context_ex->All.Offset == -(int)context_arch[test].context_length, - "Got unexpected Offset %d, flags %#x.\n", context_ex->All.Offset, flags); + "Got unexpected Offset %ld, flags %#lx.\n", context_ex->All.Offset, flags); /* No extra 8 bytes in x64 CONTEXT_EX here. */ ok(context_ex->All.Length == context_arch[test].context_length + context_ex->XState.Offset + context_ex->XState.Length, - "Got unexpected Length %#x, flags %#x.\n", context_ex->All.Length, flags); + "Got unexpected Length %#lx, flags %#lx.\n", context_ex->All.Length, flags); expected_compaction = compaction_enabled ? (ULONG64)1 << 63 : 0; xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset); @@ -9901,7 +9902,7 @@ static void test_extended_context(void) length = 0xdeadbeef; ret = pRtlGetExtendedContextLength(context_arch[0].flag | context_arch[1].flag, &length); - ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#x, length %#x.\n", + ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#lx, length %#lx.\n", ret, length); if (0) @@ -9935,7 +9936,7 @@ static void test_extended_context(void) memcpy(data, test_extended_context_data, sizeof(data)); func(); - ok(context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS), "Got unexpected ContextFlags %#x.\n", + ok(context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS), "Got unexpected ContextFlags %#lx.\n", context->ContextFlags); for (i = 0; i < 8; ++i) ok(data[i] == test_extended_context_data[i], "Got unexpected data %#x, i %u.\n", data[i], i); @@ -9953,7 +9954,7 @@ static void test_extended_context(void) expected_flags |= CONTEXT_EXTENDED_REGISTERS; #endif pSetXStateFeaturesMask(context, ~(ULONG64)0); - ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n", + ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n", context->ContextFlags); *(void **)(call_func_code_set_ymm0 + call_func_offsets.func_addr) = GetThreadContext; *(void **)(call_func_code_set_ymm0 + call_func_offsets.func_param1) = (void *)GetCurrentThread(); @@ -9966,9 +9967,9 @@ static void test_extended_context(void) context_ex->XState.Length = sizeof(XSTATE); bret = func(); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); - ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n", + ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n", context->ContextFlags); expected_compaction = compaction_enabled ? (ULONG64)1 << 63 : 0; @@ -9982,7 +9983,7 @@ static void test_extended_context(void) for (i = 0; i < 4; ++i) ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask == 4 ? test_extended_context_data[i + 4] : 0xcccccccc), - "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + "Got unexpected data %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0; @@ -9991,8 +9992,8 @@ static void test_extended_context(void) context_ex->XState.Length = sizeof(XSTATE) + 64; bret = func(); ok(!bret && GetLastError() == ERROR_INVALID_PARAMETER, - "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n", + "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); + ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n", context->ContextFlags); ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == 4, "Got unexpected CompactionMask %s.\n", @@ -10000,31 +10001,31 @@ static void test_extended_context(void) for (i = 0; i < 4; ++i) ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */, - "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + "Got unexpected data %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); xs->CompactionMask = 4; xs->Mask = compaction_enabled ? 0 : 4; context_ex->XState.Length = offsetof(XSTATE, YmmContext); bret = func(); - ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n", + ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n", context->ContextFlags); ok(!bret && GetLastError() == ERROR_MORE_DATA, - "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); ok(xs->Mask == 4, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */, - "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + "Got unexpected data %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); context_ex->XState.Length = sizeof(XSTATE); xs->CompactionMask = 4; xs->Mask = compaction_enabled ? 0 : 4; bret = func(); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); - ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n", + ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n", context->ContextFlags); ok(xs->Mask == 4, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); @@ -10036,7 +10037,7 @@ static void test_extended_context(void) for (i = 0; i < 4; ++i) ok(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4], - "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + "Got unexpected data %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); /* Test GetThreadContext (current thread, ymm state cleared). */ length = sizeof(context_buffer); @@ -10053,13 +10054,13 @@ static void test_extended_context(void) memcpy(code_mem, call_func_code_reset_ymm_state, sizeof(call_func_code_reset_ymm_state)); bret = func(); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); expected_flags = CONTEXT_FULL | CONTEXT_XSTATE | CONTEXT_FLOATING_POINT; #ifdef __i386__ expected_flags |= CONTEXT_EXTENDED_REGISTERS; #endif - ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n", + ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n", context->ContextFlags); expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0; @@ -10075,7 +10076,7 @@ static void test_extended_context(void) for (i = 0; i < 4; ++i) ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc) || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]), - "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + "Got unexpected data %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); /* Test fault exception context. */ memset(data, 0xff, sizeof(data)); @@ -10111,69 +10112,69 @@ static void test_extended_context(void) pSetXStateFeaturesMask(context, 4); bret = GetThreadContext(thread, context); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); todo_wine_if (!xsaveopt_enabled) ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 16 * 4; ++i) ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc), - "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); pSetXStateFeaturesMask(context, 4); memset(&xs->YmmContext, 0, sizeof(xs->YmmContext)); bret = SetThreadContext(thread, context); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); ok(!xs->Mask || broken(xs->Mask == 4), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 16 * 4; ++i) ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc || broken(xs->Mask == 4 && !((ULONG *)&xs->YmmContext)[i]), - "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); pSetXStateFeaturesMask(context, 4); memset(&xs->YmmContext, 0x28, sizeof(xs->YmmContext)); bret = SetThreadContext(thread, context); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); ok(xs->Mask == 4, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0x28282828, "Got unexpected value %#x, i %u.\n", + ok(((ULONG *)&xs->YmmContext)[i] == 0x28282828, "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); wait_for_thread_next_suspend(thread); bret = GetThreadContext(thread, context); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); pSetXStateFeaturesMask(context, 4); memset(&xs->YmmContext, 0x48, sizeof(xs->YmmContext)); bret = SetThreadContext(thread, context); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); wait_for_thread_next_suspend(thread); memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); ok(xs->Mask == 4, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0x68686868, "Got unexpected value %#x, i %u.\n", + ok(((ULONG *)&xs->YmmContext)[i] == 0x68686868, "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); wait_for_thread_next_suspend(thread); memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); todo_wine_if (!xsaveopt_enabled && sizeof(void *) != 4) ok(xs->Mask == (xsaveopt_enabled ? 0 : 4) || (sizeof(void *) == 4 && xs->Mask == 4), "Got unexpected Mask %#I64x.\n", xs->Mask); @@ -10181,20 +10182,20 @@ static void test_extended_context(void) { for (i = 0; i < 8 * sizeof(void *); ++i) ok(((ULONG *)&xs->YmmContext)[i] == 0, - "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); for (; i < 16 * 4; ++i) ok(((ULONG *)&xs->YmmContext)[i] == 0x48484848, - "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); } else { for (i = 0; i < 16 * 4; ++i) ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, - "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); } bret = ResumeThread(thread); - ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); + ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError()); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); @@ -10231,7 +10232,7 @@ static void check_changes_in_range_(const char *file, unsigned int line, const B if (flag & flags && p[i] == 0xcc) { if (!once++) - ok(broken(1), "Matched broken result at %#x, flags %#x.\n", i, flags); + ok(broken(1), "Matched broken result at %#x, flags %#lx.\n", i, flags); continue; } flag = 0; @@ -10239,12 +10240,12 @@ static void check_changes_in_range_(const char *file, unsigned int line, const B if (flag & flags && p[i] != 0xcc) { - ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#lx.\n", p[i], i, flags); return; } else if (!(flag & flags) && p[i] != 0xdd) { - ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#lx.\n", p[i], i, flags); return; } } @@ -10330,15 +10331,15 @@ static void test_copy_context(void) status = pRtlInitializeExtendedContext(src_context_buffer, flags, &src_ex); if (enabled_features || !(flags & 0x40)) { - ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags); + ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags); } else { - ok(status == STATUS_NOT_SUPPORTED, "Got unexpected status %#x, flags %#x.\n", status, flags); + ok(status == STATUS_NOT_SUPPORTED, "Got unexpected status %#lx, flags %#lx.\n", status, flags); continue; } status = pRtlInitializeExtendedContext(dst_context_buffer, flags, &dst_ex); - ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags); + ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags); src = pRtlLocateLegacyContext(src_ex, NULL); dst = pRtlLocateLegacyContext(dst_ex, NULL); @@ -10352,26 +10353,26 @@ static void test_copy_context(void) src_xs->CompactionMask = ~(ULONG64)0; status = pRtlCopyExtendedContext(dst_ex, flags, src_ex); - ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags); + ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags); context_length = (BYTE *)dst_ex - (BYTE *)dst + dst_ex->All.Length; check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0], flags, context_length); - ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", + ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", *(DWORD *)((BYTE *)dst + flags_offset), flags); memset(dst_context_buffer, 0xdd, sizeof(dst_context_buffer)); status = pRtlInitializeExtendedContext(dst_context_buffer, flags, &dst_ex); - ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags); + ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags); *(DWORD *)((BYTE *)src + flags_offset) = 0; *(DWORD *)((BYTE *)dst + flags_offset) = 0; SetLastError(0xdeadbeef); status = pRtlCopyContext(dst, flags | 0x40, src); ok(status == (enabled_features ? STATUS_INVALID_PARAMETER : STATUS_NOT_SUPPORTED) || broken(status == STATUS_INVALID_PARAMETER), - "Got unexpected status %#x, flags %#x.\n", status, flags); - ok(*(DWORD *)((BYTE *)dst + flags_offset) == 0, "Got unexpected ContextFlags %#x, flags %#x.\n", + "Got unexpected status %#lx, flags %#lx.\n", status, flags); + ok(*(DWORD *)((BYTE *)dst + flags_offset) == 0, "Got unexpected ContextFlags %#lx, flags %#lx.\n", *(DWORD *)((BYTE *)dst + flags_offset), flags); check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0], 0, context_length); @@ -10382,13 +10383,13 @@ static void test_copy_context(void) if (flags & 0x40) ok((status == STATUS_BUFFER_OVERFLOW) || broken(!(flags & CONTEXT_NATIVE) && status == STATUS_INVALID_PARAMETER), - "Got unexpected status %#x, flags %#x.\n", status, flags); + "Got unexpected status %#lx, flags %#lx.\n", status, flags); else ok(!status || broken(!(flags & CONTEXT_NATIVE) && status == STATUS_INVALID_PARAMETER), - "Got unexpected status %#x, flags %#x.\n", status, flags); + "Got unexpected status %#lx, flags %#lx.\n", status, flags); if (!status) { - ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", + ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", *(DWORD *)((BYTE *)dst + flags_offset), flags); check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0], flags, context_length); @@ -10396,7 +10397,7 @@ static void test_copy_context(void) else { ok(*(DWORD *)((BYTE *)dst + flags_offset) == (flags & 0x110000), - "Got unexpected ContextFlags %#x, flags %#x.\n", + "Got unexpected ContextFlags %#lx, flags %#lx.\n", *(DWORD *)((BYTE *)dst + flags_offset), flags); check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0], 0, context_length); @@ -10414,11 +10415,11 @@ static void test_copy_context(void) memset(src_context_buffer, 0xcc, sizeof(src_context_buffer)); length = sizeof(src_context_buffer); bret = pInitializeContext(src_context_buffer, flags, &src, &length); - ok(bret, "Got unexpected bret %#x, flags %#x.\n", bret, flags); + ok(bret, "Got unexpected bret %#x, flags %#lx.\n", bret, flags); length = sizeof(dst_context_buffer); bret = pInitializeContext(dst_context_buffer, flags, &dst, &length); - ok(bret, "Got unexpected bret %#x, flags %#x.\n", bret, flags); + ok(bret, "Got unexpected bret %#x, flags %#lx.\n", bret, flags); dst_ex = (CONTEXT_EX *)((BYTE *)dst + context_length); src_ex = (CONTEXT_EX *)((BYTE *)src + context_length); @@ -10442,12 +10443,12 @@ static void test_copy_context(void) dst_ex->XState.Length = 0; status = pRtlCopyExtendedContext(dst_ex, flags, src_ex); ok(status == (enabled_features ? STATUS_BUFFER_OVERFLOW : STATUS_NOT_SUPPORTED), - "Got unexpected status %#x, flags %#x.\n", status, flags); + "Got unexpected status %#lx, flags %#lx.\n", status, flags); if (!enabled_features) continue; - ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", + ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", *(DWORD *)((BYTE *)dst + flags_offset), flags); src_xs->Mask = ~(ULONG64)0; @@ -10457,8 +10458,8 @@ static void test_copy_context(void) dst_xs->Mask = 0xdddddddddddddddd; dst_ex->XState.Length = 0; status = pRtlCopyExtendedContext(dst_ex, flags, src_ex); - ok(status == STATUS_BUFFER_OVERFLOW, "Got unexpected status %#x, flags %#x.\n", status, flags); - ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", + ok(status == STATUS_BUFFER_OVERFLOW, "Got unexpected status %#lx, flags %#lx.\n", status, flags); + ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", *(DWORD *)((BYTE *)dst + flags_offset), flags); ok(dst_xs->Mask == 0xdddddddddddddddd, "Got unexpected Mask %s.\n", @@ -10473,8 +10474,8 @@ static void test_copy_context(void) dst_xs->Mask = 0xdddddddddddddddd; dst_ex->XState.Length = offsetof(XSTATE, YmmContext); status = pRtlCopyExtendedContext(dst_ex, flags, src_ex); - ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags); - ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", + ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags); + ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", *(DWORD *)((BYTE *)dst + flags_offset), flags); ok(dst_xs->Mask == 0, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(dst_xs->Mask)); @@ -10487,7 +10488,7 @@ static void test_copy_context(void) dst_xs->Mask = 0xdddddddddddddddd; dst_ex->XState.Length = sizeof(XSTATE); status = pRtlCopyExtendedContext(dst_ex, flags, src_ex); - ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags); + ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags); ok(dst_xs->Mask == 0, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(dst_xs->Mask)); ok(dst_xs->CompactionMask == expected_compaction, @@ -10499,7 +10500,7 @@ static void test_copy_context(void) dst_xs->CompactionMask = 0xdddddddddddddddd; dst_xs->Mask = 0xdddddddddddddddd; status = pRtlCopyExtendedContext(dst_ex, flags, src_ex); - ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags); + ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags); ok(dst_xs->Mask == 4, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(dst_xs->Mask)); ok(dst_xs->CompactionMask == expected_compaction, @@ -10511,7 +10512,7 @@ static void test_copy_context(void) dst_xs->CompactionMask = 0xdddddddddddddddd; dst_xs->Mask = 0xdddddddddddddddd; status = pRtlCopyExtendedContext(dst_ex, flags, src_ex); - ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags); + ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags); ok(dst_xs->Mask == 0, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(dst_xs->Mask)); ok(dst_xs->CompactionMask == expected_compaction, @@ -10526,7 +10527,7 @@ static void test_copy_context(void) dst_xs->CompactionMask = 0xdddddddddddddddd; dst_xs->Mask = 0xdddddddddddddddd; status = pRtlCopyExtendedContext(dst_ex, flags, src_ex); - ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags); + ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags); ok(dst_xs->Mask == 4, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(dst_xs->Mask)); ok(dst_xs->CompactionMask == expected_compaction, @@ -10539,11 +10540,11 @@ static void test_copy_context(void) dst_xs->Mask = 0xdddddddddddddddd; status = pRtlCopyContext(dst, flags, src); ok(!status || broken(!(flags & CONTEXT_NATIVE) && status == STATUS_INVALID_PARAMETER), - "Got unexpected status %#x, flags %#x.\n", status, flags); - ok(dst_xs->Mask == 0xdddddddddddddddd || broken(dst_xs->Mask == 4), "Got unexpected Mask %s, flags %#x.\n", + "Got unexpected status %#lx, flags %#lx.\n", status, flags); + ok(dst_xs->Mask == 0xdddddddddddddddd || broken(dst_xs->Mask == 4), "Got unexpected Mask %s, flags %#lx.\n", wine_dbgstr_longlong(dst_xs->Mask), flags); ok(dst_xs->CompactionMask == 0xdddddddddddddddd || broken(dst_xs->CompactionMask == expected_compaction), - "Got unexpected CompactionMask %s, flags %#x.\n", wine_dbgstr_longlong(dst_xs->CompactionMask), flags); + "Got unexpected CompactionMask %s, flags %#lx.\n", wine_dbgstr_longlong(dst_xs->CompactionMask), flags); check_changes_in_range((BYTE *)&dst_xs->YmmContext, single_range, dst_xs->Mask == 4, sizeof(dst_xs->YmmContext)); }

1 0

[PATCH] dlls/ntdll/tests/error.c: enable compilation with long types
by Eric Pouech 18 Mar '22

18 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/error.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 8f099e6903a..7784886c79b 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -18,6 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> #include <stdio.h> @@ -75,7 +76,7 @@ static void cmp_call(NTSTATUS win_nt, ULONG win32, const char* message) err = pRtlNtStatusToDosError(win_nt); ok(err == win32, - "%s (%x): got %u, expected %u\n", + "%s (%lx): got %lu, expected %lu\n", message, win_nt, err, win32); } @@ -86,7 +87,7 @@ static void cmp_call2(NTSTATUS win_nt, ULONG win32, const char* message) err = pRtlNtStatusToDosError(win_nt); ok(err == win32 || (!strict && err == ERROR_MR_MID_NOT_FOUND), - "%s (%x): got %u, expected %u (or MID_NOT_FOUND)\n", + "%s (%lx): got %lu, expected %lu (or MID_NOT_FOUND)\n", message, win_nt, err, win32); } @@ -96,7 +97,7 @@ static void cmp_call3(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char* err = pRtlNtStatusToDosError(win_nt); ok(err == win32_1 || (!strict && err == win32_2), - "%s (%x): got %u, expected %u or %u\n", + "%s (%lx): got %lu, expected %lu or %lu\n", message, win_nt, err, win32_1, win32_2); } @@ -107,7 +108,7 @@ static void cmp_call4(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char* err = pRtlNtStatusToDosError(win_nt); ok(err == win32_1 || (!strict && (err == win32_2 || err == ERROR_MR_MID_NOT_FOUND)), - "%s (%x): got %u, expected %u or %u\n", + "%s (%lx): got %lu, expected %lu or %lu\n", message, win_nt, err, win32_1, win32_2); }

1 0

[PATCH] dlls/ntdll/tests/env.c: enable compilation with long types
by Eric Pouech 18 Mar '22

18 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/env.c | 161 ++++++++++++++++++++++++------------------------ 1 file changed, 81 insertions(+), 80 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 9cfbf9eb435..09a91d35807 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdio.h> @@ -111,7 +112,7 @@ static void testQuery(void) pRtlMultiByteToUnicodeN( bn, sizeof(bn), NULL, test->var, strlen(test->var)+1 ); nts = pRtlQueryEnvironmentVariable_U(small_env, &name, &value); ok( nts == test->status || (test->alt && nts == test->alt), - "[%d]: Wrong status for '%s', expecting %x got %x\n", + "[%d]: Wrong status for '%s', expecting %lx got %lx\n", i, test->var, test->status, nts ); if (nts == test->status) switch (nts) { @@ -144,20 +145,20 @@ static void testQuery(void) pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1); nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length); ok(nts == test->status || (test->alt && nts == test->alt), - "[%d]: Wrong status for '%s', expecting %x got %x\n", + "[%d]: Wrong status for '%s', expecting %lx got %lx\n", i, test->var, test->status, nts); if (nts == test->status) switch (nts) { case STATUS_SUCCESS: pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1); - ok(return_length == strlen(test->val), "Wrong length %ld for %s\n", + ok(return_length == strlen(test->val), "Wrong length %Id for %s\n", return_length, test->var); ok(!memcmp(bv, bn, return_length), "Wrong result for %s/%d\n", test->var, test->len); ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len); break; case STATUS_BUFFER_TOO_SMALL: ok(return_length == (strlen(test->val) + 1), - "Wrong returned length %ld (too small buffer) for %s\n", return_length, test->var); + "Wrong returned length %Id (too small buffer) for %s\n", return_length, test->var); break; } } @@ -207,20 +208,20 @@ static void testExpand(void) us_dst.Buffer = NULL; nts = pRtlExpandEnvironmentStrings_U(small_env, &us_src, &us_dst, &ul); - ok(nts == STATUS_BUFFER_TOO_SMALL, "Call failed (%u)\n", nts); + ok(nts == STATUS_BUFFER_TOO_SMALL, "Call failed (%lu)\n", nts); ok(ul == strlen(test->dst) * sizeof(WCHAR) + sizeof(WCHAR), - "Wrong returned length for %s: %u\n", test->src, ul ); + "Wrong returned length for %s: %lu\n", test->src, ul ); us_dst.Length = 0; us_dst.MaximumLength = sizeof(dst); us_dst.Buffer = dst; nts = pRtlExpandEnvironmentStrings_U(small_env, &us_src, &us_dst, &ul); - ok(nts == STATUS_SUCCESS, "Call failed (%u)\n", nts); + ok(nts == STATUS_SUCCESS, "Call failed (%lu)\n", nts); ok(ul == us_dst.Length + sizeof(WCHAR), - "Wrong returned length for %s: %u\n", test->src, ul); + "Wrong returned length for %s: %lu\n", test->src, ul); ok(ul == strlen(test->dst) * sizeof(WCHAR) + sizeof(WCHAR), - "Wrong returned length for %s: %u\n", test->src, ul); + "Wrong returned length for %s: %lu\n", test->src, ul); ok(lstrcmpW(dst, rst) == 0, "Wrong result for %s: expecting %s\n", test->src, test->dst); @@ -229,9 +230,9 @@ static void testExpand(void) us_dst.Buffer = dst; dst[8] = '-'; nts = pRtlExpandEnvironmentStrings_U(small_env, &us_src, &us_dst, &ul); - ok(nts == STATUS_BUFFER_TOO_SMALL, "Call failed (%u)\n", nts); + ok(nts == STATUS_BUFFER_TOO_SMALL, "Call failed (%lu)\n", nts); ok(ul == strlen(test->dst) * sizeof(WCHAR) + sizeof(WCHAR), - "Wrong returned length for %s (with buffer too small): %u\n", test->src, ul); + "Wrong returned length for %s (with buffer too small): %lu\n", test->src, ul); ok(dst[8] == '-', "Writing too far in buffer (got %c/%d)\n", dst[8], dst[8]); } @@ -273,7 +274,7 @@ static UINT_PTR check_string_( int line, RTL_USER_PROCESS_PARAMETERS *params, UN } ok_(__FILE__,line)( (UINT_PTR)str->Buffer == align(pos, sizeof(void *)) || (!expect && (UINT_PTR)str->Buffer == pos) || /* initial params are not aligned */ - broken( (UINT_PTR)str->Buffer == align(pos, 4) ), "wrong buffer %lx/%lx\n", + broken( (UINT_PTR)str->Buffer == align(pos, 4) ), "wrong buffer %Ix/%Ix\n", (UINT_PTR)str->Buffer, pos ); if (str->Length < str->MaximumLength) { @@ -305,39 +306,39 @@ static void test_process_params(void) MEMORY_BASIC_INFORMATION info; NTSTATUS status = pRtlCreateProcessParameters( &params, &image, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); - ok( !status, "failed %x\n", status ); + ok( !status, "failed %lx\n", status ); if (VirtualQuery( params, &info, sizeof(info) ) && info.AllocationBase == params) { size = info.RegionSize; ok( broken(TRUE), "not a heap block %p\n", params ); /* winxp */ ok( params->AllocationSize == info.RegionSize, - "wrong AllocationSize %x/%lx\n", params->AllocationSize, info.RegionSize ); + "wrong AllocationSize %lx/%Ix\n", params->AllocationSize, info.RegionSize ); } else { size = HeapSize( GetProcessHeap(), 0, params ); ok( size != ~(SIZE_T)0, "not a heap block %p\n", params ); ok( params->AllocationSize == params->Size, - "wrong AllocationSize %x/%x\n", params->AllocationSize, params->Size ); + "wrong AllocationSize %lx/%lx\n", params->AllocationSize, params->Size ); } ok( params->Size < size || broken(params->Size == size), /* <= win2k3 */ - "wrong Size %x/%lx\n", params->Size, size ); - ok( params->Flags == 0, "wrong Flags %u\n", params->Flags ); - ok( params->DebugFlags == 0, "wrong Flags %u\n", params->DebugFlags ); + "wrong Size %lx/%Ix\n", params->Size, size ); + ok( params->Flags == 0, "wrong Flags %lu\n", params->Flags ); + ok( params->DebugFlags == 0, "wrong Flags %lu\n", params->DebugFlags ); ok( params->ConsoleHandle == 0, "wrong ConsoleHandle %p\n", params->ConsoleHandle ); - ok( params->ConsoleFlags == 0, "wrong ConsoleFlags %u\n", params->ConsoleFlags ); + ok( params->ConsoleFlags == 0, "wrong ConsoleFlags %lu\n", params->ConsoleFlags ); ok( params->hStdInput == 0, "wrong hStdInput %p\n", params->hStdInput ); ok( params->hStdOutput == 0, "wrong hStdOutput %p\n", params->hStdOutput ); ok( params->hStdError == 0, "wrong hStdError %p\n", params->hStdError ); - ok( params->dwX == 0, "wrong dwX %u\n", params->dwX ); - ok( params->dwY == 0, "wrong dwY %u\n", params->dwY ); - ok( params->dwXSize == 0, "wrong dwXSize %u\n", params->dwXSize ); - ok( params->dwYSize == 0, "wrong dwYSize %u\n", params->dwYSize ); - ok( params->dwXCountChars == 0, "wrong dwXCountChars %u\n", params->dwXCountChars ); - ok( params->dwYCountChars == 0, "wrong dwYCountChars %u\n", params->dwYCountChars ); - ok( params->dwFillAttribute == 0, "wrong dwFillAttribute %u\n", params->dwFillAttribute ); - ok( params->dwFlags == 0, "wrong dwFlags %u\n", params->dwFlags ); - ok( params->wShowWindow == 0, "wrong wShowWindow %u\n", params->wShowWindow ); + ok( params->dwX == 0, "wrong dwX %lu\n", params->dwX ); + ok( params->dwY == 0, "wrong dwY %lu\n", params->dwY ); + ok( params->dwXSize == 0, "wrong dwXSize %lu\n", params->dwXSize ); + ok( params->dwYSize == 0, "wrong dwYSize %lu\n", params->dwYSize ); + ok( params->dwXCountChars == 0, "wrong dwXCountChars %lu\n", params->dwXCountChars ); + ok( params->dwYCountChars == 0, "wrong dwYCountChars %lu\n", params->dwYCountChars ); + ok( params->dwFillAttribute == 0, "wrong dwFillAttribute %lu\n", params->dwFillAttribute ); + ok( params->dwFlags == 0, "wrong dwFlags %lu\n", params->dwFlags ); + ok( params->wShowWindow == 0, "wrong wShowWindow %lu\n", params->wShowWindow ); pos = (UINT_PTR)params->CurrentDirectory.DosPath.Buffer; ok( params->CurrentDirectory.DosPath.MaximumLength == MAX_PATH * sizeof(WCHAR), @@ -356,18 +357,18 @@ static void test_process_params(void) pos = check_string( params, &params->RuntimeInfo, &null_str, pos ); pos = align(pos, 4); ok( pos == params->Size || pos + 4 == params->Size, - "wrong pos %lx/%x\n", pos, params->Size ); + "wrong pos %Ix/%lx\n", pos, params->Size ); pos = params->Size; if ((char *)params->Environment > (char *)params && (char *)params->Environment < (char *)params + size) { ok( (char *)params->Environment - (char *)params == (UINT_PTR)pos, - "wrong env %lx/%lx\n", (UINT_PTR)((char *)params->Environment - (char *)params), pos); + "wrong env %Ix/%Ix\n", (UINT_PTR)((char *)params->Environment - (char *)params), pos); pos += get_env_length(params->Environment) * sizeof(WCHAR); ok( align(pos, sizeof(void *)) == size || - broken( align(pos, 4) == size ), "wrong size %lx/%lx\n", pos, size ); + broken( align(pos, 4) == size ), "wrong size %Ix/%Ix\n", pos, size ); ok( params->EnvironmentSize == size - ((char *)params->Environment - (char *)params), - "wrong len %lx/%lx\n", params->EnvironmentSize, + "wrong len %Ix/%Ix\n", params->EnvironmentSize, size - ((char *)params->Environment - (char *)params) ); } else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */ @@ -375,23 +376,23 @@ static void test_process_params(void) status = pRtlCreateProcessParameters( &params, &image, &dummy, &dummy, &dummy, dummy_env, &dummy, &dummy, &dummy, &dummy ); - ok( !status, "failed %x\n", status ); + ok( !status, "failed %lx\n", status ); if (VirtualQuery( params, &info, sizeof(info) ) && info.AllocationBase == params) { size = info.RegionSize; ok( broken(TRUE), "not a heap block %p\n", params ); /* winxp */ ok( params->AllocationSize == info.RegionSize, - "wrong AllocationSize %x/%lx\n", params->AllocationSize, info.RegionSize ); + "wrong AllocationSize %lx/%Ix\n", params->AllocationSize, info.RegionSize ); } else { size = HeapSize( GetProcessHeap(), 0, params ); ok( size != ~(SIZE_T)0, "not a heap block %p\n", params ); ok( params->AllocationSize == params->Size, - "wrong AllocationSize %x/%x\n", params->AllocationSize, params->Size ); + "wrong AllocationSize %lx/%lx\n", params->AllocationSize, params->Size ); } ok( params->Size < size || broken(params->Size == size), /* <= win2k3 */ - "wrong Size %x/%lx\n", params->Size, size ); + "wrong Size %lx/%Ix\n", params->Size, size ); pos = (UINT_PTR)params->CurrentDirectory.DosPath.Buffer; if (params->CurrentDirectory.DosPath.Length == dummy_dir.Length + sizeof(WCHAR)) @@ -410,18 +411,18 @@ static void test_process_params(void) pos = check_string( params, &params->RuntimeInfo, &dummy, pos ); pos = align(pos, 4); ok( pos == params->Size || pos + 4 == params->Size, - "wrong pos %lx/%x\n", pos, params->Size ); + "wrong pos %Ix/%lx\n", pos, params->Size ); pos = params->Size; if ((char *)params->Environment > (char *)params && (char *)params->Environment < (char *)params + size) { ok( (char *)params->Environment - (char *)params == pos, - "wrong env %lx/%lx\n", (UINT_PTR)((char *)params->Environment - (char *)params), pos); + "wrong env %Ix/%Ix\n", (UINT_PTR)((char *)params->Environment - (char *)params), pos); pos += get_env_length(params->Environment) * sizeof(WCHAR); ok( align(pos, sizeof(void *)) == size || - broken( align(pos, 4) == size ), "wrong size %lx/%lx\n", pos, size ); + broken( align(pos, 4) == size ), "wrong size %Ix/%Ix\n", pos, size ); ok( params->EnvironmentSize == size - ((char *)params->Environment - (char *)params), - "wrong len %lx/%lx\n", params->EnvironmentSize, + "wrong len %Ix/%Ix\n", params->EnvironmentSize, size - ((char *)params->Environment - (char *)params) ); } else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */ @@ -434,15 +435,15 @@ static void test_process_params(void) { ok( broken(TRUE), "not a heap block %p\n", cur_params ); /* winxp */ ok( cur_params->AllocationSize == info.RegionSize, - "wrong AllocationSize %x/%lx\n", cur_params->AllocationSize, info.RegionSize ); + "wrong AllocationSize %lx/%Ix\n", cur_params->AllocationSize, info.RegionSize ); } else { size = HeapSize( GetProcessHeap(), 0, cur_params ); ok( size != ~(SIZE_T)0, "not a heap block %p\n", cur_params ); ok( cur_params->AllocationSize == cur_params->Size, - "wrong AllocationSize %x/%x\n", cur_params->AllocationSize, cur_params->Size ); - ok( cur_params->Size == size, "wrong Size %x/%lx\n", cur_params->Size, size ); + "wrong AllocationSize %lx/%lx\n", cur_params->AllocationSize, cur_params->Size ); + ok( cur_params->Size == size, "wrong Size %lx/%Ix\n", cur_params->Size, size ); } /* CurrentDirectory points outside the params, and DllPath may be null */ @@ -475,7 +476,7 @@ static void test_process_params(void) size = HeapSize( GetProcessHeap(), 0, initial_env ); ok( size != ~(SIZE_T)0, "env is not a heap block %p / %p\n", cur_params, initial_env ); ok( cur_params->EnvironmentSize == size, - "wrong len %lx/%lx\n", cur_params->EnvironmentSize, size ); + "wrong len %Ix/%Ix\n", cur_params->EnvironmentSize, size ); } } @@ -493,13 +494,13 @@ static void check_env_var_(int line, const char *var, const char *value) DWORD size = GetEnvironmentVariableA(var, buffer, sizeof(buffer)); if (value) { - ok_(__FILE__, line)(size == strlen(value), "wrong size %u\n", size); + ok_(__FILE__, line)(size == strlen(value), "wrong size %lu\n", size); ok_(__FILE__, line)(!strcmp(buffer, value), "wrong value %s\n", debugstr_a(buffer)); } else { - ok_(__FILE__, line)(!size, "wrong size %u\n", size); - ok_(__FILE__, line)(GetLastError() == ERROR_ENVVAR_NOT_FOUND, "got error %u\n", GetLastError()); + ok_(__FILE__, line)(!size, "wrong size %lu\n", size); + ok_(__FILE__, line)(GetLastError() == ERROR_ENVVAR_NOT_FOUND, "got error %lu\n", GetLastError()); } } #define check_env_var(a, b) check_env_var_(__LINE__, a, b) @@ -512,31 +513,31 @@ static void test_RtlSetCurrentEnvironment(void) SIZE_T size; status = RtlCreateEnvironment(FALSE, &env); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); ret = SetEnvironmentVariableA("testenv1", "heis"); - ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %lu\n", GetLastError()); ret = SetEnvironmentVariableA("testenv2", "dyo"); - ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %lu\n", GetLastError()); status = set_env_var(&env, L"testenv1", L"unus"); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); status = set_env_var(&env, L"testenv3", L"tres"); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); old_env = NtCurrentTeb()->Peb->ProcessParameters->Environment; ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == get_env_length(old_env) * sizeof(WCHAR), - "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); + "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == HeapSize( GetProcessHeap(), 0, old_env ), - "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); + "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); RtlSetCurrentEnvironment(env, &prev); ok(prev == old_env, "got wrong previous env %p\n", prev); ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == env, "got wrong current env\n"); ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == get_env_length(env) * sizeof(WCHAR), - "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); + "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == HeapSize( GetProcessHeap(), 0, env ), - "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); + "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); check_env_var("testenv1", "unus"); check_env_var("testenv2", NULL); @@ -546,14 +547,14 @@ static void test_RtlSetCurrentEnvironment(void) env = HeapReAlloc( GetProcessHeap(), 0, env, HeapSize( GetProcessHeap(), 0, env) + 120 ); RtlSetCurrentEnvironment(env, &prev); ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == HeapSize( GetProcessHeap(), 0, env ), - "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); + "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); RtlSetCurrentEnvironment(old_env, NULL); ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == old_env, "got wrong current env\n"); ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == get_env_length(old_env) * sizeof(WCHAR), - "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); + "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == HeapSize( GetProcessHeap(), 0, old_env ), - "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); + "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize); check_env_var("testenv1", "heis"); check_env_var("testenv2", "dyo"); @@ -562,19 +563,19 @@ static void test_RtlSetCurrentEnvironment(void) env = NtCurrentTeb()->Peb->ProcessParameters->Environment; size = get_env_length(env) * sizeof(WCHAR); ok( NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == size, - "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize ); + "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize ); ok( size == HeapSize( GetProcessHeap(), 0, env ), - "got wrong size %lu / %lu\n", size, HeapSize( GetProcessHeap(), 0, env )); + "got wrong size %Iu / %Iu\n", size, HeapSize( GetProcessHeap(), 0, env )); SetEnvironmentVariableA("testenv1", NULL); SetEnvironmentVariableA("testenv2", NULL); env = NtCurrentTeb()->Peb->ProcessParameters->Environment; ok( NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == size, - "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize ); + "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize ); ok( size == HeapSize( GetProcessHeap(), 0, env ), - "got wrong size %lu / %lu\n", size, HeapSize( GetProcessHeap(), 0, env )); - ok( size > get_env_length(env) * sizeof(WCHAR), "got wrong size %lu\n", size ); + "got wrong size %Iu / %Iu\n", size, HeapSize( GetProcessHeap(), 0, env )); + ok( size > get_env_length(env) * sizeof(WCHAR), "got wrong size %Iu\n", size ); } static void query_env_var_(int line, WCHAR *env, const WCHAR *var, const WCHAR *value) @@ -590,13 +591,13 @@ static void query_env_var_(int line, WCHAR *env, const WCHAR *var, const WCHAR * status = RtlQueryEnvironmentVariable_U(env, &var_string, &value_string); if (value) { - ok_(__FILE__, line)(!status, "got %#x\n", status); + ok_(__FILE__, line)(!status, "got %#lx\n", status); ok_(__FILE__, line)(value_string.Length/sizeof(WCHAR) == wcslen(value), - "wrong size %u\n", value_string.Length/sizeof(WCHAR)); + "wrong size %Iu\n", value_string.Length/sizeof(WCHAR)); ok_(__FILE__, line)(!wcscmp(value_string.Buffer, value), "wrong value %s\n", debugstr_w(value_string.Buffer)); } else - ok_(__FILE__, line)(status == STATUS_VARIABLE_NOT_FOUND, "got %#x\n", status); + ok_(__FILE__, line)(status == STATUS_VARIABLE_NOT_FOUND, "got %#lx\n", status); } #define query_env_var(a, b, c) query_env_var_(__LINE__, a, b, c) @@ -606,52 +607,52 @@ static void test_RtlSetEnvironmentVariable(void) WCHAR *env; status = RtlCreateEnvironment(FALSE, &env); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); status = set_env_var(&env, L"cat", L"dog"); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); query_env_var(env, L"cat", L"dog"); status = set_env_var(&env, L"cat", L"horse"); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); query_env_var(env, L"cat", L"horse"); status = set_env_var(&env, L"cat", NULL); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); query_env_var(env, L"cat", NULL); status = set_env_var(&env, L"cat", NULL); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); status = set_env_var(&env, L"foo", L"meouw"); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); query_env_var(env, L"foo", L"meouw"); status = set_env_var(&env, L"fOo", NULL); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); query_env_var(env, L"foo", NULL); status = set_env_var(&env, L"horse", NULL); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); query_env_var(env, L"horse", NULL); status = set_env_var(&env, L"me=too", L"also"); - ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got %#lx\n", status); status = set_env_var(&env, L"me", L"too=also"); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); query_env_var(env, L"me", L"too=also"); status = set_env_var(&env, L"=too", L"also"); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); query_env_var(env, L"=too", L"also"); status = set_env_var(&env, L"=", L"also"); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); query_env_var(env, L"=", L"also"); status = RtlDestroyEnvironment(env); - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); } START_TEST(env)

1 0

[PATCH] dlls/ntdll/tests/directory.c: enable compilation with long types
by Eric Pouech 18 Mar '22

18 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/directory.c | 239 +++++++++++++++++++++--------------------- 1 file changed, 120 insertions(+), 119 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 8a8047c6392..77b17a50037 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -23,6 +23,7 @@ * We use function pointers here as there is no import library for NTDLL on * windows. */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdio.h> #include <stdarg.h> @@ -89,7 +90,7 @@ static void set_up_attribute_test(const WCHAR *testdir) BOOL ret; ret = CreateDirectoryW(testdir, NULL); - ok(ret, "couldn't create dir %s, error %d\n", wine_dbgstr_w(testdir), GetLastError()); + ok(ret, "couldn't create dir %s, error %ld\n", wine_dbgstr_w(testdir), GetLastError()); for (i=0; i < test_dir_count; i++) { WCHAR buf[MAX_PATH]; @@ -101,7 +102,7 @@ static void set_up_attribute_test(const WCHAR *testdir) lstrcatW( buf, testfiles[i].name ); if (testfiles[i].attr & FILE_ATTRIBUTE_DIRECTORY) { ret = CreateDirectoryW(buf, NULL); - ok(ret, "couldn't create dir %s, error %d\n", wine_dbgstr_w(buf), GetLastError()); + ok(ret, "couldn't create dir %s, error %ld\n", wine_dbgstr_w(buf), GetLastError()); } else { HANDLE h = CreateFileW(buf, GENERIC_READ|GENERIC_WRITE, @@ -137,11 +138,11 @@ static void tear_down_attribute_test(const WCHAR *testdir) if (testfiles[i].attr & FILE_ATTRIBUTE_DIRECTORY) { ret = RemoveDirectoryW(buf); ok(ret || (GetLastError() == ERROR_PATH_NOT_FOUND), - "Failed to rmdir %s, error %d\n", wine_dbgstr_w(buf), GetLastError()); + "Failed to rmdir %s, error %ld\n", wine_dbgstr_w(buf), GetLastError()); } else { ret = DeleteFileW(buf); ok(ret || (GetLastError() == ERROR_PATH_NOT_FOUND), - "Failed to rm %s, error %d\n", wine_dbgstr_w(buf), GetLastError()); + "Failed to rm %s, error %ld\n", wine_dbgstr_w(buf), GetLastError()); } } RemoveDirectoryW(testdir); @@ -163,7 +164,7 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) continue; if (!testfiles[i].attr_done) { todo_wine_if (testfiles[i].todo) - ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", wine_dbgstr_w(testfiles[i].name), testfiles[i].description, testfiles[i].attr, attrib); + ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%lx), got %lx (is your linux new enough?)\n", wine_dbgstr_w(testfiles[i].name), testfiles[i].description, testfiles[i].attr, attrib); testfiles[i].attr_done = TRUE; } testfiles[i].nfound++; @@ -195,7 +196,7 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char /* Read the directory and note which files are found */ status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT|FILE_OPEN_FOR_BACKUP_INTENT|FILE_DIRECTORY_FILE); - ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%x, error %d\n", testdirA, status, GetLastError()); + ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%lx, error %ld\n", testdirA, status, GetLastError()); if (status != STATUS_SUCCESS) { skip("can't test if we can't open the directory\n"); return; @@ -204,8 +205,8 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char U(io).Status = 0xdeadbeef; status = pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, single_entry, mask, restart_flag ); - ok (status == STATUS_SUCCESS, "failed to query directory; status %x\n", status); - ok (U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); + ok (status == STATUS_SUCCESS, "failed to query directory; status %lx\n", status); + ok (U(io).Status == STATUS_SUCCESS, "failed to query directory; status %lx\n", U(io).Status); data_len = io.Information; ok (data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); @@ -224,9 +225,9 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char U(io).Status = 0xdeadbeef; status = pNtQueryDirectoryFile( new_dirh, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, single_entry, &dummy_mask, FALSE ); - ok (U(io).Status == status, "wrong status %x / %x\n", status, U(io).Status); + ok (U(io).Status == status, "wrong status %lx / %lx\n", status, U(io).Status); if (status == STATUS_NO_MORE_FILES) break; - ok (status == STATUS_SUCCESS, "failed to query directory; status %x\n", status); + ok (status == STATUS_SUCCESS, "failed to query directory; status %lx\n", status); data_len = io.Information; if (data_len < sizeof(FILE_BOTH_DIRECTORY_INFORMATION)) break; @@ -278,8 +279,8 @@ static void test_directory_sort( const WCHAR *testdir ) U(io).Status = 0xdeadbeef; status = pNtQueryDirectoryFile( handle, NULL, NULL, NULL, &io, data, sizeof(data), FileBothDirectoryInformation, FALSE, NULL, TRUE ); - ok( status == STATUS_SUCCESS, "failed to query directory; status %x\n", status ); - ok( U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status ); + ok( status == STATUS_SUCCESS, "failed to query directory; status %lx\n", status ); + ok( U(io).Status == STATUS_SUCCESS, "failed to query directory; status %lx\n", U(io).Status ); data_len = io.Information; ok( data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n" ); data_pos = 0; @@ -316,9 +317,9 @@ static void test_directory_sort( const WCHAR *testdir ) U(io).Status = 0xdeadbeef; status = pNtQueryDirectoryFile( handle, 0, NULL, NULL, &io, data, sizeof(data), FileBothDirectoryInformation, FALSE, NULL, FALSE ); - ok (U(io).Status == status, "wrong status %x / %x\n", status, U(io).Status); + ok (U(io).Status == status, "wrong status %lx / %lx\n", status, U(io).Status); if (status == STATUS_NO_MORE_FILES) break; - ok( status == STATUS_SUCCESS, "failed to query directory; status %x\n", status ); + ok( status == STATUS_SUCCESS, "failed to query directory; status %lx\n", status ); data_len = io.Information; data_pos = 0; } @@ -346,9 +347,9 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma status = pNtQueryDirectoryFile( handle, 0, NULL, NULL, &io, data, data_size, class, FALSE, mask, TRUE ); - ok( U(io).Status == 0xdeadbeef, "%u: wrong status %x\n", class, U(io).Status ); - ok( U(io).Information == 0xdeadbeef, "%u: wrong info %lx\n", class, U(io).Information ); - ok(data[0] == 0x55555555, "%u: wrong offset %x\n", class, data[0] ); + ok( U(io).Status == 0xdeadbeef, "%u: wrong status %lx\n", class, U(io).Status ); + ok( U(io).Information == 0xdeadbeef, "%u: wrong info %Ix\n", class, U(io).Information ); + ok(data[0] == 0x55555555, "%u: wrong offset %lx\n", class, data[0] ); switch (class) { @@ -366,11 +367,11 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma case FileObjectIdInformation: case FileQuotaInformation: case FileReparsePointInformation: - ok( status == STATUS_INFO_LENGTH_MISMATCH, "%u: wrong status %x\n", class, status ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "%u: wrong status %lx\n", class, status ); break; default: ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED, - "%u: wrong status %x\n", class, status ); + "%u: wrong status %lx\n", class, status ); continue; } @@ -380,16 +381,16 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma class, FALSE, mask, TRUE ); if (status == STATUS_BUFFER_OVERFLOW) { - ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, U(io).Status ); + ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, U(io).Status ); ok( U(io).Information == data_size || broken(!U(io).Information), /* win10 1709 */ - "%u: wrong info %lx\n", class, U(io).Information ); - if (U(io).Information) ok(data[0] == 0, "%u: wrong offset %x\n", class, data[0] ); + "%u: wrong info %Ix\n", class, U(io).Information ); + if (U(io).Information) ok(data[0] == 0, "%u: wrong offset %lx\n", class, data[0] ); } else { - ok( U(io).Status == 0xdeadbeef, "%u: wrong status %x\n", class, U(io).Status ); - ok( U(io).Information == 0xdeadbeef, "%u: wrong info %lx\n", class, U(io).Information ); - ok(data[0] == 0x55555555, "%u: wrong offset %x\n", class, data[0] ); + ok( U(io).Status == 0xdeadbeef, "%u: wrong status %lx\n", class, U(io).Status ); + ok( U(io).Information == 0xdeadbeef, "%u: wrong info %Ix\n", class, U(io).Information ); + ok(data[0] == 0x55555555, "%u: wrong offset %lx\n", class, data[0] ); } if (status != STATUS_INFO_LENGTH_MISMATCH) break; } @@ -397,50 +398,50 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma switch (class) { case FileDirectoryInformation: - ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status ); + ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status ); ok( data_size == ((offsetof( FILE_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7), "%u: wrong size %u\n", class, data_size ); break; case FileFullDirectoryInformation: - ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status ); + ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status ); ok( data_size == ((offsetof( FILE_FULL_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7), "%u: wrong size %u\n", class, data_size ); break; case FileBothDirectoryInformation: - ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status ); + ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status ); ok( data_size == ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7), "%u: wrong size %u\n", class, data_size ); break; case FileNamesInformation: - ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status ); + ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status ); ok( data_size == ((offsetof( FILE_NAMES_INFORMATION, FileName[1] ) + 7) & ~7), "%u: wrong size %u\n", class, data_size ); break; case FileIdBothDirectoryInformation: - ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status ); + ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status ); ok( data_size == ((offsetof( FILE_ID_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7), "%u: wrong size %u\n", class, data_size ); break; case FileIdFullDirectoryInformation: - ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status ); + ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status ); ok( data_size == ((offsetof( FILE_ID_FULL_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7), "%u: wrong size %u\n", class, data_size ); break; case FileIdGlobalTxDirectoryInformation: - ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status ); + ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status ); ok( data_size == ((offsetof( FILE_ID_GLOBAL_TX_DIR_INFORMATION, FileName[1] ) + 7) & ~7), "%u: wrong size %u\n", class, data_size ); break; case FileObjectIdInformation: - ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %x\n", class, status ); + ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %lx\n", class, status ); ok( data_size == sizeof(FILE_OBJECTID_INFORMATION), "%u: wrong size %u\n", class, data_size ); break; case FileQuotaInformation: - ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %x\n", class, status ); + ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %lx\n", class, status ); ok( data_size == sizeof(FILE_QUOTA_INFORMATION), "%u: wrong size %u\n", class, data_size ); break; case FileReparsePointInformation: - ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %x\n", class, status ); + ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %lx\n", class, status ); ok( data_size == sizeof(FILE_REPARSE_POINT_INFORMATION), "%u: wrong size %u\n", class, data_size ); break; } @@ -504,16 +505,16 @@ static void test_NtQueryDirectoryFile(void) return; } status = pNtQueryInformationFile( dirh, &io, &pos_info, sizeof(pos_info), FilePositionInformation ); - ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", status ); ok( pos_info.CurrentByteOffset.QuadPart == 0, "wrong pos %s\n", wine_dbgstr_longlong(pos_info.CurrentByteOffset.QuadPart)); pos_info.CurrentByteOffset.QuadPart = 0xbeef; status = pNtSetInformationFile( dirh, &io, &pos_info, sizeof(pos_info), FilePositionInformation ); - ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", status ); status = pNtQueryInformationFile( dirh, &io, &pos_info, sizeof(pos_info), FilePositionInformation ); - ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", status ); ok( pos_info.CurrentByteOffset.QuadPart == 0xbeef, "wrong pos %s\n", wine_dbgstr_longlong(pos_info.CurrentByteOffset.QuadPart)); @@ -523,12 +524,12 @@ static void test_NtQueryDirectoryFile(void) U(io).Status = 0xdeadbeef; status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, &mask, FALSE); - ok(status == STATUS_SUCCESS, "failed to query directory; status %x\n", status); - ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); + ok(status == STATUS_SUCCESS, "failed to query directory; status %lx\n", status); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %lx\n", U(io).Status); ok(fbdi->ShortName[0], "ShortName is empty\n"); status = pNtQueryInformationFile( dirh, &io, &pos_info, sizeof(pos_info), FilePositionInformation ); - ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", status ); ok( pos_info.CurrentByteOffset.QuadPart == 0xbeef, "wrong pos %s\n", wine_dbgstr_longlong(pos_info.CurrentByteOffset.QuadPart) ); @@ -539,17 +540,17 @@ static void test_NtQueryDirectoryFile(void) U(io).Information = 0xdeadbeef; status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, &mask, TRUE); - ok(status == STATUS_SUCCESS, "failed to query directory status %x\n", status); - ok(U(io).Status == STATUS_SUCCESS, "failed to query directory status %x\n", U(io).Status); + ok(status == STATUS_SUCCESS, "failed to query directory status %lx\n", status); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory status %lx\n", U(io).Status); ok(U(io).Information == offsetof(FILE_BOTH_DIRECTORY_INFORMATION, FileName[lstrlenW(testfiles[0].name)]), - "wrong info %lx\n", U(io).Information); + "wrong info %Ix\n", U(io).Information); ok(fbdi->FileNameLength == lstrlenW(testfiles[0].name)*sizeof(WCHAR) && !memcmp(fbdi->FileName, testfiles[0].name, fbdi->FileNameLength), "incorrect long file name: %s\n", wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR))); status = pNtQueryInformationFile( dirh, &io, &pos_info, sizeof(pos_info), FilePositionInformation ); - ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", status ); ok( pos_info.CurrentByteOffset.QuadPart == 0xbeef, "wrong pos %s\n", wine_dbgstr_longlong(pos_info.CurrentByteOffset.QuadPart) ); @@ -560,16 +561,16 @@ static void test_NtQueryDirectoryFile(void) data_size = offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ); status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, &mask, TRUE); - ok( status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", status ); - ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", U(io).Status ); + ok( status == STATUS_BUFFER_OVERFLOW, "wrong status %lx\n", status ); + ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "wrong status %lx\n", U(io).Status ); ok( U(io).Information == data_size || broken( U(io).Information == 0), - "wrong info %lx\n", U(io).Information ); + "wrong info %Ix\n", U(io).Information ); ok( fbdi->NextEntryOffset == 0 || fbdi->NextEntryOffset == 0x55555555, /* win10 >= 1709 */ - "wrong offset %x\n", fbdi->NextEntryOffset ); + "wrong offset %lx\n", fbdi->NextEntryOffset ); if (!fbdi->NextEntryOffset) { ok( fbdi->FileNameLength == lstrlenW(testfiles[0].name) * sizeof(WCHAR), - "wrong length %x\n", fbdi->FileNameLength ); + "wrong length %lx\n", fbdi->FileNameLength ); ok( filename[0] == testfiles[0].name[0], "incorrect long file name: %s\n", wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR))); ok( filename[1] == 0x5555, "incorrect long file name: %s\n", @@ -584,8 +585,8 @@ static void test_NtQueryDirectoryFile(void) data_size = offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[256] ); status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, &mask, TRUE); - ok( status == STATUS_SUCCESS || status == STATUS_NO_MORE_FILES, "wrong status %x\n", status ); - ok( U(io).Status == status, "wrong status %x / %x\n", U(io).Status, status ); + ok( status == STATUS_SUCCESS || status == STATUS_NO_MORE_FILES, "wrong status %lx\n", status ); + ok( U(io).Status == status, "wrong status %lx / %lx\n", U(io).Status, status ); if (!status) ok( fbdi->FileNameLength == lstrlenW(testfiles[0].name)*sizeof(WCHAR) && !memcmp(fbdi->FileName, testfiles[0].name, fbdi->FileNameLength), @@ -604,18 +605,18 @@ static void test_NtQueryDirectoryFile(void) U(io).Information = 0xdeadbeef; status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, FALSE, NULL, TRUE); - ok(status == STATUS_SUCCESS, "wrong status %x\n", status); - ok(U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status); - ok(U(io).Information > 0 && U(io).Information < data_size, "wrong info %lx\n", U(io).Information); + ok(status == STATUS_SUCCESS, "wrong status %lx\n", status); + ok(U(io).Status == STATUS_SUCCESS, "wrong status %lx\n", U(io).Status); + ok(U(io).Information > 0 && U(io).Information < data_size, "wrong info %Ix\n", U(io).Information); ok( fbdi->NextEntryOffset == ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7), - "wrong offset %x\n", fbdi->NextEntryOffset ); - ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %x\n", fbdi->FileNameLength ); + "wrong offset %lx\n", fbdi->NextEntryOffset ); + ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %lx\n", fbdi->FileNameLength ); ok( fbdi->FileName[0] == '.', "incorrect long file name: %s\n", wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR))); next = (FILE_BOTH_DIRECTORY_INFORMATION *)(data + fbdi->NextEntryOffset); ok( next->NextEntryOffset == ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ) + 7) & ~7), - "wrong offset %x\n", next->NextEntryOffset ); - ok( next->FileNameLength == 2 * sizeof(WCHAR), "wrong length %x\n", next->FileNameLength ); + "wrong offset %lx\n", next->NextEntryOffset ); + ok( next->FileNameLength == 2 * sizeof(WCHAR), "wrong length %lx\n", next->FileNameLength ); filename = next->FileName; ok( filename[0] == '.' && filename[1] == '.', "incorrect long file name: %s\n", wine_dbgstr_wn(next->FileName, next->FileNameLength/sizeof(WCHAR))); @@ -626,16 +627,16 @@ static void test_NtQueryDirectoryFile(void) U(io).Information = 0xdeadbeef; status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, FALSE, NULL, TRUE ); - ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); - ok( U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status ); + ok( status == STATUS_SUCCESS, "wrong status %lx\n", status ); + ok( U(io).Status == STATUS_SUCCESS, "wrong status %lx\n", U(io).Status ); ok( U(io).Information == offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ), - "wrong info %lx\n", U(io).Information ); - ok( fbdi->NextEntryOffset == 0, "wrong offset %x\n", fbdi->NextEntryOffset ); - ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %x\n", fbdi->FileNameLength ); + "wrong info %Ix\n", U(io).Information ); + ok( fbdi->NextEntryOffset == 0, "wrong offset %lx\n", fbdi->NextEntryOffset ); + ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %lx\n", fbdi->FileNameLength ); ok( fbdi->FileName[0] == '.', "incorrect long file name: %s\n", wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR))); next = (FILE_BOTH_DIRECTORY_INFORMATION *)&fbdi->FileName[1]; - ok( next->NextEntryOffset == 0x55555555, "wrong offset %x\n", next->NextEntryOffset ); + ok( next->NextEntryOffset == 0x55555555, "wrong offset %lx\n", next->NextEntryOffset ); data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ); memset( data, 0x55, data_size ); @@ -643,11 +644,11 @@ static void test_NtQueryDirectoryFile(void) U(io).Information = 0xdeadbeef; status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, FALSE, NULL, TRUE ); - ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); - ok( U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status ); + ok( status == STATUS_SUCCESS, "wrong status %lx\n", status ); + ok( U(io).Status == STATUS_SUCCESS, "wrong status %lx\n", U(io).Status ); ok( U(io).Information == offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ), - "wrong info %lx\n", U(io).Information ); - ok( fbdi->NextEntryOffset == 0, "wrong offset %x\n", fbdi->NextEntryOffset ); + "wrong info %Ix\n", U(io).Information ); + ok( fbdi->NextEntryOffset == 0, "wrong offset %lx\n", fbdi->NextEntryOffset ); data_size = ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7) + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ); @@ -656,18 +657,18 @@ static void test_NtQueryDirectoryFile(void) U(io).Information = 0xdeadbeef; status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, (data_size + 7) & ~7, FileBothDirectoryInformation, FALSE, NULL, TRUE ); - ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); - ok( U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status ); + ok( status == STATUS_SUCCESS, "wrong status %lx\n", status ); + ok( U(io).Status == STATUS_SUCCESS, "wrong status %lx\n", U(io).Status ); ok( U(io).Information == data_size || U(io).Information == ((data_size + 7) & ~7), - "wrong info %lx / %x\n", U(io).Information, data_size ); + "wrong info %Ix / %x\n", U(io).Information, data_size ); ok( fbdi->NextEntryOffset == ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7), - "wrong offset %x\n", fbdi->NextEntryOffset ); - ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %x\n", fbdi->FileNameLength ); + "wrong offset %lx\n", fbdi->NextEntryOffset ); + ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %lx\n", fbdi->FileNameLength ); ok( fbdi->FileName[0] == '.', "incorrect long file name: %s\n", wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR))); next = (FILE_BOTH_DIRECTORY_INFORMATION *)(data + fbdi->NextEntryOffset); - ok( next->NextEntryOffset == 0, "wrong offset %x\n", next->NextEntryOffset ); - ok( next->FileNameLength == 2 * sizeof(WCHAR), "wrong length %x\n", next->FileNameLength ); + ok( next->NextEntryOffset == 0, "wrong offset %lx\n", next->NextEntryOffset ); + ok( next->FileNameLength == 2 * sizeof(WCHAR), "wrong length %lx\n", next->FileNameLength ); filename = next->FileName; ok( filename[0] == '.' && filename[1] == '.', "incorrect long file name: %s\n", wine_dbgstr_wn(next->FileName, next->FileNameLength/sizeof(WCHAR))); @@ -679,18 +680,18 @@ static void test_NtQueryDirectoryFile(void) U(io).Information = 0xdeadbeef; status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size, FileNamesInformation, FALSE, NULL, TRUE ); - ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); - ok( U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status ); - ok( U(io).Information == data_size, "wrong info %lx / %x\n", U(io).Information, data_size ); + ok( status == STATUS_SUCCESS, "wrong status %lx\n", status ); + ok( U(io).Status == STATUS_SUCCESS, "wrong status %lx\n", U(io).Status ); + ok( U(io).Information == data_size, "wrong info %Ix / %x\n", U(io).Information, data_size ); names = (FILE_NAMES_INFORMATION *)data; ok( names->NextEntryOffset == ((offsetof( FILE_NAMES_INFORMATION, FileName[1] ) + 7) & ~7), - "wrong offset %x\n", names->NextEntryOffset ); - ok( names->FileNameLength == sizeof(WCHAR), "wrong length %x\n", names->FileNameLength ); + "wrong offset %lx\n", names->NextEntryOffset ); + ok( names->FileNameLength == sizeof(WCHAR), "wrong length %lx\n", names->FileNameLength ); ok( names->FileName[0] == '.', "incorrect long file name: %s\n", wine_dbgstr_wn(names->FileName, names->FileNameLength/sizeof(WCHAR))); names = (FILE_NAMES_INFORMATION *)(data + names->NextEntryOffset); - ok( names->NextEntryOffset == 0, "wrong offset %x\n", names->NextEntryOffset ); - ok( names->FileNameLength == 2 * sizeof(WCHAR), "wrong length %x\n", names->FileNameLength ); + ok( names->NextEntryOffset == 0, "wrong offset %lx\n", names->NextEntryOffset ); + ok( names->FileNameLength == 2 * sizeof(WCHAR), "wrong length %lx\n", names->FileNameLength ); filename = names->FileName; ok( filename[0] == '.' && filename[1] == '.', "incorrect long file name: %s\n", wine_dbgstr_wn(names->FileName, names->FileNameLength/sizeof(WCHAR))); @@ -707,28 +708,28 @@ static void test_NtQueryDirectoryFile(void) data_size = sizeof(data); status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, &mask, TRUE); - ok(status == STATUS_NO_SUCH_FILE, "wrong status %x\n", status); - ok(U(io).Status == 0xdeadbeef, "wrong status %x\n", U(io).Status); + ok(status == STATUS_NO_SUCH_FILE, "wrong status %lx\n", status); + ok(U(io).Status == 0xdeadbeef, "wrong status %lx\n", U(io).Status); U(io).Status = 0xdeadbeef; status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, NULL, FALSE); - ok(status == STATUS_NO_MORE_FILES, "wrong status %x\n", status); - ok(U(io).Status == STATUS_NO_MORE_FILES, "wrong status %x\n", U(io).Status); + ok(status == STATUS_NO_MORE_FILES, "wrong status %lx\n", status); + ok(U(io).Status == STATUS_NO_MORE_FILES, "wrong status %lx\n", U(io).Status); U(io).Status = 0xdeadbeef; status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, NULL, TRUE); - ok(status == STATUS_NO_MORE_FILES, "wrong status %x\n", status); - ok(U(io).Status == STATUS_NO_MORE_FILES, "wrong status %x\n", U(io).Status); + ok(status == STATUS_NO_MORE_FILES, "wrong status %lx\n", status); + ok(U(io).Status == STATUS_NO_MORE_FILES, "wrong status %lx\n", U(io).Status); pNtClose(dirh); U(io).Status = 0xdeadbeef; status = pNtQueryDirectoryFile( (HANDLE)0xbeef, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, NULL, TRUE ); - ok(status == STATUS_INVALID_HANDLE, "wrong status %x\n", status); - ok(U(io).Status == 0xdeadbeef, "wrong status %x\n", U(io).Status); + ok(status == STATUS_INVALID_HANDLE, "wrong status %lx\n", status); + ok(U(io).Status == 0xdeadbeef, "wrong status %lx\n", U(io).Status); GetModuleFileNameA( 0, buffer, sizeof(buffer) ); h = CreateFileA( buffer, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); @@ -737,8 +738,8 @@ static void test_NtQueryDirectoryFile(void) U(io).Status = 0xdeadbeef; status = pNtQueryDirectoryFile( h, 0, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, NULL, TRUE ); - ok(status == STATUS_INVALID_PARAMETER, "wrong status %x\n", status); - ok(U(io).Status == 0xdeadbeef, "wrong status %x\n", U(io).Status); + ok(status == STATUS_INVALID_PARAMETER, "wrong status %lx\n", status); + ok(U(io).Status == 0xdeadbeef, "wrong status %lx\n", U(io).Status); CloseHandle ( h ); } @@ -755,7 +756,7 @@ static void set_up_case_test(const char *testdir) HANDLE h; ret = CreateDirectoryA(testdir, NULL); - ok(ret, "couldn't create dir '%s', error %d\n", testdir, GetLastError()); + ok(ret, "couldn't create dir '%s', error %ld\n", testdir, GetLastError()); sprintf(buf, "%s\\%s", testdir, "TesT"); h = CreateFileA(buf, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, @@ -772,7 +773,7 @@ static void tear_down_case_test(const char *testdir) sprintf(buf, "%s\\%s", testdir, "TesT"); ret = DeleteFileA(buf); ok(ret || (GetLastError() == ERROR_PATH_NOT_FOUND), - "Failed to rm %s, error %d\n", buf, GetLastError()); + "Failed to rm %s, error %ld\n", buf, GetLastError()); RemoveDirectoryA(testdir); } @@ -814,7 +815,7 @@ static void test_NtQueryDirectoryFile_case(void) status = pNtOpenFile(&dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE); - ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%x, error %d\n", testdir, status, GetLastError()); + ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%lx, error %ld\n", testdir, status, GetLastError()); if (status != STATUS_SUCCESS) { skip("can't test if we can't open the directory\n"); @@ -825,14 +826,14 @@ static void test_NtQueryDirectoryFile_case(void) mask.Length = mask.MaximumLength = sizeof(testmask); pNtQueryDirectoryFile(dirh, NULL, NULL, NULL, &io, data, data_size, FileBothDirectoryInformation, TRUE, &mask, FALSE); - ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %lx\n", U(io).Status); data_len = io.Information; ok(data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); name = dir_info->FileName; name_len = dir_info->FileNameLength / sizeof(WCHAR); - ok(name_len == testfile_len, "unexpected filename length %u\n", name_len); + ok(name_len == testfile_len, "unexpected filename length %lu\n", name_len); ok(!memcmp(name, testfile_w, testfile_len * sizeof(WCHAR)), "unexpected filename %s\n", wine_dbgstr_wn(name, name_len)); @@ -894,7 +895,7 @@ static void test_redirection(void) skip( "Wow64 redirection not supported\n" ); return; } - ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status ); #ifndef _WIN64 if (NtCurrentTeb()->GdiBatchCount) @@ -902,46 +903,46 @@ static void test_redirection(void) #endif status = pRtlWow64EnableFsRedirectionEx( FALSE, &cur ); - ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); - ok( !cur, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status ); + ok( !cur, "RtlWow64EnableFsRedirectionEx got %lu\n", cur ); if (tls64) ok( *tls64 == FALSE, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) ); status = pRtlWow64EnableFsRedirectionEx( TRUE, &cur ); - ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status ); status = pRtlWow64EnableFsRedirectionEx( TRUE, &cur ); - ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); - ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status ); + ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %lu\n", cur ); if (tls64) ok( *tls64 == TRUE, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) ); status = pRtlWow64EnableFsRedirection( TRUE ); - ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status ); status = pRtlWow64EnableFsRedirectionEx( TRUE, &cur ); - ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); - ok( !cur, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status ); + ok( !cur, "RtlWow64EnableFsRedirectionEx got %lu\n", cur ); if (tls64) ok( *tls64 == TRUE, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) ); status = pRtlWow64EnableFsRedirectionEx( 123, &cur ); - ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); - ok( cur == TRUE, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status ); + ok( cur == TRUE, "RtlWow64EnableFsRedirectionEx got %lu\n", cur ); if (tls64) ok( *tls64 == 123, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) ); status = pRtlWow64EnableFsRedirectionEx( 0xdeadbeef, &cur ); - ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); - ok( cur == 123, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status ); + ok( cur == 123, "RtlWow64EnableFsRedirectionEx got %lu\n", cur ); if (tls64) ok( *tls64 == 0xdeadbeef, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) ); status = pRtlWow64EnableFsRedirectionEx( TRUE, NULL ); - ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %lx\n", status ); status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)1 ); - ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %lx\n", status ); status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)0xDEADBEEF ); - ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); + ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %lx\n", status ); status = pRtlWow64EnableFsRedirection( FALSE ); - ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status ); status = pRtlWow64EnableFsRedirectionEx( FALSE, &cur ); - ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); - ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status ); + ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %lu\n", cur ); if (tls64) ok( *tls64 == FALSE, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) ); if (tls64) @@ -993,13 +994,13 @@ static void test_redirection(void) pRtlWow64EnableFsRedirection( FALSE ); status = get_file_id( &info, tests[i].root, tests[i].name ); ok( !status || status == tests[i].expect || (tests[i].alt && status == tests[i].alt), - "%u: got %x / %x for %s + %s without redirect\n", i, status, tests[i].expect, + "%u: got %lx / %lx for %s + %s without redirect\n", i, status, tests[i].expect, debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); if (status) memset( &info, 0xcc, sizeof(info) ); pRtlWow64EnableFsRedirection( TRUE ); status = get_file_id( &info_redir, tests[i].root, tests[i].name ); ok( status == tests[i].expect || (tests[i].alt && status == tests[i].alt), - "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect, + "%u: got %lx / %lx for %s + %s\n", i, status, tests[i].expect, debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); if (!status) {

1 0

[PATCH] dlls/ntdll/tests/change.c: enable compilation with long types
by Eric Pouech 18 Mar '22

18 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/change.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index e7201b52a3c..89e319bccd7 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <ntstatus.h> #define WIN32_NO_STATUS @@ -301,9 +302,9 @@ static void test_ntncdf_async(void) CloseHandle(hdir); - ok(U(iosb).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb).Status); - ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb2).Status); - ok(U(iosb3).Status == STATUS_SUCCESS, "status wrong %x\n",U(iosb3).Status); + ok(U(iosb).Status == STATUS_CANCELLED, "status wrong %lx\n",U(iosb).Status); + ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong %lx\n",U(iosb2).Status); + ok(U(iosb3).Status == STATUS_SUCCESS, "status wrong %lx\n",U(iosb3).Status); ok(iosb.Information == 0, "info wrong\n"); ok(iosb2.Information == 0, "info wrong\n"); @@ -312,8 +313,8 @@ static void test_ntncdf_async(void) U(iosb3).Status = 0x111111; iosb3.Information = 0x222222; r = pNtCancelIoFile(hdir, &iosb3); - ok( r == STATUS_INVALID_HANDLE, "cancel failed %x\n", r); - ok(U(iosb3).Status == 0x111111, "status wrong %x\n",U(iosb3).Status); + ok( r == STATUS_INVALID_HANDLE, "cancel failed %lx\n", r); + ok(U(iosb3).Status == 0x111111, "status wrong %lx\n",U(iosb3).Status); ok(iosb3.Information == 0x222222, "info wrong\n"); r = RemoveDirectoryW( path );

1 0

[PATCH] dlls/ntdll/tests/atom.c: enable compilation with long types
by Eric Pouech 18 Mar '22

18 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/atom.c | 187 ++++++++++++++++++++++++----------------------- 1 file changed, 94 insertions(+), 93 deletions(-) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 6bb789867bf..f93194d450f 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -20,6 +20,7 @@ * We use function pointers here as there is no import library for NTDLL on * windows. */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdio.h> #include <stdarg.h> @@ -100,30 +101,30 @@ static DWORD WINAPI RtlAtomTestThread(LPVOID Table) WCHAR Name[64]; res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &Atom); - ok(!res, "Unable to find atom from another thread, retval: %x\n", res); + ok(!res, "Unable to find atom from another thread, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom2, &Atom); - ok(!res, "Unable to lookup pinned atom in table, retval: %x\n", res); + ok(!res, "Unable to lookup pinned atom in table, retval: %lx\n", res); res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, Name, &Len); - ok(res == STATUS_BUFFER_TOO_SMALL, "We got wrong retval: %x\n", res); + ok(res == STATUS_BUFFER_TOO_SMALL, "We got wrong retval: %lx\n", res); Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, Name, &Len); - ok(!res, "Failed with long enough buffer, retval: %x\n", res); - ok(RefCount == 1, "Refcount was not 1 but %x\n", RefCount); - ok(PinCount == 1, "Pincount was not 1 but %x\n", PinCount); + ok(!res, "Failed with long enough buffer, retval: %lx\n", res); + ok(RefCount == 1, "Refcount was not 1 but %lx\n", RefCount); + ok(PinCount == 1, "Pincount was not 1 but %lx\n", PinCount); ok(!lstrcmpW(Name, testAtom2), "We found wrong atom!!\n"); - ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len); + ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len); Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, Atom, NULL, NULL, Name, &Len); - ok(!res, "RtlQueryAtomInAtomTable with optional args invalid failed, retval: %x\n", res); + ok(!res, "RtlQueryAtomInAtomTable with optional args invalid failed, retval: %lx\n", res); ok(!lstrcmpW(Name, testAtom2), "Found Wrong atom!\n"); - ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len); + ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len); res = pRtlPinAtomInAtomTable(AtomTable, Atom); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); return 0; } @@ -145,39 +146,39 @@ static void test_NtAtom(void) if (!res) { res = pRtlDestroyAtomTable(AtomTable); - ok(!res, "We could create the atom table, but we couldn't destroy it! retval: %x\n", res); + ok(!res, "We could create the atom table, but we couldn't destroy it! retval: %lx\n", res); } AtomTable = NULL; res = pRtlCreateAtomTable(37, &AtomTable); - ok(!res, "We're unable to create an atom table with a valid table size retval: %x\n", res); + ok(!res, "We're unable to create an atom table with a valid table size retval: %lx\n", res); if (!res) { - ok( *(DWORD *)AtomTable == 0x6d6f7441, "wrong signature %x\n", *(DWORD *)AtomTable ); + ok( *(DWORD *)AtomTable == 0x6d6f7441, "wrong signature %lx\n", *(DWORD *)AtomTable ); res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom1); - ok(!res, "We were unable to add a simple atom to the atom table, retval: %x\n", res); + ok(!res, "We were unable to add a simple atom to the atom table, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1Cap, &testAtom); - ok(!res, "We were unable to find capital version of the atom, retval: %x\n", res); + ok(!res, "We were unable to find capital version of the atom, retval: %lx\n", res); ok(Atom1 == testAtom, "Found wrong atom in table when querying capital atom\n"); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1Low, &testAtom); - ok(!res, "Unable to find lowercase version of the atom, retval: %x\n", res); + ok(!res, "Unable to find lowercase version of the atom, retval: %lx\n", res); ok(testAtom == Atom1, "Found wrong atom when querying lowercase atom\n"); res = pRtlAddAtomToAtomTable(AtomTable, EmptyAtom, &testEAtom); - ok(res == STATUS_OBJECT_NAME_INVALID, "Got wrong retval, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_INVALID, "Got wrong retval, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(!res, "Failed to find totally legitimate atom, retval: %x\n", res); + ok(!res, "Failed to find totally legitimate atom, retval: %lx\n", res); ok(testAtom == Atom1, "Found wrong atom!\n"); res = pRtlAddAtomToAtomTable(AtomTable, testAtom2, &Atom2); - ok(!res, "Unable to add other legitimate atom to table, retval: %x\n", res); + ok(!res, "Unable to add other legitimate atom to table, retval: %lx\n", res); res = pRtlPinAtomInAtomTable(AtomTable, Atom2); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); testThread = CreateThread(NULL, 0, RtlAtomTestThread, &AtomTable, 0, NULL); WaitForSingleObject(testThread, INFINITE); @@ -185,28 +186,28 @@ static void test_NtAtom(void) Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, &RefCount, &PinCount, Name, &Len); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); - ok(RefCount == 1, "RefCount is not 1 but %x\n", RefCount); - ok(PinCount == 1, "PinCount is not 1 but %x\n", PinCount); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); + ok(RefCount == 1, "RefCount is not 1 but %lx\n", RefCount); + ok(PinCount == 1, "PinCount is not 1 but %lx\n", PinCount); ok(!lstrcmpW(Name, testAtom2), "We found wrong atom\n"); - ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len); + ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len); res = pRtlEmptyAtomTable(AtomTable, FALSE); - ok(!res, "Unable to empty atom table, retval %x\n", res); + ok(!res, "Unable to empty atom table, retval %lx\n", res); Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, &RefCount, &PinCount, Name, &Len); - ok(!res, "It seems RtlEmptyAtomTable deleted our pinned atom eaven though we asked it not to, retval: %x\n", res); - ok(RefCount == 1, "RefCount is not 1 but %x\n", RefCount); - ok(PinCount == 1, "PinCount is not 1 but %x\n", PinCount); + ok(!res, "It seems RtlEmptyAtomTable deleted our pinned atom eaven though we asked it not to, retval: %lx\n", res); + ok(RefCount == 1, "RefCount is not 1 but %lx\n", RefCount); + ok(PinCount == 1, "PinCount is not 1 but %lx\n", PinCount); ok(!lstrcmpW(Name, testAtom2), "We found wrong atom\n"); - ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len); + ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len); Len = 8; Name[0] = Name[1] = Name[2] = Name[3] = Name[4] = 0x1337; res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, NULL, NULL, Name, &Len); - ok(!res, "query atom %x\n", res); - ok(Len == 6, "wrong length %u\n", Len); + ok(!res, "query atom %lx\n", res); + ok(Len == 6, "wrong length %lu\n", Len); ok(!memcmp(Name, testAtom2, Len), "wrong atom string\n"); ok(!Name[3], "wrong string termination\n"); ok(Name[4] == 0x1337, "buffer overwrite\n"); @@ -214,75 +215,75 @@ static void test_NtAtom(void) Len = lstrlenW(testAtom2) * sizeof(WCHAR); memset(Name, '.', sizeof(Name)); res = pRtlQueryAtomInAtomTable( AtomTable, Atom2, NULL, NULL, Name, &Len ); - ok(!res, "query atom %x\n", res); - ok(Len == (lstrlenW(testAtom2) - 1) * sizeof(WCHAR), "wrong length %u\n", Len); + ok(!res, "query atom %lx\n", res); + ok(Len == (lstrlenW(testAtom2) - 1) * sizeof(WCHAR), "wrong length %lu\n", Len); ok(!memcmp(testAtom2, Name, (lstrlenW(testAtom2) - 1) * sizeof(WCHAR)), "wrong atom name\n"); ok(Name[lstrlenW(testAtom2) - 1] == '\0', "wrong char\n"); ok(Name[lstrlenW(testAtom2)] == ('.' << 8) + '.', "wrong char\n"); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom2, &testAtom); - ok(!res, "We can't find our pinned atom!! retval: %x\n", res); + ok(!res, "We can't find our pinned atom!! retval: %lx\n", res); ok(testAtom == Atom2, "We found wrong atom!!!\n"); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "We found the atom in our table eaven though we asked RtlEmptyAtomTable to remove it, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "We found the atom in our table eaven though we asked RtlEmptyAtomTable to remove it, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtom3, &Atom3); - ok(!res, "Unable to add atom to table, retval: %x\n", res); + ok(!res, "Unable to add atom to table, retval: %lx\n", res); res = pRtlEmptyAtomTable(AtomTable, TRUE); - ok(!res, "Unable to empty atom table, retval: %x\n", res); + ok(!res, "Unable to empty atom table, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom2, &testAtom); - ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "The pinned atom should be removed, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "The pinned atom should be removed, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom3, &testAtom); - ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Non pinned atom should also be removed, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Non pinned atom should also be removed, retval: %lx\n", res); res = pRtlDestroyAtomTable(AtomTable); - ok(!res, "Can't destroy atom table, retval: %x\n", res); + ok(!res, "Can't destroy atom table, retval: %lx\n", res); } AtomTable = NULL; res = pRtlCreateAtomTable(37, &AtomTable); - ok(!res, "Unable to create atom table, retval: %x\n", res); + ok(!res, "Unable to create atom table, retval: %lx\n", res); if (!res) { res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Didn't get expected retval with querying an empty atom table, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Didn't get expected retval with querying an empty atom table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom1); - ok(!res, "Unable to add atom to atom table, retval %x\n", res); + ok(!res, "Unable to add atom to atom table, retval %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(!res, "Can't find previously added atom in table, retval: %x\n", res); - ok(testAtom == Atom1, "Found wrong atom! retval: %x\n", res); + ok(!res, "Can't find previously added atom in table, retval: %lx\n", res); + ok(testAtom == Atom1, "Found wrong atom! retval: %lx\n", res); res = pRtlDeleteAtomFromAtomTable(AtomTable, Atom1); - ok(!res, "Unable to delete atom from table, retval: %x\n", res); + ok(!res, "Unable to delete atom from table, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Able to find previously deleted atom in table, retval: %x\n", res); + ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Able to find previously deleted atom in table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom1); - ok(!res, "Unable to add atom to atom table, retval: %x\n", res); + ok(!res, "Unable to add atom to atom table, retval: %lx\n", res); Len = 0; res = pRtlQueryAtomInAtomTable(AtomTable, Atom1, NULL, NULL, Name, &Len); - ok(res == STATUS_BUFFER_TOO_SMALL, "Got wrong retval, retval: %x\n", res); - ok((lstrlenW(testAtom1) * sizeof(WCHAR)) == Len || broken(!Len) /* nt4 */, "Got wrong length %x\n", Len); + ok(res == STATUS_BUFFER_TOO_SMALL, "Got wrong retval, retval: %lx\n", res); + ok((lstrlenW(testAtom1) * sizeof(WCHAR)) == Len || broken(!Len) /* nt4 */, "Got wrong length %lx\n", Len); if (!Len) pNtAddAtomNT4 = (void *)pNtAddAtom; res = pRtlPinAtomInAtomTable(AtomTable, Atom1); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); - ok(!res, "Unable to find atom in atom table, retval: %x\n", res); + ok(!res, "Unable to find atom in atom table, retval: %lx\n", res); ok(testAtom == Atom1, "Wrong atom found\n"); res = pRtlDeleteAtomFromAtomTable(AtomTable, Atom1); - ok(res == STATUS_WAS_LOCKED, "Unable to delete atom from table, retval: %x\n", res); + ok(res == STATUS_WAS_LOCKED, "Unable to delete atom from table, retval: %lx\n", res); res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom); ok(!res, "Able to find deleted atom in table\n"); @@ -305,82 +306,82 @@ static void test_NtIntAtom(void) AtomTable = NULL; res = pRtlCreateAtomTable(37, &AtomTable); - ok(!res, "Unable to create atom table, %x\n", res); + ok(!res, "Unable to create atom table, %lx\n", res); if (!res) { /* According to the kernel32 functions, integer atoms are only allowed from * 0x0001 to 0xbfff and not 0xc000 to 0xffff, which is correct */ res = pRtlAddAtomToAtomTable(AtomTable, NULL, &testAtom); - ok(res == STATUS_INVALID_PARAMETER, "Didn't get expected result from adding 0 int atom, retval: %x\n", res); + ok(res == STATUS_INVALID_PARAMETER, "Didn't get expected result from adding 0 int atom, retval: %lx\n", res); for (i = 1; i <= 0xbfff; i++) { res = pRtlAddAtomToAtomTable(AtomTable, (LPWSTR)i, &testAtom); - ok(!res, "Unable to add valid integer atom %li, retval: %x\n", i, res); + ok(!res, "Unable to add valid integer atom %Ii, retval: %lx\n", i, res); } for (i = 1; i <= 0xbfff; i++) { res = pRtlLookupAtomInAtomTable(AtomTable, (LPWSTR)i, &testAtom); - ok(!res, "Unable to find int atom %li, retval: %x\n", i, res); + ok(!res, "Unable to find int atom %Ii, retval: %lx\n", i, res); if (!res) { res = pRtlPinAtomInAtomTable(AtomTable, testAtom); - ok(!res, "Unable to pin int atom %li, retval: %x\n", i, res); + ok(!res, "Unable to pin int atom %Ii, retval: %lx\n", i, res); } } for (i = 0xc000; i <= 0xffff; i++) { res = pRtlAddAtomToAtomTable(AtomTable, (LPWSTR)i, &testAtom); - ok(res, "Able to illeageal integer atom %li, retval: %x\n", i, res); + ok(res, "Able to illeageal integer atom %Ii, retval: %lx\n", i, res); } res = pRtlDestroyAtomTable(AtomTable); - ok(!res, "Unable to destroy atom table, retval: %x\n", res); + ok(!res, "Unable to destroy atom table, retval: %lx\n", res); } AtomTable = NULL; res = pRtlCreateAtomTable(37, &AtomTable); - ok(!res, "Unable to create atom table, %x\n", res); + ok(!res, "Unable to create atom table, %lx\n", res); if (!res) { res = pRtlLookupAtomInAtomTable(AtomTable, (PWSTR)123, &testAtom); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtomInt, &testAtom); - ok(!res, "Unable to add int atom to table, retval: %x\n", res); + ok(!res, "Unable to add int atom to table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtomIntInv, &testAtom); - ok(!res, "Unable to add int atom to table, retval: %x\n", res); + ok(!res, "Unable to add int atom to table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, (PWSTR)123, &testAtom); - ok(!res, "Unable to add int atom to table, retval: %x\n", res); + ok(!res, "Unable to add int atom to table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, (PWSTR)123, &testAtom); - ok(!res, "Unable to re-add int atom to table, retval: %x\n", res); + ok(!res, "Unable to re-add int atom to table, retval: %lx\n", res); Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, testAtom, &RefCount, &PinCount, Name, &Len); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); - ok(PinCount == 1, "Expected pincount 1 but got %x\n", PinCount); - ok(RefCount == 1, "Expected refcount 1 but got %x\n", RefCount); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); + ok(PinCount == 1, "Expected pincount 1 but got %lx\n", PinCount); + ok(RefCount == 1, "Expected refcount 1 but got %lx\n", RefCount); ok(!lstrcmpW(testAtomOTT, Name), "Got wrong atom name\n"); - ok((lstrlenW(testAtomOTT) * sizeof(WCHAR)) == Len, "Got wrong len %d\n", Len); + ok((lstrlenW(testAtomOTT) * sizeof(WCHAR)) == Len, "Got wrong len %ld\n", Len); res = pRtlPinAtomInAtomTable(AtomTable, testAtom); - ok(!res, "Unable to pin int atom, retval: %x\n", res); + ok(!res, "Unable to pin int atom, retval: %lx\n", res); res = pRtlPinAtomInAtomTable(AtomTable, testAtom); - ok(!res, "Unable to pin int atom, retval: %x\n", res); + ok(!res, "Unable to pin int atom, retval: %lx\n", res); res = pRtlQueryAtomInAtomTable(AtomTable, testAtom, &RefCount, &PinCount, NULL, NULL); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); - ok(PinCount == 1, "Expected pincount 1 but got %x\n", PinCount); - ok(RefCount == 1, "Expected refcount 1 but got %x\n", RefCount); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); + ok(PinCount == 1, "Expected pincount 1 but got %lx\n", PinCount); + ok(RefCount == 1, "Expected refcount 1 but got %lx\n", RefCount); res = pRtlDestroyAtomTable(AtomTable); - ok(!res, "Unable to destroy atom table, retval: %x\n", res); + ok(!res, "Unable to destroy atom table, retval: %lx\n", res); } } @@ -394,40 +395,40 @@ static void test_NtRefPinAtom(void) AtomTable = NULL; res = pRtlCreateAtomTable(37, &AtomTable); - ok(!res, "Unable to create atom table, %x\n", res); + ok(!res, "Unable to create atom table, %lx\n", res); if (!res) { res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom); - ok(!res, "Unable to add our atom to the atom table, retval: %x\n", res); + ok(!res, "Unable to add our atom to the atom table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom); - ok(!res, "Unable to add our atom to the atom table, retval: %x\n", res); + ok(!res, "Unable to add our atom to the atom table, retval: %lx\n", res); res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom); - ok(!res, "Unable to add our atom to the atom table, retval: %x\n", res); + ok(!res, "Unable to add our atom to the atom table, retval: %lx\n", res); res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, NULL, NULL); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); - ok(PinCount == 0, "Expected pincount 0 but got %x\n", PinCount); - ok(RefCount == 3, "Expected refcount 3 but got %x\n", RefCount); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); + ok(PinCount == 0, "Expected pincount 0 but got %lx\n", PinCount); + ok(RefCount == 3, "Expected refcount 3 but got %lx\n", RefCount); res = pRtlPinAtomInAtomTable(AtomTable, Atom); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); res = pRtlPinAtomInAtomTable(AtomTable, Atom); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); res = pRtlPinAtomInAtomTable(AtomTable, Atom); - ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); + ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, NULL, NULL); - ok(!res, "Unable to query atom in atom table, retval: %x\n", res); - ok(PinCount == 1, "Expected pincount 1 but got %x\n", PinCount); - ok(RefCount == 3, "Expected refcount 3 but got %x\n", RefCount); + ok(!res, "Unable to query atom in atom table, retval: %lx\n", res); + ok(PinCount == 1, "Expected pincount 1 but got %lx\n", PinCount); + ok(RefCount == 3, "Expected refcount 3 but got %lx\n", RefCount); res = pRtlDestroyAtomTable(AtomTable); - ok(!res, "Unable to destroy atom table, retval: %x\n", res); + ok(!res, "Unable to destroy atom table, retval: %lx\n", res); } } @@ -444,7 +445,7 @@ static void test_Global(void) else res = pNtAddAtom(testAtom1, lstrlenW(testAtom1) * sizeof(WCHAR), &atom); - ok(!res, "Added atom (%x)\n", res); + ok(!res, "Added atom (%lx)\n", res); memset( ptr, 0xcc, sizeof(ptr) ); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); @@ -456,14 +457,14 @@ static void test_Global(void) ptr_size = sizeof(ATOM_BASIC_INFORMATION); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); - ok(res == STATUS_BUFFER_TOO_SMALL, "wrong return status (%x)\n", res); + ok(res == STATUS_BUFFER_TOO_SMALL, "wrong return status (%lx)\n", res); ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR) || broken(abi->NameLength == sizeof(WCHAR)), /* nt4 */ "string length %u\n",abi->NameLength); memset( ptr, 0xcc, sizeof(ptr) ); ptr_size = sizeof(ATOM_BASIC_INFORMATION) + lstrlenW(testAtom1) * sizeof(WCHAR); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); - ok(!res, "atom lookup %x\n", res); + ok(!res, "atom lookup %lx\n", res); ok(!lstrcmpW(abi->Name, testAtom1), "strings don't match\n"); ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR), "wrong string length\n"); ok(abi->Name[lstrlenW(testAtom1)] == 0, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1)]);

1 0

[PATCH] wine.inf: Enable Light theme by default.
by Zhiyi Zhang 18 Mar '22

18 Mar '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- loader/wine.inf.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0e488d87dcb..3e6194a3929 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -71,6 +71,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ LicenseInformation @@ -95,6 +96,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ VersionInfo,\ LicenseInformation @@ -121,6 +123,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ VersionInfo.ntamd64,\ LicenseInformation @@ -147,6 +150,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ VersionInfo.ntamd64,\ LicenseInformation @@ -5494,6 +5498,12 @@ ServiceType=32 StartType=3 ErrorControl=1 +[ThemeManager] +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","ThemeActive",2,"1" +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","DllName",2,"%10%\resources\themes\light\light.msstyles" +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","ColorName",2,"Blue" +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","SizeName",2,"NormalSize" + [WinmgmtService] Description="Provides access to Windows Management Instrumentation" DisplayName="Windows Management Instrumentation Service" -- 2.32.0

3 4

Re: [PATCH vkd3d v3 2/8] vkd3d-shader/hlsl: Add default writemask for matrix stores.
by Zebediah Figura 17 Mar '22

17 Mar '22

On 3/7/22 09:09, Francisco Casas wrote: > Hello, > > March 4, 2022 10:01 PM, "Zebediah Figura (she/her)" <zfigura(a)codeweavers.com> wrote: > >> On 3/2/22 12:31, Francisco Casas wrote: >> >>> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> >>> --- >>> v3: >>> - This patch is new. >>> - While we don't use the default writemask for matrices (yet), >>> I think it is good for consistency, since we are getting rid >>> of the type_is_single_reg() function. >>> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> >>> --- >>> libs/vkd3d-shader/hlsl.c | 12 ++++++++---- >>> 1 file changed, 8 insertions(+), 4 deletions(-) >>> diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c >>> index 00a374b4..5152aec4 100644 >>> --- a/libs/vkd3d-shader/hlsl.c >>> +++ b/libs/vkd3d-shader/hlsl.c >>> @@ -527,9 +527,13 @@ struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char >>> *nam >>> return var; >>> } >>>> -static bool type_is_single_reg(const struct hlsl_type *type) >>> +static unsigned int type_default_writemask(const struct hlsl_type *type) >>> - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; >>> + if (type->type == HLSL_CLASS_MATRIX && hlsl_type_is_row_major(type)) >>> + return (1 << type->dimy) - 1; >> >> I don't understand the logic here. A nonzero writemask should encompass the whole type, which this >> does not. Why do we need this? >> > > Well, I am not totally sure this patch is actually necessary, I just > thought it could be a good default behavior since we are getting rid of > hlsl_is_single_reg(), but maybe I am overthinking... FWIW, I don't know that that instance of type_is_single_reg() necessarily needs to go away. Although given 1/8, we could certainly say that a zero writemask always means the whole variable, and let hlsl_reg_from_deref() deal with that even for scalar and vector types. > > As you know, if we have a HLSL_IR_STORE with a whole matrix in the rhs, > we have to split it in up to 4 stores, each one with a writemask that > matches the result of this type_default_writemask() here. Well, yeah, but we should be using the result type in that case, i.e. vectors rather than matrices. > > The patch from Giovanni that implements this split_matrix_copies() > pass (which is many patches ahead), makes sure to do it with only vectors > in the rhs. > > But currently, if I am not mistaken (I could be), a HLSL_IR_STORE with a > matrix in the rhs is producing a single MOV instruction for the first > register that the matrix uses. Which maybe could be problematic in sm4 > with matrices with major size =1 and minor size <4. Currently it's not producing anything, actually; we have a FIXME for that case in write_sm[14]_instructions(). > > I added this default behavior thinking on those cases (if they could actually > happen), and maybe because I thought it could be useful in the future if for > some reason we wanted to implement split_matrix_copies() in other way, by > directly copying the store instructions. > > But well, maybe I'll just do > --- > if (!writemask && (type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR)) > writemask = (1 << rhs->data_type->dimx) - 1; > --- > or remove the patch altogether in the next version of the batch. > > > Best regards, > Francisco

2 1

[PATCH vkd3d v3 1/8] vkd3d-shader/hlsl: Allow offsets for scalar and vector variables.
by Francisco Casas 17 Mar '22

17 Mar '22

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - In v3, this patch replaces vkd3d-shader/hlsl: Move type_is_single_reg() to hlsl.h and rename it to hlsl_type_uses_writemask(). This in order to simplify numeric variable initializations later. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 3 +-- libs/vkd3d-shader/hlsl_codegen.c | 22 +++++----------------- libs/vkd3d-shader/hlsl_sm1.c | 4 ++-- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++++----- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 243ed72b..1fd5dc58 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -793,8 +793,7 @@ unsigned int hlsl_swizzle_from_writemask(unsigned int writemask); bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset); unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type); +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 837d39e3..d25e0ff5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1542,11 +1542,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) } } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset) { struct hlsl_ir_node *offset_node = deref->offset.node; @@ -1589,8 +1584,7 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl return 0; } -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type) +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref) { const struct hlsl_ir_var *var = deref->var; struct hlsl_reg ret = var->reg; @@ -1598,16 +1592,10 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere ret.id += offset / 4; - if (type_is_single_reg(var->data_type)) - { - assert(!offset); - ret.writemask = var->reg.writemask; - } - else - { - assert(type_is_single_reg(type)); - ret.writemask = ((1 << type->dimx) - 1) << (offset % 4); - } + ret.writemask = 0xf & (0xf << (offset % 4)); + if (var->reg.writemask) + ret.writemask = hlsl_combine_writemasks(var->reg.writemask, ret.writemask); + return ret; } diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 90ec6058..f661dbc2 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -663,7 +663,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_load *load = hlsl_ir_load(instr); - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src, instr->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, @@ -707,7 +707,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * { const struct hlsl_ir_store *store = hlsl_ir_store(instr); const struct hlsl_ir_node *rhs = store->rhs.node; - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs, rhs->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 6996bb2d..802db3c1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -870,6 +870,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -877,11 +879,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_INPUT; @@ -899,6 +901,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -909,11 +913,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r reg->dim = VKD3D_SM4_DIMENSION_SCALAR; else reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_OUTPUT; @@ -925,7 +929,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_TEMP; -- 2.25.1

3 2

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 17 Mar '22

17 Mar '22

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 104 ++++++++++++++++++------------------------------------- 1 file changed, 33 insertions(+), 71 deletions(-) diff --git a/po/fi.po b/po/fi.po index de3434f4d3d..be14b9b2ebd 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-06-17 12:10+0300\n" +"PO-Revision-Date: 2022-03-17 20:32+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -10519,16 +10519,16 @@ msgstr "(UTC-03:00) Saint-Pierre ja Miquelon" #: dlls/tzres/tzres.rc:327 msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" -msgstr "Sao Tomen normaaliaika" +msgstr "São Tomén normaaliaika" #: dlls/tzres/tzres.rc:328 msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" -msgstr "Sao Tomen kesäaika" +msgstr "São Tomén kesäaika" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "(UTC+00:00) Sao Tome" +msgstr "(UTC+00:00) São Tomé" #: dlls/tzres/tzres.rc:249 msgctxt "maximum 31 characters" @@ -10559,18 +10559,14 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 -#, fuzzy -#| msgid "Mountain Standard Time (Mexico)" msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" -msgstr "Kalliovuorten normaaliaika (Meksiko)" +msgstr "Kalliovuorten norm.aika (Meks.)" #: dlls/tzres/tzres.rc:241 -#, fuzzy -#| msgid "Mountain Daylight Time (Mexico)" msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" -msgstr "Kalliovuorten kesäaika (Meksiko)" +msgstr "Kalliovuorten kesäaika (Meks.)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" @@ -10782,11 +10778,9 @@ msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) Kaliningrad" #: dlls/tzres/tzres.rc:282 -#, fuzzy -#| msgid "Pacific Standard Time (Mexico)" msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" -msgstr "Tyynenmeren normaaliaika (Meksiko)" +msgstr "Tyynenmeren norm.aika (Meksiko)" #: dlls/tzres/tzres.rc:283 msgctxt "maximum 31 characters" @@ -10919,11 +10913,9 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) Azorit" #: dlls/tzres/tzres.rc:264 -#, fuzzy -#| msgid "North Asia East Standard Time" msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" -msgstr "Itäisen Pohjois-Aasian normaaliaika" +msgstr "It. Pohjois-Aasian normaaliaika" #: dlls/tzres/tzres.rc:265 msgctxt "maximum 31 characters" @@ -10958,18 +10950,14 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) Buenos Aires" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turks And Caicos Standard Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" -msgstr "Turks- ja Caicossaarten normaaliaika" +msgstr "Turks ja Caicos, normaaliaika" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turks And Caicos Daylight Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" -msgstr "Turks- ja Caicossaarten kesäaika" +msgstr "Turks ja Caicos, kesäaika" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" @@ -11209,11 +11197,9 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 -#, fuzzy -#| msgid "N. Central Asia Standard Time" msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" -msgstr "Pohjoisen Keski-Aasian normaaliaika" +msgstr "Pohj. Keski-Aasian normaaliaika" #: dlls/tzres/tzres.rc:247 msgctxt "maximum 31 characters" @@ -11402,11 +11388,9 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) Koordinoitu yleisaika -02" #: dlls/tzres/tzres.rc:387 -#, fuzzy -#| msgid "US Mountain Standard Time" msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" -msgstr "Kalliovuorten normaaliaika (USA)" +msgstr "Kalliovuorten norm.aika (USA)" #: dlls/tzres/tzres.rc:388 msgctxt "maximum 31 characters" @@ -11497,16 +11481,14 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) Jakutsk" #: dlls/tzres/tzres.rc:309 -#, fuzzy -#| msgid "SA Eastern Standard Time" msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" -msgstr "Etelä-Amerikan itäinen normaaliaika" +msgstr "Etelä-Am. itäinen vyöhyke" #: dlls/tzres/tzres.rc:310 msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" -msgstr "Etelä-Amerikan itäinen kesäaika" +msgstr "Etelä-Am. itäinen kesäaika" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" @@ -11552,7 +11534,7 @@ msgstr "Tocantinsin kesäaika" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" -msgstr "(UTC-03:00) Araguaina" +msgstr "(UTC-03:00) Araguaína" #: dlls/tzres/tzres.rc:306 msgctxt "maximum 31 characters" @@ -11569,11 +11551,9 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Moskova, Pietari" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Aus Central W. Standard Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" -msgstr "Australian keskilännen normaaliaika" +msgstr "Australian keskilännen vyöhyke" #: dlls/tzres/tzres.rc:64 msgctxt "maximum 31 characters" @@ -11596,7 +11576,7 @@ msgstr "Romaaninen kesäaika" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "(UTC+01:00) Brysseli, Kööpenhamina, Madrid, Pariisi" +msgstr "(UTC+01:00) Bryssel, Kööpenhamina, Madrid, Pariisi" #: dlls/tzres/tzres.rc:159 msgctxt "maximum 31 characters" @@ -11624,12 +11604,12 @@ msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamtšatski" #: dlls/tzres/tzres.rc:435 msgctxt "maximum 31 characters" msgid "West Bank Standard Time" -msgstr "Länsirannikon normaaliaika" +msgstr "Länsirannan ja Gazan norm.ika" #: dlls/tzres/tzres.rc:436 msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" -msgstr "Länsirannikon kesäaika" +msgstr "Länsirannan ja Gazan kesäaika" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" @@ -11650,11 +11630,9 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) Damaskos" #: dlls/tzres/tzres.rc:60 -#, fuzzy -#| msgid "AUS Central Standard Time" msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" -msgstr "Australian keskinen normaaliaika" +msgstr "Australian keskinen norm.aika" #: dlls/tzres/tzres.rc:61 msgctxt "maximum 31 characters" @@ -11710,12 +11688,12 @@ msgstr "(UTC+11:00) Norfolkinsaari" #: dlls/tzres/tzres.rc:195 msgctxt "maximum 31 characters" msgid "Israel Standard Time" -msgstr "Israelin normaaliaika" +msgstr "Jerusalemin normaaliaika" #: dlls/tzres/tzres.rc:196 msgctxt "maximum 31 characters" msgid "Israel Daylight Time" -msgstr "Israelin kesäaika" +msgstr "Jerusalemin kesäaika" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" @@ -11736,18 +11714,14 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 -#, fuzzy -#| msgid "SA Pacific Standard Time" msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" -msgstr "Etelä-Amerikan Tyynenmeren normaaliaika" +msgstr "Etelä-Am. Tyynenmeren norm.aika" #: dlls/tzres/tzres.rc:313 -#, fuzzy -#| msgid "SA Pacific Daylight Time" msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" -msgstr "Etelä-Amerikan Tyynenmeren kesäaika" +msgstr "Etelä-Am. Tyynenmeren kesäaika" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" @@ -11793,7 +11767,7 @@ msgstr "Paraguayn kesäaika" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "(UTC-04:00) Asuncion" +msgstr "(UTC-04:00) Asunción" #: dlls/tzres/tzres.rc:132 msgctxt "maximum 31 characters" @@ -11992,18 +11966,14 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 -#, fuzzy -#| msgid "SA Western Standard Time" msgctxt "maximum 31 characters" msgid "SA Western Standard Time" -msgstr "Etelä-Amerikan läntinen normaaliaika" +msgstr "Etelä-Am. läntinen normaaliaika" #: dlls/tzres/tzres.rc:316 -#, fuzzy -#| msgid "SA Western Daylight Time" msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" -msgstr "Etelä-Amerikan läntinen kesäaika" +msgstr "Etelä-Am. läntinen kesäaika" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" @@ -12173,16 +12143,14 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) Helsinki, Kiova, Riika, Sofia, Tallinna, Vilna" #: dlls/tzres/tzres.rc:144 -#, fuzzy -#| msgid "E. South America Standard Time" msgctxt "maximum 31 characters" msgid "E. South America Standard Time" -msgstr "Itäisen Etelä-Amerikan normaaliaika" +msgstr "Itäisen Etelä-Am. vyöhyke" #: dlls/tzres/tzres.rc:145 msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" -msgstr "Itäisen Etelä-Amerikan kesäaika" +msgstr "Itäisen Etelä-Am. kesäaika" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" @@ -12203,11 +12171,9 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) Salomonsaaret, Uusi-Kaledonia" #: dlls/tzres/tzres.rc:423 -#, fuzzy -#| msgid "W. Central Africa Standard Time" msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" -msgstr "Läntisen Keski-Afrikan normaaliaika" +msgstr "Läntis. Keski-Afrikan norm.aika" #: dlls/tzres/tzres.rc:424 msgctxt "maximum 31 characters" @@ -12216,21 +12182,17 @@ msgstr "Läntisen Keski-Afrikan kesäaika" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) West Central Africa" -msgstr "(UTC+01:00) Länsi-Afrikan aika" +msgstr "(UTC+01:00) Läntinen Keski-Afrikka" #: dlls/tzres/tzres.rc:276 -#, fuzzy -#| msgid "Pacific SA Standard Time" msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" -msgstr "Tyynenmeren Etelä-Amerikan normaaliaika" +msgstr "Tyynenmeren Etelä-Am. norm.aika" #: dlls/tzres/tzres.rc:277 -#, fuzzy -#| msgid "Pacific SA Daylight Time" msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" -msgstr "Tyynenmeren Etelä-Amerikan kesäaika" +msgstr "Tyynenmeren Etelä-Am. kesäaika" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -- 2.35.1

1 0

[PATCH 7/7] winealsa: Move MODM_RESET to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 41 ++++++++++++++++++++++++++++++++++-- dlls/winealsa.drv/midi.c | 36 ------------------------------- dlls/winealsa.drv/unixlib.h | 15 ++----------- 3 files changed, 41 insertions(+), 51 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index f3de2a5ce07..b99c3aedd33 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -48,6 +48,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); +struct midi_dest +{ + BOOL bEnabled; + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIOUTCAPSW caps; + snd_seq_t *seq; + snd_seq_addr_t addr; + int port_out; +}; + static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; static unsigned int num_dests, num_srcs; @@ -353,9 +364,7 @@ NTSTATUS midi_init(void *args) free( pinfo ); *params->err = NOERROR; - params->num_dests = num_dests; params->num_srcs = num_srcs; - params->dests = dests; params->srcs = srcs; TRACE("End\n"); @@ -800,6 +809,31 @@ static UINT midi_out_get_volume(WORD dev_id, UINT* volume) return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; } +static UINT midi_out_reset(WORD dev_id) +{ + unsigned chn; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + if (!dests[dev_id].bEnabled) return MIDIERR_NODEVICE; + + /* stop all notes */ + /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that + * it's channel dependent... + */ + for (chn = 0; chn < 16; chn++) + { + /* turn off every note */ + midi_out_data(dev_id, 0x7800 | MIDI_CMD_CONTROL | chn); + /* remove sustain on all channels */ + midi_out_data(dev_id, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn); + } + /* FIXME: the LongData buffers must also be returned to the app */ + return MMSYSERR_NOERROR; +} + + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -844,6 +878,9 @@ NTSTATUS midi_out_message(void *args) case MODM_SETVOLUME: *params->err = 0; break; + case MODM_RESET: + *params->err = midi_out_reset(params->dev_id); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 0ed2feb41eb..53b683f59c8 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -48,10 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); static WINE_MIDIIN *MidiInDev; -static WINE_MIDIOUT *MidiOutDev; -/* this is the total number of MIDI out devices found (synth and port) */ -static int MODM_NumDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; @@ -605,35 +602,6 @@ static DWORD midStop(WORD wDevID) return MMSYSERR_NOERROR; } -/************************************************************************** - * modReset [internal] - */ -static DWORD modReset(WORD wDevID) -{ - DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2); - unsigned chn; - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - /* stop all notes */ - /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that - * it's channel dependent... - */ - for (chn = 0; chn < 16; chn++) { - /* turn off every note */ - ALSA_modMessage(wDevID, MODM_DATA, 0, 0x7800 | MIDI_CMD_CONTROL | chn, 0); - /* remove sustain on all channels */ - ALSA_modMessage(wDevID, MODM_DATA, 0, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn, 0); - } - /* FIXME: the LongData buffers must also be returned to the app */ - return MMSYSERR_NOERROR; -} - - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -653,9 +621,7 @@ static BOOL ALSA_MidiInit(void) if (!err) { - MODM_NumDevs = params.num_dests; MIDM_NumDevs = params.num_srcs; - MidiOutDev = params.dests; MidiInDev = params.srcs; } return TRUE; @@ -721,8 +687,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_RESET: - return modReset(wDevID); } params.dev_id = wDevID; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e3cd7123101..c1dbd83b84e 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -223,22 +223,11 @@ typedef struct midi_src int port_in; } WINE_MIDIIN; -typedef struct midi_dest -{ - BOOL bEnabled; - MIDIOPENDESC midiDesc; - WORD wFlags; - MIDIOUTCAPSW caps; - snd_seq_t *seq; - snd_seq_addr_t addr; - int port_out; -} WINE_MIDIOUT; - struct midi_init_params { UINT *err; - unsigned int num_dests, num_srcs; - void *dests, *srcs; + unsigned int num_srcs; + void *srcs; }; struct notify_context -- 2.25.1

2 1

[PATCH 6/7] winealsa: Move MODM_GETVOLUME and MODM_SETVOLUME to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 15 +++++++++++++++ dlls/winealsa.drv/midi.c | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index fa09626bc80..f3de2a5ce07 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -791,6 +791,15 @@ static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_out_get_volume(WORD dev_id, UINT* volume) +{ + if (!volume) return MMSYSERR_INVALPARAM; + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + + *volume = 0xFFFFFFFF; + return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -829,6 +838,12 @@ NTSTATUS midi_out_message(void *args) case MODM_GETNUMDEVS: *params->err = num_dests; break; + case MODM_GETVOLUME: + *params->err = midi_out_get_volume(params->dev_id, (UINT *)params->param_1); + break; + case MODM_SETVOLUME: + *params->err = 0; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4b8062390fa..0ed2feb41eb 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -605,17 +605,6 @@ static DWORD midStop(WORD wDevID) return MMSYSERR_NOERROR; } -/************************************************************************** - * modGetVolume [internal] - */ -static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume) -{ - if (!lpdwVolume) return MMSYSERR_INVALPARAM; - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - *lpdwVolume = 0xFFFFFFFF; - return (MidiOutDev[wDevID].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; -} - /************************************************************************** * modReset [internal] */ @@ -732,10 +721,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_GETVOLUME: - return modGetVolume(wDevID, (DWORD*)dwParam1); - case MODM_SETVOLUME: - return 0; case MODM_RESET: return modReset(wDevID); } -- 2.25.1

2 1

[PATCH 5/7] winealsa: Move MODM_GETNUMDEVS to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 3 +++ dlls/winealsa.drv/midi.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 602682554c0..fa09626bc80 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -826,6 +826,9 @@ NTSTATUS midi_out_message(void *args) case MODM_GETDEVCAPS: *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2); break; + case MODM_GETNUMDEVS: + *params->err = num_dests; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index b9b3bbf7c35..4b8062390fa 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -732,8 +732,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_GETNUMDEVS: - return MODM_NumDevs; case MODM_GETVOLUME: return modGetVolume(wDevID, (DWORD*)dwParam1); case MODM_SETVOLUME: -- 2.25.1

2 1

[PATCH 4/7] winealsa: Move MODM_GETDEVAPS to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 15 +++++++++++++++ dlls/winealsa.drv/midi.c | 17 ----------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index bc68442a0d7..602682554c0 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -779,6 +779,18 @@ static UINT midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) return MMSYSERR_NOERROR; } +static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size) +{ + TRACE("(%04X, %p, %08X);\n", dev_id, caps, size); + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + if (!caps) return MMSYSERR_INVALPARAM; + + memcpy(caps, &dests[dev_id].caps, min(size, sizeof(*caps))); + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -811,6 +823,9 @@ NTSTATUS midi_out_message(void *args) case MODM_UNPREPARE: *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; + case MODM_GETDEVCAPS: + *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 7329b2cd2e7..b9b3bbf7c35 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -605,21 +605,6 @@ static DWORD midStop(WORD wDevID) return MMSYSERR_NOERROR; } -/************************************************************************** - * modGetDevCaps [internal] - */ -static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) -{ - TRACE("(%04X, %p, %08X);\n", wDevID, lpCaps, dwSize); - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - - memcpy(lpCaps, &MidiOutDev[wDevID].caps, min(dwSize, sizeof(*lpCaps))); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * modGetVolume [internal] */ @@ -747,8 +732,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_GETDEVCAPS: - return modGetDevCaps(wDevID, (LPMIDIOUTCAPSW)dwParam1, dwParam2); case MODM_GETNUMDEVS: return MODM_NumDevs; case MODM_GETVOLUME: -- 2.25.1

2 1

[PATCH 3/7] winealsa: Move MODM_PREPARE and MODM_UNPREPARE to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 36 +++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 39 ------------------------------------ 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 0a3e1a80be3..bc68442a0d7 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -749,6 +749,36 @@ static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct return MMSYSERR_NOERROR; } +static UINT midi_out_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + return MMSYSERR_NOERROR; +} + +static UINT midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -775,6 +805,12 @@ NTSTATUS midi_out_message(void *args) case MODM_LONGDATA: *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); break; + case MODM_PREPARE: + *params->err = midi_out_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; + case MODM_UNPREPARE: + *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 5638dace27c..7329b2cd2e7 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -620,41 +620,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modPrepare [internal] - */ -static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwFlags & MHDR_PREPARED) - return MMSYSERR_NOERROR; - - lpMidiHdr->lpNext = 0; - lpMidiHdr->dwFlags |= MHDR_PREPARED; - lpMidiHdr->dwFlags &= ~(MHDR_DONE|MHDR_INQUEUE); /* flags cleared since w2k */ - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * modUnprepare [internal] - */ -static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MMSYSERR_NOERROR; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - lpMidiHdr->dwFlags &= ~MHDR_PREPARED; - return MMSYSERR_NOERROR; -} - /************************************************************************** * modGetVolume [internal] */ @@ -782,10 +747,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_PREPARE: - return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MODM_UNPREPARE: - return modUnprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_GETDEVCAPS: return modGetDevCaps(wDevID, (LPMIDIOUTCAPSW)dwParam1, dwParam2); case MODM_GETNUMDEVS: -- 2.25.1

2 1

[PATCH 2/7] winealsa: Move MODM_LONGDATA to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 101 +++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 106 ----------------------------------- 2 files changed, 101 insertions(+), 106 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 32c983ba0a3..0a3e1a80be3 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -651,6 +651,104 @@ static UINT midi_out_data(WORD dev_id, UINT data) return MMSYSERR_NOERROR; } +static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct notify_context *notify) +{ + struct midi_dest *dest; + int len_add = 0; + BYTE *data, *new_data = NULL; + snd_seq_event_t event; + + TRACE("(%04X, %p, %08X);\n", dev_id, hdr, hdr_size); + + /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure + * but it seems to be used only for midi input. + * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. + */ + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + dest = dests + dev_id; + + if (!dest->bEnabled) return MIDIERR_NODEVICE; + + if (dest->seq == NULL) + { + WARN("can't play !\n"); + return MIDIERR_NODEVICE; + } + + data = (BYTE*)hdr->lpData; + + if (data == NULL) + return MIDIERR_UNPREPARED; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MIDIERR_UNPREPARED; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + hdr->dwFlags &= ~MHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + + /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive + * data, or can it also contain raw MIDI data, to be split up and sent to + * modShortData() ? + * If the latest is true, then the following WARNing will fire up + */ + if (data[0] != 0xF0 || data[hdr->dwBufferLength - 1] != 0xF7) + { + WARN("Alleged system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); + new_data = malloc(hdr->dwBufferLength + 2); + } + + TRACE("dwBufferLength=%u !\n", hdr->dwBufferLength); + TRACE(" %02X %02X %02X ... %02X %02X %02X\n", + data[0], data[1], data[2], data[hdr->dwBufferLength-3], + data[hdr->dwBufferLength-2], data[hdr->dwBufferLength-1]); + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + /* FIXME: I don't think there is much to do here */ + free(new_data); + break; + case MOD_MIDIPORT: + if (data[0] != 0xF0) + { + /* Send start of System Exclusive */ + len_add = 1; + new_data[0] = 0xF0; + memcpy(new_data + 1, data, hdr->dwBufferLength); + WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n"); + } + if (data[hdr->dwBufferLength-1] != 0xF7) + { + /* Send end of System Exclusive */ + if (!len_add) + memcpy(new_data, data, hdr->dwBufferLength); + new_data[hdr->dwBufferLength + len_add] = 0xF7; + len_add++; + WARN("Adding missing 0xF7 marker at the end of system exclusive byte stream\n"); + } + snd_seq_ev_clear(&event); + snd_seq_ev_set_direct(&event); + snd_seq_ev_set_source(&event, dest->port_out); + snd_seq_ev_set_subs(&event); + snd_seq_ev_set_sysex(&event, hdr->dwBufferLength + len_add, new_data ? new_data : data); + seq_lock(); + snd_seq_event_output_direct(dest->seq, &event); + seq_unlock(); + free(new_data); + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + free(new_data); + return MMSYSERR_NOTENABLED; + } + + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_out_notify(notify, dest, dev_id, MOM_DONE, (DWORD_PTR)hdr, 0); + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -674,6 +772,9 @@ NTSTATUS midi_out_message(void *args) case MODM_DATA: *params->err = midi_out_data(params->dev_id, params->param_1); break; + case MODM_LONGDATA: + *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index dd2f3cd9040..5638dace27c 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -122,16 +122,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_DONE: - case MOM_POSITIONCB: - if (wDevID > MODM_NumDevs) return; - - dwCallBack = MidiOutDev[wDevID].midiDesc.dwCallback; - uFlags = MidiOutDev[wDevID].wFlags; - hDev = MidiOutDev[wDevID].midiDesc.hMidi; - dwInstance = MidiOutDev[wDevID].midiDesc.dwInstance; - break; - case MIM_OPEN: case MIM_CLOSE: case MIM_DATA: @@ -630,100 +620,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modLongData [internal] - */ -static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - int len_add = 0; - BYTE *lpData, *lpNewData = NULL; - snd_seq_event_t event; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize); - - /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure - * but it seems to be used only for midi input. - * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. - */ - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - if (MidiOutDev[wDevID].seq == NULL) { - WARN("can't play !\n"); - return MIDIERR_NODEVICE; - } - - lpData = (BYTE*)lpMidiHdr->lpData; - - if (lpData == NULL) - return MIDIERR_UNPREPARED; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MIDIERR_UNPREPARED; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - lpMidiHdr->dwFlags &= ~MHDR_DONE; - lpMidiHdr->dwFlags |= MHDR_INQUEUE; - - /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive - * data, or can it also contain raw MIDI data, to be split up and sent to - * modShortData() ? - * If the latest is true, then the following WARNing will fire up - */ - if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { - WARN("Alleged system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); - lpNewData = HeapAlloc(GetProcessHeap(), 0, lpMidiHdr->dwBufferLength + 2); - } - - TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength); - TRACE(" %02X %02X %02X ... %02X %02X %02X\n", - lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3], - lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]); - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - /* FIXME: I don't think there is much to do here */ - HeapFree(GetProcessHeap(), 0, lpNewData); - break; - case MOD_MIDIPORT: - if (lpData[0] != 0xF0) { - /* Send start of System Exclusive */ - len_add = 1; - lpNewData[0] = 0xF0; - memcpy(lpNewData + 1, lpData, lpMidiHdr->dwBufferLength); - WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n"); - } - if (lpData[lpMidiHdr->dwBufferLength-1] != 0xF7) { - /* Send end of System Exclusive */ - if (!len_add) - memcpy(lpNewData, lpData, lpMidiHdr->dwBufferLength); - lpNewData[lpMidiHdr->dwBufferLength + len_add] = 0xF7; - len_add++; - WARN("Adding missing 0xF7 marker at the end of system exclusive byte stream\n"); - } - snd_seq_ev_clear(&event); - snd_seq_ev_set_direct(&event); - snd_seq_ev_set_source(&event, MidiOutDev[wDevID].port_out); - snd_seq_ev_set_subs(&event); - snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); - seq_lock(); - snd_seq_event_output_direct(MidiOutDev[wDevID].seq, &event); - seq_unlock(); - HeapFree(GetProcessHeap(), 0, lpNewData); - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - HeapFree(GetProcessHeap(), 0, lpNewData); - return MMSYSERR_NOTENABLED; - } - - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); - return MMSYSERR_NOERROR; -} - /************************************************************************** * modPrepare [internal] */ @@ -886,8 +782,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_LONGDATA: - return modLongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE: return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_UNPREPARE: -- 2.25.1

2 1

[PATCH 1/7] winealsa: Move MODM_DATA to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 129 +++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 134 ++--------------------------------- 2 files changed, 135 insertions(+), 128 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index a92c08793af..32c983ba0a3 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -525,6 +525,132 @@ static UINT midi_out_close(WORD dev_id, struct notify_context *notify) return MMSYSERR_NOERROR; } +static UINT midi_out_data(WORD dev_id, UINT data) +{ + BYTE evt = LOBYTE(LOWORD(data)); + BYTE d1 = HIBYTE(LOWORD(data)); + BYTE d2 = LOBYTE(HIWORD(data)); + struct midi_dest *dest; + + TRACE("(%04X, %08X);\n", dev_id, data); + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + dest = dests + dev_id; + + if (!dest->bEnabled) return MIDIERR_NODEVICE; + + if (dest->seq == NULL) + { + WARN("can't play !\n"); + return MIDIERR_NODEVICE; + } + switch (dest->caps.wTechnology) + { + case MOD_SYNTH: + case MOD_MIDIPORT: + { + int handled = 1; /* Assume event is handled */ + snd_seq_event_t event; + snd_seq_ev_clear(&event); + snd_seq_ev_set_direct(&event); + snd_seq_ev_set_source(&event, dest->port_out); + snd_seq_ev_set_subs(&event); + + switch (evt & 0xF0) + { + case MIDI_CMD_NOTE_OFF: + snd_seq_ev_set_noteoff(&event, evt & 0x0F, d1, d2); + break; + case MIDI_CMD_NOTE_ON: + snd_seq_ev_set_noteon(&event, evt & 0x0F, d1, d2); + break; + case MIDI_CMD_NOTE_PRESSURE: + snd_seq_ev_set_keypress(&event, evt & 0x0F, d1, d2); + break; + case MIDI_CMD_CONTROL: + snd_seq_ev_set_controller(&event, evt & 0x0F, d1, d2); + break; + case MIDI_CMD_BENDER: + snd_seq_ev_set_pitchbend(&event, evt & 0x0F, ((WORD)d2 << 7 | (WORD)d1) - 0x2000); + break; + case MIDI_CMD_PGM_CHANGE: + snd_seq_ev_set_pgmchange(&event, evt & 0x0F, d1); + break; + case MIDI_CMD_CHANNEL_PRESSURE: + snd_seq_ev_set_chanpress(&event, evt & 0x0F, d1); + break; + case MIDI_CMD_COMMON_SYSEX: + switch (evt & 0x0F) + { + case 0x00: /* System Exclusive, don't do it on modData, + * should require modLongData*/ + case 0x04: /* Undefined. */ + case 0x05: /* Undefined. */ + case 0x07: /* End of Exclusive. */ + case 0x09: /* Undefined. */ + case 0x0D: /* Undefined. */ + handled = 0; + break; + case 0x06: /* Tune Request */ + case 0x08: /* Timing Clock. */ + case 0x0A: /* Start. */ + case 0x0B: /* Continue */ + case 0x0C: /* Stop */ + case 0x0E: /* Active Sensing. */ + { + snd_midi_event_t *midi_event; + + snd_midi_event_new(1, &midi_event); + snd_midi_event_init(midi_event); + snd_midi_event_encode_byte(midi_event, evt, &event); + snd_midi_event_free(midi_event); + break; + } + case 0x0F: /* Reset */ + /* snd_seq_ev_set_sysex(&event, 1, &evt); + this other way may be better */ + { + BYTE reset_sysex_seq[] = {MIDI_CMD_COMMON_SYSEX, 0x7e, 0x7f, 0x09, 0x01, 0xf7}; + snd_seq_ev_set_sysex(&event, sizeof(reset_sysex_seq), reset_sysex_seq); + break; + } + case 0x01: /* MTC Quarter frame */ + case 0x03: /* Song Select. */ + { + BYTE buf[2]; + buf[0] = evt; + buf[1] = d1; + snd_seq_ev_set_sysex(&event, sizeof(buf), buf); + break; + } + case 0x02: /* Song Position Pointer. */ + { + BYTE buf[3]; + buf[0] = evt; + buf[1] = d1; + buf[2] = d2; + snd_seq_ev_set_sysex(&event, sizeof(buf), buf); + break; + } + } + break; + } + if (handled) + { + seq_lock(); + snd_seq_event_output_direct(dest->seq, &event); + seq_unlock(); + } + break; + } + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -545,6 +671,9 @@ NTSTATUS midi_out_message(void *args) case MODM_CLOSE: *params->err = midi_out_close(params->dev_id, params->notify); break; + case MODM_DATA: + *params->err = midi_out_data(params->dev_id, params->param_1); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 5f8d855c9fb..dd2f3cd9040 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -630,128 +630,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modData [internal] - */ -static DWORD modData(WORD wDevID, DWORD dwParam) -{ - BYTE evt = LOBYTE(LOWORD(dwParam)); - BYTE d1 = HIBYTE(LOWORD(dwParam)); - BYTE d2 = LOBYTE(HIWORD(dwParam)); - - TRACE("(%04X, %08X);\n", wDevID, dwParam); - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - if (MidiOutDev[wDevID].seq == NULL) { - WARN("can't play !\n"); - return MIDIERR_NODEVICE; - } - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_SYNTH: - case MOD_MIDIPORT: - { - int handled = 1; /* Assume event is handled */ - snd_seq_event_t event; - snd_seq_ev_clear(&event); - snd_seq_ev_set_direct(&event); - snd_seq_ev_set_source(&event, MidiOutDev[wDevID].port_out); - snd_seq_ev_set_subs(&event); - - switch (evt & 0xF0) { - case MIDI_CMD_NOTE_OFF: - snd_seq_ev_set_noteoff(&event, evt&0x0F, d1, d2); - break; - case MIDI_CMD_NOTE_ON: - snd_seq_ev_set_noteon(&event, evt&0x0F, d1, d2); - break; - case MIDI_CMD_NOTE_PRESSURE: - snd_seq_ev_set_keypress(&event, evt&0x0F, d1, d2); - break; - case MIDI_CMD_CONTROL: - snd_seq_ev_set_controller(&event, evt&0x0F, d1, d2); - break; - case MIDI_CMD_BENDER: - snd_seq_ev_set_pitchbend(&event, evt&0x0F, ((WORD)d2 << 7 | (WORD)d1) - 0x2000); - break; - case MIDI_CMD_PGM_CHANGE: - snd_seq_ev_set_pgmchange(&event, evt&0x0F, d1); - break; - case MIDI_CMD_CHANNEL_PRESSURE: - snd_seq_ev_set_chanpress(&event, evt&0x0F, d1); - break; - case MIDI_CMD_COMMON_SYSEX: - switch (evt & 0x0F) { - case 0x00: /* System Exclusive, don't do it on modData, - * should require modLongData*/ - case 0x04: /* Undefined. */ - case 0x05: /* Undefined. */ - case 0x07: /* End of Exclusive. */ - case 0x09: /* Undefined. */ - case 0x0D: /* Undefined. */ - handled = 0; - break; - case 0x06: /* Tune Request */ - case 0x08: /* Timing Clock. */ - case 0x0A: /* Start. */ - case 0x0B: /* Continue */ - case 0x0C: /* Stop */ - case 0x0E: /* Active Sensing. */ - { - snd_midi_event_t *midi_event; - - snd_midi_event_new(1, &midi_event); - snd_midi_event_init(midi_event); - snd_midi_event_encode_byte(midi_event, evt, &event); - snd_midi_event_free(midi_event); - break; - } - case 0x0F: /* Reset */ - /* snd_seq_ev_set_sysex(&event, 1, &evt); - this other way may be better */ - { - BYTE reset_sysex_seq[] = {MIDI_CMD_COMMON_SYSEX, 0x7e, 0x7f, 0x09, 0x01, 0xf7}; - snd_seq_ev_set_sysex(&event, sizeof(reset_sysex_seq), reset_sysex_seq); - } - break; - case 0x01: /* MTC Quarter frame */ - case 0x03: /* Song Select. */ - { - BYTE buf[2]; - buf[0] = evt; - buf[1] = d1; - snd_seq_ev_set_sysex(&event, sizeof(buf), buf); - } - break; - case 0x02: /* Song Position Pointer. */ - { - BYTE buf[3]; - buf[0] = evt; - buf[1] = d1; - buf[2] = d2; - snd_seq_ev_set_sysex(&event, sizeof(buf), buf); - } - break; - } - break; - } - if (handled) { - seq_lock(); - snd_seq_event_output_direct(MidiOutDev[wDevID].seq, &event); - seq_unlock(); - } - } - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - return MMSYSERR_NOERROR; -} - /************************************************************************** * modLongData [internal] */ @@ -897,6 +775,8 @@ static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume) */ static DWORD modReset(WORD wDevID) { + DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2); unsigned chn; TRACE("(%04X);\n", wDevID); @@ -909,10 +789,10 @@ static DWORD modReset(WORD wDevID) * it's channel dependent... */ for (chn = 0; chn < 16; chn++) { - /* turn off every note */ - modData(wDevID, 0x7800 | MIDI_CMD_CONTROL | chn); - /* remove sustain on all channels */ - modData(wDevID, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn); + /* turn off every note */ + ALSA_modMessage(wDevID, MODM_DATA, 0, 0x7800 | MIDI_CMD_CONTROL | chn, 0); + /* remove sustain on all channels */ + ALSA_modMessage(wDevID, MODM_DATA, 0, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn, 0); } /* FIXME: the LongData buffers must also be returned to the app */ return MMSYSERR_NOERROR; @@ -1006,8 +886,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_DATA: - return modData(wDevID, dwParam1); case MODM_LONGDATA: return modLongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE: -- 2.25.1

2 1

[PATCH 0/4] Series short description
by Eric Pouech 17 Mar '22

17 Mar '22

supersedes 227544 As described in bugzilla ticket, when calling CreateProcess: - with "default" console inheritance (no CREATE_NEW_CONSOLE nor DETACHED_PROCESS flags), - when parent is not attached to a console - and when the child's subsystem is CUI , native behaves as if CREATE_NEW_CONSOLE was passed. builtin doesn't... this serie: - adds a test case for showing the CUI/GUI discrepancies - fixes kernelbase accordingly - but also requires to fix all usage of CreateProcess in Wine Code that would now generate the creation of a console + a couple of programs moved into the GUI subsystem (to avoid console creation on invocation) + when looking to the other usage of CreateProcess, I only convinced myself to adapt one of them V1 => V2: - don't mess up with the number of patches in the serie - no longer modify makedep for creating cui vs gui test executable, but copy current *_test.exe executable and adapt its subsystem to the need V2 => V3: - removed the hacks in wow64 redirect, and let programs/uninstaller and programs/wusa belong to the GUI subsystem instead - force console creation for wine initial process when a) none of the unix fd are attached to a TTY, b) the initial process is in CUI subsystem V3 => V4: - included Jacek's comments: + removed unneeded casts + move CreateProcess change in programs/services into a separate patch + I didn't change programs/start as you suggested. Testing on W10 shows that 'start /b cui.exe' from a cmd prompt just reuses the current console. V4 => V5: - removed patches applied in V4 - added tweaks in start.exe not so create a console when detached And Marvin will generate errors for Chinese and Japanese VM in console testing that are independant of this serie. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (4): dlls/kernel32/tests: add some console tests about creating cui vs gui processes programs/services: start services detached from console programs/start: force no console creation when using start /exec dlls/kernelbase: handle corner case in CreateProcess dlls/kernel32/tests/console.c | 85 +++++++++++++++++++++++++++++++++++ dlls/kernelbase/process.c | 6 ++- programs/services/services.c | 2 +- programs/start/start.c | 7 ++- 4 files changed, 96 insertions(+), 4 deletions(-)

2 8

[PATCH 2/5] win32u: Move NtUserDestroyWindow implementation from user32.
by Jacek Caban 17 Mar '22

17 Mar '22

2 1

[PATCH v2 5/5] win32u: Move GetWindowContextHelpId implementation from user32.
by Huw Davies 17 Mar '22

17 Mar '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/win.c | 12 +----------- dlls/win32u/window.c | 18 ++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4d4199c67fc..22227c23280 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2249,17 +2249,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) */ DWORD WINAPI GetWindowContextHelpId( HWND hwnd ) { - DWORD retval; - WND *wnd = WIN_GetPtr( hwnd ); - if (!wnd || wnd == WND_DESKTOP) return 0; - if (wnd == WND_OTHER_PROCESS) - { - if (IsWindow( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); - return 0; - } - retval = wnd->helpContext; - WIN_ReleasePtr( wnd ); - return retval; + return NtUserCallHwnd( hwnd, NtUserGetWindowContextHelpId ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index ab69096184c..e513a13b152 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3913,6 +3913,22 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) } } +/* see GetWindowContextHelpId */ +static DWORD get_window_context_help_id( HWND hwnd ) +{ + DWORD retval; + WND *win = get_win_ptr( hwnd ); + if (!win || win == WND_DESKTOP) return 0; + if (win == WND_OTHER_PROCESS) + { + if (is_window( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); + return 0; + } + retval = win->helpContext; + release_win_ptr( win ); + return retval; +} + /*********************************************************************** * send_destroy_message */ @@ -4190,6 +4206,8 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) return get_dpi_for_window( hwnd ); case NtUserGetParent: return HandleToUlong( get_parent( hwnd )); + case NtUserGetWindowContextHelpId: + return get_window_context_help_id( hwnd ); case NtUserGetWindowDpiAwarenessContext: return (ULONG_PTR)get_window_dpi_awareness_context( hwnd ); case NtUserGetWindowTextLength: diff --git a/include/ntuser.h b/include/ntuser.h index 6526d190e28..7bcb91fcc25 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -147,6 +147,7 @@ enum { NtUserGetDpiForWindow, NtUserGetParent, + NtUserGetWindowContextHelpId, NtUserGetWindowDpiAwarenessContext, NtUserGetWindowTextLength, NtUserIsWindow, -- 2.23.0

1 0

[PATCH v2 4/5] win32u: Move NtUserShowWindow implementation from user32.
by Huw Davies 17 Mar '22

17 Mar '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/combo.c | 4 +- dlls/user32/defwnd.c | 2 +- dlls/user32/dialog.c | 6 +- dlls/user32/driver.c | 8 +- dlls/user32/mdi.c | 12 +- dlls/user32/message.c | 21 +- dlls/user32/nonclient.c | 6 +- dlls/user32/scroll.c | 2 +- dlls/user32/user32.spec | 4 +- dlls/user32/user_main.c | 1 - dlls/user32/win.c | 10 +- dlls/user32/win.h | 6 - dlls/user32/winpos.c | 228 +--------------- dlls/win32u/driver.c | 1 + dlls/win32u/gdiobj.c | 2 + dlls/win32u/input.c | 2 +- dlls/win32u/message.c | 3 + dlls/win32u/ntuser_private.h | 7 +- dlls/win32u/win32u.spec | 4 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/window.c | 487 ++++++++++++++++++++++++++++++++++- dlls/win32u/wrappers.c | 12 + include/ntuser.h | 1 + 23 files changed, 542 insertions(+), 291 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index b375de5080c..d9123057295 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1030,7 +1030,7 @@ static void CBRollUp( LPHEADCOMBO lphc, BOOL ok, BOOL bButton ) RECT rect; lphc->wState &= ~CBF_DROPPED; - ShowWindow( lphc->hWndLBox, SW_HIDE ); + NtUserShowWindow( lphc->hWndLBox, SW_HIDE ); if(GetCapture() == lphc->hWndLBox) { @@ -1419,7 +1419,7 @@ static void CBResetPos(HEADCOMBO *combo, BOOL redraw) if (combo->wState & CBF_DROPPED) { combo->wState &= ~CBF_DROPPED; - ShowWindow(combo->hWndLBox, SW_HIDE); + NtUserShowWindow( combo->hWndLBox, SW_HIDE ); } if (redraw && !(combo->wState & CBF_NOREDRAW)) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 271644bb953..bd1928412e0 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -562,7 +562,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } else pWnd->flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; WIN_ReleasePtr( pWnd ); - ShowWindow( hwnd, wParam ? SW_SHOWNOACTIVATE : SW_HIDE ); + NtUserShowWindow( hwnd, wParam ? SW_SHOWNOACTIVATE : SW_HIDE ); break; } diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index f9d388d0104..a3efd5b6742 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -702,7 +702,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) { - ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ + NtUserShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ } return hwnd; } @@ -793,7 +793,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) if (bFirstEmpty) { /* ShowWindow the first time the queue goes empty */ - ShowWindow( hwnd, SW_SHOWNORMAL ); + NtUserShowWindow( hwnd, SW_SHOWNORMAL ); bFirstEmpty = FALSE; } if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) @@ -821,7 +821,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) if (bFirstEmpty && msg.message == WM_TIMER) { - ShowWindow( hwnd, SW_SHOWNORMAL ); + NtUserShowWindow( hwnd, SW_SHOWNORMAL ); bFirstEmpty = FALSE; } } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index ada0b8ca2f7..25ed33ff073 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -95,11 +95,6 @@ static void CDECL nulldrv_SetWindowText( HWND hwnd, LPCWSTR text ) { } -static UINT CDECL nulldrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) -{ - return ~0; /* use default implementation */ -} - static LRESULT CDECL nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) { return -1; @@ -184,7 +179,7 @@ static struct user_driver_funcs lazy_load_driver = nulldrv_SetWindowIcon, NULL, nulldrv_SetWindowText, - nulldrv_ShowWindow, + NULL, nulldrv_SysCommand, NULL, NULL, @@ -222,7 +217,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v SET_USER_FUNC(MsgWaitForMultipleObjectsEx); SET_USER_FUNC(SetWindowIcon); SET_USER_FUNC(SetWindowText); - SET_USER_FUNC(ShowWindow); SET_USER_FUNC(SysCommand); SET_USER_FUNC(WindowPosChanging); SET_USER_FUNC(WindowPosChanged); diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 3d85487f808..19db8382bd0 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -514,13 +514,13 @@ static void MDI_SwitchActiveChild( MDICLIENTINFO *ci, HWND hwndTo, BOOL activate { /* restore old MDI child */ SendMessageW( hwndPrev, WM_SETREDRAW, FALSE, 0 ); - ShowWindow( hwndPrev, SW_RESTORE ); + NtUserShowWindow( hwndPrev, SW_RESTORE ); SendMessageW( hwndPrev, WM_SETREDRAW, TRUE, 0 ); /* activate new MDI child */ NtUserSetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); /* maximize new MDI child */ - ShowWindow( hwndTo, SW_MAXIMIZE ); + NtUserShowWindow( hwndTo, SW_MAXIMIZE ); } /* activate new MDI child */ NtUserSetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, @@ -547,7 +547,7 @@ static LRESULT MDIDestroyChild( HWND client, MDICLIENTINFO *ci, MDI_SwitchActiveChild(ci, next, TRUE); else { - ShowWindow(child, SW_HIDE); + NtUserShowWindow( child, SW_HIDE ); if (child == ci->hwndChildMaximized) { HWND frame = GetParent(client); @@ -1133,7 +1133,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM return 0; case WM_MDIMAXIMIZE: - ShowWindow( (HWND)wParam, SW_MAXIMIZE ); + NtUserShowWindow( (HWND)wParam, SW_MAXIMIZE ); return 0; case WM_MDINEXT: /* lParam != 0 means previous window */ @@ -1147,7 +1147,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM } case WM_MDIRESTORE: - ShowWindow( (HWND)wParam, SW_SHOWNORMAL ); + NtUserShowWindow( (HWND)wParam, SW_SHOWNORMAL ); return 0; case WM_MDISETMENU: @@ -1518,7 +1518,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, SendMessageW( hMaxChild, WM_SETREDRAW, FALSE, 0 ); MDI_RestoreFrameMenu( GetParent(client), hMaxChild ); - ShowWindow( hMaxChild, SW_SHOWNOACTIVATE ); + NtUserShowWindow( hMaxChild, SW_SHOWNOACTIVATE ); SendMessageW( hMaxChild, WM_SETREDRAW, TRUE, 0 ); } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 0ba540d2e5d..2badec331c1 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1857,21 +1857,12 @@ static void reply_message( struct received_message_info *info, LRESULT result, B */ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - switch(msg) - { - case WM_WINE_SHOWWINDOW: - if (is_desktop_window( hwnd )) return 0; - return ShowWindow( hwnd, wparam ); - default: - { - MSG m; - m.hwnd = hwnd; - m.message = msg; - m.wParam = wparam; - m.lParam = lparam; - return NtUserCallOneParam( (UINT_PTR)&m, NtUserHandleInternalMessage ); - } - } + MSG m; + m.hwnd = hwnd; + m.message = msg; + m.wParam = wparam; + m.lParam = lparam; + return NtUserCallOneParam( (UINT_PTR)&m, NtUserHandleInternalMessage ); } /* since the WM_DDE_ACK response to a WM_DDE_EXECUTE message should contain the handle diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 096674db5f7..a2a49fda27b 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1557,19 +1557,19 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) case SC_MINIMIZE: ShowOwnedPopups(hwnd,FALSE); - ShowWindow( hwnd, SW_MINIMIZE ); + NtUserShowWindow( hwnd, SW_MINIMIZE ); break; case SC_MAXIMIZE: if (IsIconic(hwnd)) ShowOwnedPopups(hwnd,TRUE); - ShowWindow( hwnd, SW_MAXIMIZE ); + NtUserShowWindow( hwnd, SW_MAXIMIZE ); break; case SC_RESTORE: if (IsIconic(hwnd)) ShowOwnedPopups(hwnd,TRUE); - ShowWindow( hwnd, SW_RESTORE ); + NtUserShowWindow( hwnd, SW_RESTORE ); break; case SC_CLOSE: diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index d666707299f..c042b72a344 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1973,7 +1973,7 @@ static BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar, BOOL fShowH, BOOL fShowV switch(nBar) { case SB_CTL: - ShowWindow( hwnd, fShowH ? SW_SHOW : SW_HIDE ); + NtUserShowWindow( hwnd, fShowH ? SW_SHOW : SW_HIDE ); return TRUE; case SB_BOTH: diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index cb18d9415c9..36ec63c21d4 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -740,8 +740,8 @@ @ stdcall ShowOwnedPopups(long long) @ stdcall ShowScrollBar(long long long) @ stub ShowStartGlass -@ stdcall ShowWindow(long long) -@ stdcall ShowWindowAsync(long long) +@ stdcall ShowWindow(long long) NtUserShowWindow +@ stdcall ShowWindowAsync(long long) NtUserShowWindowAsync @ stdcall ShutdownBlockReasonCreate(long wstr) @ stdcall ShutdownBlockReasonDestroy(long) # @ stub SoftModalMessageBox diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 15293d76c41..5a3db40c93c 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -166,7 +166,6 @@ static const struct user_callbacks user_funcs = SendMessageW, SendNotifyMessageW, ShowCaret, - ShowWindow, WaitForInputIdle, free_win_ptr, MENU_IsMenuActive, diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b0e6b33eb56..4d4199c67fc 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1023,10 +1023,10 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, { /* if the new window is maximized don't bother repainting */ SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); - ShowWindow( top_child, SW_SHOWNORMAL ); + NtUserShowWindow( top_child, SW_SHOWNORMAL ); SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); } - else ShowWindow( top_child, SW_SHOWNORMAL ); + else NtUserShowWindow( top_child, SW_SHOWNORMAL ); } } } @@ -1303,7 +1303,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, else if (cs->style & WS_MINIMIZE) sw = SW_SHOWMINIMIZED; - ShowWindow( hwnd, sw ); + NtUserShowWindow( hwnd, sw ); if (cs->dwExStyle & WS_EX_MDICHILD) { SendMessageW(cs->hwndParent, WM_MDIREFRESHMENU, 0, 0); @@ -1399,7 +1399,7 @@ HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExW( DWORD exStyle, LPCWSTR className, BOOL WINAPI CloseWindow( HWND hwnd ) { if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) return FALSE; - ShowWindow( hwnd, SW_MINIMIZE ); + NtUserShowWindow( hwnd, SW_MINIMIZE ); return TRUE; } @@ -1410,7 +1410,7 @@ BOOL WINAPI CloseWindow( HWND hwnd ) BOOL WINAPI OpenIcon( HWND hwnd ) { if (!IsIconic( hwnd )) return FALSE; - ShowWindow( hwnd, SW_SHOWNORMAL ); + NtUserShowWindow( hwnd, SW_SHOWNORMAL ); return TRUE; } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 89e91a255f9..79a57de6bb9 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -42,7 +42,6 @@ extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentThread( HWND hwnd ) DECLSPEC_HIDDEN; -extern UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) DECLSPEC_HIDDEN; extern ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN; extern BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWindow, RECT *rectClient ) DECLSPEC_HIDDEN; extern HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) DECLSPEC_HIDDEN; @@ -94,9 +93,4 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect ) rect->right = width - tmp; } -static inline UINT win_get_flags( HWND hwnd ) -{ - return win_set_flags( hwnd, 0, 0 ); -} - #endif /* __WINE_WIN_H */ diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 1951f887351..4ba0c47626d 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -67,7 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); */ void WINAPI SwitchToThisWindow( HWND hwnd, BOOL alt_tab ) { - if (IsIconic( hwnd )) ShowWindow( hwnd, SW_RESTORE ); + if (IsIconic( hwnd )) NtUserShowWindow( hwnd, SW_RESTORE ); else BringWindowToTop( hwnd ); } @@ -799,228 +799,6 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) } -/*********************************************************************** - * show_window - * - * Implementation of ShowWindow and ShowWindowAsync. - */ -static BOOL show_window( HWND hwnd, INT cmd ) -{ - WND *wndPtr; - HWND parent; - DPI_AWARENESS_CONTEXT context; - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); - BOOL wasVisible = (style & WS_VISIBLE) != 0; - BOOL showFlag = TRUE; - RECT newPos = {0, 0, 0, 0}; - UINT new_swp, swp = 0; - - TRACE("hwnd=%p, cmd=%d, wasVisible %d\n", hwnd, cmd, wasVisible); - - context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); - - switch(cmd) - { - case SW_HIDE: - if (!wasVisible) goto done; - showFlag = FALSE; - swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; - if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; - break; - - case SW_SHOWMINNOACTIVE: - case SW_MINIMIZE: - case SW_FORCEMINIMIZE: /* FIXME: Does not work if thread is hung. */ - swp |= SWP_NOACTIVATE | SWP_NOZORDER; - /* fall through */ - case SW_SHOWMINIMIZED: - swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; - swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos ); - if ((style & WS_MINIMIZE) && wasVisible) goto done; - break; - - case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ - if (!wasVisible) swp |= SWP_SHOWWINDOW; - swp |= SWP_FRAMECHANGED; - swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos ); - if ((style & WS_MAXIMIZE) && wasVisible) goto done; - break; - - case SW_SHOWNA: - swp |= SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; - if (style & WS_CHILD) swp |= SWP_NOZORDER; - break; - case SW_SHOW: - if (wasVisible) goto done; - swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; - if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; - break; - - case SW_SHOWNOACTIVATE: - swp |= SWP_NOACTIVATE | SWP_NOZORDER; - /* fall through */ - case SW_RESTORE: - /* fall through */ - case SW_SHOWNORMAL: /* same as SW_NORMAL: */ - case SW_SHOWDEFAULT: /* FIXME: should have its own handler */ - if (!wasVisible) swp |= SWP_SHOWWINDOW; - if (style & (WS_MINIMIZE | WS_MAXIMIZE)) - { - swp |= SWP_FRAMECHANGED; - swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos ); - } - else - { - if (wasVisible) goto done; - swp |= SWP_NOSIZE | SWP_NOMOVE; - } - if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER; - break; - default: - goto done; - } - - if ((showFlag != wasVisible || cmd == SW_SHOWNA) && cmd != SW_SHOWMAXIMIZED && !(swp & SWP_STATECHANGED)) - { - SendMessageW( hwnd, WM_SHOWWINDOW, showFlag, 0 ); - if (!IsWindow( hwnd )) goto done; - } - - if (IsRectEmpty( &newPos )) new_swp = swp; - else if ((new_swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp )) == ~0) - { - if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) new_swp = swp; - else if (IsIconic( hwnd ) && (newPos.left != -32000 || newPos.top != -32000)) - { - OffsetRect( &newPos, -32000 - newPos.left, -32000 - newPos.top ); - new_swp = swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE); - } - else new_swp = swp; - } - swp = new_swp; - - parent = NtUserGetAncestor( hwnd, GA_PARENT ); - if (parent && !IsWindowVisible( parent ) && !(swp & SWP_STATECHANGED)) - { - /* if parent is not visible simply toggle WS_VISIBLE and return */ - if (showFlag) WIN_SetStyle( hwnd, WS_VISIBLE, 0 ); - else WIN_SetStyle( hwnd, 0, WS_VISIBLE ); - } - else - NtUserSetWindowPos( hwnd, HWND_TOP, newPos.left, newPos.top, - newPos.right - newPos.left, newPos.bottom - newPos.top, swp ); - - if (cmd == SW_HIDE) - { - HWND hFocus; - - /* FIXME: This will cause the window to be activated irrespective - * of whether it is owned by the same thread. Has to be done - * asynchronously. - */ - - if (hwnd == GetActiveWindow()) - WINPOS_ActivateOtherWindow(hwnd); - - /* Revert focus to parent */ - hFocus = GetFocus(); - if (hwnd == hFocus) - { - HWND parent = NtUserGetAncestor(hwnd, GA_PARENT); - if (parent == GetDesktopWindow()) parent = 0; - NtUserSetFocus( parent ); - } - goto done; - } - - if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) goto done; - - if (wndPtr->flags & WIN_NEED_SIZE) - { - /* should happen only in CreateWindowEx() */ - int wParam = SIZE_RESTORED; - RECT client; - LPARAM lparam; - - WIN_GetRectangles( hwnd, COORDS_PARENT, NULL, &client ); - lparam = MAKELONG( client.right - client.left, client.bottom - client.top ); - wndPtr->flags &= ~WIN_NEED_SIZE; - if (wndPtr->dwStyle & WS_MAXIMIZE) wParam = SIZE_MAXIMIZED; - else if (wndPtr->dwStyle & WS_MINIMIZE) - { - wParam = SIZE_MINIMIZED; - lparam = 0; - } - WIN_ReleasePtr( wndPtr ); - - SendMessageW( hwnd, WM_SIZE, wParam, lparam ); - SendMessageW( hwnd, WM_MOVE, 0, MAKELONG( client.left, client.top )); - } - else WIN_ReleasePtr( wndPtr ); - - /* if previous state was minimized Windows sets focus to the window */ - if (style & WS_MINIMIZE) - { - NtUserSetFocus( hwnd ); - /* Send a WM_ACTIVATE message for a top level window, even if the window is already active */ - if (NtUserGetAncestor( hwnd, GA_ROOT ) == hwnd && !(swp & SWP_NOACTIVATE)) - SendMessageW( hwnd, WM_ACTIVATE, WA_ACTIVE, 0 ); - } - -done: - SetThreadDpiAwarenessContext( context ); - return wasVisible; -} - - -/*********************************************************************** - * ShowWindowAsync (USER32.@) - * - * doesn't wait; returns immediately. - * used by threads to toggle windows in other (possibly hanging) threads - */ -BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd ) -{ - HWND full_handle; - - if (is_broadcast(hwnd)) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - - if ((full_handle = WIN_IsCurrentThread( hwnd ))) - return show_window( full_handle, cmd ); - - return SendNotifyMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); -} - - -/*********************************************************************** - * ShowWindow (USER32.@) - */ -BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) -{ - HWND full_handle; - - if (is_broadcast(hwnd)) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - if ((full_handle = WIN_IsCurrentThread( hwnd ))) - return show_window( full_handle, cmd ); - - if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) - return FALSE; - - if ((cmd == SW_SHOW) && (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) - return TRUE; - - return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); -} - - /*********************************************************************** * GetInternalWindowPos (USER32.@) */ @@ -1190,7 +968,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f wp.rcNormalPosition.bottom - wp.rcNormalPosition.top, SWP_NOZORDER | SWP_NOACTIVATE ); - ShowWindow( hwnd, wndpl->showCmd ); + NtUserShowWindow( hwnd, wndpl->showCmd ); if (IsIconic( hwnd )) { @@ -1237,7 +1015,7 @@ BOOL WINAPI AnimateWindow(HWND hwnd, DWORD dwTime, DWORD dwFlags) return FALSE; } - ShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA)); + NtUserShowWindow( hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA) ); return TRUE; } diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 166c2009dbc..ec8162b0284 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1202,6 +1202,7 @@ static const struct user_driver_funcs lazy_load_driver = .pReleaseDC = nulldrv_ReleaseDC, .pScrollDC = nulldrv_ScrollDC, .pSetFocus = nulldrv_SetFocus, + .pShowWindow = nulldrv_ShowWindow, .pUpdateLayeredWindow = loaderdrv_UpdateLayeredWindow, .pWindowMessage = nulldrv_WindowMessage, /* system parameters */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 69607f0e3de..e47271e6108 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1210,6 +1210,8 @@ static struct unix_funcs unix_funcs = NtUserSetWindowRgn, NtUserSetWindowWord, NtUserShowCursor, + NtUserShowWindow, + NtUserShowWindowAsync, NtUserSystemParametersInfo, NtUserSystemParametersInfoForDpi, NtUserToUnicodeEx, diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index bc82d5e17a3..5cd2cdd0970 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1162,7 +1162,7 @@ HWND get_active_window(void) } /* see GetFocus */ -static HWND get_focus(void) +HWND get_focus(void) { GUITHREADINFO info; info.cbSize = sizeof(info); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 690de6cdf8a..853182b6e94 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -46,6 +46,9 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar case WM_WINE_SETWINDOWPOS: if (is_desktop_window( hwnd )) return 0; return set_window_pos( (WINDOWPOS *)lparam, 0, 0 ); + case WM_WINE_SHOWWINDOW: + if (is_desktop_window( hwnd )) return 0; + return NtUserShowWindow( hwnd, wparam ); case WM_WINE_SETPARENT: if (is_desktop_window( hwnd )) return 0; return HandleToUlong( NtUserSetParent( hwnd, UlongToHandle(wparam) )); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 51f17f63de5..49fd22ca140 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -42,7 +42,6 @@ struct user_callbacks LRESULT (WINAPI *pSendMessageW)( HWND, UINT, WPARAM, LPARAM ); BOOL (WINAPI *pSendNotifyMessageW)( HWND, UINT, WPARAM, LPARAM ); BOOL (WINAPI *pShowCaret)( HWND hwnd ); - BOOL (WINAPI *pShowWindow)( HWND, INT ); DWORD (WINAPI *pWaitForInputIdle)( HANDLE, DWORD ); void (CDECL *free_win_ptr)( struct tagWND *win ); HWND (CDECL *is_menu_active)(void); @@ -278,6 +277,12 @@ HANDLE alloc_user_handle( struct user_object *ptr, unsigned int type ) DECLSPEC_ void *free_user_handle( HANDLE handle, unsigned int type ) DECLSPEC_HIDDEN; void *get_user_handle_ptr( HANDLE handle, unsigned int type ) DECLSPEC_HIDDEN; void release_user_handle_ptr( void *ptr ) DECLSPEC_HIDDEN; +UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) DECLSPEC_HIDDEN; + +static inline UINT win_get_flags( HWND hwnd ) +{ + return win_set_flags( hwnd, 0, 0 ); +} WND *get_win_ptr( HWND hwnd ) DECLSPEC_HIDDEN; BOOL is_child( HWND parent, HWND child ); diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index aacfebd1b15..68348db4033 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1261,8 +1261,8 @@ @ stdcall NtUserShowCursor(long) @ stub NtUserShowScrollBar @ stub NtUserShowSystemCursor -@ stub NtUserShowWindow -@ stub NtUserShowWindowAsync +@ stdcall NtUserShowWindow(long long) +@ stdcall NtUserShowWindowAsync(long long) @ stub NtUserShutdownBlockReasonCreate @ stub NtUserShutdownBlockReasonQuery @ stub NtUserShutdownReasonDestroy diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 2e8a8e3da8e..361bec31ec8 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -258,6 +258,8 @@ struct unix_funcs int (WINAPI *pNtUserSetWindowRgn)( HWND hwnd, HRGN hrgn, BOOL redraw ); WORD (WINAPI *pNtUserSetWindowWord)( HWND hwnd, INT offset, WORD newval ); INT (WINAPI *pNtUserShowCursor)( BOOL show ); + BOOL (WINAPI *pNtUserShowWindow)( HWND hwnd, INT cmd ); + BOOL (WINAPI *pNtUserShowWindowAsync)( HWND hwnd, INT cmd ); BOOL (WINAPI *pNtUserSystemParametersInfo)( UINT action, UINT val, PVOID ptr, UINT winini ); BOOL (WINAPI *pNtUserSystemParametersInfoForDpi)( UINT action, UINT val, PVOID ptr, UINT winini, UINT dpi ); @@ -311,6 +313,7 @@ extern BOOL unhook_windows_hook( INT id, HOOKPROC proc ) DECLSPEC_HIDDEN; extern LONG global_key_state_counter DECLSPEC_HIDDEN; extern HWND get_active_window(void) DECLSPEC_HIDDEN; extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; +extern HWND get_focus(void) DECLSPEC_HIDDEN; extern DWORD get_input_state(void) DECLSPEC_HIDDEN; extern BOOL WINAPI release_capture(void) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; @@ -353,6 +356,7 @@ struct tagWND; extern HDWP begin_defer_window_pos( INT count ) DECLSPEC_HIDDEN; extern void destroy_thread_windows(void) DECLSPEC_HIDDEN; extern LRESULT destroy_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern BOOL get_client_rect( HWND hwnd, RECT *rect ) DECLSPEC_HIDDEN; extern HWND get_desktop_window(void) DECLSPEC_HIDDEN; extern UINT get_dpi_for_window( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND get_full_window_handle( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 1069ace0794..ab69096184c 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -916,6 +916,11 @@ BOOL is_iconic( HWND hwnd ) return (get_window_long( hwnd, GWL_STYLE ) & WS_MINIMIZE) != 0; } +static BOOL is_zoomed( HWND hwnd ) +{ + return (get_window_long( hwnd, GWL_STYLE ) & WS_MAXIMIZE) != 0; +} + static LONG_PTR get_window_long_size( HWND hwnd, INT offset, UINT size, BOOL ansi ) { LONG_PTR retval = 0; @@ -1655,7 +1660,7 @@ BOOL get_window_rect( HWND hwnd, RECT *rect, UINT dpi ) } /* see GetClientRect */ -static BOOL get_client_rect( HWND hwnd, RECT *rect ) +BOOL get_client_rect( HWND hwnd, RECT *rect ) { return get_window_rects( hwnd, COORDS_CLIENT, NULL, rect, get_thread_dpi() ); } @@ -2174,14 +2179,6 @@ BOOL get_window_placement( HWND hwnd, WINDOWPLACEMENT *placement ) return TRUE; } -/***************************************************************************** - * NtUserShowWindow (win32u.@) - */ -BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd ) -{ - return user_callbacks && user_callbacks->pShowWindow( hwnd, cmd ); -} - /***************************************************************************** * NtUserBuildHwndList (win32u.@) */ @@ -3179,7 +3176,7 @@ BOOL WINAPI NtUserEndDeferWindowPosEx( HDWP hdwp, BOOL async ) * * Set the flags of a window and return the previous value. */ -static UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) +UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) { WND *win = get_win_ptr( hwnd ); UINT ret; @@ -3361,6 +3358,255 @@ static MINMAXINFO get_min_max_info( HWND hwnd ) return minmax; } +static POINT get_first_minimized_child_pos( const RECT *parent, const MINIMIZEDMETRICS *mm, + int width, int height ) +{ + POINT ret; + + if (mm->iArrange & ARW_STARTRIGHT) + ret.x = parent->right - mm->iHorzGap - width; + else + ret.x = parent->left + mm->iHorzGap; + if (mm->iArrange & ARW_STARTTOP) + ret.y = parent->top + mm->iVertGap; + else + ret.y = parent->bottom - mm->iVertGap - height; + + return ret; +} + +static void get_next_minimized_child_pos( const RECT *parent, const MINIMIZEDMETRICS *mm, + int width, int height, POINT *pos ) +{ + BOOL next; + + if (mm->iArrange & ARW_UP) /* == ARW_DOWN */ + { + if (mm->iArrange & ARW_STARTTOP) + { + pos->y += height + mm->iVertGap; + if ((next = pos->y + height > parent->bottom)) + pos->y = parent->top + mm->iVertGap; + } + else + { + pos->y -= height + mm->iVertGap; + if ((next = pos->y < parent->top)) + pos->y = parent->bottom - mm->iVertGap - height; + } + + if (next) + { + if (mm->iArrange & ARW_STARTRIGHT) + pos->x -= width + mm->iHorzGap; + else + pos->x += width + mm->iHorzGap; + } + } + else + { + if (mm->iArrange & ARW_STARTRIGHT) + { + pos->x -= width + mm->iHorzGap; + if ((next = pos->x < parent->left)) + pos->x = parent->right - mm->iHorzGap - width; + } + else + { + pos->x += width + mm->iHorzGap; + if ((next = pos->x + width > parent->right)) + pos->x = parent->left + mm->iHorzGap; + } + + if (next) + { + if (mm->iArrange & ARW_STARTTOP) + pos->y += height + mm->iVertGap; + else + pos->y -= height + mm->iVertGap; + } + } +} + +static POINT get_minimized_pos( HWND hwnd, POINT pt ) +{ + RECT rect, parent_rect; + HWND parent, child; + HRGN hrgn, tmp; + MINIMIZEDMETRICS metrics; + int width, height; + + parent = NtUserGetAncestor( hwnd, GA_PARENT ); + if (parent == get_desktop_window()) + { + MONITORINFO mon_info; + HMONITOR monitor = monitor_from_window( hwnd, MONITOR_DEFAULTTOPRIMARY, get_thread_dpi() ); + + mon_info.cbSize = sizeof( mon_info ); + get_monitor_info( monitor, &mon_info ); + parent_rect = mon_info.rcWork; + } + else get_client_rect( parent, &parent_rect ); + + if (pt.x >= parent_rect.left && (pt.x + get_system_metrics( SM_CXMINIMIZED ) < parent_rect.right) && + pt.y >= parent_rect.top && (pt.y + get_system_metrics( SM_CYMINIMIZED ) < parent_rect.bottom)) + return pt; /* The icon already has a suitable position */ + + width = get_system_metrics( SM_CXMINIMIZED ); + height = get_system_metrics( SM_CYMINIMIZED ); + + metrics.cbSize = sizeof(metrics); + NtUserSystemParametersInfo( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); + + /* Check if another icon already occupies this spot */ + /* FIXME: this is completely inefficient */ + + hrgn = NtGdiCreateRectRgn( 0, 0, 0, 0 ); + tmp = NtGdiCreateRectRgn( 0, 0, 0, 0 ); + for (child = get_window_relative( parent, GW_CHILD ); + child; + child = get_window_relative( child, GW_HWNDNEXT )) + { + if (child == hwnd) continue; + if ((get_window_long( child, GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) != (WS_VISIBLE|WS_MINIMIZE)) + continue; + if (get_window_rects( child, COORDS_PARENT, &rect, NULL, get_thread_dpi() )) + { + NtGdiSetRectRgn( tmp, rect.left, rect.top, rect.right, rect.bottom ); + NtGdiCombineRgn( hrgn, hrgn, tmp, RGN_OR ); + } + } + NtGdiDeleteObjectApp( tmp ); + + pt = get_first_minimized_child_pos( &parent_rect, &metrics, width, height ); + for (;;) + { + set_rect( &rect, pt.x, pt.y, pt.x + width, pt.y + height ); + if (!NtGdiRectInRegion( hrgn, &rect )) + break; + + get_next_minimized_child_pos( &parent_rect, &metrics, width, height, &pt ); + } + + NtGdiDeleteObjectApp( hrgn ); + return pt; +} + +/*********************************************************************** + * window_min_maximize + */ +static UINT window_min_maximize( HWND hwnd, UINT cmd, RECT *rect ) +{ + UINT swp_flags = 0; + LONG old_style; + MINMAXINFO minmax; + WINDOWPLACEMENT wpl; + + TRACE( "%p %u\n", hwnd, cmd ); + + wpl.length = sizeof(wpl); + get_window_placement( hwnd, &wpl ); + + if (call_hooks( WH_CBT, HCBT_MINMAX, (WPARAM)hwnd, cmd, TRUE )) + return SWP_NOSIZE | SWP_NOMOVE; + + if (is_iconic( hwnd )) + { + switch (cmd) + { + case SW_SHOWMINNOACTIVE: + case SW_SHOWMINIMIZED: + case SW_FORCEMINIMIZE: + case SW_MINIMIZE: + wpl.ptMinPosition = get_minimized_pos( hwnd, wpl.ptMinPosition ); + + set_rect( rect, wpl.ptMinPosition.x, wpl.ptMinPosition.y, + wpl.ptMinPosition.x + get_system_metrics( SM_CXMINIMIZED ), + wpl.ptMinPosition.y + get_system_metrics( SM_CYMINIMIZED )); + return SWP_NOSIZE | SWP_NOMOVE; + } + if (!send_message( hwnd, WM_QUERYOPEN, 0, 0 )) return SWP_NOSIZE | SWP_NOMOVE; + swp_flags |= SWP_NOCOPYBITS; + } + + switch( cmd ) + { + case SW_SHOWMINNOACTIVE: + case SW_SHOWMINIMIZED: + case SW_FORCEMINIMIZE: + case SW_MINIMIZE: + if (is_zoomed( hwnd )) win_set_flags( hwnd, WIN_RESTORE_MAX, 0 ); + else win_set_flags( hwnd, 0, WIN_RESTORE_MAX ); + + if (get_focus() == hwnd) + { + if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) + NtUserSetFocus( NtUserGetAncestor( hwnd, GA_PARENT )); + else + NtUserSetFocus( 0 ); + } + + old_style = set_window_style( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); + + wpl.ptMinPosition = get_minimized_pos( hwnd, wpl.ptMinPosition ); + + if (!(old_style & WS_MINIMIZE)) swp_flags |= SWP_STATECHANGED; + set_rect( rect, wpl.ptMinPosition.x, wpl.ptMinPosition.y, + wpl.ptMinPosition.x + get_system_metrics(SM_CXMINIMIZED), + wpl.ptMinPosition.y + get_system_metrics(SM_CYMINIMIZED) ); + swp_flags |= SWP_NOCOPYBITS; + break; + + case SW_MAXIMIZE: + old_style = get_window_long( hwnd, GWL_STYLE ); + if ((old_style & WS_MAXIMIZE) && (old_style & WS_VISIBLE)) return SWP_NOSIZE | SWP_NOMOVE; + + minmax = get_min_max_info( hwnd ); + + old_style = set_window_style( hwnd, WS_MAXIMIZE, WS_MINIMIZE ); + if (old_style & WS_MINIMIZE) + win_set_flags( hwnd, WIN_RESTORE_MAX, 0 ); + + if (!(old_style & WS_MAXIMIZE)) swp_flags |= SWP_STATECHANGED; + set_rect( rect, minmax.ptMaxPosition.x, minmax.ptMaxPosition.y, + minmax.ptMaxPosition.x + minmax.ptMaxSize.x, + minmax.ptMaxPosition.y + minmax.ptMaxSize.y ); + break; + + case SW_SHOWNOACTIVATE: + win_set_flags( hwnd, 0, WIN_RESTORE_MAX ); + /* fall through */ + case SW_SHOWNORMAL: + case SW_RESTORE: + case SW_SHOWDEFAULT: /* FIXME: should have its own handler */ + old_style = set_window_style( hwnd, 0, WS_MINIMIZE | WS_MAXIMIZE ); + if (old_style & WS_MINIMIZE) + { + if (win_get_flags( hwnd ) & WIN_RESTORE_MAX) + { + /* Restore to maximized position */ + minmax = get_min_max_info( hwnd ); + set_window_style( hwnd, WS_MAXIMIZE, 0 ); + swp_flags |= SWP_STATECHANGED; + set_rect( rect, minmax.ptMaxPosition.x, minmax.ptMaxPosition.y, + minmax.ptMaxPosition.x + minmax.ptMaxSize.x, + minmax.ptMaxPosition.y + minmax.ptMaxSize.y ); + break; + } + } + else if (!(old_style & WS_MAXIMIZE)) break; + + swp_flags |= SWP_STATECHANGED; + + /* Restore to normal position */ + + *rect = wpl.rcNormalPosition; + break; + } + + return swp_flags; +} + /******************************************************************* * update_window_state * @@ -3387,6 +3633,227 @@ void update_window_state( HWND hwnd ) set_thread_dpi_awareness_context( context ); } +/*********************************************************************** + * show_window + * + * Implementation of ShowWindow and ShowWindowAsync. + */ +static BOOL show_window( HWND hwnd, INT cmd ) +{ + WND *win; + HWND parent; + DPI_AWARENESS_CONTEXT context; + LONG style = get_window_long( hwnd, GWL_STYLE ); + BOOL was_visible = (style & WS_VISIBLE) != 0; + BOOL show_flag = TRUE; + RECT newPos = {0, 0, 0, 0}; + UINT new_swp, swp = 0; + + TRACE( "hwnd=%p, cmd=%d, was_visible %d\n", hwnd, cmd, was_visible ); + + context = set_thread_dpi_awareness_context( get_window_dpi_awareness_context( hwnd )); + + switch(cmd) + { + case SW_HIDE: + if (!was_visible) goto done; + show_flag = FALSE; + swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; + if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; + break; + + case SW_SHOWMINNOACTIVE: + case SW_MINIMIZE: + case SW_FORCEMINIMIZE: /* FIXME: Does not work if thread is hung. */ + swp |= SWP_NOACTIVATE | SWP_NOZORDER; + /* fall through */ + case SW_SHOWMINIMIZED: + swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; + swp |= window_min_maximize( hwnd, cmd, &newPos ); + if ((style & WS_MINIMIZE) && was_visible) goto done; + break; + + case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ + if (!was_visible) swp |= SWP_SHOWWINDOW; + swp |= SWP_FRAMECHANGED; + swp |= window_min_maximize( hwnd, SW_MAXIMIZE, &newPos ); + if ((style & WS_MAXIMIZE) && was_visible) goto done; + break; + + case SW_SHOWNA: + swp |= SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; + if (style & WS_CHILD) swp |= SWP_NOZORDER; + break; + + case SW_SHOW: + if (was_visible) goto done; + swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; + if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; + break; + + case SW_SHOWNOACTIVATE: + swp |= SWP_NOACTIVATE | SWP_NOZORDER; + /* fall through */ + case SW_RESTORE: + /* fall through */ + case SW_SHOWNORMAL: /* same as SW_NORMAL: */ + case SW_SHOWDEFAULT: /* FIXME: should have its own handler */ + if (!was_visible) swp |= SWP_SHOWWINDOW; + if (style & (WS_MINIMIZE | WS_MAXIMIZE)) + { + swp |= SWP_FRAMECHANGED; + swp |= window_min_maximize( hwnd, cmd, &newPos ); + } + else + { + if (was_visible) goto done; + swp |= SWP_NOSIZE | SWP_NOMOVE; + } + if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER; + break; + + default: + goto done; + } + + if ((show_flag != was_visible || cmd == SW_SHOWNA) && cmd != SW_SHOWMAXIMIZED && !(swp & SWP_STATECHANGED)) + { + send_message( hwnd, WM_SHOWWINDOW, show_flag, 0 ); + if (!is_window( hwnd )) goto done; + } + + if (IsRectEmpty( &newPos )) new_swp = swp; + else if ((new_swp = user_driver->pShowWindow( hwnd, cmd, &newPos, swp )) == ~0) + { + if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) new_swp = swp; + else if (is_iconic( hwnd ) && (newPos.left != -32000 || newPos.top != -32000)) + { + offset_rect( &newPos, -32000 - newPos.left, -32000 - newPos.top ); + new_swp = swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE); + } + else new_swp = swp; + } + swp = new_swp; + + parent = NtUserGetAncestor( hwnd, GA_PARENT ); + if (parent && !is_window_visible( parent ) && !(swp & SWP_STATECHANGED)) + { + /* if parent is not visible simply toggle WS_VISIBLE and return */ + if (show_flag) set_window_style( hwnd, WS_VISIBLE, 0 ); + else set_window_style( hwnd, 0, WS_VISIBLE ); + } + else + NtUserSetWindowPos( hwnd, HWND_TOP, newPos.left, newPos.top, + newPos.right - newPos.left, newPos.bottom - newPos.top, swp ); + + if (cmd == SW_HIDE) + { + HWND hFocus; + + /* FIXME: This will cause the window to be activated irrespective + * of whether it is owned by the same thread. Has to be done + * asynchronously. + */ + + if (hwnd == get_active_window()) activate_other_window( hwnd ); + + /* Revert focus to parent */ + hFocus = get_focus(); + if (hwnd == hFocus) + { + HWND parent = NtUserGetAncestor(hwnd, GA_PARENT); + if (parent == get_desktop_window()) parent = 0; + NtUserSetFocus(parent); + } + goto done; + } + + if (!(win = get_win_ptr( hwnd )) || win == WND_OTHER_PROCESS) goto done; + + if (win->flags & WIN_NEED_SIZE) + { + /* should happen only in CreateWindowEx() */ + int wParam = SIZE_RESTORED; + RECT client; + LPARAM lparam; + + get_window_rects( hwnd, COORDS_PARENT, NULL, &client, get_thread_dpi() ); + lparam = MAKELONG( client.right - client.left, client.bottom - client.top ); + win->flags &= ~WIN_NEED_SIZE; + if (win->dwStyle & WS_MAXIMIZE) wParam = SIZE_MAXIMIZED; + else if (win->dwStyle & WS_MINIMIZE) + { + wParam = SIZE_MINIMIZED; + lparam = 0; + } + release_win_ptr( win ); + + send_message( hwnd, WM_SIZE, wParam, lparam ); + send_message( hwnd, WM_MOVE, 0, MAKELONG( client.left, client.top )); + } + else release_win_ptr( win ); + + /* if previous state was minimized Windows sets focus to the window */ + if (style & WS_MINIMIZE) + { + NtUserSetFocus( hwnd ); + /* Send a WM_ACTIVATE message for a top level window, even if the window is already active */ + if (NtUserGetAncestor( hwnd, GA_ROOT ) == hwnd && !(swp & SWP_NOACTIVATE)) + send_message( hwnd, WM_ACTIVATE, WA_ACTIVE, 0 ); + } + +done: + set_thread_dpi_awareness_context( context ); + return was_visible; +} + +/*********************************************************************** + * NtUserShowWindowAsync (win32u.@) + * + * doesn't wait; returns immediately. + * used by threads to toggle windows in other (possibly hanging) threads + */ +BOOL WINAPI NtUserShowWindowAsync( HWND hwnd, INT cmd ) +{ + HWND full_handle; + + if (is_broadcast(hwnd)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if ((full_handle = is_current_thread_window( hwnd ))) + return show_window( full_handle, cmd ); + + return NtUserMessageCall( hwnd, WM_WINE_SHOWWINDOW, cmd, 0, 0, + FNID_SENDNOTIFYMESSAGE, FALSE ); +} + +/*********************************************************************** + * NtUserShowWindow (win32u.@) + */ +BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd ) +{ + HWND full_handle; + + if (is_broadcast(hwnd)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if ((full_handle = is_current_thread_window( hwnd ))) + return show_window( full_handle, cmd ); + + if ((cmd == SW_HIDE) && !(get_window_long( hwnd, GWL_STYLE ) & WS_VISIBLE)) + return FALSE; + + if ((cmd == SW_SHOW) && (get_window_long( hwnd, GWL_STYLE ) & WS_VISIBLE)) + return TRUE; + + return send_message( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); +} + /******************************************************************* * NtUserFlashWindowEx (win32u.@) */ diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index da1957c8c88..6cb3a6896b5 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1075,6 +1075,18 @@ INT WINAPI NtUserShowCursor( BOOL show ) return unix_funcs->pNtUserShowCursor( show ); } +BOOL WINAPI NtUserShowWindowAsync( HWND hwnd, INT cmd ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserShowWindowAsync( hwnd, cmd ); +} + +BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserShowWindow( hwnd, cmd ); +} + BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, PVOID ptr, UINT winini ) { if (!unix_funcs) return FALSE; diff --git a/include/ntuser.h b/include/ntuser.h index 274c0cf31c9..6526d190e28 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -422,6 +422,7 @@ HWINEVENTHOOK WINAPI NtUserSetWinEventHook( DWORD event_min, DWORD event_max, HM DWORD pid, DWORD tid, DWORD flags ); INT WINAPI NtUserShowCursor( BOOL show ); BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd ); +BOOL WINAPI NtUserShowWindowAsync( HWND hwnd, INT cmd ); BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT winini ); BOOL WINAPI NtUserSystemParametersInfoForDpi( UINT action, UINT val, PVOID ptr, UINT winini, UINT dpi ); INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, -- 2.23.0

1 0

[PATCH v2 3/5] win32u: Move get_min_max_info implementation from user32.
by Huw Davies 17 Mar '22

17 Mar '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/user_main.c | 1 + dlls/user32/winpos.c | 92 ++-------------------------------- dlls/win32u/menu.c | 6 +++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u_private.h | 3 ++ dlls/win32u/window.c | 97 ++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 7 files changed, 113 insertions(+), 88 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index bc0dec6b579..15293d76c41 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -154,6 +154,7 @@ static void CDECL free_win_ptr( WND *win ) static const struct user_callbacks user_funcs = { + AdjustWindowRectEx, CopyImage, DestroyCaret, DestroyMenu, diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index b3e8aff3cfa..1951f887351 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -48,8 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); (((style) & WS_THICKFRAME) && \ !(((style) & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME)) -#define EMPTYPOINT(pt) ((pt).x == -1 && (pt).y == -1) - #define ON_LEFT_BORDER(hit) \ (((hit) == HTLEFT) || ((hit) == HTTOPLEFT) || ((hit) == HTBOTTOMLEFT)) #define ON_RIGHT_BORDER(hit) \ @@ -548,94 +546,12 @@ static BOOL get_work_rect( HWND hwnd, RECT *rect ) */ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) { - DPI_AWARENESS_CONTEXT context; - RECT rc_work, rc_primary; - MINMAXINFO MinMax; - INT xinc, yinc; - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); - LONG adjustedStyle; - LONG exstyle = GetWindowLongW( hwnd, GWL_EXSTYLE ); - RECT rc; - WND *win; - - context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); - - /* Compute default values */ - - GetWindowRect(hwnd, &rc); - MinMax.ptReserved.x = rc.left; - MinMax.ptReserved.y = rc.top; - - if ((style & WS_CAPTION) == WS_CAPTION) - adjustedStyle = style & ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ - else - adjustedStyle = style; - - GetClientRect(NtUserGetAncestor(hwnd,GA_PARENT), &rc); - AdjustWindowRectEx(&rc, adjustedStyle, ((style & WS_POPUP) && GetMenu(hwnd)), exstyle); - - xinc = -rc.left; - yinc = -rc.top; - - MinMax.ptMaxSize.x = rc.right - rc.left; - MinMax.ptMaxSize.y = rc.bottom - rc.top; - if (style & (WS_DLGFRAME | WS_BORDER)) - { - MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK); - MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); - } - else - { - MinMax.ptMinTrackSize.x = 2 * xinc; - MinMax.ptMinTrackSize.y = 2 * yinc; - } - MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); - MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); - MinMax.ptMaxPosition.x = -xinc; - MinMax.ptMaxPosition.y = -yinc; - - if ((win = WIN_GetPtr( hwnd )) && win != WND_DESKTOP && win != WND_OTHER_PROCESS) - { - if (!EMPTYPOINT(win->max_pos)) MinMax.ptMaxPosition = win->max_pos; - WIN_ReleasePtr( win ); - } - - SendMessageW( hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax ); - - /* if the app didn't change the values, adapt them for the current monitor */ - - if (get_work_rect( hwnd, &rc_work )) - { - rc_primary = get_primary_monitor_rect(); - if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && - MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc) - { - MinMax.ptMaxSize.x = (rc_work.right - rc_work.left) + 2 * xinc; - MinMax.ptMaxSize.y = (rc_work.bottom - rc_work.top) + 2 * yinc; - } - if (MinMax.ptMaxPosition.x == -xinc && MinMax.ptMaxPosition.y == -yinc) - { - MinMax.ptMaxPosition.x = rc_work.left - xinc; - MinMax.ptMaxPosition.y = rc_work.top - yinc; - } - } - - /* Some sanity checks */ - - TRACE("%d %d / %d %d / %d %d / %d %d\n", - MinMax.ptMaxSize.x, MinMax.ptMaxSize.y, - MinMax.ptMaxPosition.x, MinMax.ptMaxPosition.y, - MinMax.ptMaxTrackSize.x, MinMax.ptMaxTrackSize.y, - MinMax.ptMinTrackSize.x, MinMax.ptMinTrackSize.y); - MinMax.ptMaxTrackSize.x = max( MinMax.ptMaxTrackSize.x, - MinMax.ptMinTrackSize.x ); - MinMax.ptMaxTrackSize.y = max( MinMax.ptMaxTrackSize.y, - MinMax.ptMinTrackSize.y ); - - SetThreadDpiAwarenessContext( context ); - return MinMax; + MINMAXINFO info; + NtUserCallHwndParam( hwnd, (UINT_PTR)&info, NtUserGetMinMaxInfo ); + return info; } + static POINT get_first_minimized_child_pos( const RECT *parent, const MINIMIZEDMETRICS *mm, int width, int height ) { diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 1e8410d347e..921c5752536 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -106,6 +106,12 @@ BOOL WINAPI NtUserDestroyAcceleratorTable( HACCEL handle ) return TRUE; } +/* see GetMenu */ +HMENU get_menu( HWND hwnd ) +{ + return UlongToHandle( get_window_long( hwnd, GWLP_ID )); +} + /********************************************************************** * NtUserDestroyMenu (win32u.@) */ diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index b3cafe791df..51f17f63de5 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -30,6 +30,7 @@ struct tagWND; struct user_callbacks { + BOOL (WINAPI *pAdjustWindowRectEx)( RECT *, DWORD, BOOL, DWORD ); HANDLE (WINAPI *pCopyImage)( HANDLE, UINT, INT, INT, UINT ); BOOL (WINAPI *pDestroyCaret)(void); BOOL (WINAPI *pDestroyMenu)( HMENU ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 83b0e093a20..2e8a8e3da8e 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -316,6 +316,9 @@ extern BOOL WINAPI release_capture(void) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; +/* menu.c */ +extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN; + /* message.c */ extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) DECLSPEC_HIDDEN; extern LRESULT post_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index f8d147b785c..1069ace0794 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3267,6 +3267,100 @@ static void send_parent_notify( HWND hwnd, UINT msg ) } } +/******************************************************************* + * get_min_max_info + * + * Get the minimized and maximized information for a window. + */ +static MINMAXINFO get_min_max_info( HWND hwnd ) +{ + LONG style = get_window_long( hwnd, GWL_STYLE ); + LONG exstyle = get_window_long( hwnd, GWL_EXSTYLE ); + DPI_AWARENESS_CONTEXT context; + RECT rc_work, rc_primary; + LONG adjusted_style; + MINMAXINFO minmax; + INT xinc, yinc; + RECT rc; + WND *win; + + context = set_thread_dpi_awareness_context( get_window_dpi_awareness_context( hwnd )); + + /* Compute default values */ + + get_window_rect( hwnd, &rc, get_thread_dpi() ); + minmax.ptReserved.x = rc.left; + minmax.ptReserved.y = rc.top; + + if ((style & WS_CAPTION) == WS_CAPTION) + adjusted_style = style & ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ + else + adjusted_style = style; + + get_client_rect( NtUserGetAncestor( hwnd, GA_PARENT ), &rc ); + if (user_callbacks) + user_callbacks->pAdjustWindowRectEx( &rc, adjusted_style, + (style & WS_POPUP) && get_menu( hwnd ), exstyle); + + xinc = -rc.left; + yinc = -rc.top; + + minmax.ptMaxSize.x = rc.right - rc.left; + minmax.ptMaxSize.y = rc.bottom - rc.top; + if (style & (WS_DLGFRAME | WS_BORDER)) + { + minmax.ptMinTrackSize.x = get_system_metrics( SM_CXMINTRACK ); + minmax.ptMinTrackSize.y = get_system_metrics( SM_CYMINTRACK ); + } + else + { + minmax.ptMinTrackSize.x = 2 * xinc; + minmax.ptMinTrackSize.y = 2 * yinc; + } + minmax.ptMaxTrackSize.x = get_system_metrics( SM_CXMAXTRACK ); + minmax.ptMaxTrackSize.y = get_system_metrics( SM_CYMAXTRACK ); + minmax.ptMaxPosition.x = -xinc; + minmax.ptMaxPosition.y = -yinc; + + if ((win = get_win_ptr( hwnd )) && win != WND_DESKTOP && win != WND_OTHER_PROCESS) + { + if (!empty_point( win->max_pos )) minmax.ptMaxPosition = win->max_pos; + release_win_ptr( win ); + } + + send_message( hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&minmax ); + + /* if the app didn't change the values, adapt them for the current monitor */ + + if (get_work_rect( hwnd, &rc_work )) + { + rc_primary = get_primary_monitor_rect( get_thread_dpi() ); + if (minmax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && + minmax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc) + { + minmax.ptMaxSize.x = (rc_work.right - rc_work.left) + 2 * xinc; + minmax.ptMaxSize.y = (rc_work.bottom - rc_work.top) + 2 * yinc; + } + if (minmax.ptMaxPosition.x == -xinc && minmax.ptMaxPosition.y == -yinc) + { + minmax.ptMaxPosition.x = rc_work.left - xinc; + minmax.ptMaxPosition.y = rc_work.top - yinc; + } + } + + TRACE( "%d %d / %d %d / %d %d / %d %d\n", + minmax.ptMaxSize.x, minmax.ptMaxSize.y, + minmax.ptMaxPosition.x, minmax.ptMaxPosition.y, + minmax.ptMaxTrackSize.x, minmax.ptMaxTrackSize.y, + minmax.ptMinTrackSize.x, minmax.ptMinTrackSize.y ); + + minmax.ptMaxTrackSize.x = max( minmax.ptMaxTrackSize.x, minmax.ptMinTrackSize.x ); + minmax.ptMaxTrackSize.y = max( minmax.ptMaxTrackSize.y, minmax.ptMinTrackSize.y ); + + set_thread_dpi_awareness_context( context ); + return minmax; +} + /******************************************************************* * update_window_state * @@ -3671,6 +3765,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return get_class_word( hwnd, param ); case NtUserGetClientRect: return get_client_rect( hwnd, (RECT *)param ); + case NtUserGetMinMaxInfo: + *(MINMAXINFO *)param = get_min_max_info( hwnd ); + return 0; case NtUserGetWindowInfo: return get_window_info( hwnd, (WINDOWINFO *)param ); case NtUserGetWindowLongA: diff --git a/include/ntuser.h b/include/ntuser.h index de958caa735..274c0cf31c9 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -167,6 +167,7 @@ enum NtUserGetClassLongPtrW, NtUserGetClassWord, NtUserGetClientRect, + NtUserGetMinMaxInfo, NtUserGetWindowInfo, NtUserGetWindowLongA, NtUserGetWindowLongW, -- 2.23.0

1 0

[PATCH v2 2/5] win32u: Move NtUserDestroyWindow implementation from user32.
by Huw Davies 17 Mar '22

17 Mar '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/clipboard.c | 23 --- dlls/user32/combo.c | 2 +- dlls/user32/dde_misc.c | 6 +- dlls/user32/dde_server.c | 2 +- dlls/user32/defwnd.c | 2 +- dlls/user32/dialog.c | 4 +- dlls/user32/driver.c | 7 +- dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 8 +- dlls/user32/message.c | 2 - dlls/user32/msgbox.c | 70 ++++---- dlls/user32/painting.c | 12 -- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 10 ++ dlls/user32/win.c | 248 +-------------------------- dlls/user32/win.h | 1 - dlls/win32u/clipboard.c | 25 +++ dlls/win32u/driver.c | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 2 + dlls/win32u/ntuser_private.h | 4 + dlls/win32u/sysparams.c | 18 +- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 6 + dlls/win32u/window.c | 315 +++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 + include/ntuser.h | 4 +- 27 files changed, 440 insertions(+), 345 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 1a69421ea17..b45ddf9c7c0 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -616,29 +616,6 @@ static HANDLE render_synthesized_format( UINT format, UINT from ) return data; } -/************************************************************************** - * CLIPBOARD_ReleaseOwner - */ -void CLIPBOARD_ReleaseOwner( HWND hwnd ) -{ - HWND viewer = 0, owner = 0; - - SendMessageW( hwnd, WM_RENDERALLFORMATS, 0, 0 ); - - SERVER_START_REQ( release_clipboard ) - { - req->owner = wine_server_user_handle( hwnd ); - if (!wine_server_call( req )) - { - viewer = wine_server_ptr_handle( reply->viewer ); - owner = wine_server_ptr_handle( reply->owner ); - } - } - SERVER_END_REQ; - - if (viewer) SendNotifyMessageW( viewer, WM_DRAWCLIPBOARD, (WPARAM)owner, 0 ); -} - /************************************************************************** * RegisterClipboardFormatW (USER32.@) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 77cb24be064..b375de5080c 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -173,7 +173,7 @@ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc ) TRACE("[%p]: freeing storage\n", lphc->self); if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) - DestroyWindow( lphc->hWndLBox ); + NtUserDestroyWindow( lphc->hWndLBox ); SetWindowLongPtrW( lphc->self, 0, 0 ); HeapFree( GetProcessHeap(), 0, lphc ); diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 41181d099cc..7bc1656432e 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -1158,7 +1158,7 @@ BOOL WINAPI DdeUninitialize(DWORD idInst) */ WDML_FreeAllHSZ(pInstance); - DestroyWindow(pInstance->hwndEvent); + NtUserDestroyWindow( pInstance->hwndEvent ); /* OK now delete the instance handle itself */ @@ -1711,7 +1711,7 @@ void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) pPrev->next = pServer->next; } - DestroyWindow(pServer->hwndServer); + NtUserDestroyWindow(pServer->hwndServer); WDML_DecHSZ(pInstance, pServer->hszServiceSpec); WDML_DecHSZ(pInstance, pServer->hszService); @@ -2105,7 +2105,7 @@ void WDML_RemoveConv(WDML_CONV* pRef, WDML_SIDE side) hWnd = (side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer; SetWindowLongPtrW(hWnd, GWL_WDML_CONVERSATION, 0); - DestroyWindow((side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer); + NtUserDestroyWindow((side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer); WDML_DecHSZ(pRef->instance, pRef->hszService); WDML_DecHSZ(pRef->instance, pRef->hszTopic); diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index 3867e0f014b..26494b835e5 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -360,7 +360,7 @@ static WDML_CONV* WDML_CreateServerConv(WDML_INSTANCE* pInstance, HWND hwndClien } else { - DestroyWindow(hwndServerConv); + NtUserDestroyWindow(hwndServerConv); } return pConv; } diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index f78236cb194..271644bb953 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -400,7 +400,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return 0; case WM_CLOSE: - DestroyWindow( hwnd ); + NtUserDestroyWindow( hwnd ); return 0; case WM_MOUSEACTIVATE: diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index e6e5b91587c..f9d388d0104 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -707,7 +707,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, return hwnd; } if (disabled_owner) EnableWindow( disabled_owner, TRUE ); - if( IsWindow(hwnd) ) DestroyWindow( hwnd ); + if (IsWindow(hwnd)) NtUserDestroyWindow( hwnd ); return 0; } @@ -827,7 +827,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) } } retval = dlgInfo->idResult; - DestroyWindow( hwnd ); + NtUserDestroyWindow( hwnd ); return retval; } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 72ea5ad17bd..ada0b8ca2f7 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -79,10 +79,6 @@ static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) return TRUE; } -static void CDECL nulldrv_DestroyWindow( HWND hwnd ) -{ -} - static DWORD CDECL nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { @@ -174,7 +170,7 @@ static struct user_driver_funcs lazy_load_driver = /* windowing functions */ NULL, loaderdrv_CreateWindow, - nulldrv_DestroyWindow, + NULL, NULL, NULL, nulldrv_MsgWaitForMultipleObjectsEx, @@ -223,7 +219,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v SET_USER_FUNC(SetCursorPos); SET_USER_FUNC(UpdateClipboard); SET_USER_FUNC(CreateWindow); - SET_USER_FUNC(DestroyWindow); SET_USER_FUNC(MsgWaitForMultipleObjectsEx); SET_USER_FUNC(SetWindowIcon); SET_USER_FUNC(SetWindowText); diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 6bab3e96adf..3d85487f808 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -580,7 +580,7 @@ static LRESULT MDIDestroyChild( HWND client, MDICLIENTINFO *ci, { SendMessageW(client, WM_MDIREFRESHMENU, 0, 0); MDI_PostUpdate(GetParent(child), ci, SB_BOTH+1); - DestroyWindow(child); + NtUserDestroyWindow(child); } TRACE("child destroyed - %p\n", child); diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 1d680009747..113e6103cd9 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2333,7 +2333,7 @@ static void MENU_HideSubPopups( HWND hwndOwner, HMENU hmenu, if (!(submenu = MENU_GetMenu( hsubmenu ))) return; MENU_HideSubPopups( hwndOwner, hsubmenu, FALSE, wFlags ); MENU_SelectItem( hwndOwner, hsubmenu, NO_SELECTED_ITEM, sendMenuSelect, 0 ); - DestroyWindow( submenu->hWnd ); + NtUserDestroyWindow( submenu->hWnd ); submenu->hWnd = 0; if (!(wFlags & TPM_NONOTIFY)) @@ -3319,7 +3319,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if (menu && (menu->wFlags & MF_POPUP)) { - DestroyWindow( menu->hWnd ); + NtUserDestroyWindow( menu->hWnd ); menu->hWnd = 0; if (!(wFlags & TPM_NONOTIFY)) @@ -3531,7 +3531,7 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, if (menu->hWnd) { - DestroyWindow( menu->hWnd ); + NtUserDestroyWindow( menu->hWnd ); menu->hWnd = 0; if (!(wFlags & TPM_NONOTIFY)) @@ -4269,7 +4269,7 @@ BOOL WINAPI DestroyMenu( HMENU hMenu ) /* DestroyMenu should not destroy system menu popup owner */ if ((lppop->wFlags & (MF_POPUP | MF_SYSMENU)) == MF_POPUP && lppop->hWnd) { - DestroyWindow( lppop->hWnd ); + NtUserDestroyWindow( lppop->hWnd ); lppop->hWnd = 0; } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 365f703c56e..0ba540d2e5d 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1859,8 +1859,6 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar { switch(msg) { - case WM_WINE_DESTROYWINDOW: - return WIN_DestroyWindow( hwnd ); case WM_WINE_SHOWWINDOW: if (is_desktop_window( hwnd )) return 0; return ShowWindow( hwnd, wparam ); diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 195bab2384b..c74d33092f0 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -116,57 +116,57 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) hItem = 0; switch(lpmb->dwStyle & MB_TYPEMASK) { case MB_OK: - DestroyWindow(GetDlgItem(hwnd, IDCANCEL)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDCANCEL)); /* fall through */ case MB_OKCANCEL: hItem = GetDlgItem(hwnd, IDOK); - DestroyWindow(GetDlgItem(hwnd, IDABORT)); - DestroyWindow(GetDlgItem(hwnd, IDRETRY)); - DestroyWindow(GetDlgItem(hwnd, IDIGNORE)); - DestroyWindow(GetDlgItem(hwnd, IDYES)); - DestroyWindow(GetDlgItem(hwnd, IDNO)); - DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN)); - DestroyWindow(GetDlgItem(hwnd, IDCONTINUE)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDABORT)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDRETRY)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDIGNORE)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDYES)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDNO)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDCONTINUE)); break; case MB_ABORTRETRYIGNORE: hItem = GetDlgItem(hwnd, IDABORT); - DestroyWindow(GetDlgItem(hwnd, IDOK)); - DestroyWindow(GetDlgItem(hwnd, IDCANCEL)); - DestroyWindow(GetDlgItem(hwnd, IDYES)); - DestroyWindow(GetDlgItem(hwnd, IDNO)); - DestroyWindow(GetDlgItem(hwnd, IDCONTINUE)); - DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDOK)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDCANCEL)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDYES)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDNO)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDCONTINUE)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN)); break; case MB_YESNO: - DestroyWindow(GetDlgItem(hwnd, IDCANCEL)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDCANCEL)); /* fall through */ case MB_YESNOCANCEL: hItem = GetDlgItem(hwnd, IDYES); - DestroyWindow(GetDlgItem(hwnd, IDOK)); - DestroyWindow(GetDlgItem(hwnd, IDABORT)); - DestroyWindow(GetDlgItem(hwnd, IDRETRY)); - DestroyWindow(GetDlgItem(hwnd, IDIGNORE)); - DestroyWindow(GetDlgItem(hwnd, IDCONTINUE)); - DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDOK)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDABORT)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDRETRY)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDIGNORE)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDCONTINUE)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN)); break; case MB_RETRYCANCEL: hItem = GetDlgItem(hwnd, IDRETRY); - DestroyWindow(GetDlgItem(hwnd, IDOK)); - DestroyWindow(GetDlgItem(hwnd, IDABORT)); - DestroyWindow(GetDlgItem(hwnd, IDIGNORE)); - DestroyWindow(GetDlgItem(hwnd, IDYES)); - DestroyWindow(GetDlgItem(hwnd, IDNO)); - DestroyWindow(GetDlgItem(hwnd, IDCONTINUE)); - DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDOK)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDABORT)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDIGNORE)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDYES)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDNO)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDCONTINUE)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN)); break; case MB_CANCELTRYCONTINUE: hItem = GetDlgItem(hwnd, IDCANCEL); - DestroyWindow(GetDlgItem(hwnd, IDOK)); - DestroyWindow(GetDlgItem(hwnd, IDABORT)); - DestroyWindow(GetDlgItem(hwnd, IDIGNORE)); - DestroyWindow(GetDlgItem(hwnd, IDYES)); - DestroyWindow(GetDlgItem(hwnd, IDNO)); - DestroyWindow(GetDlgItem(hwnd, IDRETRY)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDOK)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDABORT)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDIGNORE)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDYES)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDNO)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDRETRY)); } if (hItem) SetWindowLongW(hItem, GWL_STYLE, GetWindowLongW(hItem, GWL_STYLE) | WS_GROUP); @@ -202,7 +202,7 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Remove Help button unless MB_HELP supplied */ if (!(lpmb->dwStyle & MB_HELP)) { - DestroyWindow(GetDlgItem(hwnd, IDHELP)); + NtUserDestroyWindow(GetDlgItem(hwnd, IDHELP)); } /* Position everything */ diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 8722cb68f12..ee9d23b1f71 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -35,18 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -/*********************************************************************** - * free_dce - * - * Free a class or window DCE. - */ -void free_dce( struct dce *dce, HWND hwnd ) -{ - /* FIXME: move callers to win32u */ - NtUserCallTwoParam( (UINT_PTR)dce, HandleToUlong(hwnd), NtUserFreeDCE ); -} - - /*********************************************************************** * invalidate_dce * diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 7c27d9400db..cb18d9415c9 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -161,7 +161,7 @@ @ stdcall DestroyIcon(long) @ stdcall DestroyMenu(long) # @ stub DestroyReasons -@ stdcall DestroyWindow(long) +@ stdcall DestroyWindow(long) NtUserDestroyWindow # @ stub DeviceEventWorker @ stdcall DialogBoxIndirectParamA(long ptr long ptr long) @ stdcall DialogBoxIndirectParamAorW(long ptr long ptr long long) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index ff9b469dae6..bc0dec6b579 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -140,6 +140,11 @@ static void CDECL notify_ime( HWND hwnd, UINT param ) if (ime_default) SendMessageW( ime_default, WM_IME_INTERNAL, param, HandleToUlong(hwnd) ); } +void WINAPI unregister_imm( HWND hwnd ) +{ + imm_unregister_window( hwnd ); +} + static void CDECL free_win_ptr( WND *win ) { HeapFree( GetProcessHeap(), 0, win->text ); @@ -150,7 +155,9 @@ static void CDECL free_win_ptr( WND *win ) static const struct user_callbacks user_funcs = { CopyImage, + DestroyCaret, DestroyMenu, + EndMenu, HideCaret, PostMessageW, SendInput, @@ -161,12 +168,14 @@ static const struct user_callbacks user_funcs = ShowWindow, WaitForInputIdle, free_win_ptr, + MENU_IsMenuActive, notify_ime, register_builtin_classes, MSG_SendInternalMessageTimeout, SCROLL_SetStandardScrollPainted, (void *)__wine_set_user_driver, set_window_pos, + unregister_imm, }; static void WINAPI User32CallFreeIcon( ULONG *param, ULONG size ) @@ -227,6 +236,7 @@ static void thread_detach(void) struct user_thread_info *thread_info = get_user_thread_info(); exiting_thread_id = GetCurrentThreadId(); + NtUserCallNoParam( NtUserExitingThread ); WDML_NotifyThreadDetach(); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b57d6bd7566..b0e6b33eb56 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -558,38 +558,6 @@ HWND WIN_GetFullHandle( HWND hwnd ) } -/*********************************************************************** - * WIN_SetOwner - * - * Change the owner of a window. - */ -static HWND WIN_SetOwner( HWND hwnd, HWND owner ) -{ - WND *win = WIN_GetPtr( hwnd ); - HWND ret = 0; - - if (!win || win == WND_DESKTOP) return 0; - if (win == WND_OTHER_PROCESS) - { - if (IsWindow(hwnd)) ERR( "cannot set owner %p on other process window %p\n", owner, hwnd ); - return 0; - } - SERVER_START_REQ( set_window_owner ) - { - req->handle = wine_server_user_handle( hwnd ); - req->owner = wine_server_user_handle( owner ); - if (!wine_server_call( req )) - { - win->owner = wine_server_ptr_handle( reply->full_owner ); - ret = wine_server_ptr_handle( reply->prev_owner ); - } - } - SERVER_END_REQ; - WIN_ReleasePtr( win ); - return ret; -} - - /*********************************************************************** * WIN_SetStyle * @@ -739,87 +707,6 @@ other_process: } -/*********************************************************************** - * WIN_DestroyWindow - * - * Destroy storage associated to a window. "Internals" p.358 - */ -LRESULT WIN_DestroyWindow( HWND hwnd ) -{ - WND *wndPtr; - HWND *list; - HMENU menu = 0, sys_menu; - struct window_surface *surface; - - TRACE("%p\n", hwnd ); - - /* destroy default IME window */ - if (win_set_flags( hwnd, 0, WIN_HAS_IME_WIN ) & WIN_HAS_IME_WIN) - { - TRACE("unregister IME window for %p\n", hwnd); - imm_unregister_window( hwnd ); - } - - /* free child windows */ - if ((list = WIN_ListChildren( hwnd ))) - { - int i; - for (i = 0; list[i]; i++) - { - if (WIN_IsCurrentThread( list[i] )) WIN_DestroyWindow( list[i] ); - else SendNotifyMessageW( list[i], WM_WINE_DESTROYWINDOW, 0, 0 ); - } - HeapFree( GetProcessHeap(), 0, list ); - } - - /* Unlink now so we won't bother with the children later on */ - SERVER_START_REQ( set_parent ) - { - req->handle = wine_server_user_handle( hwnd ); - req->parent = 0; - wine_server_call( req ); - } - SERVER_END_REQ; - - /* - * Send the WM_NCDESTROY to the window being destroyed. - */ - SendMessageW( hwnd, WM_NCDESTROY, 0, 0 ); - - /* FIXME: do we need to fake QS_MOUSEMOVE wakebit? */ - - /* free resources associated with the window */ - - if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return 0; - if ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) - menu = (HMENU)wndPtr->wIDmenu; - sys_menu = wndPtr->hSysMenu; - free_dce( wndPtr->dce, hwnd ); - wndPtr->dce = NULL; - HeapFree( GetProcessHeap(), 0, wndPtr->text ); - wndPtr->text = NULL; - HeapFree( GetProcessHeap(), 0, wndPtr->pScroll ); - wndPtr->pScroll = NULL; - DestroyIcon( wndPtr->hIconSmall2 ); - surface = wndPtr->surface; - wndPtr->surface = NULL; - WIN_ReleasePtr( wndPtr ); - - if (menu) DestroyMenu( menu ); - if (sys_menu) DestroyMenu( sys_menu ); - if (surface) - { - register_window_surface( surface, NULL ); - window_surface_release( surface ); - } - - USER_Driver->pDestroyWindow( hwnd ); - - free_window_handle( hwnd ); - return 0; -} - - /*********************************************************************** * WIN_FixCoordinates * @@ -1435,7 +1322,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, return hwnd; failed: - WIN_DestroyWindow( hwnd ); + NtUserCallHwnd( hwnd, NtUserDestroyWindowHandle ); SetThreadDpiAwarenessContext( context ); return 0; } @@ -1506,139 +1393,6 @@ HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExW( DWORD exStyle, LPCWSTR className, } -/*********************************************************************** - * WIN_SendDestroyMsg - */ -static void WIN_SendDestroyMsg( HWND hwnd ) -{ - GUITHREADINFO info; - - info.cbSize = sizeof(info); - if (NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info )) - { - if (hwnd == info.hwndCaret) DestroyCaret(); - if (hwnd == info.hwndActive) WINPOS_ActivateOtherWindow( hwnd ); - } - - if (hwnd == NtUserGetClipboardOwner()) CLIPBOARD_ReleaseOwner( hwnd ); - - /* - * Send the WM_DESTROY to the window. - */ - SendMessageW( hwnd, WM_DESTROY, 0, 0); - - /* - * This WM_DESTROY message can trigger re-entrant calls to DestroyWindow - * make sure that the window still exists when we come back. - */ - if (IsWindow(hwnd)) - { - HWND* pWndArray; - int i; - - if (!(pWndArray = WIN_ListChildren( hwnd ))) return; - - for (i = 0; pWndArray[i]; i++) - { - if (IsWindow( pWndArray[i] )) WIN_SendDestroyMsg( pWndArray[i] ); - } - HeapFree( GetProcessHeap(), 0, pWndArray ); - } - else - WARN("\tdestroyed itself while in WM_DESTROY!\n"); -} - - -/*********************************************************************** - * DestroyWindow (USER32.@) - */ -BOOL WINAPI DestroyWindow( HWND hwnd ) -{ - BOOL is_child; - - if (!(hwnd = WIN_IsCurrentThread( hwnd )) || is_desktop_window( hwnd )) - { - SetLastError( ERROR_ACCESS_DENIED ); - return FALSE; - } - - TRACE("(%p)\n", hwnd); - - /* Call hooks */ - - if (HOOK_CallHooks( WH_CBT, HCBT_DESTROYWND, (WPARAM)hwnd, 0, TRUE )) return FALSE; - - if (MENU_IsMenuActive() == hwnd) - EndMenu(); - - is_child = (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) != 0; - - if (is_child) - { - if (!USER_IsExitingThread( GetCurrentThreadId() )) - send_parent_notify( hwnd, WM_DESTROY ); - } - else if (!GetWindow( hwnd, GW_OWNER )) - { - HOOK_CallHooks( WH_SHELL, HSHELL_WINDOWDESTROYED, (WPARAM)hwnd, 0L, TRUE ); - /* FIXME: clean up palette - see "Internals" p.352 */ - } - - if (!IsWindow(hwnd)) return TRUE; - - /* Hide the window */ - if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE) - { - /* Only child windows receive WM_SHOWWINDOW in DestroyWindow() */ - if (is_child) - ShowWindow( hwnd, SW_HIDE ); - else - NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW ); - } - - if (!IsWindow(hwnd)) return TRUE; - - /* Recursively destroy owned windows */ - - if (!is_child) - { - for (;;) - { - int i; - BOOL got_one = FALSE; - HWND *list = WIN_ListChildren( GetDesktopWindow() ); - if (list) - { - for (i = 0; list[i]; i++) - { - if (GetWindow( list[i], GW_OWNER ) != hwnd) continue; - if (WIN_IsCurrentThread( list[i] )) - { - DestroyWindow( list[i] ); - got_one = TRUE; - continue; - } - WIN_SetOwner( list[i], 0 ); - } - HeapFree( GetProcessHeap(), 0, list ); - } - if (!got_one) break; - } - } - - /* Send destroy messages */ - - WIN_SendDestroyMsg( hwnd ); - if (!IsWindow( hwnd )) return TRUE; - - /* Destroy the window storage */ - - WIN_DestroyWindow( hwnd ); - return TRUE; -} - - /*********************************************************************** * CloseWindow (USER32.@) */ diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 3e6885ab090..89e91a255f9 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -45,7 +45,6 @@ extern HWND WIN_IsCurrentThread( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) DECLSPEC_HIDDEN; extern ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN; extern BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWindow, RECT *rectClient ) DECLSPEC_HIDDEN; -extern LRESULT WIN_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) DECLSPEC_HIDDEN; extern BOOL WIN_IsWindowDrawable( HWND hwnd, BOOL ) DECLSPEC_HIDDEN; extern HWND *WIN_ListChildren( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index e132f981344..585a2aae631 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -288,3 +288,28 @@ BOOL WINAPI NtUserRemoveClipboardFormatListener( HWND hwnd ) SERVER_END_REQ; return ret; } + +/************************************************************************** + * release_clipboard_owner + */ +void release_clipboard_owner( HWND hwnd ) +{ + HWND viewer = 0, owner = 0; + + send_message( hwnd, WM_RENDERALLFORMATS, 0, 0 ); + + SERVER_START_REQ( release_clipboard ) + { + req->owner = wine_server_user_handle( hwnd ); + if (!wine_server_call( req )) + { + viewer = wine_server_ptr_handle( reply->viewer ); + owner = wine_server_ptr_handle( reply->owner ); + } + } + SERVER_END_REQ; + + if (viewer) + NtUserMessageCall( viewer, WM_DRAWCLIPBOARD, (WPARAM)owner, 0, + 0, FNID_SENDNOTIFYMESSAGE, FALSE ); +} diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index afe44e1c4a3..166c2009dbc 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1190,6 +1190,7 @@ static const struct user_driver_funcs lazy_load_driver = .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, /* windowing functions */ .pCreateDesktopWindow = loaderdrv_CreateDesktopWindow, + .pDestroyWindow = nulldrv_DestroyWindow, .pFlashWindowEx = loaderdrv_FlashWindowEx, .pGetDC = loaderdrv_GetDC, .pSetCapture = nulldrv_SetCapture, diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index adb162ab7ff..69607f0e3de 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1162,6 +1162,7 @@ static struct unix_funcs unix_funcs = NtUserCountClipboardFormats, NtUserDeferWindowPosAndBand, NtUserDestroyCursor, + NtUserDestroyWindow, NtUserDrawIconEx, NtUserEndDeferWindowPosEx, NtUserEndPaint, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index d00178e6aa4..690de6cdf8a 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -41,6 +41,8 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar { switch(msg) { + case WM_WINE_DESTROYWINDOW: + return destroy_window( hwnd ); case WM_WINE_SETWINDOWPOS: if (is_desktop_window( hwnd )) return 0; return set_window_pos( (WINDOWPOS *)lparam, 0, 0 ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index aa9b45b1542..b3cafe791df 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -31,7 +31,9 @@ struct tagWND; struct user_callbacks { HANDLE (WINAPI *pCopyImage)( HANDLE, UINT, INT, INT, UINT ); + BOOL (WINAPI *pDestroyCaret)(void); BOOL (WINAPI *pDestroyMenu)( HMENU ); + BOOL (WINAPI *pEndMenu)(void); BOOL (WINAPI *pHideCaret)( HWND hwnd ); BOOL (WINAPI *pPostMessageW)( HWND, UINT, WPARAM, LPARAM ); UINT (WINAPI *pSendInput)( UINT count, INPUT *inputs, int size ); @@ -42,6 +44,7 @@ struct user_callbacks BOOL (WINAPI *pShowWindow)( HWND, INT ); DWORD (WINAPI *pWaitForInputIdle)( HANDLE, DWORD ); void (CDECL *free_win_ptr)( struct tagWND *win ); + HWND (CDECL *is_menu_active)(void); void (CDECL *notify_ime)( HWND hwnd, UINT param ); void (CDECL *register_builtin_classes)(void); LRESULT (WINAPI *send_ll_message)( DWORD, DWORD, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR ); @@ -50,6 +53,7 @@ struct user_callbacks BOOL (CDECL *set_window_pos)( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ); + void (WINAPI *unregister_imm)( HWND hwnd ); }; #define WM_SYSTIMER 0x0118 diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index d9ddfe3400e..0166b64c76a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4591,6 +4591,16 @@ static BOOL message_beep( UINT i ) return TRUE; } +static DWORD exiting_thread_id; + +/********************************************************************** + * is_exiting_thread + */ +BOOL is_exiting_thread( DWORD tid ) +{ + return tid == exiting_thread_id; +} + static void thread_detach(void) { struct user_thread_info *thread_info = get_user_thread_info(); @@ -4602,6 +4612,8 @@ static void thread_detach(void) destroy_thread_windows(); NtClose( thread_info->server_queue ); + + exiting_thread_id = 0; } /*********************************************************************** @@ -4618,6 +4630,9 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) case NtUserReleaseCapture: return release_capture(); /* temporary exports */ + case NtUserExitingThread: + exiting_thread_id = GetCurrentThreadId(); + return 0; case NtUserThreadDetach: thread_detach(); return 0; @@ -4724,9 +4739,6 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return HandleToUlong( alloc_user_handle( (struct user_object *)arg1, arg2 )); case NtUserAllocWinProc: return (UINT_PTR)alloc_winproc( (WNDPROC)arg1, arg2 ); - case NtUserFreeDCE: - free_dce( (struct dce *)arg1, UlongToHandle(arg2) ); - return 0; case NtUserFreeHandle: return (UINT_PTR)free_user_handle( UlongToHandle(arg1), arg2 ); case NtUserGetHandlePtr: diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 96d8d4833b0..aacfebd1b15 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -834,7 +834,7 @@ @ stub NtUserDestroyInputContext @ stub NtUserDestroyMenu @ stub NtUserDestroyPalmRejectionDelayZone -@ stub NtUserDestroyWindow +@ stdcall NtUserDestroyWindow(long) @ stub NtUserDisableImmersiveOwner @ stub NtUserDisableProcessWindowFiltering @ stub NtUserDisableThreadIme diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 516f4540315..83b0e093a20 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -199,6 +199,7 @@ struct unix_funcs INT x, INT y, INT cx, INT cy, UINT flags, UINT unk1, UINT unk2 ); BOOL (WINAPI *pNtUserDestroyCursor)( HCURSOR cursor, ULONG arg ); + BOOL (WINAPI *pNtUserDestroyWindow)( HWND hwnd ); BOOL (WINAPI *pNtUserDrawIconEx)( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ); BOOL (WINAPI *pNtUserEndDeferWindowPosEx)( HDWP hdwp, BOOL async ); @@ -286,6 +287,9 @@ struct unix_funcs struct window_surface *surface ); }; +/* clipboard.c */ +extern void release_clipboard_owner( HWND hwnd ) DECLSPEC_HIDDEN; + /* cursoricon.c */ extern HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN; extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; @@ -327,6 +331,7 @@ extern UINT get_system_dpi(void) DECLSPEC_HIDDEN; extern int get_system_metrics( int index ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect( UINT dpi ) DECLSPEC_HIDDEN; +extern BOOL is_exiting_thread( DWORD tid ) DECLSPEC_HIDDEN; extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; @@ -344,6 +349,7 @@ extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; struct tagWND; extern HDWP begin_defer_window_pos( INT count ) DECLSPEC_HIDDEN; extern void destroy_thread_windows(void) DECLSPEC_HIDDEN; +extern LRESULT destroy_window( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND get_desktop_window(void) DECLSPEC_HIDDEN; extern UINT get_dpi_for_window( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND get_full_window_handle( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index a28b6ae9ebf..f8d147b785c 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3174,6 +3174,99 @@ BOOL WINAPI NtUserEndDeferWindowPosEx( HDWP hdwp, BOOL async ) return TRUE; } +/*********************************************************************** + * win_set_flags + * + * Set the flags of a window and return the previous value. + */ +static UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) +{ + WND *win = get_win_ptr( hwnd ); + UINT ret; + + if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return 0; + ret = win->flags; + win->flags = (ret & ~clear_mask) | set_mask; + release_win_ptr( win ); + return ret; +} + +/******************************************************************* + * can_activate_window + * + * Check if we can activate the specified window. + */ +static BOOL can_activate_window( HWND hwnd ) +{ + LONG style; + + if (!hwnd) return FALSE; + style = get_window_long( hwnd, GWL_STYLE ); + if (!(style & WS_VISIBLE)) return FALSE; + if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; + return !(style & WS_DISABLED); +} + +/******************************************************************* + * activate_other_window + * + * Activates window other than hwnd. + */ +static void activate_other_window( HWND hwnd ) +{ + HWND hwnd_to, fg; + + if ((get_window_long( hwnd, GWL_STYLE ) & WS_POPUP) && + (hwnd_to = get_window_relative( hwnd, GW_OWNER ))) + { + hwnd_to = NtUserGetAncestor( hwnd_to, GA_ROOT ); + if (can_activate_window( hwnd_to )) goto done; + } + + hwnd_to = hwnd; + for (;;) + { + if (!(hwnd_to = get_window_relative( hwnd_to, GW_HWNDNEXT ))) break; + if (can_activate_window( hwnd_to )) goto done; + } + + hwnd_to = get_window_relative( get_desktop_window(), GW_CHILD ); + for (;;) + { + if (hwnd_to == hwnd) + { + hwnd_to = 0; + break; + } + if (can_activate_window( hwnd_to )) goto done; + if (!(hwnd_to = get_window_relative( hwnd_to, GW_HWNDNEXT ))) break; + } + + done: + fg = NtUserGetForegroundWindow(); + TRACE( "win = %p fg = %p\n", hwnd_to, fg ); + if (!fg || hwnd == fg) + { + if (set_foreground_window( hwnd_to, FALSE )) return; + } + if (NtUserSetActiveWindow( hwnd_to )) NtUserSetActiveWindow( 0 ); +} + +/******************************************************************* + * send_parent_notify + */ +static void send_parent_notify( HWND hwnd, UINT msg ) +{ + if ((get_window_long( hwnd, GWL_STYLE ) & (WS_CHILD | WS_POPUP)) == WS_CHILD && + !(get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY)) + { + HWND parent = get_parent( hwnd ); + if (parent && parent != get_desktop_window()) + send_message( parent, WM_PARENTNOTIFY, + MAKEWPARAM( msg, get_window_long( hwnd, GWLP_ID )), (LPARAM)hwnd ); + } +} + /******************************************************************* * update_window_state * @@ -3260,6 +3353,226 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) } /*********************************************************************** + * send_destroy_message + */ +static void send_destroy_message( HWND hwnd ) +{ + GUITHREADINFO info; + + info.cbSize = sizeof(info); + if (NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info )) + { + if (hwnd == info.hwndCaret && user_callbacks) user_callbacks->pDestroyCaret(); + if (hwnd == info.hwndActive) activate_other_window( hwnd ); + } + + if (hwnd == NtUserGetClipboardOwner()) release_clipboard_owner( hwnd ); + + send_message( hwnd, WM_DESTROY, 0, 0); + + /* + * This WM_DESTROY message can trigger re-entrant calls to DestroyWindow + * make sure that the window still exists when we come back. + */ + if (is_window(hwnd)) + { + HWND *children; + int i; + + if (!(children = list_window_children( 0, hwnd, NULL, 0 ))) return; + + for (i = 0; children[i]; i++) + { + if (is_window( children[i] )) send_destroy_message( children[i] ); + } + free( children ); + } + else + WARN( "\tdestroyed itself while in WM_DESTROY!\n" ); +} + +/*********************************************************************** + * free_window_handle + * + * Free a window handle. + */ +static void free_window_handle( HWND hwnd ) +{ + WND *win; + + TRACE( "\n" ); + + if ((win = get_user_handle_ptr( hwnd, NTUSER_OBJ_WINDOW )) && win != OBJ_OTHER_PROCESS) + { + SERVER_START_REQ( destroy_window ) + { + req->handle = wine_server_user_handle( hwnd ); + wine_server_call( req ); + set_user_handle_ptr( hwnd, NULL ); + } + SERVER_END_REQ; + user_unlock(); + if (user_callbacks) user_callbacks->free_win_ptr( win ); + } +} + +/*********************************************************************** + * destroy_window + */ +LRESULT destroy_window( HWND hwnd ) +{ + struct window_surface *surface; + HMENU menu = 0, sys_menu; + WND *win; + HWND *children; + + TRACE( "%p\n", hwnd ); + + /* destroy default IME window */ + if (win_set_flags( hwnd, 0, WIN_HAS_IME_WIN ) & WIN_HAS_IME_WIN) + { + TRACE("unregister IME window for %p\n", hwnd); + if (user_callbacks) user_callbacks->unregister_imm( hwnd ); + } + + /* free child windows */ + if ((children = list_window_children( 0, hwnd, NULL, 0 ))) + { + int i; + for (i = 0; children[i]; i++) + { + if (is_current_thread_window( children[i] )) + destroy_window( children[i] ); + else + NtUserMessageCall( children[i], WM_WINE_DESTROYWINDOW, 0, 0, + 0, FNID_SENDNOTIFYMESSAGE, FALSE ); + } + free( children ); + } + + /* Unlink now so we won't bother with the children later on */ + SERVER_START_REQ( set_parent ) + { + req->handle = wine_server_user_handle( hwnd ); + req->parent = 0; + wine_server_call( req ); + } + SERVER_END_REQ; + + send_message( hwnd, WM_NCDESTROY, 0, 0 ); + + /* FIXME: do we need to fake QS_MOUSEMOVE wakebit? */ + + /* free resources associated with the window */ + + if (!(win = get_win_ptr( hwnd )) || win == WND_OTHER_PROCESS) return 0; + if ((win->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) + menu = (HMENU)win->wIDmenu; + sys_menu = win->hSysMenu; + free_dce( win->dce, hwnd ); + win->dce = NULL; + NtUserDestroyCursor( win->hIconSmall2, 0 ); + surface = win->surface; + win->surface = NULL; + release_win_ptr( win ); + + NtUserDestroyMenu( menu ); + NtUserDestroyMenu( sys_menu ); + if (surface) + { + register_window_surface( surface, NULL ); + window_surface_release( surface ); + } + + user_driver->pDestroyWindow( hwnd ); + + free_window_handle( hwnd ); + return 0; +} + +/*********************************************************************** + * NtUserDestroyWindow (win32u.@) + */ +BOOL WINAPI NtUserDestroyWindow( HWND hwnd ) +{ + BOOL is_child; + + if (!(hwnd = is_current_thread_window( hwnd )) || is_desktop_window( hwnd )) + { + SetLastError( ERROR_ACCESS_DENIED ); + return FALSE; + } + + TRACE( "(%p)\n", hwnd ); + + if (call_hooks( WH_CBT, HCBT_DESTROYWND, (WPARAM)hwnd, 0, TRUE )) return FALSE; + + if (user_callbacks && user_callbacks->is_menu_active() == hwnd) + user_callbacks->pEndMenu(); + + is_child = (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) != 0; + + if (is_child) + { + if (!is_exiting_thread( GetCurrentThreadId() )) + send_parent_notify( hwnd, WM_DESTROY ); + } + else if (!get_window_relative( hwnd, GW_OWNER )) + { + call_hooks( WH_SHELL, HSHELL_WINDOWDESTROYED, (WPARAM)hwnd, 0L, TRUE ); + /* FIXME: clean up palette - see "Internals" p.352 */ + } + + if (!is_window( hwnd )) return TRUE; + + /* Hide the window */ + if (get_window_long( hwnd, GWL_STYLE ) & WS_VISIBLE) + { + /* Only child windows receive WM_SHOWWINDOW in DestroyWindow() */ + if (is_child) + NtUserShowWindow( hwnd, SW_HIDE ); + else + NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | + SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW ); + } + + if (!is_window( hwnd )) return TRUE; + + /* Recursively destroy child windows */ + if (!is_child) + { + for (;;) + { + BOOL got_one = FALSE; + HWND *children; + unsigned int i; + + if (!(children = list_window_children( 0, get_desktop_window(), NULL, 0 ))) break; + + for (i = 0; children[i]; i++) + { + if (get_window_relative( children[i], GW_OWNER ) != hwnd) continue; + if (is_current_thread_window( children[i] )) + { + NtUserDestroyWindow( children[i] ); + got_one = TRUE; + continue; + } + set_window_owner( children[i], 0 ); + } + free( children ); + if (!got_one) break; + } + } + + send_destroy_message( hwnd ); + if (!is_window( hwnd )) return TRUE; + + destroy_window( hwnd ); + return TRUE; +} + +/***************************************************************************** * destroy_thread_windows * * Destroy all window owned by the current thread. @@ -3329,6 +3642,8 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) /* temporary exports */ case NtUserCreateDesktopWindow: return user_driver->pCreateDesktopWindow( hwnd ); + case NtUserDestroyWindowHandle: + return destroy_window( hwnd ); case NtUserGetDummySurface: return (UINT_PTR)&dummy_surface; default: diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 258483ad8de..da1957c8c88 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -783,6 +783,12 @@ BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg ) return unix_funcs->pNtUserDestroyCursor( cursor, arg ); } +BOOL WINAPI NtUserDestroyWindow( HWND hwnd ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserDestroyWindow( hwnd ); +} + BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ) { diff --git a/include/ntuser.h b/include/ntuser.h index aeb3e9ae2cc..de958caa735 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -91,6 +91,7 @@ enum NtUserGetInputState, NtUserReleaseCapture, /* temporary exports */ + NtUserExitingThread, NtUserThreadDetach, }; @@ -134,7 +135,6 @@ enum /* temporary exports */ NtUserAllocHandle, NtUserAllocWinProc, - NtUserFreeDCE, NtUserFreeHandle, NtUserGetHandlePtr, NtUserInvalidateDCE, @@ -154,6 +154,7 @@ enum NtUserIsWindowVisible, /* temporary exports */ NtUserCreateDesktopWindow, + NtUserDestroyWindowHandle, NtUserGetDummySurface, }; @@ -302,6 +303,7 @@ HDWP WINAPI NtUserDeferWindowPosAndBand( HDWP hdwp, HWND hwnd, HWND after, IN BOOL WINAPI NtUserDestroyAcceleratorTable( HACCEL handle ); BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg ); BOOL WINAPI NtUserDestroyMenu( HMENU menu ); +BOOL WINAPI NtUserDestroyWindow( HWND hwnd ); BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ); BOOL WINAPI NtUserEndDeferWindowPosEx( HDWP hdwp, BOOL async ); -- 2.23.0

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-devel