March 2022 - Wine-Devel - list.winehq.org

[tools] testbot/cgi: Rename the OK action to Save.
by Francois Gouget March 23, 2022

March 23, 2022

Save better reflects what the action does. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 4 ++-- testbot/web/admin/UserDetails.pl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index a178aa6e0..09dfc0496 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -116,7 +116,7 @@ sub GetActions($) my ($self) = @_; my @Actions = @{$self->SUPER::GetActions()}; - push @Actions, "OK", "Cancel"; + push @Actions, "Save", "Cancel"; return \@Actions; } @@ -151,7 +151,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($Action eq "OK") + if ($Action eq "Save") { return !1 if (!$self->Save()); exit($self->RedirectToList()); diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 8c26930e8..7f7c710e1 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -89,7 +89,7 @@ sub OnReject($) exit($self->RedirectToList()); } -sub OnOK($) +sub OnSave($) { my ($self) = @_; @@ -114,9 +114,9 @@ sub OnAction($$) { return $self->OnReject(); } - elsif ($Action eq "OK") + elsif ($Action eq "Save") { - return $self->OnOK(); + return $self->OnSave(); } return $self->SUPER::OnAction($Action); -- 2.30.2

1 0

[tools] testbot: Shorten the VM property descriptions.
by Francois Gouget March 23, 2022

March 23, 2022

In context the short names are just as explicit and take less space in the column headers. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 60a52b86c..f850daaf3 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -762,10 +762,10 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Name", "VM name", 1, 1, "A", 20), + CreateBasicPropertyDescriptor("Name", "Name", 1, 1, "A", 20), CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), - CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build', 'wine']), - CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), + CreateEnumPropertyDescriptor("Type", "Type", !1, 1, ['win32', 'win64', 'build', 'wine']), + CreateEnumPropertyDescriptor("Role", "Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), CreateBasicPropertyDescriptor("Missions", "Missions", !1, 1, "A", 256), CreateBasicPropertyDescriptor("MissionCaps", "Mission Capabilities", !1, !1, "A", 512), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), -- 2.30.2

1 0

[PATCH 1/2] dinput/tests: Keep child PDO remove IRP pending until fully removed.
by Rémi Bernon March 23, 2022

March 23, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Not 100% it'll solve all the problems, as I can hardly reproduce them either running patches on the testbot or in a VM, but I think it might the few timeout cases which I was able to see. dlls/dinput/tests/driver_bus.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index 9492f036c0f..be38de1999e 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -421,6 +421,7 @@ struct phys_device WCHAR instance_id[MAX_PATH]; WCHAR device_id[MAX_PATH]; + IRP *pending_remove; BOOL use_report_id; DWORD report_descriptor_len; @@ -677,8 +678,14 @@ static NTSTATUS pdo_pnp( DEVICE_OBJECT *device, IRP *irp ) { input_queue_cleanup( &impl->input_queue ); expect_queue_cleanup( &impl->expect_queue ); + irp = impl->pending_remove; IoDeleteDevice( device ); if (winetest_debug > 1) trace( "Deleted Bus PDO %p\n", device ); + if (irp) + { + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } } return STATUS_SUCCESS; } @@ -1220,7 +1227,9 @@ static NTSTATUS WINAPI pdo_ioctl( DEVICE_OBJECT *device, IRP *irp ) impl->base.state = PNP_DEVICE_REMOVED; irp_queue_clear( &impl->input_queue.pending ); KeReleaseSpinLock( &impl->base.lock, irql ); - status = STATUS_SUCCESS; + impl->pending_remove = irp; + IoMarkIrpPending( irp ); + status = STATUS_PENDING; break; case IOCTL_WINETEST_CREATE_DEVICE: ok( 0, "unexpected call\n" ); -- 2.35.1

2 4

[PATCH v2 1/3] d3dcompiler: Implement d3dcompiler_shader_reflection_GetThreadGroupSize().
by Matteo Bruni March 23, 2022

March 23, 2022

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Make a few small tweaks, mostly stylistic. dlls/d3dcompiler_43/reflection.c | 92 ++++++++++++++++++++++++-- dlls/d3dcompiler_43/tests/reflection.c | 60 +++++++++++++++++ 2 files changed, 148 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 91cc20cdded..787d0388f93 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -50,6 +50,12 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE #define D3DCOMPILER_SHADER_TARGET_VERSION_MASK 0xffff #define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK 0xffff0000 +#define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT 16 + +enum d3dcompiler_shader_type +{ + D3DCOMPILER_SHADER_TYPE_CS = 5, +}; struct d3dcompiler_shader_signature { @@ -158,6 +164,9 @@ struct d3dcompiler_shader_reflection D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; D3D_TESSELLATOR_PARTITIONING hs_partitioning; D3D_TESSELLATOR_DOMAIN tessellator_domain; + UINT thread_group_size_x; + UINT thread_group_size_y; + UINT thread_group_size_z; struct d3dcompiler_shader_signature *isgn; struct d3dcompiler_shader_signature *osgn; @@ -707,9 +716,21 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMinFeatureLeve static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize( ID3D11ShaderReflection *iface, UINT *sizex, UINT *sizey, UINT *sizez) { - FIXME("iface %p, sizex %p, sizey %p, sizez %p stub!\n", iface, sizex, sizey, sizez); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - return 0; + TRACE("iface %p, sizex %p, sizey %p, sizez %p.\n", iface, sizex, sizey, sizez); + + if (!sizex || !sizey || !sizez) + { + WARN("Invalid argument specified.\n"); + return E_INVALIDARG; + } + + *sizex = reflection->thread_group_size_x; + *sizey = reflection->thread_group_size_y; + *sizez = reflection->thread_group_size_z; + + return *sizex * *sizey * *sizez; } static UINT64 STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetRequiresFlags( @@ -1754,15 +1775,79 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * return S_OK; } +#define SM4_OPCODE_MASK 0xff +#define SM4_INSTRUCTION_LENGTH_SHIFT 24 +#define SM4_INSTRUCTION_LENGTH_MASK (0x1fu << SM4_INSTRUCTION_LENGTH_SHIFT) + +enum sm4_opcode +{ + SM5_OP_DCL_THREAD_GROUP = 0x9b, +}; + static HRESULT d3dcompiler_parse_shdr(struct d3dcompiler_shader_reflection *r, const char *data, size_t data_size) { + uint32_t opcode_token, opcode; + uint32_t size, shader_type; const char *ptr = data; + const uint32_t *u_ptr; + unsigned int len; r->version = read_u32(&ptr); TRACE("Shader version: %u\n", r->version); - /* todo: Check if anything else is needed from the shdr or shex blob. */ + shader_type = (r->version & D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK) + >> D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT; + if (shader_type != D3DCOMPILER_SHADER_TYPE_CS) + { + /* TODO: Check if anything else is needed from the SHDR or SHEX blob. */ + return S_OK; + } + + size = read_u32(&ptr); + TRACE("size %u.\n", size); + if (size * sizeof(uint32_t) != data_size || size < 2) + { + WARN("Invalid size %u.\n", size); + return E_FAIL; + } + size -= 2; + u_ptr = (uint32_t *)ptr; + while (size) + { + opcode_token = *u_ptr; + opcode = opcode_token & SM4_OPCODE_MASK; + len = (opcode_token & SM4_INSTRUCTION_LENGTH_MASK) >> SM4_INSTRUCTION_LENGTH_SHIFT; + if (!len) + { + if (size < 2) + { + WARN("End of byte-code, failed to read length token.\n"); + return E_FAIL; + } + len = u_ptr[1]; + } + if (!len || size < len) + { + WARN("Invalid instruction length %u, size %u.\n", len, size); + return E_FAIL; + } + if (opcode == SM5_OP_DCL_THREAD_GROUP) + { + if (len != 4) + { + WARN("Invalid dcl_thread_group opcode length %u.\n", len); + return E_FAIL; + } + r->thread_group_size_x = u_ptr[1]; + r->thread_group_size_y = u_ptr[2]; + r->thread_group_size_z = u_ptr[3]; + TRACE("Found dcl_thread_group %u, %u, %u.\n", + r->thread_group_size_x, r->thread_group_size_y, r->thread_group_size_z); + } + size -= len; + u_ptr += len; + } return S_OK; } @@ -1972,7 +2057,6 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void } *reflector = object; - TRACE("Created ID3D11ShaderReflection %p\n", object); return S_OK; diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index f2b7f094de6..e4261ad0d79 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -777,6 +777,7 @@ static void test_reflection_desc_ps(void) D3D_NAME expected; unsigned int i; #if D3D_COMPILER_VERSION + UINT size_x, size_y, size_z, size_total; UINT ret; #endif @@ -920,6 +921,17 @@ static void test_reflection_desc_ps(void) ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } +#if D3D_COMPILER_VERSION + size_x = 0xdeadbeef; + size_y = 0xdeadbeef; + size_z = 0xdeadbeef; + size_total = ref11->lpVtbl->GetThreadGroupSize(ref11, &size_x, &size_y, &size_z); + ok(!size_x, "Unexpected size %u.\n", size_x); + ok(!size_y, "Unexpected size %u.\n", size_y); + ok(!size_z, "Unexpected size %u.\n", size_z); + ok(!size_total, "Unexpected size %u.\n", size_total); +#endif + count = ref11->lpVtbl->Release(ref11); ok(!count, "Got unexpected count %lu.\n", count); } @@ -1186,6 +1198,53 @@ static const D3D12_SHADER_INPUT_BIND_DESC test_reflection_bound_resources_result {"c2", D3D_SIT_CBUFFER, 1, 1, 0, 0, D3D_SRV_DIMENSION_UNKNOWN, 0, 0, 1}, }; +#if D3D_COMPILER_VERSION +static void test_reflection_cs(void) +{ + /* + * fxc.exe /T cs_5_1 /Fo + */ +#if 0 + [numthreads(16, 8, 4)] + void main( uint3 DTid : SV_DispatchThreadID ) + { + } +#endif + static const DWORD test_blob[] = + { + 0x43425844, 0x77a220d9, 0xfebd5b9c, 0x14a86e30, 0x57537394, 0x00000001, 0x00000184, 0x00000005, + 0x00000034, 0x000000a0, 0x000000b0, 0x000000c0, 0x000000e8, 0x46454452, 0x00000064, 0x00000000, + 0x00000000, 0x00000000, 0x0000003c, 0x43530501, 0x00000500, 0x0000003c, 0x25441313, 0x0000003c, + 0x00000018, 0x00000028, 0x00000028, 0x00000024, 0x0000000c, 0x00000000, 0x7263694d, 0x666f736f, + 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, + 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x00000008, 0x00000000, 0x00000008, + 0x58454853, 0x00000020, 0x00050051, 0x00000008, 0x0100086a, 0x0400009b, 0x00000010, 0x00000008, + 0x00000004, 0x0100003e, 0x54415453, 0x00000094, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, + }; + UINT size_x, size_y, size_z, size_total; + ID3D11ShaderReflection *ref11; + HRESULT hr; + + hr = call_reflect(test_blob, test_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + todo_wine_if(D3D_COMPILER_VERSION < 47) + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (FAILED(hr)) + return; + size_total = ref11->lpVtbl->GetThreadGroupSize(ref11, &size_x, &size_y, &size_z); + ok(size_x == 16, "Unexpected size %u.\n", size_x); + ok(size_y == 8, "Unexpected size %u.\n", size_y); + ok(size_z == 4, "Unexpected size %u.\n", size_z); + ok(size_total == size_x * size_y * size_z, "Unexpected size %u.\n", size_total); + + ref11->lpVtbl->Release(ref11); +} +#endif + static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADER_INPUT_BIND_DESC *result, unsigned int result_count, unsigned int target_version) { @@ -2150,6 +2209,7 @@ START_TEST(reflection) #if D3D_COMPILER_VERSION test_reflection_references(); test_reflection_interfaces(); + test_reflection_cs(); #else test_d3d10_interfaces(); #endif -- 2.34.1

1 2

[PATCH 1/2] nsiproxy.sys: Avoid redundant pid mapping in tcp_conns_enumerate_all().
by Paul Gofman March 23, 2022

March 23, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Sword of Legends Online calls GetTcpTable() twice (with different sort flag) every 3-4 seconds. With the move of the implementation to nsi.dll / nsiproxy.sys the performance of this function regressed and now these calls are responsible for visible delay in rendering each 3-4 seconds. I found that the majority of time is wasted for mapping pids while that mapping result is not used in this case. These two patches reduce the time for GetTcpTable() from roughly 50ms to roughly 5ms. Further improvement looks possible but are probably more ugly. dlls/nsiproxy.sys/tcp.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 0cd81ae86e5..5ff3dbd2378 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -540,7 +540,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * memset( &key, 0, sizeof(key) ); memset( &dyn, 0, sizeof(dyn) ); memset( &stat, 0, sizeof(stat) ); - pid_map = get_pid_map( &pid_map_size ); + if (static_data) pid_map = get_pid_map( &pid_map_size ); /* skip header line */ ptr = fgets( buf, sizeof(buf), fp ); @@ -558,15 +558,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * key.local.Ipv4.sin_port = htons( key.local.Ipv4.sin_port ); key.remote.Ipv4.sin_port = htons( key.remote.Ipv4.sin_port ); - stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; } @@ -601,16 +603,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * addr_scopes_size ); key.remote.Ipv6.sin6_scope_id = find_ipv6_addr_scope( &key.remote.Ipv6.sin6_addr, addr_scopes, addr_scopes_size ); - - stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; } @@ -649,7 +652,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * if (len <= sizeof(struct xinpgen)) goto err; addr_scopes = get_ipv6_addr_scope_table( &addr_scopes_size ); - pid_map = get_pid_map( &pid_map_size ); + if (class >= TCP_TABLE_OWNER_PID_LISTENER) pid_map = get_pid_map( &pid_map_size ); orig_xig = (struct xinpgen *)buf; xig = orig_xig; @@ -708,15 +711,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * addr_scopes_size ); } - stat.pid = find_owning_pid( pid_map, pid_map_size, (UINT_PTR)sock->so_pcb ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, (UINT_PTR)sock->so_pcb ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; } -- 2.35.1

2 3

[PATCH v2 1/4] winemac.drv: Simplify control flow in copy_display_modes.
by Tim Clem March 23, 2022

March 23, 2022

Introduce a helper function to determine if a mode is preferred over another. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- v2: As per Huw's suggestion, pull the logic into its own function. dlls/winemac.drv/display.c | 123 ++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 2ac8f32fa18a..cc3bbc6cffcd 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -576,6 +576,65 @@ static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_o return ret; } + + +static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mode, + struct display_mode_descriptor *original_mode_desc) +{ + CFStringRef pixel_encoding; + size_t width_points, height_points; + size_t old_width_pixels, old_height_pixels, new_width_pixels, new_height_pixels; + BOOL old_size_same, new_size_same; + + /* If a given mode is the user's default, then always list it in preference to any similar + modes that may exist. */ + if (display_mode_matches_descriptor(new_mode, original_mode_desc)) + return TRUE; + + pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); + if (pixel_encoding) + { + BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); + CFRelease(pixel_encoding); + if (bpp30) + { + /* This is an odd pixel encoding. It seems it's only returned + when using kCGDisplayShowDuplicateLowResolutionModes. It's + 32bpp in terms of the actual raster layout, but it's 10 + bits per component. I think that no Windows program is + likely to need it and they will probably be confused by it. + Skip it. */ + return FALSE; + } + } + + if (!old_mode) + return TRUE; + + /* Prefer the original mode over any similar mode. */ + if (display_mode_matches_descriptor(old_mode, original_mode_desc)) + return FALSE; + + /* Otherwise, prefer a mode whose pixel size equals its point size over one which + is scaled. */ + width_points = CGDisplayModeGetWidth(new_mode); + height_points = CGDisplayModeGetHeight(new_mode); + new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); + new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); + old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); + old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); + new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); + old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); + + if (new_size_same && !old_size_same) + return TRUE; + + if (!new_size_same && old_size_same) + return FALSE; + + /* Otherwise, prefer the mode with the smaller pixel size. */ + return new_width_pixels < old_width_pixels && new_height_pixels < old_height_pixels; +} #endif @@ -620,72 +679,12 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display) count = CFArrayGetCount(modes); for (i = 0; i < count; i++) { - BOOL better = TRUE; CGDisplayModeRef new_mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); BOOL new_is_original = display_mode_matches_descriptor(new_mode, desc); CFDictionaryRef key = create_mode_dict(new_mode, new_is_original); + CGDisplayModeRef old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); - /* If a given mode is the user's default, then always list it in preference to any similar - modes that may exist. */ - if (new_is_original) - better = TRUE; - else - { - CFStringRef pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); - CGDisplayModeRef old_mode; - - if (pixel_encoding) - { - BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); - CFRelease(pixel_encoding); - if (bpp30) - { - /* This is an odd pixel encoding. It seems it's only returned - when using kCGDisplayShowDuplicateLowResolutionModes. It's - 32bpp in terms of the actual raster layout, but it's 10 - bits per component. I think that no Windows program is - likely to need it and they will probably be confused by it. - Skip it. */ - CFRelease(key); - continue; - } - } - - old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); - if (old_mode) - { - BOOL old_is_original = display_mode_matches_descriptor(old_mode, desc); - - if (old_is_original) - better = FALSE; - else - { - /* Otherwise, prefer a mode whose pixel size equals its point size over one which - is scaled. */ - size_t width_points = CGDisplayModeGetWidth(new_mode); - size_t height_points = CGDisplayModeGetHeight(new_mode); - size_t new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); - size_t new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); - size_t old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); - size_t old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); - BOOL new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); - BOOL old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); - - if (new_size_same && !old_size_same) - better = TRUE; - else if (!new_size_same && old_size_same) - better = FALSE; - else - { - /* Otherwise, prefer the mode with the smaller pixel size. */ - if (old_width_pixels < new_width_pixels || old_height_pixels < new_height_pixels) - better = FALSE; - } - } - } - } - - if (better) + if (mode_is_preferred(new_mode, old_mode, desc)) CFDictionarySetValue(modes_by_size, key, new_mode); CFRelease(key); -- 2.34.1

2 7

[PATCH v2 2/2] iphlpapi: Don't request redundant static data in get_extended_tcp_table().
by Huw Davies March 23, 2022

March 23, 2022

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 041e712f44f..afc400d26c1 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3082,6 +3082,19 @@ static int tcp6_row_owner_cmp( const void *a, const void *b ) return RtlUshortByteSwap( rowA->dwRemotePort ) - RtlUshortByteSwap( rowB->dwRemotePort ); } +static BOOL tcp_table_needs_pids( ULONG table_class ) +{ + switch (table_class) + { + case TCP_TABLE_BASIC_LISTENER: + case TCP_TABLE_BASIC_CONNECTIONS: + case TCP_TABLE_BASIC_ALL: + return FALSE; + + } + return TRUE; +} + /************************************************************************************* * get_extended_tcp_table * @@ -3093,13 +3106,19 @@ static DWORD get_extended_tcp_table( void *table, DWORD *size, BOOL sort, ULONG DWORD err, count, needed, i, num = 0, row_size = 0; struct nsi_tcp_conn_key *key; struct nsi_tcp_conn_dynamic *dyn; - struct nsi_tcp_conn_static *stat; + struct nsi_tcp_conn_static *stat = NULL; if (!size) return ERROR_INVALID_PARAMETER; - err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key), - NULL, 0, (void **)&dyn, sizeof(*dyn), - (void **)&stat, sizeof(*stat), &count, 0 ); + if (tcp_table_needs_pids( table_class )) + err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key), + NULL, 0, (void **)&dyn, sizeof(*dyn), + (void **)&stat, sizeof(*stat), &count, 0 ); + else /* Don't retrieve the static data if not required as this is expensive to compute */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key), + NULL, 0, (void **)&dyn, sizeof(*dyn), + NULL, 0, &count, 0 ); + if (err) return err; for (i = 0; i < count; i++) -- 2.23.0

1 0

[PATCH v2 1/2] nsiproxy: Avoid redundant pid mapping in tcp_conns_enumerate_all().
by Huw Davies March 23, 2022

March 23, 2022

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/tcp.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 0cd81ae86e5..491ac797100 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -540,7 +540,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * memset( &key, 0, sizeof(key) ); memset( &dyn, 0, sizeof(dyn) ); memset( &stat, 0, sizeof(stat) ); - pid_map = get_pid_map( &pid_map_size ); + if (static_data) pid_map = get_pid_map( &pid_map_size ); /* skip header line */ ptr = fgets( buf, sizeof(buf), fp ); @@ -558,15 +558,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * key.local.Ipv4.sin_port = htons( key.local.Ipv4.sin_port ); key.remote.Ipv4.sin_port = htons( key.remote.Ipv4.sin_port ); - stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; } @@ -601,16 +603,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * addr_scopes_size ); key.remote.Ipv6.sin6_scope_id = find_ipv6_addr_scope( &key.remote.Ipv6.sin6_addr, addr_scopes, addr_scopes_size ); - - stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, inode ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; } @@ -649,7 +652,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * if (len <= sizeof(struct xinpgen)) goto err; addr_scopes = get_ipv6_addr_scope_table( &addr_scopes_size ); - pid_map = get_pid_map( &pid_map_size ); + if (static_data) pid_map = get_pid_map( &pid_map_size ); orig_xig = (struct xinpgen *)buf; xig = orig_xig; @@ -708,15 +711,17 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * addr_scopes_size ); } - stat.pid = find_owning_pid( pid_map, pid_map_size, (UINT_PTR)sock->so_pcb ); - stat.create_time = 0; /* FIXME */ - stat.mod_info = 0; /* FIXME */ - if (num < *count) { if (key_data) *key_data++ = key; if (dynamic_data) *dynamic_data++ = dyn; - if (static_data) *static_data++ = stat; + if (static_data) + { + stat.pid = find_owning_pid( pid_map, pid_map_size, (UINT_PTR)sock->so_pcb ); + stat.create_time = 0; /* FIXME */ + stat.mod_info = 0; /* FIXME */ + *static_data++ = stat; + } } num++; } -- 2.23.0

1 0

[PATCH] dlls/ntdll/tests/sync.c: enable compilation with long types
by Eric Pouech March 23, 2022

March 23, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/sync.c | 291 ++++++++++++++++++++++++----------------------- 1 file changed, 146 insertions(+), 145 deletions(-) diff --git a/dlls/ntdll/tests/sync.c b/dlls/ntdll/tests/sync.c index f930767a8b0..12f5898a391 100644 --- a/dlls/ntdll/tests/sync.c +++ b/dlls/ntdll/tests/sync.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> @@ -74,75 +75,75 @@ static void test_event(void) InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtCreateEvent(&event, GENERIC_ALL, &attr, 2, 0); - ok( status == STATUS_INVALID_PARAMETER, "NtCreateEvent failed %08x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NtCreateEvent failed %08lx\n", status ); status = pNtCreateEvent(&event, GENERIC_ALL, &attr, NotificationEvent, 0); - ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08lx\n", status ); memset(&info, 0xcc, sizeof(info)); status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08lx\n", status ); ok( info.EventType == NotificationEvent && info.EventState == 0, - "NtQueryEvent failed, expected 0 0, got %d %d\n", info.EventType, info.EventState ); + "NtQueryEvent failed, expected 0 0, got %d %ld\n", info.EventType, info.EventState ); pNtClose(event); status = pNtCreateEvent(&event, GENERIC_ALL, &attr, SynchronizationEvent, 0); - ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08lx\n", status ); status = pNtPulseEvent(event, &prev_state); - ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); + ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08lx\n", status ); + ok( !prev_state, "prev_state = %lx\n", prev_state ); memset(&info, 0xcc, sizeof(info)); status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08lx\n", status ); ok( info.EventType == SynchronizationEvent && info.EventState == 0, - "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); + "NtQueryEvent failed, expected 1 0, got %d %ld\n", info.EventType, info.EventState ); status = pNtOpenEvent(&event2, GENERIC_ALL, &attr); - ok( status == STATUS_SUCCESS, "NtOpenEvent failed %08x\n", status ); + ok( status == STATUS_SUCCESS, "NtOpenEvent failed %08lx\n", status ); pNtClose(event); event = event2; memset(&info, 0xcc, sizeof(info)); status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08lx\n", status ); ok( info.EventType == SynchronizationEvent && info.EventState == 0, - "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); + "NtQueryEvent failed, expected 1 0, got %d %ld\n", info.EventType, info.EventState ); status = pNtSetEvent( event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08lx\n", status ); + ok( !prev_state, "prev_state = %lx\n", prev_state ); memset(&info, 0xcc, sizeof(info)); status = pNtQueryEvent(event, EventBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08lx\n", status ); ok( info.EventType == SynchronizationEvent && info.EventState == 1, - "NtQueryEvent failed, expected 1 1, got %d %d\n", info.EventType, info.EventState ); + "NtQueryEvent failed, expected 1 1, got %d %ld\n", info.EventType, info.EventState ); status = pNtSetEvent( event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( prev_state == 1, "prev_state = %x\n", prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08lx\n", status ); + ok( prev_state == 1, "prev_state = %lx\n", prev_state ); status = pNtResetEvent( event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( prev_state == 1, "prev_state = %x\n", prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08lx\n", status ); + ok( prev_state == 1, "prev_state = %lx\n", prev_state ); status = pNtResetEvent( event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08lx\n", status ); + ok( !prev_state, "prev_state = %lx\n", prev_state ); status = pNtPulseEvent( event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); + ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08lx\n", status ); + ok( !prev_state, "prev_state = %lx\n", prev_state ); status = pNtSetEvent( event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); - ok( !prev_state, "prev_state = %x\n", prev_state ); + ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08lx\n", status ); + ok( !prev_state, "prev_state = %lx\n", prev_state ); status = pNtPulseEvent( event, &prev_state ); - ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); - ok( prev_state == 1, "prev_state = %x\n", prev_state ); + ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08lx\n", status ); + ok( prev_state == 1, "prev_state = %lx\n", prev_state ); pNtClose(event); } @@ -167,7 +168,7 @@ static DWORD WINAPI keyed_event_thread( void *arg ) RtlInitUnicodeString( &str, keyed_nameW ); status = pNtOpenKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr ); - ok( !status, "NtOpenKeyedEvent failed %x\n", status ); + ok( !status, "NtOpenKeyedEvent failed %lx\n", status ); for (i = 0; i < 20; i++) { @@ -175,18 +176,18 @@ static DWORD WINAPI keyed_event_thread( void *arg ) status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); else status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); - ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); + ok( status == STATUS_SUCCESS, "%Ii: failed %lx\n", i, status ); Sleep( 20 - i ); } status = pNtReleaseKeyedEvent( handle, (void *)0x1234, 0, NULL ); - ok( status == STATUS_SUCCESS, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_SUCCESS, "NtReleaseKeyedEvent %lx\n", status ); timeout.QuadPart = -10000; status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %lx\n", status ); NtClose( handle ); return 0; @@ -216,43 +217,43 @@ static void test_keyed_events(void) RtlInitUnicodeString( &str, keyed_nameW ); status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS | SYNCHRONIZE, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + ok( !status, "NtCreateKeyedEvent failed %lx\n", status ); status = WaitForSingleObject( handle, 1000 ); - ok( status == 0, "WaitForSingleObject %x\n", status ); + ok( status == 0, "WaitForSingleObject %lx\n", status ); timeout.QuadPart = -100000; status = pNtWaitForKeyedEvent( handle, (void *)255, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( handle, (void *)255, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %lx\n", status ); status = pNtWaitForKeyedEvent( handle, (void *)254, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( handle, (void *)254, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %lx\n", status ); status = pNtWaitForKeyedEvent( handle, NULL, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( handle, NULL, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %lx\n", status ); status = pNtWaitForKeyedEvent( NULL, (void *)8, 0, &timeout ); ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ - "NtWaitForKeyedEvent %x\n", status ); + "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( NULL, (void *)8, 0, &timeout ); ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ - "NtReleaseKeyedEvent %x\n", status ); + "NtReleaseKeyedEvent %lx\n", status ); status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout ); - ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_1, "NtReleaseKeyedEvent %lx\n", status ); status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); - ok( status == STATUS_INVALID_HANDLE, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_INVALID_HANDLE, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( (HANDLE)0xdeadbeef, (void *)8, 0, &timeout ); - ok( status == STATUS_INVALID_HANDLE, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_INVALID_HANDLE, "NtReleaseKeyedEvent %lx\n", status ); thread = CreateThread( NULL, 0, keyed_event_thread, 0, 0, NULL ); for (i = 0; i < 20; i++) @@ -261,15 +262,15 @@ static void test_keyed_events(void) status = pNtReleaseKeyedEvent( handle, (void *)(i * 2), 0, NULL ); else status = pNtWaitForKeyedEvent( handle, (void *)(i * 2), 0, NULL ); - ok( status == STATUS_SUCCESS, "%li: failed %x\n", i, status ); + ok( status == STATUS_SUCCESS, "%Ii: failed %lx\n", i, status ); Sleep( i ); } status = pNtWaitForKeyedEvent( handle, (void *)0x1234, 0, &timeout ); - ok( status == STATUS_SUCCESS, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_SUCCESS, "NtWaitForKeyedEvent %lx\n", status ); status = pNtWaitForKeyedEvent( handle, (void *)0x5678, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( handle, (void *)0x9abc, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %lx\n", status ); ok( WaitForSingleObject( thread, 30000 ) == 0, "wait failed\n" ); @@ -278,65 +279,65 @@ static void test_keyed_events(void) /* test access rights */ status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAIT, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + ok( !status, "NtCreateKeyedEvent failed %lx\n", status ); status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %lx\n", status ); NtClose( handle ); status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_WAKE, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + ok( !status, "NtCreateKeyedEvent failed %lx\n", status ); status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %lx\n", status ); NtClose( handle ); status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + ok( !status, "NtCreateKeyedEvent failed %lx\n", status ); status = WaitForSingleObject( handle, 1000 ); ok( status == WAIT_FAILED && GetLastError() == ERROR_ACCESS_DENIED, - "WaitForSingleObject %x err %u\n", status, GetLastError() ); + "WaitForSingleObject %lx err %lu\n", status, GetLastError() ); status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %lx\n", status ); NtClose( handle ); /* GENERIC_READ gives wait access */ status = pNtCreateKeyedEvent( &handle, GENERIC_READ, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + ok( !status, "NtCreateKeyedEvent failed %lx\n", status ); status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_ACCESS_DENIED, "NtReleaseKeyedEvent %lx\n", status ); NtClose( handle ); /* GENERIC_WRITE gives wake access */ status = pNtCreateKeyedEvent( &handle, GENERIC_WRITE, &attr, 0 ); - ok( !status, "NtCreateKeyedEvent failed %x\n", status ); + ok( !status, "NtCreateKeyedEvent failed %lx\n", status ); status = pNtWaitForKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_ACCESS_DENIED, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( handle, (void *)8, 0, &timeout ); - ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %lx\n", status ); /* it's not an event */ status = pNtPulseEvent( handle, NULL ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %lx\n", status ); status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* 7+ */, - "CreateEvent %x\n", status ); + "CreateEvent %lx\n", status ); NtClose( handle ); status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); - ok( status == 0, "CreateEvent %x\n", status ); + ok( status == 0, "CreateEvent %lx\n", status ); status = pNtWaitForKeyedEvent( event, (void *)8, 0, &timeout ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtWaitForKeyedEvent %x\n", status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtWaitForKeyedEvent %lx\n", status ); status = pNtReleaseKeyedEvent( event, (void *)8, 0, &timeout ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtReleaseKeyedEvent %x\n", status ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtReleaseKeyedEvent %lx\n", status ); NtClose( event ); } @@ -349,12 +350,12 @@ static DWORD WINAPI mutant_thread( void *arg ) mutant = arg; ret = WaitForSingleObject( mutant, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08lx\n", ret ); memset(&info, 0xcc, sizeof(info)); status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08lx\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %ld\n", info.CurrentCount ); ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); /* abandon mutant */ @@ -377,76 +378,76 @@ static void test_mutant(void) pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test_mutant"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtCreateMutant(&mutant, GENERIC_ALL, &attr, TRUE); - ok( status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create Mutant(%08lx)\n", status ); /* bogus */ status = pNtQueryMutant(mutant, MutantBasicInformation, &info, 0, NULL); ok( status == STATUS_INFO_LENGTH_MISMATCH, - "Failed to NtQueryMutant, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + "Failed to NtQueryMutant, expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status ); status = pNtQueryMutant(mutant, 0x42, &info, sizeof(info), NULL); ok( status == STATUS_INVALID_INFO_CLASS || broken(status == STATUS_NOT_IMPLEMENTED), /* 32-bit on Vista/2k8 */ - "Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + "Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); status = pNtQueryMutant((HANDLE)0xdeadbeef, MutantBasicInformation, &info, sizeof(info), NULL); ok( status == STATUS_INVALID_HANDLE, - "Failed to NtQueryMutant, expected STATUS_INVALID_HANDLE, got %08x\n", status ); + "Failed to NtQueryMutant, expected STATUS_INVALID_HANDLE, got %08lx\n", status ); /* new */ len = -1; memset(&info, 0xcc, sizeof(info)); status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), &len); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08lx\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %ld\n", info.CurrentCount ); ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); - ok( len == sizeof(info), "got %u\n", len ); + ok( len == sizeof(info), "got %lu\n", len ); ret = WaitForSingleObject( mutant, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08lx\n", ret ); memset(&info, 0xcc, sizeof(info)); status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == -1, "expected -1, got %d\n", info.CurrentCount ); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08lx\n", status ); + ok( info.CurrentCount == -1, "expected -1, got %ld\n", info.CurrentCount ); ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); prev = 0xdeadbeef; status = pNtReleaseMutant(mutant, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); - ok( prev == -1, "NtReleaseMutant failed, expected -1, got %d\n", prev ); + ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08lx\n", status ); + ok( prev == -1, "NtReleaseMutant failed, expected -1, got %ld\n", prev ); prev = 0xdeadbeef; status = pNtReleaseMutant(mutant, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); - ok( prev == 0, "NtReleaseMutant failed, expected 0, got %d\n", prev ); + ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08lx\n", status ); + ok( prev == 0, "NtReleaseMutant failed, expected 0, got %ld\n", prev ); memset(&info, 0xcc, sizeof(info)); status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08lx\n", status ); + ok( info.CurrentCount == 1, "expected 1, got %ld\n", info.CurrentCount ); ok( info.OwnedByCaller == FALSE, "expected FALSE, got %d\n", info.OwnedByCaller ); ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); /* abandoned */ thread = CreateThread( NULL, 0, mutant_thread, mutant, 0, NULL ); ret = WaitForSingleObject( thread, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08lx\n", ret ); CloseHandle( thread ); memset(&info, 0xcc, sizeof(info)); status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 1, "expected 0, got %d\n", info.CurrentCount ); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08lx\n", status ); + ok( info.CurrentCount == 1, "expected 0, got %ld\n", info.CurrentCount ); ok( info.OwnedByCaller == FALSE, "expected FALSE, got %d\n", info.OwnedByCaller ); ok( info.AbandonedState == TRUE, "expected TRUE, got %d\n", info.AbandonedState ); ret = WaitForSingleObject( mutant, 1000 ); - ok( ret == WAIT_ABANDONED_0, "WaitForSingleObject failed %08x\n", ret ); + ok( ret == WAIT_ABANDONED_0, "WaitForSingleObject failed %08lx\n", ret ); memset(&info, 0xcc, sizeof(info)); status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( status == STATUS_SUCCESS, "NtQueryMutant failed %08lx\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %ld\n", info.CurrentCount ); ok( info.OwnedByCaller == TRUE, "expected TRUE, got %d\n", info.OwnedByCaller ); ok( info.AbandonedState == FALSE, "expected FALSE, got %d\n", info.AbandonedState ); @@ -468,63 +469,63 @@ static void test_semaphore(void) InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 2, 1); - ok( status == STATUS_INVALID_PARAMETER, "Failed to create Semaphore(%08x)\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "Failed to create Semaphore(%08lx)\n", status ); status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 1, 2); - ok( status == STATUS_SUCCESS, "Failed to create Semaphore(%08x)\n", status ); + ok( status == STATUS_SUCCESS, "Failed to create Semaphore(%08lx)\n", status ); /* bogus */ status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, 0, NULL); ok( status == STATUS_INFO_LENGTH_MISMATCH, - "Failed to NtQuerySemaphore, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + "Failed to NtQuerySemaphore, expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status ); status = pNtQuerySemaphore(semaphore, 0x42, &info, sizeof(info), NULL); ok( status == STATUS_INVALID_INFO_CLASS, - "Failed to NtQuerySemaphore, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + "Failed to NtQuerySemaphore, expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); status = pNtQuerySemaphore((HANDLE)0xdeadbeef, SemaphoreBasicInformation, &info, sizeof(info), NULL); ok( status == STATUS_INVALID_HANDLE, - "Failed to NtQuerySemaphore, expected STATUS_INVALID_HANDLE, got %08x\n", status ); + "Failed to NtQuerySemaphore, expected STATUS_INVALID_HANDLE, got %08lx\n", status ); len = -1; memset(&info, 0xcc, sizeof(info)); status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), &len); - ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); - ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); - ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); - ok( len == sizeof(info), "got %u\n", len ); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08lx\n", status ); + ok( info.CurrentCount == 1, "expected 1, got %ld\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %ld\n", info.MaximumCount ); + ok( len == sizeof(info), "got %lu\n", len ); ret = WaitForSingleObject( semaphore, 1000 ); - ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08lx\n", ret ); memset(&info, 0xcc, sizeof(info)); status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); - ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); - ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08lx\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %ld\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %ld\n", info.MaximumCount ); prev = 0xdeadbeef; status = pNtReleaseSemaphore(semaphore, 3, &prev); - ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); + ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08lx\n", status ); + ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %ld\n", prev ); prev = 0xdeadbeef; status = pNtReleaseSemaphore(semaphore, 1, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 0, "NtReleaseSemaphore failed, expected 0, got %d\n", prev ); + ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08lx\n", status ); + ok( prev == 0, "NtReleaseSemaphore failed, expected 0, got %ld\n", prev ); prev = 0xdeadbeef; status = pNtReleaseSemaphore(semaphore, 1, &prev); - ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 1, "NtReleaseSemaphore failed, expected 1, got %d\n", prev ); + ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08lx\n", status ); + ok( prev == 1, "NtReleaseSemaphore failed, expected 1, got %ld\n", prev ); prev = 0xdeadbeef; status = pNtReleaseSemaphore(semaphore, 1, &prev); - ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); - ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); + ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08lx\n", status ); + ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %ld\n", prev ); memset(&info, 0xcc, sizeof(info)); status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); - ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); - ok( info.CurrentCount == 2, "expected 2, got %d\n", info.CurrentCount ); - ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08lx\n", status ); + ok( info.CurrentCount == 2, "expected 2, got %ld\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %ld\n", info.MaximumCount ); NtClose( semaphore ); } @@ -558,7 +559,7 @@ static void test_wait_on_address(void) address = 0; compare = 0; status = pRtlWaitOnAddress(&address, &compare, 5, NULL); - ok(status == STATUS_INVALID_PARAMETER, "got %x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got %lx\n", status); /* values match */ address = 0; @@ -567,9 +568,9 @@ static void test_wait_on_address(void) timeout.QuadPart = start.QuadPart + 100 * 10000; status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); pNtQuerySystemTime(&end); - ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + ok(status == STATUS_TIMEOUT, "got 0x%08lx\n", status); elapsed = (end.QuadPart - start.QuadPart) / 10000; - ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); + ok(90 <= elapsed && elapsed <= 900, "timed out in %lu ms\n", elapsed); ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); @@ -583,17 +584,17 @@ static void test_wait_on_address(void) timeout.QuadPart = -100 * 10000; status = pRtlWaitOnAddress(&address, &compare, size, &timeout); pNtQuerySystemTime(&end); - ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + ok(status == STATUS_TIMEOUT, "got 0x%08lx\n", status); elapsed = (end.QuadPart - start.QuadPart) / 10000; - ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); + ok(90 <= elapsed && elapsed <= 900, "timed out in %lu ms\n", elapsed); status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); - ok(!status, "got 0x%08x\n", status); + ok(!status, "got 0x%08lx\n", status); } address = 0; compare = 1; status = pRtlWaitOnAddress(&address, &compare, 8, NULL); - ok(!status, "got 0x%08x\n", status); + ok(!status, "got 0x%08lx\n", status); /* no waiters */ address = 0; @@ -761,10 +762,10 @@ static DWORD WINAPI tid_alert_thread( void *arg ) NTSTATUS ret; ret = pNtAlertThreadByThreadId( arg ); - ok(!ret, "got %#x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = pNtWaitForAlertByThreadId( (void *)0x123, NULL ); - ok(ret == STATUS_ALERTED, "got %#x\n", ret); + ok(ret == STATUS_ALERTED, "got %#lx\n", ret); return 0; } @@ -786,52 +787,52 @@ static void test_tid_alert( char **argv ) } ret = pNtWaitForAlertByThreadId( (void *)0x123, &timeout ); - ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + ok(ret == STATUS_TIMEOUT, "got %#lx\n", ret); ret = pNtAlertThreadByThreadId( 0 ); - ok(ret == STATUS_INVALID_CID, "got %#x\n", ret); + ok(ret == STATUS_INVALID_CID, "got %#lx\n", ret); ret = pNtAlertThreadByThreadId( (HANDLE)0xdeadbeef ); - ok(ret == STATUS_INVALID_CID, "got %#x\n", ret); + ok(ret == STATUS_INVALID_CID, "got %#lx\n", ret); ret = pNtAlertThreadByThreadId( (HANDLE)(DWORD_PTR)GetCurrentThreadId() ); - ok(!ret, "got %#x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = pNtAlertThreadByThreadId( (HANDLE)(DWORD_PTR)GetCurrentThreadId() ); - ok(!ret, "got %#x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = pNtWaitForAlertByThreadId( (void *)0x123, &timeout ); - ok(ret == STATUS_ALERTED, "got %#x\n", ret); + ok(ret == STATUS_ALERTED, "got %#lx\n", ret); ret = pNtWaitForAlertByThreadId( (void *)0x123, &timeout ); - ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + ok(ret == STATUS_TIMEOUT, "got %#lx\n", ret); ret = pNtWaitForAlertByThreadId( (void *)0x321, &timeout ); - ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + ok(ret == STATUS_TIMEOUT, "got %#lx\n", ret); thread = CreateThread( NULL, 0, tid_alert_thread, (HANDLE)(DWORD_PTR)GetCurrentThreadId(), 0, &tid ); timeout.QuadPart = -1000 * 10000; ret = pNtWaitForAlertByThreadId( (void *)0x123, &timeout ); - ok(ret == STATUS_ALERTED, "got %#x\n", ret); + ok(ret == STATUS_ALERTED, "got %#lx\n", ret); ret = WaitForSingleObject( thread, 100 ); - ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + ok(ret == WAIT_TIMEOUT, "got %ld\n", ret); ret = pNtAlertThreadByThreadId( (HANDLE)(DWORD_PTR)tid ); - ok(!ret, "got %#x\n", ret); + ok(!ret, "got %#lx\n", ret); ret = WaitForSingleObject( thread, 1000 ); - ok(!ret, "got %d\n", ret); + ok(!ret, "got %ld\n", ret); ret = pNtAlertThreadByThreadId( (HANDLE)(DWORD_PTR)tid ); - ok(!ret, "got %#x\n", ret); + ok(!ret, "got %#lx\n", ret); CloseHandle(thread); sprintf( cmdline, "%s %s subprocess", argv[0], argv[1] ); ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); - ok(ret, "failed to create process, error %u\n", GetLastError()); + ok(ret, "failed to create process, error %lu\n", GetLastError()); ret = pNtAlertThreadByThreadId( (HANDLE)(DWORD_PTR)pi.dwThreadId ); - todo_wine ok(ret == STATUS_ACCESS_DENIED, "got %#x\n", ret); + todo_wine ok(ret == STATUS_ACCESS_DENIED, "got %#lx\n", ret); ok(!WaitForSingleObject( pi.hProcess, 1000 ), "wait failed\n"); CloseHandle( pi.hProcess ); CloseHandle( pi.hThread );

1 0

[PATCH] dlls/ntdll/tests/string.c: enable compilation with long types
by Eric Pouech March 23, 2022

March 23, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/string.c | 47 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 6939dd3c15e..eabbe86792b 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.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 <stdlib.h> #include <limits.h> @@ -308,10 +309,10 @@ static void one_ltoa_test(int test_num, const ulong2str_t *ulong2str) value = ulong2str->value; result = p_ltoa(ulong2str->value, dest_str, ulong2str->base); ok(result == dest_str, - "(test %d): _ltoa(%d, [out], %d) has result %p, expected: %p\n", + "(test %d): _ltoa(%ld, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_str); ok(memcmp(dest_str, ulong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, - "(test %d): _ltoa(%d, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ltoa(%ld, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, dest_str, ulong2str->Buffer); } @@ -327,10 +328,10 @@ static void one_ultoa_test(int test_num, const ulong2str_t *ulong2str) value = ulong2str->value; result = p_ultoa(ulong2str->value, dest_str, ulong2str->base); ok(result == dest_str, - "(test %d): _ultoa(%u, [out], %d) has result %p, expected: %p\n", + "(test %d): _ultoa(%lu, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_str); ok(memcmp(dest_str, ulong2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, - "(test %d): _ultoa(%u, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ultoa(%lu, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, dest_str, ulong2str->Buffer); } @@ -415,10 +416,10 @@ static void one_ltow_test(int test_num, const ulong2str_t *ulong2str) result = p_ltow(value, dest_wstr, ulong2str->base); pRtlUnicodeStringToAnsiString(&ansi_str, &unicode_string, 1); ok(result == dest_wstr, - "(test %d): _ltow(%d, [out], %d) has result %p, expected: %p\n", + "(test %d): _ltow(%ld, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_wstr); ok(memcmp(dest_wstr, expected_wstr, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): _ltow(%d, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ltow(%ld, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, ansi_str.Buffer, ulong2str->Buffer); pRtlFreeAnsiString(&ansi_str); } @@ -451,10 +452,10 @@ static void one_ultow_test(int test_num, const ulong2str_t *ulong2str) result = p_ultow(value, dest_wstr, ulong2str->base); pRtlUnicodeStringToAnsiString(&ansi_str, &unicode_string, 1); ok(result == dest_wstr, - "(test %d): _ultow(%u, [out], %d) has result %p, expected: %p\n", + "(test %d): _ultow(%lu, [out], %d) has result %p, expected: %p\n", test_num, value, ulong2str->base, result, dest_wstr); ok(memcmp(dest_wstr, expected_wstr, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): _ultow(%u, [out], %d) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): _ultow(%lu, [out], %d) assigns string \"%s\", expected: \"%s\"\n", test_num, value, ulong2str->base, ansi_str.Buffer, ulong2str->Buffer); pRtlFreeAnsiString(&ansi_str); } @@ -481,7 +482,7 @@ static void test_ulongtow(void) /* Crashes on XP and W2K3 */ result = p_itow(ulong2str[0].value, NULL, 10); ok(result == NULL, - "(test a): _itow(%d, NULL, 10) has result %p, expected: NULL\n", + "(test a): _itow(%ld, NULL, 10) has result %p, expected: NULL\n", ulong2str[0].value, result); } @@ -489,7 +490,7 @@ static void test_ulongtow(void) /* Crashes on XP and W2K3 */ result = p_ltow(ulong2str[0].value, NULL, 10); ok(result == NULL, - "(test b): _ltow(%d, NULL, 10) has result %p, expected: NULL\n", + "(test b): _ltow(%ld, NULL, 10) has result %p, expected: NULL\n", ulong2str[0].value, result); } @@ -497,7 +498,7 @@ static void test_ulongtow(void) /* Crashes on XP and W2K3 */ result = p_ultow(ulong2str[0].value, NULL, 10); ok(result == NULL, - "(test c): _ultow(%d, NULL, 10) has result %p, expected: NULL\n", + "(test c): _ultow(%ld, NULL, 10) has result %p, expected: NULL\n", ulong2str[0].value, result); } } @@ -959,7 +960,7 @@ static void test_wtoi(void) pRtlCreateUnicodeStringFromAsciiz(&uni, str2long[test_num].str); result = p_wtoi(uni.Buffer); ok(result == str2long[test_num].value, - "(test %d): call failed: _wtoi(\"%s\") has result %d, expected: %d\n", + "(test %d): call failed: _wtoi(\"%s\") has result %d, expected: %ld\n", test_num, str2long[test_num].str, result, str2long[test_num].value); pRtlFreeUnicodeString(&uni); } /* for */ @@ -973,7 +974,7 @@ static void test_atoi(void) for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { result = patoi(str2long[test_num].str); ok(result == str2long[test_num].value, - "(test %d): call failed: _atoi(\"%s\") has result %d, expected: %d\n", + "(test %d): call failed: _atoi(\"%s\") has result %d, expected: %ld\n", test_num, str2long[test_num].str, result, str2long[test_num].value); } } @@ -986,7 +987,7 @@ static void test_atol(void) for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { result = patol(str2long[test_num].str); ok(result == str2long[test_num].value, - "(test %d): call failed: _atol(\"%s\") has result %d, expected: %d\n", + "(test %d): call failed: _atol(\"%s\") has result %d, expected: %ld\n", test_num, str2long[test_num].str, result, str2long[test_num].value); } } @@ -1001,14 +1002,14 @@ static void test_wtol(void) pRtlCreateUnicodeStringFromAsciiz(&uni, str2long[test_num].str); result = p_wtol(uni.Buffer); ok(result == str2long[test_num].value, - "(test %d): call failed: _wtol(\"%s\") has result %d, expected: %d\n", + "(test %d): call failed: _wtol(\"%s\") has result %ld, expected: %ld\n", test_num, str2long[test_num].str, result, str2long[test_num].value); pRtlFreeUnicodeString(&uni); } result = p_wtol( L"\t\xa0\n 12" ); - ok( result == 12, "got %d\n", result ); + ok( result == 12, "got %ld\n", result ); result = p_wtol( L"\x3000 12" ); - ok( result == 0, "got %d\n", result ); + ok( result == 0, "got %ld\n", result ); } @@ -1231,10 +1232,10 @@ static void test_wcstol(void) for (i = 0; i < ARRAY_SIZE(tests); i++) { res = pwcstol( tests[i].str, &endpos, tests[i].base ); - ok( res == tests[i].res, "%u: %s res %08x\n", i, wine_dbgstr_w(tests[i].str), res ); + ok( res == tests[i].res, "%u: %s res %08lx\n", i, wine_dbgstr_w(tests[i].str), res ); if (!res) ok( endpos == tests[i].str, "%u: wrong endpos %p/%p\n", i, endpos, tests[i].str ); ures = pwcstoul( tests[i].str, &endpos, tests[i].base ); - ok( ures == tests[i].ures, "%u: %s res %08x\n", i, wine_dbgstr_w(tests[i].str), ures ); + ok( ures == tests[i].ures, "%u: %s res %08lx\n", i, wine_dbgstr_w(tests[i].str), ures ); } /* Test various unicode digits */ @@ -1242,14 +1243,14 @@ static void test_wcstol(void) { WCHAR tmp[] = { zeros[i] + 4, zeros[i], zeros[i] + 5, 0 }; res = pwcstol(tmp, NULL, 0); - ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], res); + ok(res == 405, "with zero = U+%04X: got %ld, expected 405\n", zeros[i], res); ures = pwcstoul(tmp, NULL, 0); - ok(ures == 405, "with zero = U+%04X: got %u, expected 405\n", zeros[i], ures); + ok(ures == 405, "with zero = U+%04X: got %lu, expected 405\n", zeros[i], ures); tmp[1] = zeros[i] + 10; res = pwcstol(tmp, NULL, 16); - ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], res); + ok(res == 4, "with zero = U+%04X: got %ld, expected 4\n", zeros[i], res); ures = pwcstoul(tmp, NULL, 16); - ok(ures == 4, "with zero = U+%04X: got %u, expected 4\n", zeros[i], ures); + ok(ures == 4, "with zero = U+%04X: got %lu, expected 4\n", zeros[i], ures); } }

1 0