- wine-devel - winehq.org

[PATCH] ntdll: Return the UI language id in uppercase.
by Francois Gouget 23 Mar '22

23 Mar '22

This fixes a failure in kernel32:locale. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- https://test.winehq.org/data/patterns.html#kernel32:locale The test was introduced in commit 68dc3d411674. At the time this lead to tweaking the nls ILANGUAGE values: https://www.winehq.org/pipermail/wine-devel/2021-December/202660.html --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 158f068b03d..e24b4d8188f 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -605,7 +605,7 @@ static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); - if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lx", lang ); + if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lX", lang ); else { UNICODE_STRING str; -- 2.30.2

1 0

[PATCH v2 2/8] user32: Use dispatch_win_proc_params in CallWindowProc.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed a typo in commit message dlls/user32/winproc.c | 70 ++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 30 deletions(-)

2 1

[PATCH 8/8] win32u: Move ScreenToClient implementation from user32.
by Jacek Caban 23 Mar '22

23 Mar '22

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

3 2

[PATCH 7/8] user32: Merge WINPROC_call_window into call_window_proc.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 62 ++++++++++++++++++++++++++++++++------ dlls/user32/user_private.h | 3 +- dlls/user32/winproc.c | 55 ++++----------------------------- 3 files changed, 59 insertions(+), 61 deletions(-)

3 2

[PATCH 6/8] user32: Use User32CallWinEventHook in peek_message.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/hook.c | 6 +++--- dlls/user32/message.c | 43 ++++++++++++++++--------------------------- dlls/win32u/hook.c | 2 ++ include/ntuser.h | 2 ++ 4 files changed, 23 insertions(+), 30 deletions(-)

3 2

[PATCH 5/8] win32u: Implement NtUserDispatchMessage.
by Jacek Caban 23 Mar '22

23 Mar '22

3 2

[PATCH 4/8] win32u: Move init_win_proc_params implementation from user32.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winproc.c | 46 +++++++----------------------------- dlls/win32u/class.c | 21 +++++++++++++++- dlls/win32u/message.c | 22 +++++++++++++++++ dlls/win32u/ntuser_private.h | 1 + include/ntuser.h | 1 + 5 files changed, 52 insertions(+), 39 deletions(-)

3 2

[PATCH 3/8] user32: Move more code out of call_window_proc.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winproc.c | 20 ++++++++++++-------- include/ntuser.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-)

3 2

[PATCH 2/8] win32u: Use dispatch_win_proc_params in CallWindowProc.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winproc.c | 70 ++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 30 deletions(-)

3 2

[PATCH 1/8] user32: Factor out dispatch_win_proc_params.
by Jacek Caban 23 Mar '22

23 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_private.h | 13 --- dlls/user32/winproc.c | 174 +++++++++++++++++++++++-------------- include/ntuser.h | 30 +++++++ 3 files changed, 140 insertions(+), 77 deletions(-)

3 2

[PATCH v2 1/2] dinput/tests: Wait for spurious Win7 polled HID device events.
by Rémi Bernon 23 Mar '22

23 Mar '22

Win7 has spurious device arrival / removal messages for the first polled HID device created, probably when installing the driver the first time, and it causes a timeout if we open it before it completed its sequence. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/hid.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index de77c02540f..8f984a006ac 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -74,7 +74,7 @@ const GUID expect_guid_product = {EXPECT_VIDPID, 0x0000, 0x0000, {0x00, 0x00, 'P const WCHAR expect_path[] = L"\\\\?\\hid#vid_1209&pid_0001#2&"; const WCHAR expect_path_end[] = L"&0000#{4d1e55b2-f16f-11cf-88cb-001111000030}"; HANDLE device_added, device_removed; -static BOOL hid_device_created; +static LONG device_added_count; static struct winetest_shared_data *test_data; static HANDLE monitor_thread, monitor_stop; @@ -734,7 +734,6 @@ BOOL hid_device_start( struct hid_device_desc *desc ) CloseHandle( control ); WaitForSingleObject( device_added, INFINITE ); - hid_device_created = TRUE; return TRUE; } @@ -2471,6 +2470,11 @@ static void test_hid_device( DWORD report_id, DWORD polled, const HIDP_CAPS *exp winetest_push_context( "id %ld%s", report_id, polled ? " poll" : "" ); + /* Win7 has a spurious device removal event with polled HID devices */ + if (!polled || !strcmp(winetest_platform, "wine")) ret = WAIT_TIMEOUT; + else ret = WaitForSingleObject( device_removed, 2000 ); + if (!ret && InterlockedOr( &device_added_count, 0 ) == 1) WaitForSingleObject( device_added, INFINITE ); + swprintf( device_path, MAX_PATH, L"\\\\?\\hid#vid_%04x&pid_%04x", vid, pid ); ret = find_hid_device_path( device_path ); ok( ret, "Failed to find HID device matching %s\n", debugstr_w( device_path ) ); @@ -3339,7 +3343,10 @@ static LRESULT CALLBACK monitor_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPA if (wparam == DBT_DEVICEREMOVECOMPLETE && IsEqualGUID( &iface->dbcc_classguid, &control_class )) SetEvent( device_removed ); if (wparam == DBT_DEVICEARRIVAL && IsEqualGUID( &iface->dbcc_classguid, &GUID_DEVINTERFACE_HID )) + { + InterlockedIncrement( &device_added_count ); SetEvent( device_added ); + } } return DefWindowProcW( hwnd, msg, wparam, lparam ); @@ -3648,7 +3655,6 @@ static void test_bus_driver(void) ok( ret, "IOCTL_WINETEST_CREATE_DEVICE failed, last error %lu\n", GetLastError() ); WaitForSingleObject( device_added, INFINITE ); - hid_device_created = TRUE; swprintf( device_path, MAX_PATH, L"\\\\?\\hid#vid_%04x&pid_%04x", LOWORD(EXPECT_VIDPID), HIWORD(EXPECT_VIDPID) ); ret = find_hid_device_path( device_path ); -- 2.35.1

2 2

[PATCH] bcrypt: Fix ECC public key export.
by Paul Gofman 23 Mar '22

23 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 20 +++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 884f4b1d37e..9de126c2bfe 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -91,6 +91,8 @@ static int (*pgnutls_cipher_add_auth)(gnutls_cipher_hd_t, const void *, size_t); static gnutls_sign_algorithm_t (*pgnutls_pk_to_sign)(gnutls_pk_algorithm_t, gnutls_digest_algorithm_t); static int (*pgnutls_pubkey_import_ecc_raw)(gnutls_pubkey_t, gnutls_ecc_curve_t, const gnutls_datum_t *, const gnutls_datum_t *); +static int (*pgnutls_pubkey_export_ecc_raw)(gnutls_pubkey_t key, gnutls_ecc_curve_t *curve, + gnutls_datum_t *x, gnutls_datum_t *y); static int (*pgnutls_privkey_import_ecc_raw)(gnutls_privkey_t, gnutls_ecc_curve_t, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *); static int (*pgnutls_pubkey_verify_hash2)(gnutls_pubkey_t, gnutls_sign_algorithm_t, unsigned int, @@ -158,6 +160,12 @@ static int compat_gnutls_pubkey_import_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_c return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_pubkey_export_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_curve_t *curve, + gnutls_datum_t *x, gnutls_datum_t *y) +{ + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static int compat_gnutls_privkey_export_rsa_raw(gnutls_privkey_t key, gnutls_datum_t *m, gnutls_datum_t *e, gnutls_datum_t *d, gnutls_datum_t *p, gnutls_datum_t *q, gnutls_datum_t *u, gnutls_datum_t *e1, gnutls_datum_t *e2) @@ -292,6 +300,7 @@ static NTSTATUS gnutls_process_attach( void *args ) LOAD_FUNCPTR_OPT(gnutls_cipher_tag) LOAD_FUNCPTR_OPT(gnutls_cipher_add_auth) LOAD_FUNCPTR_OPT(gnutls_pubkey_import_ecc_raw) + LOAD_FUNCPTR_OPT(gnutls_pubkey_export_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_rsa_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_import_ecc_raw) @@ -673,7 +682,14 @@ static NTSTATUS key_export_ecc_public( struct key *key, UCHAR *buf, ULONG len, U return STATUS_NOT_IMPLEMENTED; } - if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL ))) + if (key_data(key)->a.pubkey) + ret = pgnutls_pubkey_export_ecc_raw( key_data(key)->a.pubkey, &curve, &x, &y ); + else if (key_data(key)->a.privkey) + ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL ); + else + return STATUS_INVALID_PARAMETER; + + if (ret) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -910,6 +926,8 @@ static NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *r return STATUS_NOT_IMPLEMENTED; } + if (!key_data(key)->a.privkey) return STATUS_INVALID_PARAMETER; + if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, &d ))) { pgnutls_perror( ret ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index efb5843fa4e..5d8e81cc522 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1860,6 +1860,16 @@ static void test_ECDSA(void) status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + memset(buffer, 0xcc, sizeof(buffer)); + status = BCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, buffer, sizeof(buffer), &size, 0); + ok(!status, "Got unexpected status %#lx\n", status); + ok(ecckey->dwMagic == BCRYPT_ECDSA_PUBLIC_P256_MAGIC, "Got unexpected magic %#lx.\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); + ok(!memcmp(ecckey + 1, eccPubkey, sizeof(eccPubkey)), "Got unexpected key data.\n"); + + status = BCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, sizeof(buffer), &size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#lx\n", status); + status = BCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %#lx\n", status); @@ -1885,6 +1895,14 @@ static void test_ECDSA(void) status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + memset( buffer, 0xcc, sizeof(buffer) ); + status = BCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, buffer, sizeof(buffer), &size, 0); + ok(!status, "Got unexpected status %#lx\n", status); + ok(ecckey->dwMagic == BCRYPT_ECDSA_PUBLIC_P256_MAGIC, "got %#lx\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); + ok(!memcmp(ecckey + 1, eccPrivkey, sizeof(eccPubkey)), "Got unexpected key data.\n"); + + size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPrivkey); memset( buffer, 0, sizeof(buffer) ); status = BCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, size, &size, 0); ok(status == STATUS_SUCCESS, "got %#lx\n", status); -- 2.35.1

2 1

[tools] testbot/cgi: Rename FormPage::SaveProperties() to Save().
by Francois Gouget 23 Mar '22

23 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index e432fcbbd..bc8ce478c 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -361,7 +361,7 @@ sub SaveProperty($$$) die "Pure virtual function FormPage::SaveProperty called"; } -sub SaveProperties($) +sub Save($) { my ($self) = @_; @@ -394,13 +394,6 @@ sub SaveProperties($) return 1; } -sub Save($) -{ - my ($self) = @_; - - return $self->SaveProperties(); -} - sub OnAction($$) { my ($self, $Action) = @_; -- 2.30.2

1 0

[tools] testbot/cgi: Rename the OK action to Save.
by Francois Gouget 23 Mar '22

23 Mar '22

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 23 Mar '22

23 Mar '22

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 23 Mar '22

23 Mar '22

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 23 Mar '22

23 Mar '22

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 23 Mar '22

23 Mar '22

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 23 Mar '22

23 Mar '22

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 23 Mar '22

23 Mar '22

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 23 Mar '22

23 Mar '22

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 23 Mar '22

23 Mar '22

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 23 Mar '22

23 Mar '22

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

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

23 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/rtlstr.c | 265 +++++++++++++++++++++++---------------------- 1 file changed, 133 insertions(+), 132 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 9f7e5df9f67..09a3333dad6 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -21,6 +21,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> @@ -220,7 +221,7 @@ static void test_RtlInitUnicodeStringEx(void) uni.Buffer = (void *) 0xdeadbeef; result = pRtlInitUnicodeStringEx(&uni, teststring); ok(result == STATUS_SUCCESS, - "pRtlInitUnicodeStringEx(&uni, 0) returns %x, expected 0\n", + "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected 0\n", result); ok(uni.Length == 32, "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n", @@ -251,7 +252,7 @@ static void test_RtlInitUnicodeStringEx(void) uni.Buffer = (void *) 0xdeadbeef; result = pRtlInitUnicodeStringEx(&uni, teststring2); ok(result == STATUS_NAME_TOO_LONG, - "pRtlInitUnicodeStringEx(&uni, 0) returns %x, expected %x\n", + "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %lx\n", result, STATUS_NAME_TOO_LONG); ok(uni.Length == 12345 || uni.Length == 0, /* win2k3 */ @@ -287,7 +288,7 @@ static void test_RtlInitUnicodeStringEx(void) uni.Buffer = (void *) 0xdeadbeef; result = pRtlInitUnicodeStringEx(&uni, 0); ok(result == STATUS_SUCCESS, - "pRtlInitUnicodeStringEx(&uni, 0) returns %x, expected 0\n", + "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected 0\n", result); ok(uni.Length == 0, "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n", @@ -470,7 +471,7 @@ static void test_RtlDuplicateUnicodeString(void) dest_ansi_buf[dest_ansi_str.Length] = '\0'; dest_ansi_str.Buffer = dest_ansi_buf; ok(result == dupl_ustr[test_num].result, - "(test %d): RtlDuplicateUnicodeString(%d, source, dest) has result %x, expected %x\n", + "(test %d): RtlDuplicateUnicodeString(%d, source, dest) has result %lx, expected %lx\n", test_num, dupl_ustr[test_num].add_nul, result, dupl_ustr[test_num].result); ok(dest_str.Length == dupl_ustr[test_num].res_Length, "(test %d): RtlDuplicateUnicodeString(%d, source, dest) destination has Length %d, expected %d\n", @@ -828,7 +829,7 @@ static void test_RtlUnicodeStringToAnsiString(void) } result = pRtlUnicodeStringToAnsiString(&ansi_str, &uni_str, ustr2astr[test_num].doalloc); ok(result == ustr2astr[test_num].result, - "(test %d): RtlUnicodeStringToAnsiString(ansi, uni, %d) has result %x, expected %x\n", + "(test %d): RtlUnicodeStringToAnsiString(ansi, uni, %d) has result %lx, expected %lx\n", test_num, ustr2astr[test_num].doalloc, result, ustr2astr[test_num].result); ok(ansi_str.Length == ustr2astr[test_num].res_Length, "(test %d): RtlUnicodeStringToAnsiString(ansi, uni, %d) ansi has Length %d, expected %d\n", @@ -890,7 +891,7 @@ static void test_RtlAppendAsciizToString(void) } result = pRtlAppendAsciizToString(&dest_str, app_asc2str[test_num].src); ok(result == app_asc2str[test_num].result, - "(test %d): RtlAppendAsciizToString(dest, src) has result %x, expected %x\n", + "(test %d): RtlAppendAsciizToString(dest, src) has result %lx, expected %lx\n", test_num, result, app_asc2str[test_num].result); ok(dest_str.Length == app_asc2str[test_num].res_Length, "(test %d): RtlAppendAsciizToString(dest, src) dest has Length %d, expected %d\n", @@ -970,7 +971,7 @@ static void test_RtlAppendStringToString(void) } result = pRtlAppendStringToString(&dest_str, &src_str); ok(result == app_str2str[test_num].result, - "(test %d): RtlAppendStringToString(dest, src) has result %x, expected %x\n", + "(test %d): RtlAppendStringToString(dest, src) has result %lx, expected %lx\n", test_num, result, app_str2str[test_num].result); ok(dest_str.Length == app_str2str[test_num].res_Length, "(test %d): RtlAppendStringToString(dest, src) dest has Length %d, expected %d\n", @@ -1041,7 +1042,7 @@ static void test_RtlAppendUnicodeToString(void) } result = pRtlAppendUnicodeToString(&dest_str, (LPCWSTR) app_uni2str[test_num].src); ok(result == app_uni2str[test_num].result, - "(test %d): RtlAppendUnicodeToString(dest, src) has result %x, expected %x\n", + "(test %d): RtlAppendUnicodeToString(dest, src) has result %lx, expected %lx\n", test_num, result, app_uni2str[test_num].result); ok(dest_str.Length == app_uni2str[test_num].res_Length, "(test %d): RtlAppendUnicodeToString(dest, src) dest has Length %d, expected %d\n", @@ -1125,7 +1126,7 @@ static void test_RtlAppendUnicodeStringToString(void) } result = pRtlAppendUnicodeStringToString(&dest_str, &src_str); ok(result == app_ustr2str[test_num].result, - "(test %d): RtlAppendStringToString(dest, src) has result %x, expected %x\n", + "(test %d): RtlAppendStringToString(dest, src) has result %lx, expected %lx\n", test_num, result, app_ustr2str[test_num].result); ok(dest_str.Length == app_ustr2str[test_num].res_Length, "(test %d): RtlAppendStringToString(dest, src) dest has Length %d, expected %d\n", @@ -1249,7 +1250,7 @@ static void test_RtlFindCharInUnicodeString(void) pos = 12345; result = pRtlFindCharInUnicodeString(find_ch_in_ustr[test_num].flags, &main_str, &search_chars, &pos); ok(result == find_ch_in_ustr[test_num].result, - "(test %d): RtlFindCharInUnicodeString(%d, %s, %s, [out]) has result %x, expected %x\n", + "(test %d): RtlFindCharInUnicodeString(%d, %s, %s, [out]) has result %lx, expected %lx\n", test_num, find_ch_in_ustr[test_num].flags, find_ch_in_ustr[test_num].main_str, find_ch_in_ustr[test_num].search_chars, result, find_ch_in_ustr[test_num].result); @@ -1400,7 +1401,7 @@ static void test_RtlUnicodeStringToInteger(void) result = pRtlUnicodeStringToInteger(&uni, str2int[test_num].base, &value); ok(result == str2int[test_num].result || (str2int[test_num].alternative && result == str2int[test_num].alternative), - "(test %d): RtlUnicodeStringToInteger(\"%s\", %d, [out]) has result %x, expected: %x (%x)\n", + "(test %d): RtlUnicodeStringToInteger(\"%s\", %d, [out]) has result %lx, expected: %lx (%lx)\n", test_num, str2int[test_num].str, str2int[test_num].base, result, str2int[test_num].result, str2int[test_num].alternative); if (result == STATUS_SUCCESS) @@ -1419,17 +1420,17 @@ static void test_RtlUnicodeStringToInteger(void) pRtlInitUnicodeString(&uni, wstr); result = pRtlUnicodeStringToInteger(&uni, str2int[1].base, NULL); ok(result == STATUS_ACCESS_VIOLATION, - "call failed: RtlUnicodeStringToInteger(\"%s\", %d, NULL) has result %x\n", + "call failed: RtlUnicodeStringToInteger(\"%s\", %d, NULL) has result %lx\n", str2int[1].str, str2int[1].base, result); result = pRtlUnicodeStringToInteger(&uni, 20, NULL); ok(result == STATUS_INVALID_PARAMETER || result == STATUS_ACCESS_VIOLATION, - "call failed: RtlUnicodeStringToInteger(\"%s\", 20, NULL) has result %x\n", + "call failed: RtlUnicodeStringToInteger(\"%s\", 20, NULL) has result %lx\n", str2int[1].str, result); uni.Length = 10; /* Make Length shorter (5 WCHARS instead of 7) */ result = pRtlUnicodeStringToInteger(&uni, str2int[1].base, &value); ok(result == STATUS_SUCCESS, - "call failed: RtlUnicodeStringToInteger(\"12345\", %d, [out]) has result %x\n", + "call failed: RtlUnicodeStringToInteger(\"12345\", %d, [out]) has result %lx\n", str2int[1].base, result); ok(value == 12345, "didn't return expected value (test a): expected: %d, got: %d\n", @@ -1438,7 +1439,7 @@ static void test_RtlUnicodeStringToInteger(void) uni.Length = 5; /* Use odd Length (2.5 WCHARS) */ result = pRtlUnicodeStringToInteger(&uni, str2int[1].base, &value); ok(result == STATUS_SUCCESS || result == STATUS_INVALID_PARAMETER /* vista */, - "call failed: RtlUnicodeStringToInteger(\"12\", %d, [out]) has result %x\n", + "call failed: RtlUnicodeStringToInteger(\"12\", %d, [out]) has result %lx\n", str2int[1].base, result); if (result == STATUS_SUCCESS) ok(value == 12, "didn't return expected value (test b): expected: %d, got: %d\n", 12, value); @@ -1446,7 +1447,7 @@ static void test_RtlUnicodeStringToInteger(void) uni.Length = 2; result = pRtlUnicodeStringToInteger(&uni, str2int[1].base, &value); ok(result == STATUS_SUCCESS, - "call failed: RtlUnicodeStringToInteger(\"1\", %d, [out]) has result %x\n", + "call failed: RtlUnicodeStringToInteger(\"1\", %d, [out]) has result %lx\n", str2int[1].base, result); ok(value == 1, "didn't return expected value (test c): expected: %d, got: %d\n", @@ -1469,7 +1470,7 @@ static void test_RtlCharToInteger(void) result = pRtlCharToInteger(str2int[test_num].str, str2int[test_num].base, &value); ok(result == str2int[test_num].result || (str2int[test_num].alternative && result == str2int[test_num].alternative), - "(test %d): call failed: RtlCharToInteger(\"%s\", %d, [out]) has result %x, expected: %x (%x)\n", + "(test %d): call failed: RtlCharToInteger(\"%s\", %d, [out]) has result %lx, expected: %lx (%lx)\n", test_num, str2int[test_num].str, str2int[test_num].base, result, str2int[test_num].result, str2int[test_num].alternative); if (result == STATUS_SUCCESS) @@ -1485,12 +1486,12 @@ static void test_RtlCharToInteger(void) result = pRtlCharToInteger(str2int[1].str, str2int[1].base, NULL); ok(result == STATUS_ACCESS_VIOLATION, - "call failed: RtlCharToInteger(\"%s\", %d, NULL) has result %x\n", + "call failed: RtlCharToInteger(\"%s\", %d, NULL) has result %lx\n", str2int[1].str, str2int[1].base, result); result = pRtlCharToInteger(str2int[1].str, 20, NULL); ok(result == STATUS_INVALID_PARAMETER, - "call failed: RtlCharToInteger(\"%s\", 20, NULL) has result %x\n", + "call failed: RtlCharToInteger(\"%s\", 20, NULL) has result %lx\n", str2int[1].str, result); } @@ -1657,22 +1658,22 @@ static void one_RtlIntegerToUnicodeString_test(int test_num, const int2str_t *in } } else { ok(result == int2str->result, - "(test %d): RtlIntegerToUnicodeString(%u, %d, [out]) has result %x, expected: %x\n", + "(test %d): RtlIntegerToUnicodeString(%lu, %d, [out]) has result %lx, expected: %lx\n", test_num, int2str->value, int2str->base, result, int2str->result); if (result == STATUS_SUCCESS) { ok(unicode_string.Buffer[unicode_string.Length/sizeof(WCHAR)] == '\0', - "(test %d): RtlIntegerToUnicodeString(%u, %d, [out]) string \"%s\" is not NULL terminated\n", + "(test %d): RtlIntegerToUnicodeString(%lu, %d, [out]) string \"%s\" is not NULL terminated\n", test_num, int2str->value, int2str->base, ansi_str.Buffer); } } ok(memcmp(unicode_string.Buffer, expected_unicode_string.Buffer, STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): RtlIntegerToUnicodeString(%u, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): RtlIntegerToUnicodeString(%lu, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", test_num, int2str->value, int2str->base, ansi_str.Buffer, expected_ansi_str.Buffer); ok(unicode_string.Length == expected_unicode_string.Length, - "(test %d): RtlIntegerToUnicodeString(%u, %d, [out]) string has Length %d, expected: %d\n", + "(test %d): RtlIntegerToUnicodeString(%lu, %d, [out]) string has Length %d, expected: %d\n", test_num, int2str->value, int2str->base, unicode_string.Length, expected_unicode_string.Length); ok(unicode_string.MaximumLength == expected_unicode_string.MaximumLength, - "(test %d): RtlIntegerToUnicodeString(%u, %d, [out]) string has MaximumLength %d, expected: %d\n", + "(test %d): RtlIntegerToUnicodeString(%lu, %d, [out]) string has MaximumLength %d, expected: %d\n", test_num, int2str->value, int2str->base, unicode_string.MaximumLength, expected_unicode_string.MaximumLength); pRtlFreeAnsiString(&expected_ansi_str); pRtlFreeAnsiString(&ansi_str); @@ -1697,10 +1698,10 @@ static void one_RtlIntegerToChar_test(int test_num, const int2str_t *int2str) dest_str[STRI_BUFFER_LENGTH] = '\0'; result = pRtlIntegerToChar(int2str->value, int2str->base, int2str->MaximumLength, dest_str); ok(result == int2str->result, - "(test %d): RtlIntegerToChar(%u, %d, %d, [out]) has result %x, expected: %x\n", + "(test %d): RtlIntegerToChar(%lu, %d, %d, [out]) has result %lx, expected: %lx\n", test_num, int2str->value, int2str->base, int2str->MaximumLength, result, int2str->result); ok(memcmp(dest_str, int2str->Buffer, STRI_BUFFER_LENGTH) == 0, - "(test %d): RtlIntegerToChar(%u, %d, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): RtlIntegerToChar(%lu, %d, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", test_num, int2str->value, int2str->base, int2str->MaximumLength, dest_str, int2str->Buffer); } @@ -1715,22 +1716,22 @@ static void test_RtlIntegerToChar(void) result = pRtlIntegerToChar(int2str[0].value, 20, int2str[0].MaximumLength, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test a): RtlIntegerToChar(%u, %d, %d, NULL) has result %x, expected: %x\n", + "(test a): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", int2str[0].value, 20, int2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); result = pRtlIntegerToChar(int2str[0].value, 20, 0, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test b): RtlIntegerToChar(%u, %d, %d, NULL) has result %x, expected: %x\n", + "(test b): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", int2str[0].value, 20, 0, result, STATUS_INVALID_PARAMETER); result = pRtlIntegerToChar(int2str[0].value, int2str[0].base, 0, NULL); ok(result == STATUS_BUFFER_OVERFLOW, - "(test c): RtlIntegerToChar(%u, %d, %d, NULL) has result %x, expected: %x\n", + "(test c): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", int2str[0].value, int2str[0].base, 0, result, STATUS_BUFFER_OVERFLOW); result = pRtlIntegerToChar(int2str[0].value, int2str[0].base, int2str[0].MaximumLength, NULL); ok(result == STATUS_ACCESS_VIOLATION, - "(test d): RtlIntegerToChar(%u, %d, %d, NULL) has result %x, expected: %x\n", + "(test d): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", int2str[0].value, int2str[0].base, int2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); } @@ -1883,17 +1884,17 @@ static void test_RtlCompareUnicodeString(void) for (ch2 = 0; ch2 < 1024; ch2++) { LONG res = pRtlCompareUnicodeString( &str1, &str2, FALSE ); - ok( res == (ch1 - ch2), "wrong result %d %04x %04x\n", res, ch1, ch2 ); + ok( res == (ch1 - ch2), "wrong result %ld %04x %04x\n", res, ch1, ch2 ); res = pRtlCompareUnicodeString( &str1, &str2, TRUE ); ok( res == (pRtlUpcaseUnicodeChar(ch1) - pRtlUpcaseUnicodeChar(ch2)), - "wrong result %d %04x %04x\n", res, ch1, ch2 ); + "wrong result %ld %04x %04x\n", res, ch1, ch2 ); if (pRtlCompareUnicodeStrings) { res = pRtlCompareUnicodeStrings( &ch1, 1, &ch2, 1, FALSE ); - ok( res == (ch1 - ch2), "wrong result %d %04x %04x\n", res, ch1, ch2 ); + ok( res == (ch1 - ch2), "wrong result %ld %04x %04x\n", res, ch1, ch2 ); res = pRtlCompareUnicodeStrings( &ch1, 1, &ch2, 1, TRUE ); ok( res == (pRtlUpcaseUnicodeChar(ch1) - pRtlUpcaseUnicodeChar(ch2)), - "wrong result %d %04x %04x\n", res, ch1, ch2 ); + "wrong result %ld %04x %04x\n", res, ch1, ch2 ); } } } @@ -1924,7 +1925,7 @@ static void test_RtlGUIDFromString(void) str.Buffer = (LPWSTR)szGuid; ret = pRtlGUIDFromString(&str, &guid); - ok(ret == 0, "expected ret=0, got 0x%0x\n", ret); + ok(ret == 0, "expected ret=0, got 0x%0lx\n", ret); ok(IsEqualGUID(&guid, &IID_Endianness), "Endianness broken\n"); str.Length = str.MaximumLength = sizeof(szGuid2) - sizeof(WCHAR); @@ -1949,7 +1950,7 @@ static void test_RtlStringFromGUID(void) str.Buffer = NULL; ret = pRtlStringFromGUID(&IID_Endianness, &str); - ok(ret == 0, "expected ret=0, got 0x%0x\n", ret); + ok(ret == 0, "expected ret=0, got 0x%0lx\n", ret); ok(str.Buffer && !lstrcmpiW(str.Buffer, szGuid), "Endianness broken\n"); pRtlFreeUnicodeString(&str); } @@ -1991,22 +1992,22 @@ static void test_RtlHashUnicodeString(void) } status = pRtlHashUnicodeString(NULL, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); - ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08lx\n", status); pRtlInitUnicodeString(&str, strW); status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, NULL); - ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08lx\n", status); status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_INVALID, &hash); - ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got status 0x%08lx\n", status); /* embedded null */ str.Buffer = (PWSTR)strW; str.Length = sizeof(strW) - sizeof(WCHAR); str.MaximumLength = sizeof(strW); status = pRtlHashUnicodeString(&str, FALSE, HASH_STRING_ALGORITHM_X65599, &hash); - ok(status == STATUS_SUCCESS, "got status 0x%08x\n", status); - ok(hash == 0x32803083, "got 0x%08x\n", hash); + ok(status == STATUS_SUCCESS, "got status 0x%08lx\n", status); + ok(hash == 0x32803083, "got 0x%08lx\n", hash); ptr = hash_test; while (*ptr->str) @@ -2014,8 +2015,8 @@ static void test_RtlHashUnicodeString(void) pRtlInitUnicodeString(&str, ptr->str); hash = 0; status = pRtlHashUnicodeString(&str, ptr->case_insensitive, HASH_STRING_ALGORITHM_X65599, &hash); - ok(status == STATUS_SUCCESS, "got status 0x%08x for %s\n", status, wine_dbgstr_w(ptr->str)); - ok(hash == ptr->hash, "got wrong hash 0x%08x, expected 0x%08x, for %s, mode %d\n", hash, ptr->hash, + ok(status == STATUS_SUCCESS, "got status 0x%08lx for %s\n", status, wine_dbgstr_w(ptr->str)); + ok(hash == ptr->hash, "got wrong hash 0x%08lx, expected 0x%08lx, for %s, mode %d\n", hash, ptr->hash, wine_dbgstr_w(ptr->str), ptr->case_insensitive); ptr++; @@ -2078,8 +2079,8 @@ static void utf8_expect_(const unsigned char *out_string, ULONG buflen, ULONG ou status = pRtlUnicodeToUTF8N( out_string ? buffer : NULL, buflen, &bytes_out, in_string, in_bytes); - ok_(__FILE__, line)(status == expect_status, "status 0x%x, expected 0x%x\n", status, expect_status); - ok_(__FILE__, line)(bytes_out == out_bytes, "bytes_out = %u, expected %u\n", bytes_out, out_bytes); + ok_(__FILE__, line)(status == expect_status, "status 0x%lx, expected 0x%lx\n", status, expect_status); + ok_(__FILE__, line)(bytes_out == out_bytes, "bytes_out = %lu, expected %lu\n", bytes_out, out_bytes); if (out_string) { for (i = 0; i < bytes_out; i++) @@ -2120,51 +2121,51 @@ static void test_RtlUnicodeToUTF8N(void) /* show that bytes_out is really ULONG */ memset(bytes_out_array, 0x55, sizeof(bytes_out_array)); status = pRtlUnicodeToUTF8N(NULL, 0, bytes_out_array, empty_string, 0); - ok(status == STATUS_SUCCESS, "status = 0x%x\n", status); - ok(bytes_out_array[0] == 0x00000000, "Got 0x%x\n", bytes_out_array[0]); - ok(bytes_out_array[1] == 0x55555555, "Got 0x%x\n", bytes_out_array[1]); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); + ok(bytes_out_array[0] == 0x00000000, "Got 0x%lx\n", bytes_out_array[0]); + ok(bytes_out_array[1] == 0x55555555, "Got 0x%lx\n", bytes_out_array[1]); /* parameter checks */ status = pRtlUnicodeToUTF8N(NULL, 0, NULL, NULL, 0); - ok(status == STATUS_INVALID_PARAMETER_4, "status = 0x%x\n", status); + ok(status == STATUS_INVALID_PARAMETER_4, "status = 0x%lx\n", status); status = pRtlUnicodeToUTF8N(NULL, 0, NULL, empty_string, 0); - ok(status == STATUS_INVALID_PARAMETER, "status = 0x%x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "status = 0x%lx\n", status); bytes_out = 0x55555555; status = pRtlUnicodeToUTF8N(NULL, 0, &bytes_out, NULL, 0); - ok(status == STATUS_INVALID_PARAMETER_4, "status = 0x%x\n", status); - ok(bytes_out == 0x55555555, "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_INVALID_PARAMETER_4, "status = 0x%lx\n", status); + ok(bytes_out == 0x55555555, "bytes_out = 0x%lx\n", bytes_out); bytes_out = 0x55555555; status = pRtlUnicodeToUTF8N(NULL, 0, &bytes_out, invalid_pointer, 0); - ok(status == STATUS_SUCCESS, "status = 0x%x\n", status); - ok(bytes_out == 0, "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); + ok(bytes_out == 0, "bytes_out = 0x%lx\n", bytes_out); bytes_out = 0x55555555; status = pRtlUnicodeToUTF8N(NULL, 0, &bytes_out, empty_string, 0); - ok(status == STATUS_SUCCESS, "status = 0x%x\n", status); - ok(bytes_out == 0, "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); + ok(bytes_out == 0, "bytes_out = 0x%lx\n", bytes_out); bytes_out = 0x55555555; status = pRtlUnicodeToUTF8N(NULL, 0, &bytes_out, test_string, 0); - ok(status == STATUS_SUCCESS, "status = 0x%x\n", status); - ok(bytes_out == 0, "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); + ok(bytes_out == 0, "bytes_out = 0x%lx\n", bytes_out); bytes_out = 0x55555555; status = pRtlUnicodeToUTF8N(NULL, 0, &bytes_out, empty_string, 1); - ok(status == STATUS_SUCCESS, "status = 0x%x\n", status); - ok(bytes_out == 0, "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); + ok(bytes_out == 0, "bytes_out = 0x%lx\n", bytes_out); bytes_out = 0x55555555; status = pRtlUnicodeToUTF8N(invalid_pointer, 0, &bytes_out, empty_string, 1); - ok(status == STATUS_INVALID_PARAMETER_5, "status = 0x%x\n", status); - ok(bytes_out == 0x55555555, "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_INVALID_PARAMETER_5, "status = 0x%lx\n", status); + ok(bytes_out == 0x55555555, "bytes_out = 0x%lx\n", bytes_out); bytes_out = 0x55555555; status = pRtlUnicodeToUTF8N(invalid_pointer, 8, &bytes_out, empty_string, 1); - ok(status == STATUS_INVALID_PARAMETER_5, "status = 0x%x\n", status); - ok(bytes_out == 0x55555555, "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_INVALID_PARAMETER_5, "status = 0x%lx\n", status); + ok(bytes_out == 0x55555555, "bytes_out = 0x%lx\n", bytes_out); /* length output with special chars */ #define length_expect(in_chars, out_bytes, expect_status) \ @@ -2184,14 +2185,14 @@ static void test_RtlUnicodeToUTF8N(void) memset(buffer, 0x55, sizeof(buffer)); bytes_out = 0xdeadbeef; status = pRtlUnicodeToUTF8N(buffer, i, &bytes_out, special_string, sizeof(special_string)); - ok(status == STATUS_BUFFER_TOO_SMALL, "%d: status = 0x%x\n", i, status); - ok(bytes_out == special_string_len[i], "%d: expected %u, got %u\n", i, special_string_len[i], bytes_out); + ok(status == STATUS_BUFFER_TOO_SMALL, "%d: status = 0x%lx\n", i, status); + ok(bytes_out == special_string_len[i], "%d: expected %lu, got %lu\n", i, special_string_len[i], bytes_out); ok(memcmp(buffer, special_expected, special_string_len[i]) == 0, "%d: bad conversion\n", i); } status = pRtlUnicodeToUTF8N(buffer, 7, &bytes_out, special_string, sizeof(special_string)); - ok(status == STATUS_SOME_NOT_MAPPED, "status = 0x%x\n", status); - ok(bytes_out == special_string_len[7], "expected %u, got %u\n", special_string_len[7], bytes_out); + ok(status == STATUS_SOME_NOT_MAPPED, "status = 0x%lx\n", status); + ok(bytes_out == special_string_len[7], "expected %lu, got %lu\n", special_string_len[7], bytes_out); ok(memcmp(buffer, special_expected, 7) == 0, "bad conversion\n"); /* conversion behavior with varying input length */ @@ -2208,9 +2209,9 @@ static void test_RtlUnicodeToUTF8N(void) test_string, input_len); if (input_len % sizeof(WCHAR) == 0) { ok(status == STATUS_SUCCESS, - "(len %u): status = 0x%x\n", input_len, status); + "(len %u): status = 0x%lx\n", input_len, status); ok(bytes_out == input_len / sizeof(WCHAR), - "(len %u): bytes_out = 0x%x\n", input_len, bytes_out); + "(len %u): bytes_out = 0x%lx\n", input_len, bytes_out); for (i = 0; i < bytes_out; i++) { ok(buffer[i] == test_string[i], "(len %u): buffer[%d] = 0x%x, expected 0x%x\n", @@ -2222,9 +2223,9 @@ static void test_RtlUnicodeToUTF8N(void) } } else { ok(status == STATUS_INVALID_PARAMETER_5, - "(len %u): status = 0x%x\n", input_len, status); + "(len %u): status = 0x%lx\n", input_len, status); ok(bytes_out == 0x55555555, - "(len %u): bytes_out = 0x%x\n", input_len, bytes_out); + "(len %u): bytes_out = 0x%lx\n", input_len, bytes_out); for (i = 0; i < sizeof(buffer); i++) { ok(buffer[i] == 0x55, "(len %u): buffer[%d] = 0x%x\n", input_len, i, buffer[i]); @@ -2240,14 +2241,14 @@ static void test_RtlUnicodeToUTF8N(void) buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, lstrlenW(unicode_to_utf8[i].unicode) * sizeof(WCHAR)); ok(status == unicode_to_utf8[i].status, - "(test %d): status is 0x%x, expected 0x%x\n", + "(test %d): status is 0x%lx, expected 0x%lx\n", i, status, unicode_to_utf8[i].status); ok(bytes_out == strlen(unicode_to_utf8[i].expected), - "(test %d): bytes_out is %u, expected %u\n", + "(test %d): bytes_out is %lu, expected %u\n", i, bytes_out, lstrlenA(unicode_to_utf8[i].expected)); ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", - i, bytes_out, buffer, unicode_to_utf8[i].expected); + i, (int)bytes_out, buffer, unicode_to_utf8[i].expected); ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); memset(buffer, 0x55, sizeof(buffer)); @@ -2266,14 +2267,14 @@ static void test_RtlUnicodeToUTF8N(void) buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, (lstrlenW(unicode_to_utf8[i].unicode) + 1) * sizeof(WCHAR)); ok(status == unicode_to_utf8[i].status, - "(test %d): status is 0x%x, expected 0x%x\n", + "(test %d): status is 0x%lx, expected 0x%lx\n", i, status, unicode_to_utf8[i].status); ok(bytes_out == strlen(unicode_to_utf8[i].expected) + 1, - "(test %d): bytes_out is %u, expected %u\n", + "(test %d): bytes_out is %lu, expected %u\n", i, bytes_out, lstrlenA(unicode_to_utf8[i].expected) + 1); ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", - i, bytes_out, buffer, unicode_to_utf8[i].expected); + i, (int)bytes_out, buffer, unicode_to_utf8[i].expected); ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); memset(buffer, 0x55, sizeof(buffer)); @@ -2290,7 +2291,7 @@ static void test_RtlUnicodeToUTF8N(void) if (unicode_to_utf8[i].status == STATUS_SOME_NOT_MAPPED) { ok( ret == 0, "(test %d): wrong len %u\n", i, ret ); - ok( GetLastError() == ERROR_NO_UNICODE_TRANSLATION, "(test %d): wrong error %u\n", i, GetLastError() ); + ok( GetLastError() == ERROR_NO_UNICODE_TRANSLATION, "(test %d): wrong error %lu\n", i, GetLastError() ); ret = strlen(unicode_to_utf8[i].expected) + 1; } else @@ -2410,9 +2411,9 @@ static void unicode_expect_(const WCHAR *out_string, ULONG buflen, ULONG out_cha status = pRtlUTF8ToUnicodeN( out_string ? buffer : NULL, buflen, &bytes_out, in_string, in_chars); - ok_(__FILE__, line)(status == expect_status, "status = 0x%x\n", status); + ok_(__FILE__, line)(status == expect_status, "status = 0x%lx\n", status); ok_(__FILE__, line)(bytes_out == out_chars * sizeof(WCHAR), - "bytes_out = %u, expected %u\n", bytes_out, out_chars * (ULONG)sizeof(WCHAR)); + "bytes_out = %lu, expected %lu\n", bytes_out, out_chars * (ULONG)sizeof(WCHAR)); if (out_string) { for (i = 0; i < bytes_out / sizeof(WCHAR); i++) @@ -2453,41 +2454,41 @@ static void test_RtlUTF8ToUnicodeN(void) /* show that bytes_out is really ULONG */ memset(bytes_out_array, 0x55, sizeof(bytes_out_array)); status = pRtlUTF8ToUnicodeN(NULL, 0, bytes_out_array, empty_string, 0); - ok(status == STATUS_SUCCESS, "status = 0x%x\n", status); - ok(bytes_out_array[0] == 0x00000000, "Got 0x%x\n", bytes_out_array[0]); - ok(bytes_out_array[1] == 0x55555555, "Got 0x%x\n", bytes_out_array[1]); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); + ok(bytes_out_array[0] == 0x00000000, "Got 0x%lx\n", bytes_out_array[0]); + ok(bytes_out_array[1] == 0x55555555, "Got 0x%lx\n", bytes_out_array[1]); /* parameter checks */ status = pRtlUTF8ToUnicodeN(NULL, 0, NULL, NULL, 0); - ok(status == STATUS_INVALID_PARAMETER_4, "status = 0x%x\n", status); + ok(status == STATUS_INVALID_PARAMETER_4, "status = 0x%lx\n", status); status = pRtlUTF8ToUnicodeN(NULL, 0, NULL, empty_string, 0); - ok(status == STATUS_INVALID_PARAMETER, "status = 0x%x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "status = 0x%lx\n", status); bytes_out = 0x55555555; status = pRtlUTF8ToUnicodeN(NULL, 0, &bytes_out, NULL, 0); - ok(status == STATUS_INVALID_PARAMETER_4, "status = 0x%x\n", status); - ok(bytes_out == 0x55555555, "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_INVALID_PARAMETER_4, "status = 0x%lx\n", status); + ok(bytes_out == 0x55555555, "bytes_out = 0x%lx\n", bytes_out); bytes_out = 0x55555555; status = pRtlUTF8ToUnicodeN(NULL, 0, &bytes_out, invalid_pointer, 0); - ok(status == STATUS_SUCCESS, "status = 0x%x\n", status); - ok(bytes_out == 0, "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); + ok(bytes_out == 0, "bytes_out = 0x%lx\n", bytes_out); bytes_out = 0x55555555; status = pRtlUTF8ToUnicodeN(NULL, 0, &bytes_out, empty_string, 0); - ok(status == STATUS_SUCCESS, "status = 0x%x\n", status); - ok(bytes_out == 0, "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); + ok(bytes_out == 0, "bytes_out = 0x%lx\n", bytes_out); bytes_out = 0x55555555; status = pRtlUTF8ToUnicodeN(NULL, 0, &bytes_out, test_string, 0); - ok(status == STATUS_SUCCESS, "status = 0x%x\n", status); - ok(bytes_out == 0, "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); + ok(bytes_out == 0, "bytes_out = 0x%lx\n", bytes_out); bytes_out = 0x55555555; status = pRtlUTF8ToUnicodeN(NULL, 0, &bytes_out, empty_string, 1); - ok(status == STATUS_SUCCESS, "status = 0x%x\n", status); - ok(bytes_out == sizeof(WCHAR), "bytes_out = 0x%x\n", bytes_out); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); + ok(bytes_out == sizeof(WCHAR), "bytes_out = 0x%lx\n", bytes_out); /* length output with special chars */ #define length_expect(in_chars, out_chars, expect_status) \ @@ -2543,10 +2544,10 @@ static void test_RtlUTF8ToUnicodeN(void) buffer, sizeof(buffer), &bytes_out, utf8_to_unicode[i].utf8, strlen(utf8_to_unicode[i].utf8)); ok(status == utf8_to_unicode[i].status, - "(test %d): status is 0x%x, expected 0x%x\n", + "(test %d): status is 0x%lx, expected 0x%lx\n", i, status, utf8_to_unicode[i].status); ok(bytes_out == lstrlenW(utf8_to_unicode[i].expected) * sizeof(WCHAR), - "(test %d): bytes_out is %u, expected %u\n", + "(test %d): bytes_out is %lu, expected %lu\n", i, bytes_out, lstrlenW(utf8_to_unicode[i].expected) * (ULONG)sizeof(WCHAR)); ok(!memcmp(buffer, utf8_to_unicode[i].expected, bytes_out), "(test %d): got %s, expected %s\n", @@ -2570,10 +2571,10 @@ static void test_RtlUTF8ToUnicodeN(void) buffer, sizeof(buffer), &bytes_out, utf8_to_unicode[i].utf8, strlen(utf8_to_unicode[i].utf8) + 1); ok(status == utf8_to_unicode[i].status, - "(test %d): status is 0x%x, expected 0x%x\n", + "(test %d): status is 0x%lx, expected 0x%lx\n", i, status, utf8_to_unicode[i].status); ok(bytes_out == (lstrlenW(utf8_to_unicode[i].expected) + 1) * sizeof(WCHAR), - "(test %d): bytes_out is %u, expected %u\n", + "(test %d): bytes_out is %lu, expected %lu\n", i, bytes_out, (lstrlenW(utf8_to_unicode[i].expected) + 1) * (ULONG)sizeof(WCHAR)); ok(!memcmp(buffer, utf8_to_unicode[i].expected, bytes_out), "(test %d): got %s, expected %s\n", @@ -2597,7 +2598,7 @@ static void test_RtlUTF8ToUnicodeN(void) if (utf8_to_unicode[i].status == STATUS_SOME_NOT_MAPPED) { ok( ret == 0, "(test %d): wrong len %u\n", i, ret ); - ok( GetLastError() == ERROR_NO_UNICODE_TRANSLATION, "(test %d): wrong error %u\n", i, GetLastError() ); + ok( GetLastError() == ERROR_NO_UNICODE_TRANSLATION, "(test %d): wrong error %lu\n", i, GetLastError() ); ret = lstrlenW(utf8_to_unicode[i].expected) + 1; } else @@ -2635,10 +2636,10 @@ static void WINAPIV testfmt( const WCHAR *src, const WCHAR *expect, ULONG width, va_start( args, ansi ); status = pRtlFormatMessage( src, width, FALSE, ansi, FALSE, &args, buffer, sizeof(buffer), &size ); va_end( args ); - ok( !status, "%s: failed %x\n", debugstr_w(src), status ); + ok( !status, "%s: failed %lx\n", debugstr_w(src), status ); ok( !lstrcmpW( buffer, expect ), "%s: got %s expected %s\n", debugstr_w(src), debugstr_w(buffer), debugstr_w(expect) ); - ok( size == (lstrlenW(expect) + 1) * sizeof(WCHAR), "%s: wrong size %u\n", debugstr_w(src), size ); + ok( size == (lstrlenW(expect) + 1) * sizeof(WCHAR), "%s: wrong size %lu\n", debugstr_w(src), size ); } static void test_RtlFormatMessage(void) @@ -2768,7 +2769,7 @@ static void test_RtlFormatMessage(void) } lstrcpyW( buffer, L"xxxxxxxxxx" ); fmt( src, 4, FALSE, FALSE, buffer, sizeof(buffer), &size ); - ok( !lstrcmpW( buffer, expect ), "%04x: got %s\n", i, debugstr_w(buffer) ); + ok( !lstrcmpW( buffer, expect ), "%04lx: got %s\n", i, debugstr_w(buffer) ); } /* args are not counted the same way with an argument array */ @@ -2787,37 +2788,37 @@ static void test_RtlFormatMessage(void) /* buffer overflows */ lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"testing", 0, FALSE, FALSE, buffer, 8, &size ); - ok( status == STATUS_BUFFER_OVERFLOW, "failed %x\n", status ); + ok( status == STATUS_BUFFER_OVERFLOW, "failed %lx\n", status ); ok( !lstrcmpW( buffer, L"testxxxxxx" ) || broken(!lstrcmpW( buffer, L"tesxxxxxxx" )), /* winxp */ "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"%1", 0, FALSE, FALSE, buffer, 8, &size, L"test" ); - ok( status == STATUS_BUFFER_OVERFLOW, "failed %x\n", status ); + ok( status == STATUS_BUFFER_OVERFLOW, "failed %lx\n", status ); ok( !memcmp( buffer, L"tes\0xxxxxx", 10 * sizeof(WCHAR) ) || broken(!lstrcmpW( buffer, L"testxxxxxx" )), /* winxp */ "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"%1!x!", 0, FALSE, FALSE, buffer, 8, &size, 0x12345678 ); - ok( status == STATUS_BUFFER_OVERFLOW, "failed %x\n", status ); + ok( status == STATUS_BUFFER_OVERFLOW, "failed %lx\n", status ); ok( !memcmp( buffer, L"123\0xxxxxx", 10 * sizeof(WCHAR) ) || broken(!lstrcmpW( buffer, L"1234xxxxxx" )), /* winxp */ "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"%1!*s!", 0, FALSE, FALSE, buffer, 10, &size, 5, L"abc" ); - ok( status == STATUS_BUFFER_OVERFLOW, "failed %x\n", status ); + ok( status == STATUS_BUFFER_OVERFLOW, "failed %lx\n", status ); ok( !memcmp( buffer, L" ab\0xxxxx", 10 * sizeof(WCHAR) ) || broken(!lstrcmpW( buffer, L" abcxxxxx" )), /* winxp */ "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"ab%n", 0, FALSE, FALSE, buffer, 6, &size ); - ok( status == STATUS_BUFFER_OVERFLOW, "failed %x\n", status ); + ok( status == STATUS_BUFFER_OVERFLOW, "failed %lx\n", status ); ok( !memcmp( buffer, L"abxxxxxxxx", 10 * sizeof(WCHAR) ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); /* ignore inserts */ lstrcpyW( buffer, L"xxxxxxxxxx" ); @@ -2826,67 +2827,67 @@ static void test_RtlFormatMessage(void) lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"ab%0cd", 0, TRUE, FALSE, buffer, sizeof(buffer), &size ); - ok( !status, "failed %x\n", status ); + ok( !status, "failed %lx\n", status ); ok( !memcmp( buffer, L"ab\0xxxxxxx", 10 * sizeof(WCHAR) ), "got %s\n", wine_dbgstr_wn(buffer, 10) ); /* invalid args */ lstrcpyW( buffer, L"xxxxxxxxxx" ); size = 0xdeadbeef; status = pRtlFormatMessage( L"abc%1", 0, FALSE, FALSE, FALSE, NULL, buffer, sizeof(buffer), &size ); - ok( status == STATUS_INVALID_PARAMETER, "failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "failed %lx\n", status ); ok( !lstrcmpW( buffer, L"abcxxxxxxx" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = pRtlFormatMessage( L"abc%1", 0, FALSE, FALSE, TRUE, NULL, buffer, sizeof(buffer), &size ); - ok( status == STATUS_INVALID_PARAMETER, "failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "failed %lx\n", status ); ok( !lstrcmpW( buffer, L"abcxxxxxxx" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = pRtlFormatMessage( L"abc%", 0, FALSE, FALSE, TRUE, NULL, buffer, sizeof(buffer), &size ); - ok( status == STATUS_INVALID_PARAMETER, "failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "failed %lx\n", status ); ok( !lstrcmpW( buffer, L"abcxxxxxxx" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"%1!u! %2!u", 0, FALSE, FALSE, buffer, sizeof(buffer), &size, 34 ); - ok( status == STATUS_INVALID_PARAMETER, "failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "failed %lx\n", status ); ok( !lstrcmpW( buffer, L"34 xxxxxxx" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"%1!**u!", 0, FALSE, FALSE, buffer, sizeof(buffer), &size, 34 ); - ok( status == STATUS_SUCCESS, "failed %x\n", status ); + ok( status == STATUS_SUCCESS, "failed %lx\n", status ); ok( !lstrcmpW( buffer, L"*u" ), "got %s\n", wine_dbgstr_w(buffer) ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"%1!0.3+*u!", 0, FALSE, FALSE, buffer, sizeof(buffer), &size, 34 ); - ok( status == STATUS_SUCCESS, "failed %x\n", status ); + ok( status == STATUS_SUCCESS, "failed %lx\n", status ); ok( !lstrcmpW( buffer, L"+*u" ), "got %s\n", wine_dbgstr_w(buffer) ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"aa%1!***u!", 0, FALSE, FALSE, buffer, sizeof(buffer), &size, 34 ); - ok( status == STATUS_INVALID_PARAMETER, "failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "failed %lx\n", status ); ok( !lstrcmpW( buffer, L"aaxxxxxxxx" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"abc%1!#.000000000000000000000000000x!", 0, FALSE, FALSE, buffer, sizeof(buffer), &size, 34 ); - ok( status == STATUS_SUCCESS, "failed %x\n", status ); + ok( status == STATUS_SUCCESS, "failed %lx\n", status ); ok( !lstrcmpW( buffer, L"abc0x22" ), "got %s\n", wine_dbgstr_w(buffer) ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"abc%1!#.0000000000000000000000000000x!", 0, FALSE, FALSE, buffer, sizeof(buffer), &size, 34 ); - ok( status == STATUS_INVALID_PARAMETER, "failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "failed %lx\n", status ); ok( !lstrcmpW( buffer, L"abcxxxxxxx" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); lstrcpyW( buffer, L"xxxxxxxxxx" ); status = fmt( L"abc%1!hsaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!", 0, FALSE, FALSE, buffer, sizeof(buffer), &size, "hello" ); - ok( status == STATUS_INVALID_PARAMETER, "failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "failed %lx\n", status ); ok( !lstrcmpW( buffer, L"abcxxxxxxx" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( size == 0xdeadbeef, "wrong size %u\n", size ); + ok( size == 0xdeadbeef, "wrong size %lu\n", size ); }

1 0

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

23 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/rtlbitmap.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/rtlbitmap.c b/dlls/ntdll/tests/rtlbitmap.c index 3c3992e8fc9..7cb046a105a 100644 --- a/dlls/ntdll/tests/rtlbitmap.c +++ b/dlls/ntdll/tests/rtlbitmap.c @@ -20,6 +20,7 @@ * We use function pointers here as some of the bitmap functions exist only * in later versions of ntdll. */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "ntdll_test.h" @@ -501,7 +502,7 @@ static void test_RtlFindSetRuns(void) /* Get first 2 */ ulCount = pRtlFindSetRuns(&bm, runs, 2, FALSE); - ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); + ok(ulCount == 2, "RtlFindClearRuns returned %ld, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 19 + 3,"bad size\n"); @@ -511,7 +512,7 @@ static void test_RtlFindSetRuns(void) /* Get longest 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindSetRuns(&bm, runs, 2, TRUE); - ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); + ok(ulCount == 2, "RtlFindClearRuns returned %ld, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 1877,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 33 + 19,"bad size\n"); @@ -521,7 +522,7 @@ static void test_RtlFindSetRuns(void) /* Get all 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindSetRuns(&bm, runs, 3, TRUE); - ok(ulCount == 3, "RtlFindClearRuns returned %d, expected 3\n", ulCount); + ok(ulCount == 3, "RtlFindClearRuns returned %ld, expected 3\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101 || @@ -539,7 +540,7 @@ static void test_RtlFindSetRuns(void) ULONG ulStart = 0; ulCount = pRtlFindLongestRunSet(&bm, &ulStart); - ok(ulCount == 33 && ulStart == 1877,"didn't find longest %d %d\n",ulCount,ulStart); + ok(ulCount == 33 && ulStart == 1877,"didn't find longest %ld %ld\n",ulCount,ulStart); memset(buff, 0, sizeof(buff)); ulCount = pRtlFindLongestRunSet(&bm, &ulStart); @@ -578,7 +579,7 @@ static void test_RtlFindClearRuns(void) /* Get first 2 */ ulCount = pRtlFindClearRuns(&bm, runs, 2, FALSE); - ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); + ok(ulCount == 2, "RtlFindClearRuns returned %ld, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 19 + 3,"bad size\n"); @@ -588,7 +589,7 @@ static void test_RtlFindClearRuns(void) /* Get longest 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindClearRuns(&bm, runs, 2, TRUE); - ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); + ok(ulCount == 2, "RtlFindClearRuns returned %ld, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 1877,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 33 + 19,"bad size\n"); @@ -598,7 +599,7 @@ static void test_RtlFindClearRuns(void) /* Get all 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindClearRuns(&bm, runs, 3, TRUE); - ok(ulCount == 3, "RtlFindClearRuns returned %d, expected 3\n", ulCount); + ok(ulCount == 3, "RtlFindClearRuns returned %ld, expected 3\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101 || @@ -635,8 +636,8 @@ static void test_RtlFindNextForwardRunSet(void) pRtlInitializeBitMap(&bm, mask, 62); ulCount = pRtlFindNextForwardRunSet(&bm, ulStart, &lpPos); - ok(ulCount == 6, "Invalid length of found set run: %d, expected 6\n", ulCount); - ok(lpPos == 56, "Invalid position of found set run: %d, expected 56\n", lpPos); + ok(ulCount == 6, "Invalid length of found set run: %ld, expected 6\n", ulCount); + ok(lpPos == 56, "Invalid position of found set run: %ld, expected 56\n", lpPos); } static void test_RtlFindNextForwardRunClear(void) @@ -649,8 +650,8 @@ static void test_RtlFindNextForwardRunClear(void) pRtlInitializeBitMap(&bm, mask, 62); ulCount = pRtlFindNextForwardRunClear(&bm, ulStart, &lpPos); - ok(ulCount == 6, "Invalid length of found clear run: %d, expected 6\n", ulCount); - ok(lpPos == 56, "Invalid position of found clear run: %d, expected 56\n", lpPos); + ok(ulCount == 6, "Invalid length of found clear run: %ld, expected 6\n", ulCount); + ok(lpPos == 56, "Invalid position of found clear run: %ld, expected 56\n", lpPos); } #endif

1 0

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

23 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/rtl.c | 543 ++++++++++++++++++++++++------------------------ 1 file changed, 272 insertions(+), 271 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index c0168884a0a..6d7a5eb845c 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.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> @@ -141,17 +142,17 @@ static void test_RtlQueryProcessDebugInformation(void) ok( buffer != NULL, "RtlCreateQueryDebugBuffer returned NULL" ); status = RtlQueryProcessDebugInformation( GetCurrentThreadId(), PDI_HEAPS | PDI_HEAP_BLOCKS, buffer ); - ok( status == STATUS_INVALID_CID, "RtlQueryProcessDebugInformation returned %x\n", status ); + ok( status == STATUS_INVALID_CID, "RtlQueryProcessDebugInformation returned %lx\n", status ); status = RtlQueryProcessDebugInformation( GetCurrentProcessId(), PDI_HEAPS | PDI_HEAP_BLOCKS, buffer ); - ok( !status, "RtlQueryProcessDebugInformation returned %x\n", status ); + ok( !status, "RtlQueryProcessDebugInformation returned %lx\n", status ); status = RtlDestroyQueryDebugBuffer( buffer ); - ok( !status, "RtlDestroyQueryDebugBuffer returned %x\n", status ); + ok( !status, "RtlDestroyQueryDebugBuffer returned %lx\n", status ); } #define COMP(str1,str2,cmplen,len) size = RtlCompareMemory(str1, str2, cmplen); \ - ok(size == len, "Expected %ld, got %ld\n", size, (SIZE_T)len) + ok(size == len, "Expected %Id, got %Id\n", size, (SIZE_T)len) static void test_RtlCompareMemory(void) { @@ -175,39 +176,39 @@ static void test_RtlCompareMemoryUlong(void) a[2]= 0x89ab; a[3]= 0xcdef; result = RtlCompareMemoryUlong(a, 0, 0x0123); - ok(result == 0, "RtlCompareMemoryUlong(%p, 0, 0x0123) returns %u, expected 0\n", a, result); + ok(result == 0, "RtlCompareMemoryUlong(%p, 0, 0x0123) returns %lu, expected 0\n", a, result); result = RtlCompareMemoryUlong(a, 3, 0x0123); - ok(result == 0, "RtlCompareMemoryUlong(%p, 3, 0x0123) returns %u, expected 0\n", a, result); + ok(result == 0, "RtlCompareMemoryUlong(%p, 3, 0x0123) returns %lu, expected 0\n", a, result); result = RtlCompareMemoryUlong(a, 4, 0x0123); - ok(result == 4, "RtlCompareMemoryUlong(%p, 4, 0x0123) returns %u, expected 4\n", a, result); + ok(result == 4, "RtlCompareMemoryUlong(%p, 4, 0x0123) returns %lu, expected 4\n", a, result); result = RtlCompareMemoryUlong(a, 5, 0x0123); - ok(result == 4, "RtlCompareMemoryUlong(%p, 5, 0x0123) returns %u, expected 4\n", a, result); + ok(result == 4, "RtlCompareMemoryUlong(%p, 5, 0x0123) returns %lu, expected 4\n", a, result); result = RtlCompareMemoryUlong(a, 7, 0x0123); - ok(result == 4, "RtlCompareMemoryUlong(%p, 7, 0x0123) returns %u, expected 4\n", a, result); + ok(result == 4, "RtlCompareMemoryUlong(%p, 7, 0x0123) returns %lu, expected 4\n", a, result); result = RtlCompareMemoryUlong(a, 8, 0x0123); - ok(result == 4, "RtlCompareMemoryUlong(%p, 8, 0x0123) returns %u, expected 4\n", a, result); + ok(result == 4, "RtlCompareMemoryUlong(%p, 8, 0x0123) returns %lu, expected 4\n", a, result); result = RtlCompareMemoryUlong(a, 9, 0x0123); - ok(result == 4, "RtlCompareMemoryUlong(%p, 9, 0x0123) returns %u, expected 4\n", a, result); + ok(result == 4, "RtlCompareMemoryUlong(%p, 9, 0x0123) returns %lu, expected 4\n", a, result); result = RtlCompareMemoryUlong(a, 4, 0x0127); - ok(result == 0, "RtlCompareMemoryUlong(%p, 4, 0x0127) returns %u, expected 0\n", a, result); + ok(result == 0, "RtlCompareMemoryUlong(%p, 4, 0x0127) returns %lu, expected 0\n", a, result); result = RtlCompareMemoryUlong(a, 4, 0x7123); - ok(result == 0, "RtlCompareMemoryUlong(%p, 4, 0x7123) returns %u, expected 0\n", a, result); + ok(result == 0, "RtlCompareMemoryUlong(%p, 4, 0x7123) returns %lu, expected 0\n", a, result); result = RtlCompareMemoryUlong(a, 16, 0x4567); - ok(result == 0, "RtlCompareMemoryUlong(%p, 16, 0x4567) returns %u, expected 0\n", a, result); + ok(result == 0, "RtlCompareMemoryUlong(%p, 16, 0x4567) returns %lu, expected 0\n", a, result); a[1]= 0x0123; result = RtlCompareMemoryUlong(a, 3, 0x0123); - ok(result == 0, "RtlCompareMemoryUlong(%p, 3, 0x0123) returns %u, expected 0\n", a, result); + ok(result == 0, "RtlCompareMemoryUlong(%p, 3, 0x0123) returns %lu, expected 0\n", a, result); result = RtlCompareMemoryUlong(a, 4, 0x0123); - ok(result == 4, "RtlCompareMemoryUlong(%p, 4, 0x0123) returns %u, expected 4\n", a, result); + ok(result == 4, "RtlCompareMemoryUlong(%p, 4, 0x0123) returns %lu, expected 4\n", a, result); result = RtlCompareMemoryUlong(a, 5, 0x0123); - ok(result == 4, "RtlCompareMemoryUlong(%p, 5, 0x0123) returns %u, expected 4\n", a, result); + ok(result == 4, "RtlCompareMemoryUlong(%p, 5, 0x0123) returns %lu, expected 4\n", a, result); result = RtlCompareMemoryUlong(a, 7, 0x0123); - ok(result == 4, "RtlCompareMemoryUlong(%p, 7, 0x0123) returns %u, expected 4\n", a, result); + ok(result == 4, "RtlCompareMemoryUlong(%p, 7, 0x0123) returns %lu, expected 4\n", a, result); result = RtlCompareMemoryUlong(a, 8, 0x0123); - ok(result == 8, "RtlCompareMemoryUlong(%p, 8, 0x0123) returns %u, expected 8\n", a, result); + ok(result == 8, "RtlCompareMemoryUlong(%p, 8, 0x0123) returns %lu, expected 8\n", a, result); result = RtlCompareMemoryUlong(a, 9, 0x0123); - ok(result == 8, "RtlCompareMemoryUlong(%p, 9, 0x0123) returns %u, expected 8\n", a, result); + ok(result == 8, "RtlCompareMemoryUlong(%p, 9, 0x0123) returns %lu, expected 8\n", a, result); } #define COPY(len) memset(dest,0,sizeof(dest_aligned_block)); pRtlMoveMemory(dest, src, len) @@ -364,7 +365,7 @@ static void test_RtlUniform(void) expected = 0x7fffffc3; result = RtlUniform(&seed); ok(result == expected, - "RtlUniform(&seed (seed == 0)) returns %x, expected %x\n", + "RtlUniform(&seed (seed == 0)) returns %lx, expected %lx\n", result, expected); /* * The algorithm is now: @@ -385,7 +386,7 @@ static void test_RtlUniform(void) expected = seed * 0xffffffed + 0x7fffffc3 + 1; result = RtlUniform(&seed); ok(result == expected, - "RtlUniform(&seed (seed == 1)) returns %x, expected %x\n", + "RtlUniform(&seed (seed == 1)) returns %lx, expected %lx\n", result, expected); /* * For seed = 2 the const_2 is 0x7fffffc3: @@ -405,7 +406,7 @@ static void test_RtlUniform(void) } ok(result == expected, - "RtlUniform(&seed (seed == 2)) returns %x, expected %x\n", + "RtlUniform(&seed (seed == 2)) returns %lx, expected %lx\n", result, expected); /* @@ -415,21 +416,21 @@ static void test_RtlUniform(void) expected = seed * 0xffffffed + 0x7fffffc3 + (seed & 1); result = RtlUniform(&seed); ok(result == expected, - "RtlUniform(&seed (seed == 3)) returns %x, expected %x\n", + "RtlUniform(&seed (seed == 3)) returns %lx, expected %lx\n", result, expected); seed = 0x6bca1aa; expected = seed * 0xffffffed + 0x7fffffc3; result = RtlUniform(&seed); ok(result == expected, - "RtlUniform(&seed (seed == 0x6bca1aa)) returns %x, expected %x\n", + "RtlUniform(&seed (seed == 0x6bca1aa)) returns %lx, expected %lx\n", result, expected); seed = 0x6bca1ab; expected = seed * 0xffffffed + 0x7fffffc3 + 1; result = RtlUniform(&seed); ok(result == expected, - "RtlUniform(&seed (seed == 0x6bca1ab)) returns %x, expected %x\n", + "RtlUniform(&seed (seed == 0x6bca1ab)) returns %lx, expected %lx\n", result, expected); /* * When seed is 0x6bca1ac there is an exception: @@ -438,7 +439,7 @@ static void test_RtlUniform(void) expected = seed * 0xffffffed + 0x7fffffc3 + 2; result = RtlUniform(&seed); ok(result == expected, - "RtlUniform(&seed (seed == 0x6bca1ac)) returns %x, expected %x\n", + "RtlUniform(&seed (seed == 0x6bca1ac)) returns %lx, expected %lx\n", result, expected); /* * Note that up to here const_3 is not used @@ -450,14 +451,14 @@ static void test_RtlUniform(void) expected = (seed * 0xffffffed + 0x7fffffc3) & MAXLONG; result = RtlUniform(&seed); ok(result == expected, - "RtlUniform(&seed (seed == 0x6bca1ad)) returns %x, expected %x\n", + "RtlUniform(&seed (seed == 0x6bca1ad)) returns %lx, expected %lx\n", result, expected); seed = 0x6bca1ae; expected = (seed * 0xffffffed + 0x7fffffc3 + 1) & MAXLONG; result = RtlUniform(&seed); ok(result == expected, - "RtlUniform(&seed (seed == 0x6bca1ae)) returns %x, expected %x\n", + "RtlUniform(&seed (seed == 0x6bca1ae)) returns %lx, expected %lx\n", result, expected); /* * There are several ranges where for odd or even seed the result must be @@ -565,10 +566,10 @@ static void test_RtlUniform(void) seed_bak = seed; result = RtlUniform(&seed); ok(result == expected, - "test: 0x%s RtlUniform(&seed (seed == %x)) returns %x, expected %x\n", + "test: 0x%s RtlUniform(&seed (seed == %lx)) returns %lx, expected %lx\n", wine_dbgstr_longlong(num), seed_bak, result, expected); ok(seed == expected, - "test: 0x%s RtlUniform(&seed (seed == %x)) sets seed to %x, expected %x\n", + "test: 0x%s RtlUniform(&seed (seed == %lx)) sets seed to %lx, expected %lx\n", wine_dbgstr_longlong(num), seed_bak, result, expected); } /* for */ /* @@ -612,10 +613,10 @@ static void test_RtlUniform(void) seed_bak = seed; result = RtlUniform(&seed); ok(result == expected, - "test: 0x%s RtlUniform(&seed (seed == %x)) returns %x, expected %x\n", + "test: 0x%s RtlUniform(&seed (seed == %lx)) returns %lx, expected %lx\n", wine_dbgstr_longlong(num), seed_bak, result, expected); ok(seed == expected, - "test: 0x%s RtlUniform(&seed (seed == %x)) sets seed to %x, expected %x\n", + "test: 0x%s RtlUniform(&seed (seed == %lx)) sets seed to %lx, expected %lx\n", wine_dbgstr_longlong(num), seed_bak, result, expected); } /* for */ /* @@ -636,9 +637,9 @@ static void test_RtlRandom(void) for (i = 0; i < ARRAY_SIZE(res); i++) { res[i] = RtlRandom(&seed); - ok(seed != res[i], "%i: seed is same as res %x\n", i, seed); + ok(seed != res[i], "%i: seed is same as res %lx\n", i, seed); for (j = 0; j < i; j++) - ok(res[i] != res[j], "res[%i] (%x) is same as res[%i] (%x)\n", j, res[j], i, res[i]); + ok(res[i] != res[j], "res[%i] (%lx) is same as res[%i] (%lx)\n", j, res[j], i, res[i]); } } @@ -672,7 +673,7 @@ static void test_RtlAreAllAccessesGranted(void) result = RtlAreAllAccessesGranted(all_accesses[test_num].GrantedAccess, all_accesses[test_num].DesiredAccess); ok(all_accesses[test_num].result == result, - "(test %d): RtlAreAllAccessesGranted(%08x, %08x) returns %d, expected %d\n", + "(test %d): RtlAreAllAccessesGranted(%08lx, %08lx) returns %d, expected %d\n", test_num, all_accesses[test_num].GrantedAccess, all_accesses[test_num].DesiredAccess, result, all_accesses[test_num].result); @@ -708,7 +709,7 @@ static void test_RtlAreAnyAccessesGranted(void) result = RtlAreAnyAccessesGranted(any_accesses[test_num].GrantedAccess, any_accesses[test_num].DesiredAccess); ok(any_accesses[test_num].result == result, - "(test %d): RtlAreAnyAccessesGranted(%08x, %08x) returns %d, expected %d\n", + "(test %d): RtlAreAnyAccessesGranted(%08lx, %08lx) returns %d, expected %d\n", test_num, any_accesses[test_num].GrantedAccess, any_accesses[test_num].DesiredAccess, result, any_accesses[test_num].result); @@ -720,7 +721,7 @@ static void test_RtlComputeCrc32(void) DWORD crc = 0; crc = RtlComputeCrc32(crc, (const BYTE *)src, LEN); - ok(crc == 0x40861dc2,"Expected 0x40861dc2, got %8x\n", crc); + ok(crc == 0x40861dc2,"Expected 0x40861dc2, got %8lx\n", crc); } @@ -754,7 +755,7 @@ static void test_HandleTables(void) result = RtlFreeHandle(&HandleTable, &MyHandle->RtlHandle); ok(result, "Couldn't free handle %p\n", MyHandle); status = RtlDestroyHandleTable(&HandleTable); - ok(status == STATUS_SUCCESS, "RtlDestroyHandleTable failed with error 0x%08x\n", status); + ok(status == STATUS_SUCCESS, "RtlDestroyHandleTable failed with error 0x%08lx\n", status); } static void test_RtlAllocateAndInitializeSid(void) @@ -764,9 +765,9 @@ static void test_RtlAllocateAndInitializeSid(void) PSID psid; ret = RtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); - ok(!ret, "RtlAllocateAndInitializeSid error %08x\n", ret); + ok(!ret, "RtlAllocateAndInitializeSid error %08lx\n", ret); ret = RtlFreeSid(psid); - ok(!ret, "RtlFreeSid error %08x\n", ret); + ok(!ret, "RtlFreeSid error %08lx\n", ret); /* these tests crash on XP */ if (0) @@ -776,7 +777,7 @@ static void test_RtlAllocateAndInitializeSid(void) } ret = RtlAllocateAndInitializeSid(&sia, 9, 1, 2, 3, 4, 5, 6, 7, 8, &psid); - ok(ret == STATUS_INVALID_SID, "wrong error %08x\n", ret); + ok(ret == STATUS_INVALID_SID, "wrong error %08lx\n", ret); } static void test_RtlDeleteTimer(void) @@ -786,7 +787,7 @@ static void test_RtlDeleteTimer(void) ret = RtlDeleteTimer(NULL, NULL, NULL); ok(ret == STATUS_INVALID_PARAMETER_1 || ret == STATUS_INVALID_PARAMETER, /* W2K */ - "expected STATUS_INVALID_PARAMETER_1 or STATUS_INVALID_PARAMETER, got %x\n", ret); + "expected STATUS_INVALID_PARAMETER_1 or STATUS_INVALID_PARAMETER, got %lx\n", ret); } static void test_RtlThreadErrorMode(void) @@ -810,32 +811,32 @@ static void test_RtlThreadErrorMode(void) status = pRtlSetThreadErrorMode(0x70, &mode); ok(status == STATUS_SUCCESS || status == STATUS_WAIT_1, /* Vista */ - "RtlSetThreadErrorMode failed with error 0x%08x\n", status); + "RtlSetThreadErrorMode failed with error 0x%08lx\n", status); ok(mode == oldmode, - "RtlSetThreadErrorMode returned mode 0x%x, expected 0x%x\n", + "RtlSetThreadErrorMode returned mode 0x%lx, expected 0x%lx\n", mode, oldmode); ok(pRtlGetThreadErrorMode() == 0x70, - "RtlGetThreadErrorMode returned 0x%x, expected 0x%x\n", mode, 0x70); + "RtlGetThreadErrorMode returned 0x%lx, expected 0x%x\n", mode, 0x70); if (!is_wow64) { ok(NtCurrentTeb()->HardErrorDisabled == 0x70, - "The TEB contains 0x%x, expected 0x%x\n", + "The TEB contains 0x%lx, expected 0x%x\n", NtCurrentTeb()->HardErrorDisabled, 0x70); } status = pRtlSetThreadErrorMode(0, &mode); ok(status == STATUS_SUCCESS || status == STATUS_WAIT_1, /* Vista */ - "RtlSetThreadErrorMode failed with error 0x%08x\n", status); + "RtlSetThreadErrorMode failed with error 0x%08lx\n", status); ok(mode == 0x70, - "RtlSetThreadErrorMode returned mode 0x%x, expected 0x%x\n", + "RtlSetThreadErrorMode returned mode 0x%lx, expected 0x%x\n", mode, 0x70); ok(pRtlGetThreadErrorMode() == 0, - "RtlGetThreadErrorMode returned 0x%x, expected 0x%x\n", mode, 0); + "RtlGetThreadErrorMode returned 0x%lx, expected 0x%x\n", mode, 0); if (!is_wow64) { ok(NtCurrentTeb()->HardErrorDisabled == 0, - "The TEB contains 0x%x, expected 0x%x\n", + "The TEB contains 0x%lx, expected 0x%x\n", NtCurrentTeb()->HardErrorDisabled, 0); } @@ -845,11 +846,11 @@ static void test_RtlThreadErrorMode(void) if (mode & 0x70) ok(status == STATUS_SUCCESS || status == STATUS_WAIT_1, /* Vista */ - "RtlSetThreadErrorMode(%x,NULL) failed with error 0x%08x\n", + "RtlSetThreadErrorMode(%lx,NULL) failed with error 0x%08lx\n", mode, status); else ok(status == STATUS_INVALID_PARAMETER_1, - "RtlSetThreadErrorMode(%x,NULL) returns 0x%08x, " + "RtlSetThreadErrorMode(%lx,NULL) returns 0x%08lx, " "expected STATUS_INVALID_PARAMETER_1\n", mode, status); } @@ -868,7 +869,7 @@ static void test_LdrProcessRelocationBlock(void) reloc = IMAGE_REL_BASED_HIGHLOW<<12; ret = LdrProcessRelocationBlock(&addr32, 1, &reloc, 0x500050); ok((USHORT*)ret == &reloc+1, "ret = %p, expected %p\n", ret, &reloc+1); - ok(addr32 == 0x550055, "addr32 = %x, expected 0x550055\n", addr32); + ok(addr32 == 0x550055, "addr32 = %lx, expected 0x550055\n", addr32); addr16 = 0x505; reloc = IMAGE_REL_BASED_HIGH<<12; @@ -954,7 +955,7 @@ static void test_RtlIpv4AddressToStringEx(void) used = strlen(buffer); ok( (res == STATUS_SUCCESS) && (size == strlen(expect) + 1) && !strcmp(buffer, expect), - "got 0x%x and size %d with '%s'\n", res, size, buffer); + "got 0x%lx and size %ld with '%s'\n", res, size, buffer); size = used + 1; memset(buffer, '#', sizeof(buffer) - 1); @@ -962,14 +963,14 @@ static void test_RtlIpv4AddressToStringEx(void) res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); ok( (res == STATUS_SUCCESS) && (size == strlen(expect) + 1) && !strcmp(buffer, expect), - "got 0x%x and size %d with '%s'\n", res, size, buffer); + "got 0x%lx and size %ld with '%s'\n", res, size, buffer); size = used; memset(buffer, '#', sizeof(buffer) - 1); buffer[sizeof(buffer) -1] = 0; res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), - "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + "got 0x%lx and %ld with '%s' (expected STATUS_INVALID_PARAMETER and %ld)\n", res, size, buffer, used + 1); size = used - 1; @@ -977,7 +978,7 @@ static void test_RtlIpv4AddressToStringEx(void) buffer[sizeof(buffer) -1] = 0; res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), - "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + "got 0x%lx and %ld with '%s' (expected STATUS_INVALID_PARAMETER and %ld)\n", res, size, buffer, used + 1); @@ -992,7 +993,7 @@ static void test_RtlIpv4AddressToStringEx(void) used = strlen(buffer); ok( (res == STATUS_SUCCESS) && (size == strlen(expect) + 1) && !strcmp(buffer, expect), - "got 0x%x and size %d with '%s'\n", res, size, buffer); + "got 0x%lx and size %ld with '%s'\n", res, size, buffer); size = used + 1; memset(buffer, '#', sizeof(buffer) - 1); @@ -1000,14 +1001,14 @@ static void test_RtlIpv4AddressToStringEx(void) res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); ok( (res == STATUS_SUCCESS) && (size == strlen(expect) + 1) && !strcmp(buffer, expect), - "got 0x%x and size %d with '%s'\n", res, size, buffer); + "got 0x%lx and size %ld with '%s'\n", res, size, buffer); size = used; memset(buffer, '#', sizeof(buffer) - 1); buffer[sizeof(buffer) -1] = 0; res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), - "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + "got 0x%lx and %ld with '%s' (expected STATUS_INVALID_PARAMETER and %ld)\n", res, size, buffer, used + 1); size = used - 1; @@ -1015,7 +1016,7 @@ static void test_RtlIpv4AddressToStringEx(void) buffer[sizeof(buffer) -1] = 0; res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), - "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + "got 0x%lx and %ld with '%s' (expected STATUS_INVALID_PARAMETER and %ld)\n", res, size, buffer, used + 1); @@ -1024,19 +1025,19 @@ static void test_RtlIpv4AddressToStringEx(void) buffer[sizeof(buffer) -1] = 0; res = pRtlIpv4AddressToStringExA(&ip, 0, buffer, NULL); ok(res == STATUS_INVALID_PARAMETER, - "got 0x%x with '%s' (expected STATUS_INVALID_PARAMETER)\n", res, buffer); + "got 0x%lx with '%s' (expected STATUS_INVALID_PARAMETER)\n", res, buffer); size = sizeof(buffer); res = pRtlIpv4AddressToStringExA(&ip, 0, NULL, &size); ok( res == STATUS_INVALID_PARAMETER, - "got 0x%x and size %d (expected STATUS_INVALID_PARAMETER)\n", res, size); + "got 0x%lx and size %ld (expected STATUS_INVALID_PARAMETER)\n", res, size); size = sizeof(buffer); memset(buffer, '#', sizeof(buffer) - 1); buffer[sizeof(buffer) -1] = 0; res = pRtlIpv4AddressToStringExA(NULL, 0, buffer, &size); ok( res == STATUS_INVALID_PARAMETER, - "got 0x%x and size %d with '%s' (expected STATUS_INVALID_PARAMETER)\n", + "got 0x%lx and size %ld with '%s' (expected STATUS_INVALID_PARAMETER)\n", res, size, buffer); } @@ -1193,7 +1194,7 @@ static void test_RtlIpv4StringToAddress(void) ip.S_un.S_addr = 0xabababab; res = RtlIpv4StringToAddressA(ipv4_tests[i].address, FALSE, &terminator, &ip); ok(res == ipv4_tests[i].res, - "[%s] res = 0x%08x, expected 0x%08x\n", + "[%s] res = 0x%08lx, expected 0x%08lx\n", ipv4_tests[i].address, res, ipv4_tests[i].res); ok(terminator == ipv4_tests[i].address + ipv4_tests[i].terminator_offset, "[%s] terminator = %p, expected %p\n", @@ -1201,7 +1202,7 @@ static void test_RtlIpv4StringToAddress(void) init_ip4(&expected_ip, ipv4_tests[i].ip); ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, - "[%s] ip = %08x, expected %08x\n", + "[%s] ip = %08lx, expected %08lx\n", ipv4_tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); if (!(ipv4_tests[i].flags & strict_diff_4)) @@ -1218,7 +1219,7 @@ static void test_RtlIpv4StringToAddress(void) ip.S_un.S_addr = 0xabababab; res = RtlIpv4StringToAddressA(ipv4_tests[i].address, TRUE, &terminator, &ip); ok(res == ipv4_tests[i].res_strict, - "[%s] res = 0x%08x, expected 0x%08x\n", + "[%s] res = 0x%08lx, expected 0x%08lx\n", ipv4_tests[i].address, res, ipv4_tests[i].res_strict); ok(terminator == ipv4_tests[i].address + ipv4_tests[i].terminator_offset_strict, "[%s] terminator = %p, expected %p\n", @@ -1226,7 +1227,7 @@ static void test_RtlIpv4StringToAddress(void) init_ip4(&expected_ip, ipv4_tests[i].ip_strict); ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, - "[%s] ip = %08x, expected %08x\n", + "[%s] ip = %08lx, expected %08lx\n", ipv4_tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); } } @@ -1276,23 +1277,23 @@ static void test_RtlIpv4StringToAddressEx(void) ip.S_un.S_addr = 0xabababab; port = 0xdead; res = pRtlIpv4StringToAddressExA(NULL, FALSE, &ip, &port); - ok(res == STATUS_INVALID_PARAMETER, "[null address] res = 0x%08x, expected 0x%08x\n", + ok(res == STATUS_INVALID_PARAMETER, "[null address] res = 0x%08lx, expected 0x%08lx\n", res, STATUS_INVALID_PARAMETER); - ok(ip.S_un.S_addr == 0xabababab, "RtlIpv4StringToAddressExA should not touch the ip!, ip == %x\n", ip.S_un.S_addr); + ok(ip.S_un.S_addr == 0xabababab, "RtlIpv4StringToAddressExA should not touch the ip!, ip == %lx\n", ip.S_un.S_addr); ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); port = 0xdead; res = pRtlIpv4StringToAddressExA("1.1.1.1", FALSE, NULL, &port); - ok(res == STATUS_INVALID_PARAMETER, "[null ip] res = 0x%08x, expected 0x%08x\n", + ok(res == STATUS_INVALID_PARAMETER, "[null ip] res = 0x%08lx, expected 0x%08lx\n", res, STATUS_INVALID_PARAMETER); ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); ip.S_un.S_addr = 0xabababab; port = 0xdead; res = pRtlIpv4StringToAddressExA("1.1.1.1", FALSE, &ip, NULL); - ok(res == STATUS_INVALID_PARAMETER, "[null port] res = 0x%08x, expected 0x%08x\n", + ok(res == STATUS_INVALID_PARAMETER, "[null port] res = 0x%08lx, expected 0x%08lx\n", res, STATUS_INVALID_PARAMETER); - ok(ip.S_un.S_addr == 0xabababab, "RtlIpv4StringToAddressExA should not touch the ip!, ip == %x\n", ip.S_un.S_addr); + ok(ip.S_un.S_addr == 0xabababab, "RtlIpv4StringToAddressExA should not touch the ip!, ip == %lx\n", ip.S_un.S_addr); ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); /* first we run the non-ex testcases on the ex function */ @@ -1304,11 +1305,11 @@ static void test_RtlIpv4StringToAddressEx(void) port = 0xdead; ip.S_un.S_addr = 0xabababab; res = pRtlIpv4StringToAddressExA(ipv4_tests[i].address, FALSE, &ip, &port); - ok(res == expect_res, "[%s] res = 0x%08x, expected 0x%08x\n", + ok(res == expect_res, "[%s] res = 0x%08lx, expected 0x%08lx\n", ipv4_tests[i].address, res, expect_res); init_ip4(&expected_ip, ipv4_tests[i].ip); - ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08x, expected %08x\n", + ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08lx, expected %08lx\n", ipv4_tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); if (!(ipv4_tests[i].flags & strict_diff_4)) @@ -1325,11 +1326,11 @@ static void test_RtlIpv4StringToAddressEx(void) port = 0xdead; ip.S_un.S_addr = 0xabababab; res = pRtlIpv4StringToAddressExA(ipv4_tests[i].address, TRUE, &ip, &port); - ok(res == expect_res, "[%s] res = 0x%08x, expected 0x%08x\n", + ok(res == expect_res, "[%s] res = 0x%08lx, expected 0x%08lx\n", ipv4_tests[i].address, res, expect_res); init_ip4(&expected_ip, ipv4_tests[i].ip_strict); - ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08x, expected %08x\n", + ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08lx, expected %08lx\n", ipv4_tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); } @@ -1342,11 +1343,11 @@ static void test_RtlIpv4StringToAddressEx(void) ip.S_un.S_addr = 0xabababab; port = 0xdead; res = pRtlIpv4StringToAddressExA(ipv4_ex_tests[i].address, strict, &ip, &port); - ok(res == ipv4_ex_tests[i].res, "[%s] res = 0x%08x, expected 0x%08x\n", + ok(res == ipv4_ex_tests[i].res, "[%s] res = 0x%08lx, expected 0x%08lx\n", ipv4_ex_tests[i].address, res, ipv4_ex_tests[i].res); init_ip4(&expected_ip, ipv4_ex_tests[i].ip); - ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08x, expected %08x\n", + ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, "[%s] ip = %08lx, expected %08lx\n", ipv4_ex_tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); ok(port == ipv4_ex_tests[i].port, "[%s] port = %u, expected %u\n", ipv4_ex_tests[i].address, port, ipv4_ex_tests[i].port); @@ -1925,31 +1926,31 @@ static void test_RtlIpv6AddressToStringEx(void) len = sizeof(buffer); res = pRtlIpv6AddressToStringExA(&ip, 0, 0, buffer, &len); - ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res); + ok(res == STATUS_SUCCESS, "[validate] res = 0x%08lx, expected STATUS_SUCCESS\n", res); ok(len == 3 && !strcmp(buffer, "::"), - "got len %d with '%s' (expected 3 with '::')\n", len, buffer); + "got len %ld with '%s' (expected 3 with '::')\n", len, buffer); memset(buffer, '#', sizeof(buffer)); buffer[sizeof(buffer)-1] = 0; len = sizeof(buffer); res = pRtlIpv6AddressToStringExA(NULL, 0, 0, buffer, &len); - ok(res == STATUS_INVALID_PARAMETER, "[null ip] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(res == STATUS_INVALID_PARAMETER, "[null ip] res = 0x%08lx, expected STATUS_INVALID_PARAMETER\n", res); len = sizeof(buffer); res = pRtlIpv6AddressToStringExA(&ip, 0, 0, NULL, &len); - ok(res == STATUS_INVALID_PARAMETER, "[null buffer] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(res == STATUS_INVALID_PARAMETER, "[null buffer] res = 0x%08lx, expected STATUS_INVALID_PARAMETER\n", res); res = pRtlIpv6AddressToStringExA(&ip, 0, 0, buffer, NULL); - ok(res == STATUS_INVALID_PARAMETER, "[null length] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(res == STATUS_INVALID_PARAMETER, "[null length] res = 0x%08lx, expected STATUS_INVALID_PARAMETER\n", res); len = 2; memset(buffer, '#', sizeof(buffer)); buffer[sizeof(buffer)-1] = 0; res = pRtlIpv6AddressToStringExA(&ip, 0, 0, buffer, &len); - ok(res == STATUS_INVALID_PARAMETER, "[null length] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(res == STATUS_INVALID_PARAMETER, "[null length] res = 0x%08lx, expected STATUS_INVALID_PARAMETER\n", res); ok(buffer[0] == '#', "got first char %c (expected '#')\n", buffer[0]); - ok(len == 3, "got len %d (expected len 3)\n", len); + ok(len == 3, "got len %ld (expected len 3)\n", len); for (i = 0; i < ARRAY_SIZE(tests); i++) { @@ -1960,9 +1961,9 @@ static void test_RtlIpv6AddressToStringEx(void) res = pRtlIpv6AddressToStringExA(&ip, tests[i].scopeid, tests[i].port, buffer, &len); - ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res); + ok(res == STATUS_SUCCESS, "[validate] res = 0x%08lx, expected STATUS_SUCCESS\n", res); ok(len == (strlen(tests[i].address) + 1) && !strcmp(buffer, tests[i].address), - "got len %d with '%s' (expected %d with '%s')\n", len, buffer, (int)strlen(tests[i].address), tests[i].address); + "got len %ld with '%s' (expected %d with '%s')\n", len, buffer, (int)strlen(tests[i].address), tests[i].address); } } @@ -1979,7 +1980,7 @@ static void compare_RtlIpv6StringToAddressW(PCSTR name_a, int terminator_offset_ init_ip6(&ip, NULL); terminator = (void *)0xdeadbeef; res = RtlIpv6StringToAddressW(name, &terminator, &ip); - ok(res == res_a, "[W:%s] res = 0x%08x, expected 0x%08x\n", name_a, res, res_a); + ok(res == res_a, "[W:%s] res = 0x%08lx, expected 0x%08lx\n", name_a, res, res_a); if (terminator_offset_a < 0) { @@ -2011,16 +2012,16 @@ static void test_RtlIpv6StringToAddress(void) unsigned int i; res = RtlIpv6StringToAddressA("::", &terminator, &ip); - ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res); + ok(res == STATUS_SUCCESS, "[validate] res = 0x%08lx, expected STATUS_SUCCESS\n", res); if (0) { /* any of these crash */ res = RtlIpv6StringToAddressA(NULL, &terminator, &ip); - ok(res == STATUS_INVALID_PARAMETER, "[null string] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(res == STATUS_INVALID_PARAMETER, "[null string] res = 0x%08lx, expected STATUS_INVALID_PARAMETER\n", res); res = RtlIpv6StringToAddressA("::", NULL, &ip); - ok(res == STATUS_INVALID_PARAMETER, "[null terminator] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(res == STATUS_INVALID_PARAMETER, "[null terminator] res = 0x%08lx, expected STATUS_INVALID_PARAMETER\n", res); res = RtlIpv6StringToAddressA("::", &terminator, NULL); - ok(res == STATUS_INVALID_PARAMETER, "[null result] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(res == STATUS_INVALID_PARAMETER, "[null result] res = 0x%08lx, expected STATUS_INVALID_PARAMETER\n", res); } /* sanity check */ @@ -2037,7 +2038,7 @@ static void test_RtlIpv6StringToAddress(void) if (ipv6_tests[i].flags & win_broken_6) { ok(res == ipv6_tests[i].res || broken(res == STATUS_INVALID_PARAMETER), - "[%s] res = 0x%08x, expected 0x%08x\n", + "[%s] res = 0x%08lx, expected 0x%08lx\n", ipv6_tests[i].address, res, ipv6_tests[i].res); if (res == STATUS_INVALID_PARAMETER) @@ -2046,7 +2047,7 @@ static void test_RtlIpv6StringToAddress(void) else { ok(res == ipv6_tests[i].res, - "[%s] res = 0x%08x, expected 0x%08x\n", + "[%s] res = 0x%08lx, expected 0x%08lx\n", ipv6_tests[i].address, res, ipv6_tests[i].res); } @@ -2090,8 +2091,8 @@ static void compare_RtlIpv6StringToAddressExW(PCSTR name_a, const struct in6_add init_ip6(&ip, NULL); res = pRtlIpv6StringToAddressExW(name, &ip, &scope, &port); - ok(res == res_a, "[W:%s] res = 0x%08x, expected 0x%08x\n", name_a, res, res_a); - ok(scope == scope_a, "[W:%s] scope = 0x%08x, expected 0x%08x\n", name_a, scope, scope_a); + ok(res == res_a, "[W:%s] res = 0x%08lx, expected 0x%08lx\n", name_a, res, res_a); + ok(scope == scope_a, "[W:%s] scope = 0x%08lx, expected 0x%08lx\n", name_a, scope, scope_a); ok(port == port_a, "[W:%s] port = 0x%08x, expected 0x%08x\n", name_a, port, port_a); ok(!memcmp(&ip, addr_a, sizeof(ip)), @@ -2199,7 +2200,7 @@ static void test_RtlIpv6StringToAddressEx(void) } res = pRtlIpv6StringToAddressExA(simple_ip, &ip, &scope, &port); - ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res); + ok(res == STATUS_SUCCESS, "[validate] res = 0x%08lx, expected STATUS_SUCCESS\n", res); init_ip6(&ip, NULL); init_ip6(&expected_ip, NULL); @@ -2207,8 +2208,8 @@ static void test_RtlIpv6StringToAddressEx(void) port = 0xbeef; res = pRtlIpv6StringToAddressExA(NULL, &ip, &scope, &port); ok(res == STATUS_INVALID_PARAMETER, - "[null string] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); - ok(scope == 0xbadf00d, "[null string] scope = 0x%08x, expected 0xbadf00d\n", scope); + "[null string] res = 0x%08lx, expected STATUS_INVALID_PARAMETER\n", res); + ok(scope == 0xbadf00d, "[null string] scope = 0x%08lx, expected 0xbadf00d\n", scope); ok(port == 0xbeef, "[null string] port = 0x%08x, expected 0xbeef\n", port); ok(!memcmp(&ip, &expected_ip, sizeof(ip)), "[null string] ip is changed, expected it not to change\n"); @@ -2219,8 +2220,8 @@ static void test_RtlIpv6StringToAddressEx(void) port = 0xbeef; res = pRtlIpv6StringToAddressExA(simple_ip, NULL, &scope, &port); ok(res == STATUS_INVALID_PARAMETER, - "[null result] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); - ok(scope == 0xbadf00d, "[null result] scope = 0x%08x, expected 0xbadf00d\n", scope); + "[null result] res = 0x%08lx, expected STATUS_INVALID_PARAMETER\n", res); + ok(scope == 0xbadf00d, "[null result] scope = 0x%08lx, expected 0xbadf00d\n", scope); ok(port == 0xbeef, "[null result] port = 0x%08x, expected 0xbeef\n", port); ok(!memcmp(&ip, &expected_ip, sizeof(ip)), "[null result] ip is changed, expected it not to change\n"); @@ -2230,8 +2231,8 @@ static void test_RtlIpv6StringToAddressEx(void) port = 0xbeef; res = pRtlIpv6StringToAddressExA(simple_ip, &ip, NULL, &port); ok(res == STATUS_INVALID_PARAMETER, - "[null scope] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); - ok(scope == 0xbadf00d, "[null scope] scope = 0x%08x, expected 0xbadf00d\n", scope); + "[null scope] res = 0x%08lx, expected STATUS_INVALID_PARAMETER\n", res); + ok(scope == 0xbadf00d, "[null scope] scope = 0x%08lx, expected 0xbadf00d\n", scope); ok(port == 0xbeef, "[null scope] port = 0x%08x, expected 0xbeef\n", port); ok(!memcmp(&ip, &expected_ip, sizeof(ip)), "[null scope] ip is changed, expected it not to change\n"); @@ -2241,8 +2242,8 @@ static void test_RtlIpv6StringToAddressEx(void) port = 0xbeef; res = pRtlIpv6StringToAddressExA(simple_ip, &ip, &scope, NULL); ok(res == STATUS_INVALID_PARAMETER, - "[null port] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); - ok(scope == 0xbadf00d, "[null port] scope = 0x%08x, expected 0xbadf00d\n", scope); + "[null port] res = 0x%08lx, expected STATUS_INVALID_PARAMETER\n", res); + ok(scope == 0xbadf00d, "[null port] scope = 0x%08lx, expected 0xbadf00d\n", scope); ok(port == 0xbeef, "[null port] port = 0x%08x, expected 0xbeef\n", port); ok(!memcmp(&ip, &expected_ip, sizeof(ip)), "[null port] ip is changed, expected it not to change\n"); @@ -2267,14 +2268,14 @@ static void test_RtlIpv6StringToAddressEx(void) /* make sure nothing was changed if this function fails. */ if (res == STATUS_INVALID_PARAMETER) { - ok(scope == 0xbadf00d, "[%s] scope = 0x%08x, expected 0xbadf00d\n", + ok(scope == 0xbadf00d, "[%s] scope = 0x%08lx, expected 0xbadf00d\n", ipv6_tests[i].address, scope); ok(port == 0xbeef, "[%s] port = 0x%08x, expected 0xbeef\n", ipv6_tests[i].address, port); } else { - ok(scope != 0xbadf00d, "[%s] scope = 0x%08x, not expected 0xbadf00d\n", + ok(scope != 0xbadf00d, "[%s] scope = 0x%08lx, not expected 0xbadf00d\n", ipv6_tests[i].address, scope); ok(port != 0xbeef, "[%s] port = 0x%08x, not expected 0xbeef\n", ipv6_tests[i].address, port); @@ -2283,14 +2284,14 @@ static void test_RtlIpv6StringToAddressEx(void) if (ipv6_tests[i].flags & win_broken_6) { ok(res == expect_ret || broken(res == STATUS_INVALID_PARAMETER), - "[%s] res = 0x%08x, expected 0x%08x\n", ipv6_tests[i].address, res, expect_ret); + "[%s] res = 0x%08lx, expected 0x%08lx\n", ipv6_tests[i].address, res, expect_ret); if (res == STATUS_INVALID_PARAMETER) continue; } else { - ok(res == expect_ret, "[%s] res = 0x%08x, expected 0x%08x\n", + ok(res == expect_ret, "[%s] res = 0x%08lx, expected 0x%08lx\n", ipv6_tests[i].address, res, expect_ret); } @@ -2318,9 +2319,9 @@ static void test_RtlIpv6StringToAddressEx(void) res = pRtlIpv6StringToAddressExA(ipv6_ex_tests[i].address, &ip, &scope, &port); compare_RtlIpv6StringToAddressExW(ipv6_ex_tests[i].address, &ip, res, scope, port); - ok(res == ipv6_ex_tests[i].res, "[%s] res = 0x%08x, expected 0x%08x\n", + ok(res == ipv6_ex_tests[i].res, "[%s] res = 0x%08lx, expected 0x%08lx\n", ipv6_ex_tests[i].address, res, ipv6_ex_tests[i].res); - ok(scope == ipv6_ex_tests[i].scope, "[%s] scope = 0x%08x, expected 0x%08x\n", + ok(scope == ipv6_ex_tests[i].scope, "[%s] scope = 0x%08lx, expected 0x%08lx\n", ipv6_ex_tests[i].address, scope, ipv6_ex_tests[i].scope); ok(port == ipv6_ex_tests[i].port, "[%s] port = 0x%08x, expected 0x%08x\n", ipv6_ex_tests[i].address, port, ipv6_ex_tests[i].port); @@ -2354,7 +2355,7 @@ static void test_LdrAddRefDll(void) mod = LoadLibraryA("comctl32.dll"); ok(mod != NULL, "got %p\n", mod); status = LdrAddRefDll(0, mod); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); ret = FreeLibrary(mod); ok(ret, "got %d\n", ret); @@ -2370,7 +2371,7 @@ static void test_LdrAddRefDll(void) mod = LoadLibraryA("comctl32.dll"); ok(mod != NULL, "got %p\n", mod); status = LdrAddRefDll(LDR_ADDREF_DLL_PIN, mod); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); ret = FreeLibrary(mod); ok(ret, "got %d\n", ret); @@ -2395,39 +2396,39 @@ static void test_LdrLockLoaderLock(void) result = 10; magic = 0xdeadbeef; status = LdrLockLoaderLock(0x10, &result, &magic); - ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); - ok(result == 0, "got %d\n", result); - ok(magic == 0, "got %lx\n", magic); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08lx\n", status); + ok(result == 0, "got %ld\n", result); + ok(magic == 0, "got %Ix\n", magic); magic = 0xdeadbeef; status = LdrLockLoaderLock(0x10, NULL, &magic); - ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); - ok(magic == 0, "got %lx\n", magic); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08lx\n", status); + ok(magic == 0, "got %Ix\n", magic); result = 10; status = LdrLockLoaderLock(0x10, &result, NULL); - ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); - ok(result == 0, "got %d\n", result); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08lx\n", status); + ok(result == 0, "got %ld\n", result); /* non-blocking mode, result is null */ magic = 0xdeadbeef; status = LdrLockLoaderLock(0x2, NULL, &magic); - ok(status == STATUS_INVALID_PARAMETER_2, "got 0x%08x\n", status); - ok(magic == 0, "got %lx\n", magic); + ok(status == STATUS_INVALID_PARAMETER_2, "got 0x%08lx\n", status); + ok(magic == 0, "got %Ix\n", magic); /* magic pointer is null */ result = 10; status = LdrLockLoaderLock(0, &result, NULL); - ok(status == STATUS_INVALID_PARAMETER_3, "got 0x%08x\n", status); - ok(result == 0, "got %d\n", result); + ok(status == STATUS_INVALID_PARAMETER_3, "got 0x%08lx\n", status); + ok(result == 0, "got %ld\n", result); /* lock in non-blocking mode */ result = 0; magic = 0; status = LdrLockLoaderLock(0x2, &result, &magic); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ok(result == 1, "got %d\n", result); - ok(magic != 0, "got %lx\n", magic); + ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); + ok(result == 1, "got %ld\n", result); + ok(magic != 0, "got %Ix\n", magic); LdrUnlockLoaderLock(0, magic); } @@ -2443,39 +2444,39 @@ static void test_RtlCompressBuffer(void) compress_workspace = decompress_workspace = 0xdeadbeef; status = RtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_LZNT1, &compress_workspace, &decompress_workspace); - ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); - ok(compress_workspace != 0, "got wrong compress_workspace %u\n", compress_workspace); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08lx\n", status); + ok(compress_workspace != 0, "got wrong compress_workspace %lu\n", compress_workspace); workspace = HeapAlloc(GetProcessHeap(), 0, compress_workspace); - ok(workspace != NULL, "HeapAlloc failed %d\n", GetLastError()); + ok(workspace != NULL, "HeapAlloc failed %ld\n", GetLastError()); /* test compression format / engine */ final_size = 0xdeadbeef; status = RtlCompressBuffer(COMPRESSION_FORMAT_NONE, test_buffer, sizeof(test_buffer), buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); - ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); - ok(final_size == 0xdeadbeef, "got wrong final_size %u\n", final_size); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08lx\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %lu\n", final_size); final_size = 0xdeadbeef; status = RtlCompressBuffer(COMPRESSION_FORMAT_DEFAULT, test_buffer, sizeof(test_buffer), buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); - ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); - ok(final_size == 0xdeadbeef, "got wrong final_size %u\n", final_size); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08lx\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %lu\n", final_size); final_size = 0xdeadbeef; status = RtlCompressBuffer(0xFF, test_buffer, sizeof(test_buffer), buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); - ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08x\n", status); - ok(final_size == 0xdeadbeef, "got wrong final_size %u\n", final_size); + ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08lx\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %lu\n", final_size); /* test compression */ final_size = 0xdeadbeef; memset(buf1, 0x11, sizeof(buf1)); status = RtlCompressBuffer(COMPRESSION_FORMAT_LZNT1, test_buffer, sizeof(test_buffer), buf1, sizeof(buf1), 4096, &final_size, workspace); - ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08lx\n", status); ok((*(WORD *)buf1 & 0x7000) == 0x3000, "no chunk signature found %04x\n", *(WORD *)buf1); todo_wine - ok(final_size < sizeof(test_buffer), "got wrong final_size %u\n", final_size); + ok(final_size < sizeof(test_buffer), "got wrong final_size %lu\n", final_size); /* test decompression */ buf_size = final_size; @@ -2483,8 +2484,8 @@ static void test_RtlCompressBuffer(void) memset(buf2, 0x11, sizeof(buf2)); status = RtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf2, sizeof(buf2), buf1, buf_size, &final_size); - ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); - ok(final_size == sizeof(test_buffer), "got wrong final_size %u\n", final_size); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08lx\n", status); + ok(final_size == sizeof(test_buffer), "got wrong final_size %lu\n", final_size); ok(!memcmp(buf2, test_buffer, sizeof(test_buffer)), "got wrong decoded data\n"); ok(buf2[sizeof(test_buffer)] == 0x11, "too many bytes written\n"); @@ -2493,7 +2494,7 @@ static void test_RtlCompressBuffer(void) memset(buf1, 0x11, sizeof(buf1)); status = RtlCompressBuffer(COMPRESSION_FORMAT_LZNT1, test_buffer, sizeof(test_buffer), buf1, 4, 4096, &final_size, workspace); - ok(status == STATUS_BUFFER_TOO_SMALL, "got wrong status 0x%08x\n", status); + ok(status == STATUS_BUFFER_TOO_SMALL, "got wrong status 0x%08lx\n", status); HeapFree(GetProcessHeap(), 0, workspace); } @@ -2506,29 +2507,29 @@ static void test_RtlGetCompressionWorkSpaceSize(void) /* test invalid format / engine */ status = RtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_NONE, &compress_workspace, &decompress_workspace); - ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08lx\n", status); status = RtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_DEFAULT, &compress_workspace, &decompress_workspace); - ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08lx\n", status); status = RtlGetCompressionWorkSpaceSize(0xFF, &compress_workspace, &decompress_workspace); - ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08x\n", status); + ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08lx\n", status); /* test LZNT1 with normal and maximum compression */ compress_workspace = decompress_workspace = 0xdeadbeef; status = RtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_LZNT1, &compress_workspace, &decompress_workspace); - ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); - ok(compress_workspace != 0, "got wrong compress_workspace %u\n", compress_workspace); - ok(decompress_workspace == 0x1000, "got wrong decompress_workspace %u\n", decompress_workspace); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08lx\n", status); + ok(compress_workspace != 0, "got wrong compress_workspace %lu\n", compress_workspace); + ok(decompress_workspace == 0x1000, "got wrong decompress_workspace %lu\n", decompress_workspace); compress_workspace = decompress_workspace = 0xdeadbeef; status = RtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_LZNT1 | COMPRESSION_ENGINE_MAXIMUM, &compress_workspace, &decompress_workspace); - ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); - ok(compress_workspace != 0, "got wrong compress_workspace %u\n", compress_workspace); - ok(decompress_workspace == 0x1000, "got wrong decompress_workspace %u\n", decompress_workspace); + ok(status == STATUS_SUCCESS, "got wrong status 0x%08lx\n", status); + ok(compress_workspace != 0, "got wrong compress_workspace %lu\n", compress_workspace); + ok(decompress_workspace == 0x1000, "got wrong decompress_workspace %lu\n", decompress_workspace); } /* helper for test_RtlDecompressBuffer, checks if a chunk is incomplete */ @@ -2769,25 +2770,25 @@ static void test_RtlDecompressBuffer(void) final_size = 0xdeadbeef; status = RtlDecompressBuffer(COMPRESSION_FORMAT_NONE, buf, sizeof(buf), test_lznt[0].compressed, test_lznt[0].compressed_size, &final_size); - ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); - ok(final_size == 0xdeadbeef, "got wrong final_size %u\n", final_size); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08lx\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %lu\n", final_size); final_size = 0xdeadbeef; status = RtlDecompressBuffer(COMPRESSION_FORMAT_DEFAULT, buf, sizeof(buf), test_lznt[0].compressed, test_lznt[0].compressed_size, &final_size); - ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); - ok(final_size == 0xdeadbeef, "got wrong final_size %u\n", final_size); + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08lx\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %lu\n", final_size); final_size = 0xdeadbeef; status = RtlDecompressBuffer(0xFF, buf, sizeof(buf), test_lznt[0].compressed, test_lznt[0].compressed_size, &final_size); - ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08x\n", status); - ok(final_size == 0xdeadbeef, "got wrong final_size %u\n", final_size); + ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08lx\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %lu\n", final_size); /* regular tests for RtlDecompressBuffer */ for (i = 0; i < ARRAY_SIZE(test_lznt); i++) { - trace("Running test %d (compressed_size=%u, uncompressed_size=%u, status=0x%08x)\n", + trace("Running test %d (compressed_size=%lu, uncompressed_size=%lu, status=0x%08lx)\n", i, test_lznt[i].compressed_size, test_lznt[i].uncompressed_size, test_lznt[i].status); /* test with very big buffer */ @@ -2796,15 +2797,15 @@ static void test_RtlDecompressBuffer(void) status = RtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && - (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT)), "%d: got wrong status 0x%08x\n", i, status); + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT)), "%d: got wrong status 0x%08lx\n", i, status); if (!status) { ok(final_size == test_lznt[i].uncompressed_size, - "%d: got wrong final_size %u\n", i, final_size); + "%d: got wrong final_size %lu\n", i, final_size); ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), "%d: got wrong decoded data\n", i); ok(buf[test_lznt[i].uncompressed_size] == 0x11, - "%d: buf[%u] was modified\n", i, test_lznt[i].uncompressed_size); + "%d: buf[%lu] was modified\n", i, test_lznt[i].uncompressed_size); } /* test that modifier for compression engine is ignored */ @@ -2813,15 +2814,15 @@ static void test_RtlDecompressBuffer(void) status = RtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1 | COMPRESSION_ENGINE_MAXIMUM, buf, sizeof(buf), test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && - (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT)), "%d: got wrong status 0x%08x\n", i, status); + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT)), "%d: got wrong status 0x%08lx\n", i, status); if (!status) { ok(final_size == test_lznt[i].uncompressed_size, - "%d: got wrong final_size %u\n", i, final_size); + "%d: got wrong final_size %lu\n", i, final_size); ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), "%d: got wrong decoded data\n", i); ok(buf[test_lznt[i].uncompressed_size] == 0x11, - "%d: buf[%u] was modified\n", i, test_lznt[i].uncompressed_size); + "%d: buf[%lu] was modified\n", i, test_lznt[i].uncompressed_size); } /* test with expected output size */ @@ -2831,15 +2832,15 @@ static void test_RtlDecompressBuffer(void) memset(buf, 0x11, sizeof(buf)); status = RtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, test_lznt[i].uncompressed_size, test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); - ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08lx\n", i, status); if (!status) { ok(final_size == test_lznt[i].uncompressed_size, - "%d: got wrong final_size %u\n", i, final_size); + "%d: got wrong final_size %lu\n", i, final_size); ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), "%d: got wrong decoded data\n", i); ok(buf[test_lznt[i].uncompressed_size] == 0x11, - "%d: buf[%u] was modified\n", i, test_lznt[i].uncompressed_size); + "%d: buf[%lu] was modified\n", i, test_lznt[i].uncompressed_size); } } @@ -2852,17 +2853,17 @@ static void test_RtlDecompressBuffer(void) test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); if (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_TRUNCATED) todo_wine - ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08x\n", i, status); + ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08lx\n", i, status); else - ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08lx\n", i, status); if (!status) { ok(final_size == test_lznt[i].uncompressed_size - 1, - "%d: got wrong final_size %u\n", i, final_size); + "%d: got wrong final_size %lu\n", i, final_size); ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size - 1), "%d: got wrong decoded data\n", i); ok(buf[test_lznt[i].uncompressed_size - 1] == 0x11, - "%d: buf[%u] was modified\n", i, test_lznt[i].uncompressed_size - 1); + "%d: buf[%lu] was modified\n", i, test_lznt[i].uncompressed_size - 1); } } @@ -2872,11 +2873,11 @@ static void test_RtlDecompressBuffer(void) status = RtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 0, test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); if (is_incomplete_chunk(test_lznt[i].compressed, test_lznt[i].compressed_size, FALSE)) - ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08x\n", i, status); + ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08lx\n", i, status); else { - ok(status == STATUS_SUCCESS, "%d: got wrong status 0x%08x\n", i, status); - ok(final_size == 0, "%d: got wrong final_size %u\n", i, final_size); + ok(status == STATUS_SUCCESS, "%d: got wrong status 0x%08lx\n", i, status); + ok(final_size == 0, "%d: got wrong final_size %lu\n", i, final_size); ok(buf[0] == 0x11, "%d: buf[0] was modified\n", i); } @@ -2887,17 +2888,17 @@ static void test_RtlDecompressBuffer(void) test_lznt[i].compressed_size, 0, &final_size, workspace); if (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT) todo_wine - ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08x\n", i, status); + ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08lx\n", i, status); else - ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08lx\n", i, status); if (!status) { ok(final_size == test_lznt[i].uncompressed_size, - "%d: got wrong final_size %u\n", i, final_size); + "%d: got wrong final_size %lu\n", i, final_size); ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), "%d: got wrong decoded data\n", i); ok(buf[test_lznt[i].uncompressed_size] == 0x11, - "%d: buf[%u] was modified\n", i, test_lznt[i].uncompressed_size); + "%d: buf[%lu] was modified\n", i, test_lznt[i].uncompressed_size); } /* test RtlDecompressFragment with offset = 1 */ @@ -2907,26 +2908,26 @@ static void test_RtlDecompressBuffer(void) test_lznt[i].compressed_size, 1, &final_size, workspace); if (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT) todo_wine - ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08x\n", i, status); + ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08lx\n", i, status); else - ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08lx\n", i, status); if (!status) { if (test_lznt[i].uncompressed_size == 0) { todo_wine - ok(final_size == 4095, "%d: got wrong final_size %u\n", i, final_size); + ok(final_size == 4095, "%d: got wrong final_size %lu\n", i, final_size); /* Buffer doesn't contain any useful value on Windows */ ok(buf[4095] == 0x11, "%d: buf[4095] was modified\n", i); } else { ok(final_size == test_lznt[i].uncompressed_size - 1, - "%d: got wrong final_size %u\n", i, final_size); + "%d: got wrong final_size %lu\n", i, final_size); ok(!memcmp(buf, test_lznt[i].uncompressed + 1, test_lznt[i].uncompressed_size - 1), "%d: got wrong decoded data\n", i); ok(buf[test_lznt[i].uncompressed_size - 1] == 0x11, - "%d: buf[%u] was modified\n", i, test_lznt[i].uncompressed_size - 1); + "%d: buf[%lu] was modified\n", i, test_lznt[i].uncompressed_size - 1); } } @@ -2937,13 +2938,13 @@ static void test_RtlDecompressBuffer(void) test_lznt[i].compressed_size, 4095, &final_size, workspace); if (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT) todo_wine - ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08x\n", i, status); + ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08lx\n", i, status); else - ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08lx\n", i, status); if (!status) { todo_wine - ok(final_size == 1, "%d: got wrong final_size %u\n", i, final_size); + ok(final_size == 1, "%d: got wrong final_size %lu\n", i, final_size); todo_wine ok(buf[0] == 0, "%d: padding is not zero\n", i); ok(buf[1] == 0x11, "%d: buf[1] was modified\n", i); @@ -2956,10 +2957,10 @@ static void test_RtlDecompressBuffer(void) test_lznt[i].compressed_size, 4096, &final_size, workspace); expected_status = is_incomplete_chunk(test_lznt[i].compressed, test_lznt[i].compressed_size, TRUE) ? test_lznt[i].status : STATUS_SUCCESS; - ok(status == expected_status, "%d: got wrong status 0x%08x, expected 0x%08x\n", i, status, expected_status); + ok(status == expected_status, "%d: got wrong status 0x%08lx, expected 0x%08lx\n", i, status, expected_status); if (!status) { - ok(final_size == 0, "%d: got wrong final_size %u\n", i, final_size); + ok(final_size == 0, "%d: got wrong final_size %lu\n", i, final_size); ok(buf[0] == 0x11, "%d: buf[4096] was modified\n", i); } } @@ -2980,29 +2981,29 @@ static DWORD WINAPI critsect_locked_thread(void *param) DWORD ret; ret = pRtlIsCriticalSectionLocked(&info->crit); - ok(ret == TRUE, "expected TRUE, got %u\n", ret); + ok(ret == TRUE, "expected TRUE, got %lu\n", ret); ret = pRtlIsCriticalSectionLockedByThread(&info->crit); - ok(ret == FALSE, "expected FALSE, got %u\n", ret); + ok(ret == FALSE, "expected FALSE, got %lu\n", ret); ReleaseSemaphore(info->semaphores[0], 1, NULL); ret = WaitForSingleObject(info->semaphores[1], 1000); - ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %lu\n", ret); ret = pRtlIsCriticalSectionLocked(&info->crit); - ok(ret == FALSE, "expected FALSE, got %u\n", ret); + ok(ret == FALSE, "expected FALSE, got %lu\n", ret); ret = pRtlIsCriticalSectionLockedByThread(&info->crit); - ok(ret == FALSE, "expected FALSE, got %u\n", ret); + ok(ret == FALSE, "expected FALSE, got %lu\n", ret); EnterCriticalSection(&info->crit); ret = pRtlIsCriticalSectionLocked(&info->crit); - ok(ret == TRUE, "expected TRUE, got %u\n", ret); + ok(ret == TRUE, "expected TRUE, got %lu\n", ret); ret = pRtlIsCriticalSectionLockedByThread(&info->crit); - ok(ret == TRUE, "expected TRUE, got %u\n", ret); + ok(ret == TRUE, "expected TRUE, got %lu\n", ret); ReleaseSemaphore(info->semaphores[0], 1, NULL); ret = WaitForSingleObject(info->semaphores[1], 1000); - ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %lu\n", ret); LeaveCriticalSection(&info->crit); return 0; @@ -3022,9 +3023,9 @@ static void test_RtlIsCriticalSectionLocked(void) InitializeCriticalSection(&info.crit); info.semaphores[0] = CreateSemaphoreW(NULL, 0, 1, NULL); - ok(info.semaphores[0] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); + ok(info.semaphores[0] != NULL, "CreateSemaphore failed with %lu\n", GetLastError()); info.semaphores[1] = CreateSemaphoreW(NULL, 0, 1, NULL); - ok(info.semaphores[1] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); + ok(info.semaphores[1] != NULL, "CreateSemaphore failed with %lu\n", GetLastError()); ret = pRtlIsCriticalSectionLocked(&info.crit); ok(ret == FALSE, "expected FALSE, got %u\n", ret); @@ -3039,7 +3040,7 @@ static void test_RtlIsCriticalSectionLocked(void) ok(ret == TRUE, "expected TRUE, got %u\n", ret); thread = CreateThread(NULL, 0, critsect_locked_thread, &info, 0, NULL); - ok(thread != NULL, "CreateThread failed with %u\n", GetLastError()); + ok(thread != NULL, "CreateThread failed with %lu\n", GetLastError()); ret = WaitForSingleObject(info.semaphores[0], 1000); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); @@ -3079,21 +3080,21 @@ static void test_RtlInitializeCriticalSectionEx(void) pRtlInitializeCriticalSectionEx(&cs, 0, 0); ok((cs.DebugInfo != NULL && cs.DebugInfo != no_debug) || broken(cs.DebugInfo == no_debug) /* >= Win 8 */, "expected DebugInfo != NULL and DebugInfo != ~0, got %p\n", cs.DebugInfo); - ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); - ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); + ok(cs.LockCount == -1, "expected LockCount == -1, got %ld\n", cs.LockCount); + ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %ld\n", cs.RecursionCount); ok(cs.LockSemaphore == NULL, "expected LockSemaphore == NULL, got %p\n", cs.LockSemaphore); ok(cs.SpinCount == 0 || broken(cs.SpinCount != 0) /* >= Win 8 */, - "expected SpinCount == 0, got %ld\n", cs.SpinCount); + "expected SpinCount == 0, got %Id\n", cs.SpinCount); RtlDeleteCriticalSection(&cs); memset(&cs, 0x11, sizeof(cs)); pRtlInitializeCriticalSectionEx(&cs, 0, RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO); ok(cs.DebugInfo == no_debug, "expected DebugInfo == ~0, got %p\n", cs.DebugInfo); - ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); - ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); + ok(cs.LockCount == -1, "expected LockCount == -1, got %ld\n", cs.LockCount); + ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %ld\n", cs.RecursionCount); ok(cs.LockSemaphore == NULL, "expected LockSemaphore == NULL, got %p\n", cs.LockSemaphore); ok(cs.SpinCount == 0 || broken(cs.SpinCount != 0) /* >= Win 8 */, - "expected SpinCount == 0, got %ld\n", cs.SpinCount); + "expected SpinCount == 0, got %Id\n", cs.SpinCount); RtlDeleteCriticalSection(&cs); } @@ -3106,19 +3107,19 @@ static void test_RtlLeaveCriticalSection(void) return; /* Skip winxp */ status = RtlInitializeCriticalSection(&cs); - ok(!status, "RtlInitializeCriticalSection failed: %x\n", status); + ok(!status, "RtlInitializeCriticalSection failed: %lx\n", status); status = RtlEnterCriticalSection(&cs); - ok(!status, "RtlEnterCriticalSection failed: %x\n", status); + ok(!status, "RtlEnterCriticalSection failed: %lx\n", status); todo_wine - ok(cs.LockCount == -2, "expected LockCount == -2, got %d\n", cs.LockCount); - ok(cs.RecursionCount == 1, "expected RecursionCount == 1, got %d\n", cs.RecursionCount); + ok(cs.LockCount == -2, "expected LockCount == -2, got %ld\n", cs.LockCount); + ok(cs.RecursionCount == 1, "expected RecursionCount == 1, got %ld\n", cs.RecursionCount); ok(cs.OwningThread == ULongToHandle(GetCurrentThreadId()), "unexpected OwningThread\n"); status = RtlLeaveCriticalSection(&cs); - ok(!status, "RtlLeaveCriticalSection failed: %x\n", status); - ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); - ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); + ok(!status, "RtlLeaveCriticalSection failed: %lx\n", status); + ok(cs.LockCount == -1, "expected LockCount == -1, got %ld\n", cs.LockCount); + ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %ld\n", cs.RecursionCount); ok(!cs.OwningThread, "unexpected OwningThread %p\n", cs.OwningThread); /* @@ -3126,34 +3127,34 @@ static void test_RtlLeaveCriticalSection(void) * but doesn't modify LockCount so that an attempt to enter the section later will work. */ status = RtlLeaveCriticalSection(&cs); - ok(!status, "RtlLeaveCriticalSection failed: %x\n", status); - ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); - ok(cs.RecursionCount == -1, "expected RecursionCount == -1, got %d\n", cs.RecursionCount); + ok(!status, "RtlLeaveCriticalSection failed: %lx\n", status); + ok(cs.LockCount == -1, "expected LockCount == -1, got %ld\n", cs.LockCount); + ok(cs.RecursionCount == -1, "expected RecursionCount == -1, got %ld\n", cs.RecursionCount); ok(!cs.OwningThread, "unexpected OwningThread %p\n", cs.OwningThread); /* and again */ status = RtlLeaveCriticalSection(&cs); - ok(!status, "RtlLeaveCriticalSection failed: %x\n", status); - ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); - ok(cs.RecursionCount == -2, "expected RecursionCount == -2, got %d\n", cs.RecursionCount); + ok(!status, "RtlLeaveCriticalSection failed: %lx\n", status); + ok(cs.LockCount == -1, "expected LockCount == -1, got %ld\n", cs.LockCount); + ok(cs.RecursionCount == -2, "expected RecursionCount == -2, got %ld\n", cs.RecursionCount); ok(!cs.OwningThread, "unexpected OwningThread %p\n", cs.OwningThread); /* entering section fixes RecursionCount */ status = RtlEnterCriticalSection(&cs); - ok(!status, "RtlEnterCriticalSection failed: %x\n", status); + ok(!status, "RtlEnterCriticalSection failed: %lx\n", status); todo_wine - ok(cs.LockCount == -2, "expected LockCount == -2, got %d\n", cs.LockCount); - ok(cs.RecursionCount == 1, "expected RecursionCount == 1, got %d\n", cs.RecursionCount); + ok(cs.LockCount == -2, "expected LockCount == -2, got %ld\n", cs.LockCount); + ok(cs.RecursionCount == 1, "expected RecursionCount == 1, got %ld\n", cs.RecursionCount); ok(cs.OwningThread == ULongToHandle(GetCurrentThreadId()), "unexpected OwningThread\n"); status = RtlLeaveCriticalSection(&cs); - ok(!status, "RtlLeaveCriticalSection failed: %x\n", status); - ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); - ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); + ok(!status, "RtlLeaveCriticalSection failed: %lx\n", status); + ok(cs.LockCount == -1, "expected LockCount == -1, got %ld\n", cs.LockCount); + ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %ld\n", cs.RecursionCount); ok(!cs.OwningThread, "unexpected OwningThread %p\n", cs.OwningThread); status = RtlDeleteCriticalSection(&cs); - ok(!status, "RtlDeleteCriticalSection failed: %x\n", status); + ok(!status, "RtlDeleteCriticalSection failed: %lx\n", status); } struct ldr_enum_context @@ -3190,24 +3191,24 @@ static void test_LdrEnumerateLoadedModules(void) ctx.found = FALSE; ctx.count = 0; status = pLdrEnumerateLoadedModules(NULL, ldr_enum_callback, &ctx); - ok(status == STATUS_SUCCESS, "LdrEnumerateLoadedModules failed with %08x\n", status); + ok(status == STATUS_SUCCESS, "LdrEnumerateLoadedModules failed with %08lx\n", status); ok(ctx.count > 1, "Expected more than one module, got %d\n", ctx.count); ok(ctx.found, "Could not find ntdll in list of modules\n"); ctx.abort = TRUE; ctx.count = 0; status = pLdrEnumerateLoadedModules(NULL, ldr_enum_callback, &ctx); - ok(status == STATUS_SUCCESS, "LdrEnumerateLoadedModules failed with %08x\n", status); + ok(status == STATUS_SUCCESS, "LdrEnumerateLoadedModules failed with %08lx\n", status); ok(ctx.count == 1, "Expected exactly one module, got %d\n", ctx.count); status = pLdrEnumerateLoadedModules((void *)0x1, ldr_enum_callback, (void *)0xdeadbeef); - ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08lx\n", status); status = pLdrEnumerateLoadedModules((void *)0xdeadbeef, ldr_enum_callback, (void *)0xdeadbeef); - ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08lx\n", status); status = pLdrEnumerateLoadedModules(NULL, NULL, (void *)0xdeadbeef); - ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08lx\n", status); } static void test_RtlMakeSelfRelativeSD(void) @@ -3223,31 +3224,31 @@ static void test_RtlMakeSelfRelativeSD(void) len = 0; status = RtlMakeSelfRelativeSD( &sd, NULL, &len ); - ok( status == STATUS_BUFFER_TOO_SMALL, "got %08x\n", status ); - ok( len == sizeof(*sd_rel), "got %u\n", len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %08lx\n", status ); + ok( len == sizeof(*sd_rel), "got %lu\n", len ); len += 4; status = RtlMakeSelfRelativeSD( &sd, sd_rel, &len ); - ok( status == STATUS_SUCCESS, "got %08x\n", status ); - ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + ok( status == STATUS_SUCCESS, "got %08lx\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %lu\n", len ); len = 0; status = RtlAbsoluteToSelfRelativeSD( &sd, NULL, &len ); - ok( status == STATUS_BUFFER_TOO_SMALL, "got %08x\n", status ); - ok( len == sizeof(*sd_rel), "got %u\n", len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %08lx\n", status ); + ok( len == sizeof(*sd_rel), "got %lu\n", len ); len += 4; status = RtlAbsoluteToSelfRelativeSD( &sd, sd_rel, &len ); - ok( status == STATUS_SUCCESS, "got %08x\n", status ); - ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + ok( status == STATUS_SUCCESS, "got %08lx\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %lu\n", len ); sd.Control = SE_SELF_RELATIVE; status = RtlMakeSelfRelativeSD( &sd, sd_rel, &len ); - ok( status == STATUS_SUCCESS, "got %08x\n", status ); - ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + ok( status == STATUS_SUCCESS, "got %08lx\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %lu\n", len ); status = RtlAbsoluteToSelfRelativeSD( &sd, sd_rel, &len ); - ok( status == STATUS_BAD_DESCRIPTOR_FORMAT, "got %08x\n", status ); + ok( status == STATUS_BAD_DESCRIPTOR_FORMAT, "got %08lx\n", status ); } static DWORD (CALLBACK *orig_entry)(HMODULE,DWORD,LPVOID); @@ -3275,7 +3276,7 @@ static void CALLBACK ldr_notify_callback1(ULONG reason, LDR_DLL_NOTIFICATION_DAT if (!lstrcmpiW(data->Loaded.BaseDllName->Buffer, expected_dll)) return; - ok(data->Loaded.Flags == 0, "Expected flags 0, got %x\n", data->Loaded.Flags); + ok(data->Loaded.Flags == 0, "Expected flags 0, got %lx\n", data->Loaded.Flags); ok(!lstrcmpiW(data->Loaded.BaseDllName->Buffer, expected_dll), "Expected %s, got %s\n", wine_dbgstr_w(expected_dll), wine_dbgstr_w(data->Loaded.BaseDllName->Buffer)); ok(!!data->Loaded.DllBase, "Expected non zero base address\n"); @@ -3435,67 +3436,67 @@ static void test_LdrRegisterDllNotification(void) /* generic test */ status = pLdrRegisterDllNotification(0, ldr_notify_callback1, &calls, &cookie); - ok(!status, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(!status, "Expected STATUS_SUCCESS, got %08lx\n", status); calls = 0; mod = LoadLibraryW(expected_dll); - ok(!!mod, "Failed to load library: %d\n", GetLastError()); - ok(calls == LDR_DLL_NOTIFICATION_REASON_LOADED, "Expected LDR_DLL_NOTIFICATION_REASON_LOADED, got %x\n", calls); + ok(!!mod, "Failed to load library: %ld\n", GetLastError()); + ok(calls == LDR_DLL_NOTIFICATION_REASON_LOADED, "Expected LDR_DLL_NOTIFICATION_REASON_LOADED, got %lx\n", calls); calls = 0; FreeLibrary(mod); - ok(calls == LDR_DLL_NOTIFICATION_REASON_UNLOADED, "Expected LDR_DLL_NOTIFICATION_REASON_UNLOADED, got %x\n", calls); + ok(calls == LDR_DLL_NOTIFICATION_REASON_UNLOADED, "Expected LDR_DLL_NOTIFICATION_REASON_UNLOADED, got %lx\n", calls); /* test order of callbacks */ status = pLdrRegisterDllNotification(0, ldr_notify_callback2, &calls, &cookie2); - ok(!status, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(!status, "Expected STATUS_SUCCESS, got %08lx\n", status); calls = 0; mod = LoadLibraryW(expected_dll); - ok(!!mod, "Failed to load library: %d\n", GetLastError()); - ok(calls == 0x13, "Expected order 0x13, got %x\n", calls); + ok(!!mod, "Failed to load library: %ld\n", GetLastError()); + ok(calls == 0x13, "Expected order 0x13, got %lx\n", calls); calls = 0; FreeLibrary(mod); - ok(calls == 0x24, "Expected order 0x24, got %x\n", calls); + ok(calls == 0x24, "Expected order 0x24, got %lx\n", calls); pLdrUnregisterDllNotification(cookie2); pLdrUnregisterDllNotification(cookie); /* test dll main order */ status = pLdrRegisterDllNotification(0, ldr_notify_callback_dll_main, &calls, &cookie); - ok(!status, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(!status, "Expected STATUS_SUCCESS, got %08lx\n", status); calls = 0; mod = LoadLibraryW(expected_dll); - ok(!!mod, "Failed to load library: %d\n", GetLastError()); - ok(calls == 0x13, "Expected order 0x13, got %x\n", calls); + ok(!!mod, "Failed to load library: %ld\n", GetLastError()); + ok(calls == 0x13, "Expected order 0x13, got %lx\n", calls); calls = 0; FreeLibrary(mod); - ok(calls == 0x42, "Expected order 0x42, got %x\n", calls); + ok(calls == 0x42, "Expected order 0x42, got %lx\n", calls); pLdrUnregisterDllNotification(cookie); /* test dll main order */ status = pLdrRegisterDllNotification(0, ldr_notify_callback_fail, &calls, &cookie); - ok(!status, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(!status, "Expected STATUS_SUCCESS, got %08lx\n", status); calls = 0; mod = LoadLibraryW(expected_dll); ok(!mod, "Expected library to fail loading\n"); - ok(calls == 0x1342, "Expected order 0x1342, got %x\n", calls); + ok(calls == 0x1342, "Expected order 0x1342, got %lx\n", calls); pLdrUnregisterDllNotification(cookie); /* test dll with dependencies */ status = pLdrRegisterDllNotification(0, ldr_notify_callback_imports, &calls, &cookie); - ok(!status, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(!status, "Expected STATUS_SUCCESS, got %08lx\n", status); calls = 0; mod = LoadLibraryW(wintrustdllW); - ok(!!mod, "Failed to load library: %d\n", GetLastError()); - ok(calls == 0x12 || calls == 0x21, "got %x\n", calls); + ok(!!mod, "Failed to load library: %ld\n", GetLastError()); + ok(calls == 0x12 || calls == 0x21, "got %lx\n", calls); FreeLibrary(mod); pLdrUnregisterDllNotification(cookie); @@ -3509,7 +3510,7 @@ static LONG CALLBACK test_dbg_print_except_handler( EXCEPTION_POINTERS *eptrs ) if (eptrs->ExceptionRecord->ExceptionCode == DBG_PRINTEXCEPTION_C) { ok( eptrs->ExceptionRecord->NumberParameters == 2, - "Unexpected NumberParameters: %d\n", eptrs->ExceptionRecord->NumberParameters ); + "Unexpected NumberParameters: %ld\n", eptrs->ExceptionRecord->NumberParameters ); ok( eptrs->ExceptionRecord->ExceptionInformation[0] == strlen("test_DbgPrint: Hello World") + 1, "Unexpected ExceptionInformation[0]: %d\n", (int)eptrs->ExceptionRecord->ExceptionInformation[0] ); ok( !strcmp((char *)eptrs->ExceptionRecord->ExceptionInformation[1], "test_DbgPrint: Hello World"), @@ -3551,26 +3552,26 @@ static void test_DbgPrint(void) test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); - ok( !status, "DbgPrint returned %x\n", status ); + ok( !status, "DbgPrint returned %lx\n", status ); ok( !test_dbg_print_except, "DBG_PRINTEXCEPTION_C received\n" ); Peb->BeingDebugged = TRUE; test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); - ok( !status, "DbgPrint returned %x\n", status ); + ok( !status, "DbgPrint returned %lx\n", status ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_CONTINUE_EXECUTION; status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); - ok( !status, "DbgPrint returned %x\n", status ); + ok( !status, "DbgPrint returned %lx\n", status ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_CONTINUE_SEARCH; status = DbgPrint( "test_DbgPrint: %s", "Hello World" ); - ok( !status, "DbgPrint returned %x\n", status ); + ok( !status, "DbgPrint returned %lx\n", status ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); @@ -3579,38 +3580,38 @@ static void test_DbgPrint(void) test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = DbgPrintEx( 0, DPFLTR_ERROR_LEVEL, "test_DbgPrint: %s", "Hello World" ); - ok( !status, "DbgPrintEx returned %x\n", status ); + ok( !status, "DbgPrintEx returned %lx\n", status ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = DbgPrintEx( 0, DPFLTR_WARNING_LEVEL, "test_DbgPrint: %s", "Hello World" ); - ok( !status, "DbgPrintEx returned %x\n", status ); + ok( !status, "DbgPrintEx returned %lx\n", status ); ok( !test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = DbgPrintEx( 0, DPFLTR_MASK|(1 << DPFLTR_ERROR_LEVEL), "test_DbgPrint: %s", "Hello World" ); - ok( !status, "DbgPrintEx returned %x\n", status ); + ok( !status, "DbgPrintEx returned %lx\n", status ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = DbgPrintEx( 0, DPFLTR_MASK|(1 << DPFLTR_WARNING_LEVEL), "test_DbgPrint: %s", "Hello World" ); - ok( !status, "DbgPrintEx returned %x\n", status ); + ok( !status, "DbgPrintEx returned %lx\n", status ); ok( !test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = test_vDbgPrintEx( 0, 0xFFFFFFFF, "test_DbgPrint: %s", "Hello World" ); - ok( !status, "vDbgPrintEx returned %x\n", status ); + ok( !status, "vDbgPrintEx returned %lx\n", status ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); test_dbg_print_except = FALSE; test_dbg_print_except_ret = (LONG)EXCEPTION_EXECUTE_HANDLER; status = test_vDbgPrintExWithPrefix( "test_", 0, 0xFFFFFFFF, "DbgPrint: %s", "Hello World" ); - ok( !status, "vDbgPrintExWithPrefix returned %x\n", status ); + ok( !status, "vDbgPrintExWithPrefix returned %lx\n", status ); ok( test_dbg_print_except, "DBG_PRINTEXCEPTION_C not received\n" ); Peb->BeingDebugged = debugged;

1 0

[PATCH]: po: Update Lithuanian translation.
by Aurimas Fišeras 23 Mar '22

23 Mar '22

1 0

[PATCH v2] ntdll: Avoid the lower 2GB region for large allocations on win64.
by Elaine Lefler 23 Mar '22

23 Mar '22

Fixes a crash in PaintTool SAI when allocating more than 2GB of memory. Signed-off-by: Elaine Lefler <elaineclefler(a)gmail.com> --- v2: Removed todo_wine from appropriate tests, along with a note about why that test is broken on win32. --- dlls/ntdll/tests/info.c | 16 ++++++++++++---- dlls/ntdll/unix/virtual.c | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index d3e70842b00..3652d907db5 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1840,8 +1840,13 @@ static void test_query_process_vm(void) ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc", &pvi); - todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, - "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); +#ifndef _WIN64 + /* Fails on win32 due to mapping in reserved areas. The unused regions + * should be subtracted from VirtualSize for it to succeed. */ + todo_wine +#endif + ok( pvi.VirtualSize >= prev_size + alloc_size, + "Expected to be at least %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); VirtualFree( ptr, 0, MEM_RELEASE); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); @@ -1857,8 +1862,11 @@ static void test_query_process_vm(void) ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc(MEM_RESERVE)", &pvi); - todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, - "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); +#ifndef _WIN64 + todo_wine +#endif + ok( pvi.VirtualSize >= prev_size + alloc_size, + "Expected to be at least %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); prev_size = pvi.VirtualSize; ptr = VirtualAlloc(ptr, alloc_size, MEM_COMMIT, PAGE_READWRITE); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 94b300c5057..eac9bcb1f83 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1917,7 +1917,11 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, alloc.top_down = top_down; alloc.limit = (void*)(get_zero_bits_mask( zero_bits ) & (UINT_PTR)user_space_limit); - if (mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) + if ( +#ifdef _WIN64 + size < 2 * 1024 * 1024 && +#endif + mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) { ptr = alloc.result; TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); -- 2.32.0 (Apple Git-132)

1 0

[PATCH 1/5] mfplat/sample: Simplify code for setting DirectX manager.
by Giovanni Mascellani 23 Mar '22

23 Mar '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/sample.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 8ef80eb5f24..527f44fd8fd 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -1214,13 +1214,9 @@ static HRESULT WINAPI sample_allocator_SetDirectXManager(IMFVideoSampleAllocator IDirect3DDeviceManager9_Release(allocator->d3d9_device_manager); if (allocator->dxgi_device_manager) IMFDXGIDeviceManager_Release(allocator->dxgi_device_manager); - allocator->d3d9_device_manager = NULL; - allocator->dxgi_device_manager = NULL; - if (dxgi_device_manager) - allocator->dxgi_device_manager = dxgi_device_manager; - else if (d3d9_device_manager) - allocator->d3d9_device_manager = d3d9_device_manager; + allocator->d3d9_device_manager = d3d9_device_manager; + allocator->dxgi_device_manager = dxgi_device_manager; LeaveCriticalSection(&allocator->cs); -- 2.35.1

3 7

[PATCH] ntdll: Avoid the lower 2GB region for large allocations on win64.
by Elaine Lefler 23 Mar '22

23 Mar '22

Fixes a crash in PaintTool SAI when allocating more than 2GB of memory. Signed-off-by: Elaine Lefler <elaineclefler(a)gmail.com> --- >From what I can tell, Sai basically requests an initial block of memory from VirtualAlloc, then increments that pointer and calls VirtualAlloc again with a fixed address when it wants more ram. Blindly assuming that memory space is non-fragmented enough for the call to succeed. This is definitely incorrect program behavior, but it works on Windows, and after this tweak it's working on Wine too. Heads up: I initially disabled the code path for all allocations, not just large ones. On macOS this works fine. On Linux it's broken. Somewhere, presumably in the X11 driver, we're truncating pointers to 32 bits. The change is safe for Windows apps, since Windows itself seems to avoid the lower 4GB region, even for functions like HeapAlloc. I can't find any apparent cause for the truncation, other than converting HWNDs to XIDs, which doesn't seem to be the problem. I wonder if there might be a confusion between "long" and "long long" somewhere. Anyway, window data should never be large enough to trigger the new behavior, so the broken behavior stays under containment until it can be fixed properly. --- dlls/ntdll/unix/virtual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 94b300c5057..eac9bcb1f83 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1917,7 +1917,11 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, alloc.top_down = top_down; alloc.limit = (void*)(get_zero_bits_mask( zero_bits ) & (UINT_PTR)user_space_limit); - if (mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) + if ( +#ifdef _WIN64 + size < 2 * 1024 * 1024 && +#endif + mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) { ptr = alloc.result; TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); -- 2.32.0 (Apple Git-132)

3 5

[PATCH 1/4] kernelbase: Do not return S_FALSE from UrlGetPartW().
by Zebediah Figura 23 Mar '22

23 Mar '22

Only return it from UrlGetPartA(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/path.c | 3 ++- dlls/shlwapi/tests/url.c | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 410d87ce620..be7754dade2 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4166,6 +4166,7 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par len2 = WideCharToMultiByte(CP_ACP, 0, outW, len + 1, out, *out_len, NULL, NULL); *out_len = len2 - 1; heap_free(inW); + if (hr == S_OK && !*out_len) hr = S_FALSE; return hr; } @@ -4382,7 +4383,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p } TRACE("len=%ld %s\n", *out_len, wine_dbgstr_w(out)); - return *out_len ? S_OK : S_FALSE; + return S_OK; } BOOL WINAPI UrlIsA(const char *url, URLIS Urlis) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 476358c6d45..31581f82847 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -748,8 +748,6 @@ static void test_UrlGetPart(void) {"telnet://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "telnet:hostname"}, }; - winetest_mute_threshold = 5; - hr = UrlGetPartA(NULL, NULL, NULL, URL_PART_SCHEME, 0); ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); @@ -837,7 +835,7 @@ static void test_UrlGetPart(void) size = 1; wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if (tests[i].todo_hr || tests[i].hr == S_FALSE) + todo_wine_if (tests[i].todo_hr) { if (tests[i].hr == S_OK) ok(hr == E_POINTER, "Got hr %#lx.\n", hr); @@ -870,7 +868,7 @@ static void test_UrlGetPart(void) size = ARRAY_SIZE(bufferW); wcscpy(bufferW, L"x"); hr = UrlGetPartW(urlW, bufferW, &size, part, flags); - todo_wine_if ((tests[i].hr == S_FALSE || tests[i].todo_hr) && strcmp(url, "a:") && strcmp(url, "0:")) + todo_wine_if (tests[i].todo_hr && strcmp(url, "a:") && strcmp(url, "0:")) ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#lx.\n", hr); if (SUCCEEDED(hr)) { @@ -886,8 +884,6 @@ static void test_UrlGetPart(void) winetest_pop_context(); } - - winetest_mute_threshold = 42; } /* ########################### */ -- 2.34.1

1 3

[PATCH] po: Update Korean translation.
by Byeongsik Jeon 23 Mar '22

23 Mar '22

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 117 ++++++++++++++++++++++++------------------------------- 1 file changed, 51 insertions(+), 66 deletions(-) diff --git a/po/ko.po b/po/ko.po index 34823747a8d..209366150ea 100644 --- a/po/ko.po +++ b/po/ko.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: 2021-12-30 11:19+0900\n" +"PO-Revision-Date: 2022-03-23 11:25+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -240,8 +240,8 @@ msgstr "" "다.\n" "\n" "참고: 배포판이 제공하는 wine-mono 패키지 사용을 추천합니다. 자세한 내용은 <a " -"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a>를 보십" -"시오." +"href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a>를 참고" +"하세요." #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" @@ -3954,13 +3954,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "순환하는 __proto__ 값" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "확장 가능하지 않은 속성 '|'을(를) 정의할 수 없습니다" +msgstr "확장 가능하지 않은 개체에 대한 속성을 만들 수 없습니다" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -6948,54 +6946,40 @@ msgid "This network connection does not exist.\n" msgstr "네트워크 연결이 없습니다.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "잘못된 인터럽트 시간.\n" +msgstr "호출이 중단되었습니다.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "잘못된 핸들입니다.\n" +msgstr "파일 핸들이 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "잘못된 네트워크 주소.\n" +msgstr "주소가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "잘못된 이름.\n" +msgstr "인수가 잘못되었습니다.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" -msgstr "피어가 연결을 초기화 했습니다.\n" +msgstr "피어가 연결을 다시 설정했습니다.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "포인트를 찾을 수 없습니다.\n" +msgstr "호스트를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "특성을 찾을 수 없습니다.\n" +msgstr "일시적으로 호스트를 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "복구할 수 없는 오류가 발생했습니다.\n" +msgstr "복구할 수 없는 오류입니다.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "유효한 이름입니다만, 요청한 데이터 레코드가 없습니다.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n" @@ -7011,7 +6995,7 @@ msgstr "파일에서 서명을 찾을 수 없습니다.\n" #: dlls/kernel32/winerror.mc:3824 msgid "Invalid call.\n" -msgstr "잘못된 호출.\n" +msgstr "잘못된 호출입니다.\n" #: dlls/kernel32/winerror.mc:3831 msgid "Resource is not currently available.\n" @@ -9135,8 +9119,8 @@ msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" -"공급자를 더 이상 사용할 수 없습니다. 공급자가 올바르게 설치되었는지 확인하십" -"시오." +"공급자를 더 이상 사용할 수 없습니다. 공급자가 올바르게 설치되었는지 확인하세" +"요." #: dlls/oledb32/version.rc:36 msgid "Data Link Properties" @@ -9427,7 +9411,7 @@ msgid "" "make sure the correct drive is selected below" msgstr "" "제조업체 설치 디스크를 삽입하고,\n" -"아래의 선택된 드라이브가 올바른지 확인하시오" +"아래의 선택된 드라이브가 올바른지 확인하세요" #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" @@ -10193,7 +10177,8 @@ msgstr "'%1' 항목을 휴지통으로 보내시겠습니까?" #: dlls/shell32/shell32.rc:177 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" -msgstr "항목'%1'을(를) 휴지통으로 보낼 수 없습니다. 대신에 지우시겠습니까?" +msgstr "" +"항목'%1'을(를) 휴지통으로 보낼 수 없습니다. 대신 완전히 지우시겠습니까?" #: dlls/shell32/shell32.rc:184 msgid "" @@ -15141,7 +15126,7 @@ msgid "" msgstr "" "파일 '%s'이(가) 변경되었습니다.\n" "\n" -"변결 내용을 저장하시겠습니까?" +"변경 내용을 저장하시겠습니까?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." @@ -15781,7 +15766,7 @@ msgstr "" "지원하는 작업:\n" " ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" -"특정 작업에 대한 도움말을 보려면 다음을 입력하십시오.\n" +"특정 작업에 대한 도움말을 보려면 다음처럼 입력하세요.\n" " REG [작업] /?\n" "\n" @@ -16013,7 +15998,7 @@ msgstr "" " 레지스트리 값 이름의 데이터를 삭제합니다.\n" "\n" " /va\n" -" 레지스트리 키 아래의 모든 값을 삭제하니다.\n" +" 레지스트리 키 아래의 모든 값을 삭제합니다.\n" "\n" " /f\n" " 확인 절차 없이 (모든 하위키 및 값과 함께) 레지스트리 키를\n" @@ -17442,7 +17427,7 @@ msgstr "열 선택" #: programs/taskmgr/taskmgr.rc:519 msgid "" "Select the columns that will appear on the Process page of the Task Manager." -msgstr "작업 관리자의 프로세스 페이지에 표시될 열을 선택하십시오." +msgstr "작업 관리자의 프로세스 페이지에 표시될 열을 선택하세요." #: programs/taskmgr/taskmgr.rc:521 msgid "&Image Name" @@ -18426,7 +18411,7 @@ msgstr "" #: programs/winecfg/winecfg.rc:76 msgctxt "Drive letter" msgid "Letter" -msgstr "문자" +msgstr "드라이브" #: programs/winecfg/winecfg.rc:77 msgid "Target folder" @@ -18831,19 +18816,19 @@ msgstr "새 게임(&N)\tF2" #: programs/winemine/winemine.rc:42 msgid "Question &Marks" -msgstr "물음표(&M)" +msgstr "물음표 표시(&M)" #: programs/winemine/winemine.rc:44 msgid "&Beginner" -msgstr "초보자(&B)" +msgstr "초급(&B)" #: programs/winemine/winemine.rc:45 msgid "&Intermediate" -msgstr "중급자(&I)" +msgstr "중급(&I)" #: programs/winemine/winemine.rc:46 msgid "&Expert" -msgstr "전문가(&E)" +msgstr "고급(&E)" #: programs/winemine/winemine.rc:47 msgid "&Custom..." @@ -18851,15 +18836,15 @@ msgstr "사용자 정의(&C)..." #: programs/winemine/winemine.rc:49 msgid "&Fastest Times" -msgstr "가장 빠른 시간(&F)" +msgstr "기록 보기(&F)" #: programs/winemine/winemine.rc:54 msgid "&About WineMine" -msgstr "지뢰찾기 정보(&A)" +msgstr "지뢰 찾기 정보(&A)" #: programs/winemine/winemine.rc:61 msgid "Fastest Times" -msgstr "최단 시간" +msgstr "최단 시간 기록" #: programs/winemine/winemine.rc:63 msgid "Fastest times" @@ -18867,19 +18852,19 @@ msgstr "최단 시간" #: programs/winemine/winemine.rc:64 msgid "Beginner" -msgstr "초보자" +msgstr "초급" #: programs/winemine/winemine.rc:65 msgid "Intermediate" -msgstr "중급자" +msgstr "중급" #: programs/winemine/winemine.rc:66 msgid "Expert" -msgstr "전문가" +msgstr "고급" #: programs/winemine/winemine.rc:74 programs/winemine/winemine.rc:33 msgid "Reset Results" -msgstr "초기화 결과" +msgstr "초기화" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" @@ -18891,31 +18876,31 @@ msgstr "이름을 입력해 주세요" #: programs/winemine/winemine.rc:90 msgid "Custom Game" -msgstr "사용자 지정 게임" +msgstr "사용자 정의" #: programs/winemine/winemine.rc:92 msgid "Rows" -msgstr "가로줄" +msgstr "높이" #: programs/winemine/winemine.rc:93 msgid "Columns" -msgstr "세로줄" +msgstr "너비" #: programs/winemine/winemine.rc:94 msgid "Mines" -msgstr "지뢰" +msgstr "지뢰 수" #: programs/winemine/winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "모든 결과를 잃습니다. 계속 진행하시겠습니까?" +msgstr "모든 기록이 초기화됩니다. 계속 진행하시겠습니까?" #: programs/winemine/winemine.rc:30 msgid "WineMine" -msgstr "지뢰찾기" +msgstr "지뢰 찾기" #: programs/winemine/winemine.rc:31 msgid "Nobody" -msgstr "아무개" +msgstr "익명" #: programs/winemine/winemine.rc:32 msgid "Copyright 2000 Joshua Thielen" @@ -18983,7 +18968,7 @@ msgstr "Wine 도움말" #: programs/winhlp32/winhlp32.rc:86 msgid "Error while reading the help file `%s'" -msgstr "도움말 파일 `%s'를 읽는 도중 오류 발생" +msgstr "도움말 파일 '%s'을(를) 읽는 동안 오류 발생" #: programs/winhlp32/winhlp32.rc:88 msgid "Summary" @@ -18999,31 +18984,31 @@ msgstr "도움말 파일 (*.hlp)" #: programs/winhlp32/winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "%s을(를) 찾을 수 없습니다'. 이 파일을 직접 찾으시겠습니까?" +msgstr "'%s'을(를) 찾을 수 없습니다. 파일을 직접 찾으시겠습니까?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" -msgstr "Richedit 구현을 찾을 수 없습니다... 취소중" +msgstr "Richedit 구현을 찾을 수 없습니다... 취소 중" #: programs/winhlp32/winhlp32.rc:94 msgid "Help topics: " -msgstr "도움말 목차: " +msgstr "도움말 항목: " #: programs/wmic/wmic.rc:28 msgid "Error: Command line not supported\n" -msgstr "오류: 명령 라인은 지원되지 않음\n" +msgstr "오류: 명령 줄은 지원하지 않습니다\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "오류: Alias를 찾을 수 없음\n" +msgstr "오류: 별칭을 찾을 수 없습니다\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "오류: 잘못된 질의\n" +msgstr "오류: 잘못된 질의입니다\n" #: programs/wmic/wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "오류: 잘못된 키 이름\n" +msgstr "오류: 잘못된 구문입니다\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N" -- 2.35.1

1 0

[PATCH] d3dcompiler: Implement D3DCompile2() using vkd3d_shader_compile().
by Zebediah Figura 22 Mar '22

22 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51713 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_33/Makefile.in | 3 +- dlls/d3dcompiler_34/Makefile.in | 3 +- dlls/d3dcompiler_35/Makefile.in | 3 +- dlls/d3dcompiler_36/Makefile.in | 3 +- dlls/d3dcompiler_37/Makefile.in | 3 +- dlls/d3dcompiler_38/Makefile.in | 3 +- dlls/d3dcompiler_39/Makefile.in | 3 +- dlls/d3dcompiler_40/Makefile.in | 3 +- dlls/d3dcompiler_41/Makefile.in | 3 +- dlls/d3dcompiler_42/Makefile.in | 3 +- dlls/d3dcompiler_43/Makefile.in | 2 + dlls/d3dcompiler_43/compiler.c | 220 ++++++++++++++++++++++--- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 96 +++++------ dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 214 +++++++++++------------- dlls/d3dcompiler_46/Makefile.in | 3 +- dlls/d3dcompiler_47/Makefile.in | 3 +- 16 files changed, 358 insertions(+), 210 deletions(-) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index 7130fb48376..988230890d8 100644 --- a/dlls/d3dcompiler_33/Makefile.in +++ b/dlls/d3dcompiler_33/Makefile.in @@ -1,7 +1,8 @@ MODULE = d3dcompiler_33.dll -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=33 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index e4dfc72cae8..fb5ff5d0489 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -1,7 +1,8 @@ MODULE = d3dcompiler_34.dll -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=34 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index 56c87186c2e..5e94da0e14b 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -1,7 +1,8 @@ MODULE = d3dcompiler_35.dll -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=35 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index f23ac2cb990..3a1f13a064e 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -1,7 +1,8 @@ MODULE = d3dcompiler_36.dll -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=36 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index 331f5f5f068..4afb74e419a 100644 --- a/dlls/d3dcompiler_37/Makefile.in +++ b/dlls/d3dcompiler_37/Makefile.in @@ -1,7 +1,8 @@ MODULE = d3dcompiler_37.dll -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=37 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index b34c2322aae..304548baadd 100644 --- a/dlls/d3dcompiler_38/Makefile.in +++ b/dlls/d3dcompiler_38/Makefile.in @@ -1,7 +1,8 @@ MODULE = d3dcompiler_38.dll -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=38 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index cf4dc2cdd83..87cb11b9572 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -1,7 +1,8 @@ MODULE = d3dcompiler_39.dll -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=39 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index c8d415baf83..443132d7002 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -1,7 +1,8 @@ MODULE = d3dcompiler_40.dll -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=40 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index 2fa69b5a18d..a71dca88e6c 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -1,7 +1,8 @@ MODULE = d3dcompiler_41.dll -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=41 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index d821b888bde..ea9f0fc3faa 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -1,7 +1,8 @@ MODULE = d3dcompiler_42.dll -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=42 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index b527f1681d7..b69f3749626 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,6 +1,8 @@ MODULE = d3dcompiler_43.dll IMPORTLIB = d3dcompiler_43 EXTRADEFS = -DD3D_COMPILER_VERSION=43 +IMPORTS = wined3d +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 6ae51c75cd4..4d2642f17e3 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -1,6 +1,7 @@ /* * Copyright 2009 Matteo Bruni * Copyright 2010 Matteo Bruni for CodeWeavers + * Copyright 2016,2018 Józef Kucia for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,8 +26,33 @@ #include "d3dcompiler_private.h" #include "wpp_private.h" +#include <vkd3d_shader.h> + WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); +static HRESULT hresult_from_vkd3d_result(int vkd3d_result) +{ + switch (vkd3d_result) + { + case VKD3D_OK: + return S_OK; + case VKD3D_ERROR_INVALID_SHADER: + WARN("Invalid shader bytecode.\n"); + /* fall-through */ + case VKD3D_ERROR: + return E_FAIL; + case VKD3D_ERROR_OUT_OF_MEMORY: + return E_OUTOFMEMORY; + case VKD3D_ERROR_INVALID_ARGUMENT: + return E_INVALIDARG; + case VKD3D_ERROR_NOT_IMPLEMENTED: + return E_NOTIMPL; + default: + FIXME("Unhandled vkd3d result %d.\n", vkd3d_result); + return E_FAIL; + } +} + #define D3DXERR_INVALIDDATA 0x88760b59 #define BUFFER_INITIAL_CAPACITY 256 @@ -736,39 +762,179 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena return hr; } -HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, - const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, - const char *target, UINT sflags, UINT eflags, UINT secondary_flags, - const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, - ID3DBlob **error_messages) +static int open_include(const char *filename, bool local, const char *parent_data, void *context, + struct vkd3d_shader_code *code) { + ID3DInclude *iface = context; + unsigned int size = 0; + + if (!iface) + return VKD3D_ERROR; + + memset(code, 0, sizeof(*code)); + if (FAILED(ID3DInclude_Open(iface, local ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, + filename, parent_data, &code->code, &size))) + return VKD3D_ERROR; + + code->size = size; + return VKD3D_OK; +} + +static void close_include(const struct vkd3d_shader_code *code, void *context) +{ + ID3DInclude *iface = context; + + ID3DInclude_Close(iface, code->code); +} + +HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *macros, ID3DInclude *include, const char *entry_point, + const char *profile, UINT flags, UINT effect_flags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader_blob, + ID3DBlob **messages_blob) +{ + struct d3dcompiler_include_from_file include_from_file; + struct vkd3d_shader_preprocess_info preprocess_info; + struct vkd3d_shader_hlsl_source_info hlsl_info; + struct vkd3d_shader_compile_option options[2]; + struct vkd3d_shader_compile_info compile_info; + struct vkd3d_shader_compile_option *option; + struct vkd3d_shader_code byte_code; + const D3D_SHADER_MACRO *macro; + size_t profile_len, i; + char *messages; HRESULT hr; + int ret; - TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, entrypoint %s, " - "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p, " - "secondary_data_size %Iu, shader %p, error_messages %p.\n", - data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), - debugstr_a(target), sflags, eflags, secondary_flags, secondary_data, - secondary_data_size, shader, error_messages); - - if (secondary_data) - FIXME("secondary data not implemented yet\n"); - - if (shader) *shader = NULL; - if (error_messages) *error_messages = NULL; - - EnterCriticalSection(&wpp_mutex); - - hr = preprocess_shader(data, data_size, filename, defines, include, error_messages); - if (SUCCEEDED(hr)) + static const char * const d3dbc_profiles[] = { - FIXME("HLSL shader compilation is not yet implemented.\n"); - hr = E_NOTIMPL; + "fx_2_", + + "ps.1.", + "ps.2.", + "ps.3.", + + "ps_1_", + "ps_2_", + "ps_3_", + + "vs.1.", + "vs.2.", + "vs.3.", + + "vs_1_", + "vs_2_", + "vs_3_", + + "tx_1_", + }; + + TRACE("data %p, data_size %Iu, filename %s, macros %p, include %p, entry_point %s, " + "profile %s, flags %#x, effect_flags %#x, secondary_flags %#x, secondary_data %p, " + "secondary_data_size %Iu, shader_blob %p, messages_blob %p.\n", + data, data_size, debugstr_a(filename), macros, include, debugstr_a(entry_point), + debugstr_a(profile), flags, effect_flags, secondary_flags, secondary_data, + secondary_data_size, shader_blob, messages_blob); + + if (include == D3D_COMPILE_STANDARD_FILE_INCLUDE) + { + include_from_file.ID3DInclude_iface.lpVtbl = &d3dcompiler_include_from_file_vtbl; + include = &include_from_file.ID3DInclude_iface; } - HeapFree(GetProcessHeap(), 0, wpp_output); - LeaveCriticalSection(&wpp_mutex); - return hr; + if (flags & ~D3DCOMPILE_DEBUG) + FIXME("Ignoring flags %#x.\n", flags); + if (effect_flags) + FIXME("Ignoring effect flags %#x.\n", effect_flags); + if (secondary_flags) + FIXME("Ignoring secondary flags %#x.\n", secondary_flags); + + if (messages_blob) + *messages_blob = NULL; + + option = &options[0]; + option->name = VKD3D_SHADER_COMPILE_OPTION_API_VERSION; + option->value = VKD3D_SHADER_API_VERSION_1_3; + + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + compile_info.next = &preprocess_info; + compile_info.source.code = data; + compile_info.source.size = data_size; + compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; + compile_info.target_type = VKD3D_SHADER_TARGET_DXBC_TPF; + compile_info.options = options; + compile_info.option_count = 1; + compile_info.log_level = VKD3D_SHADER_LOG_INFO; + compile_info.source_name = filename; + + profile_len = strlen(profile); + for (i = 0; i < ARRAY_SIZE(d3dbc_profiles); ++i) + { + size_t len = strlen(d3dbc_profiles[i]); + + if (len <= profile_len && !memcmp(profile, d3dbc_profiles[i], len)) + { + compile_info.target_type = VKD3D_SHADER_TARGET_D3D_BYTECODE; + break; + } + } + + preprocess_info.type = VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO; + preprocess_info.next = &hlsl_info; + preprocess_info.macros = (const struct vkd3d_shader_macro *)macros; + preprocess_info.macro_count = 0; + if (macros) + { + for (macro = macros; macro->Name; ++macro) + ++preprocess_info.macro_count; + } + preprocess_info.pfn_open_include = open_include; + preprocess_info.pfn_close_include = close_include; + preprocess_info.include_context = include; + + hlsl_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; + hlsl_info.next = NULL; + hlsl_info.profile = profile; + hlsl_info.entry_point = entry_point; + hlsl_info.secondary_code.code = secondary_data; + hlsl_info.secondary_code.size = secondary_data_size; + + if (!(flags & D3DCOMPILE_DEBUG)) + { + option = &options[compile_info.option_count++]; + option->name = VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG; + option->value = true; + } + + ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); + if (messages) + { + if (messages_blob) + { + size_t size = strlen(messages); + if (FAILED(hr = D3DCreateBlob(size, messages_blob))) + { + vkd3d_shader_free_messages(messages); + vkd3d_shader_free_shader_code(&byte_code); + return hr; + } + memcpy(ID3D10Blob_GetBufferPointer(*messages_blob), messages, size); + } + else + vkd3d_shader_free_messages(messages); + } + + if (!ret) + { + if (FAILED(hr = D3DCreateBlob(byte_code.size, shader_blob))) + { + vkd3d_shader_free_shader_code(&byte_code); + return hr; + } + memcpy(ID3D10Blob_GetBufferPointer(*shader_blob), byte_code.code, byte_code.size); + } + + return hresult_from_vkd3d_result(ret); } HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 5f7846a479b..4f52002866e 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -383,20 +383,17 @@ static void test_swizzle(void) if (!init_test_context(&test_context)) return; - todo_wine ps_code = compile_shader(ps_source, "ps_4_0"); - if (ps_code) - { - cb = create_buffer(test_context.device, D3D11_BIND_CONSTANT_BUFFER, sizeof(uniform), &uniform); - ID3D11DeviceContext_PSSetConstantBuffers(test_context.immediate_context, 0, 1, &cb); - draw_quad(&test_context, ps_code); + ps_code = compile_shader(ps_source, "ps_4_0"); + cb = create_buffer(test_context.device, D3D11_BIND_CONSTANT_BUFFER, sizeof(uniform), &uniform); + ID3D11DeviceContext_PSSetConstantBuffers(test_context.immediate_context, 0, 1, &cb); + draw_quad(&test_context, ps_code); - v = get_color_vec4(&test_context, 0, 0); - ok(compare_vec4(&v, 0.0101f, 0.0303f, 0.0202f, 0.0404f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(&test_context, 0, 0); + ok(compare_vec4(&v, 0.0101f, 0.0303f, 0.0202f, 0.0404f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - ID3D11Buffer_Release(cb); - ID3D10Blob_Release(ps_code); - } + ID3D11Buffer_Release(cb); + ID3D10Blob_Release(ps_code); release_test_context(&test_context); } @@ -421,20 +418,17 @@ static void test_math(void) if (!init_test_context(&test_context)) return; - todo_wine ps_code = compile_shader(ps_source, "ps_4_0"); - if (ps_code) - { - cb = create_buffer(test_context.device, D3D11_BIND_CONSTANT_BUFFER, sizeof(uniforms), uniforms); - ID3D11DeviceContext_PSSetConstantBuffers(test_context.immediate_context, 0, 1, &cb); - draw_quad(&test_context, ps_code); + ps_code = compile_shader(ps_source, "ps_4_0"); + cb = create_buffer(test_context.device, D3D11_BIND_CONSTANT_BUFFER, sizeof(uniforms), uniforms); + ID3D11DeviceContext_PSSetConstantBuffers(test_context.immediate_context, 0, 1, &cb); + draw_quad(&test_context, ps_code); - v = get_color_vec4(&test_context, 0, 0); - ok(compare_vec4(&v, -12.43f, 9.833333f, 1.6f, 35.0f, 1), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(&test_context, 0, 0); + ok(compare_vec4(&v, -12.43f, 9.833333f, 1.6f, 35.0f, 1), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - ID3D11Buffer_Release(cb); - ID3D10Blob_Release(ps_code); - } + ID3D11Buffer_Release(cb); + ID3D10Blob_Release(ps_code); release_test_context(&test_context); } @@ -458,29 +452,26 @@ static void test_conditionals(void) if (!init_test_context(&test_context)) return; - todo_wine ps_code = compile_shader(ps_source, "ps_4_0"); - if (ps_code) + ps_code = compile_shader(ps_source, "ps_4_0"); + draw_quad(&test_context, ps_code); + init_readback(&test_context, &rb); + + for (i = 0; i < 200; i += 40) { - draw_quad(&test_context, ps_code); - init_readback(&test_context, &rb); - - for (i = 0; i < 200; i += 40) - { - v = get_readback_vec4(&rb, i, 0); - ok(compare_vec4(v, 0.9f, 0.8f, 0.7f, 0.6f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); - } - - for (i = 240; i < 640; i += 40) - { - v = get_readback_vec4(&rb, i, 0); - ok(compare_vec4(v, 0.1f, 0.2f, 0.3f, 0.4f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); - } - - release_readback(&test_context, &rb); - ID3D10Blob_Release(ps_code); + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.9f, 0.8f, 0.7f, 0.6f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); } + + for (i = 240; i < 640; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + release_readback(&test_context, &rb); + ID3D10Blob_Release(ps_code); release_test_context(&test_context); } @@ -621,7 +612,8 @@ static void test_sampling(void) winetest_push_context("Test %u", i); ID3D11DeviceContext_ClearRenderTargetView(test_context.immediate_context, test_context.rtv, red); - todo_wine ps_code = compile_shader_flags(tests[i], "ps_4_0", D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + todo_wine_if (i < 3) + ps_code = compile_shader_flags(tests[i], "ps_4_0", D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); if (ps_code) { draw_quad(&test_context, ps_code); @@ -937,10 +929,12 @@ static void test_reflection(void) static void check_parameter_desc(const D3D11_SIGNATURE_PARAMETER_DESC *desc, const D3D11_SIGNATURE_PARAMETER_DESC *expect) { - ok(!strcmp(desc->SemanticName, expect->SemanticName), "Got name %s.\n", debugstr_a(desc->SemanticName)); + todo_wine_if(strcmp(desc->SemanticName, expect->SemanticName)) + ok(!strcmp(desc->SemanticName, expect->SemanticName), "Got name %s.\n", debugstr_a(desc->SemanticName)); ok(desc->SemanticIndex == expect->SemanticIndex, "Got index %u.\n", desc->SemanticIndex); ok(desc->Register == expect->Register, "Got register %u.\n", desc->Register); - ok(desc->SystemValueType == expect->SystemValueType, "Got sysval %u.\n", desc->SystemValueType); + todo_wine_if(desc->SystemValueType != expect->SystemValueType) + ok(desc->SystemValueType == expect->SystemValueType, "Got sysval %u.\n", desc->SystemValueType); ok(desc->ComponentType == expect->ComponentType, "Got data type %u.\n", desc->ComponentType); ok(desc->Mask == expect->Mask, "Got mask %#x.\n", desc->Mask); todo_wine_if(desc->ReadWriteMask != expect->ReadWriteMask) @@ -1129,7 +1123,7 @@ static void test_semantic_reflection(void) { winetest_push_context("Test %u", i); - todo_wine code = compile_shader_flags(tests[i].source, tests[i].target, + todo_wine_if (i > 5) code = compile_shader_flags(tests[i].source, tests[i].target, tests[i].legacy ? D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY : 0); if (!code) { @@ -1143,9 +1137,9 @@ static void test_semantic_reflection(void) hr = reflection->lpVtbl->GetDesc(reflection, &shader_desc); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(shader_desc.InputParameters == tests[i].input_count, + ok(shader_desc.InputParameters == tests[i].input_count, "Got %u input parameters.\n", shader_desc.InputParameters); - todo_wine ok(shader_desc.OutputParameters == tests[i].output_count, + ok(shader_desc.OutputParameters == tests[i].output_count, "Got %u output parameters.\n", shader_desc.OutputParameters); for (j = 0; j < shader_desc.InputParameters; ++j) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 4461a3f869f..cbf32695625 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -454,25 +454,22 @@ static void test_swizzle(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - todo_wine ps_code = compile_shader(tests[i].source, "ps_2_0"); - if (ps_code) + ps_code = compile_shader(tests[i].source, "ps_2_0"); + if (i == 0) { - if (i == 0) - { - hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); - ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - ID3DXConstantTable_Release(constants); - } - draw_quad(device, ps_code); - - v = get_color_vec4(device, 0, 0); - ok(compare_vec4(&v, tests[i].color.x, tests[i].color.y, tests[i].color.z, tests[i].color.w, 0), - "Test %u: Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", i, v.x, v.y, v.z, v.w); - - ID3D10Blob_Release(ps_code); + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + ID3DXConstantTable_Release(constants); } + draw_quad(device, ps_code); + + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, tests[i].color.x, tests[i].color.y, tests[i].color.z, tests[i].color.w, 0), + "Test %u: Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", i, v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); } release_test_context(&test_context); @@ -501,33 +498,30 @@ static void test_math(void) return; device = test_context.device; - todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); - if (ps_code) - { - hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID3DXConstantTable_SetFloat(constants, device, "$u", 2.5f); - ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID3DXConstantTable_SetFloat(constants, device, "$v", 0.3f); - ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID3DXConstantTable_SetFloat(constants, device, "$w", 0.2f); - ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID3DXConstantTable_SetFloat(constants, device, "$x", 0.7f); - ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID3DXConstantTable_SetFloat(constants, device, "$y", 0.1f); - ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID3DXConstantTable_SetFloat(constants, device, "$z", 1.5f); - ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - ID3DXConstantTable_Release(constants); + ps_code = compile_shader(ps_source, "ps_2_0"); + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$u", 2.5f); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$v", 0.3f); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$w", 0.2f); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$x", 0.7f); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$y", 0.1f); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3DXConstantTable_SetFloat(constants, device, "$z", 1.5f); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + ID3DXConstantTable_Release(constants); - draw_quad(device, ps_code); + draw_quad(device, ps_code); - v = get_color_vec4(device, 0, 0); - ok(compare_vec4(&v, -12.43f, 9.833333f, 1.6f, 35.0f, 1), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, -12.43f, 9.833333f, 1.6f, 35.0f, 1), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - ID3D10Blob_Release(ps_code); - } + ID3D10Blob_Release(ps_code); release_test_context(&test_context); } @@ -559,30 +553,27 @@ static void test_conditionals(void) return; device = test_context.device; - todo_wine ps_code = compile_shader(ps_if_source, "ps_2_0"); - if (ps_code) + ps_code = compile_shader(ps_if_source, "ps_2_0"); + draw_quad(device, ps_code); + init_readback(device, &rb); + + for (i = 0; i < 200; i += 40) { - draw_quad(device, ps_code); - init_readback(device, &rb); - - for (i = 0; i < 200; i += 40) - { - v = get_readback_vec4(&rb, i, 0); - ok(compare_vec4(v, 0.9f, 0.8f, 0.7f, 0.6f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); - } - - for (i = 240; i < 640; i += 40) - { - v = get_readback_vec4(&rb, i, 0); - ok(compare_vec4(v, 0.1f, 0.2f, 0.3f, 0.4f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); - } - - release_readback(&rb); - ID3D10Blob_Release(ps_code); + v = get_readback_vec4(&rb, i, 0); + todo_wine ok(compare_vec4(v, 0.9f, 0.8f, 0.7f, 0.6f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); } + for (i = 240; i < 640; i += 40) + { + v = get_readback_vec4(&rb, i, 0); + todo_wine ok(compare_vec4(v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v->x, v->y, v->z, v->w); + } + + release_readback(&rb); + ID3D10Blob_Release(ps_code); + todo_wine ps_code = compile_shader(ps_ternary_source, "ps_2_0"); if (ps_code) { @@ -737,17 +728,14 @@ static void test_comma(void) if (!init_test_context(&test_context)) return; - todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); - if (ps_code) - { - draw_quad(test_context.device, ps_code); + ps_code = compile_shader(ps_source, "ps_2_0"); + draw_quad(test_context.device, ps_code); - v = get_color_vec4(test_context.device, 0, 0); - ok(compare_vec4(&v, 0.6f, 0.7f, 0.8f, 0.9f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(test_context.device, 0, 0); + ok(compare_vec4(&v, 0.6f, 0.7f, 0.8f, 0.9f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - ID3D10Blob_Release(ps_code); - } + ID3D10Blob_Release(ps_code); release_test_context(&test_context); } @@ -774,17 +762,14 @@ static void test_return(void) if (!init_test_context(&test_context)) return; - todo_wine ps_code = compile_shader(void_source, "ps_2_0"); - if (ps_code) - { - draw_quad(test_context.device, ps_code); + ps_code = compile_shader(void_source, "ps_2_0"); + draw_quad(test_context.device, ps_code); - v = get_color_vec4(test_context.device, 0, 0); - ok(compare_vec4(&v, 0.1f, 0.2f, 0.3f, 0.4f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(test_context.device, 0, 0); + todo_wine ok(compare_vec4(&v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - ID3D10Blob_Release(ps_code); - } + ID3D10Blob_Release(ps_code); todo_wine ps_code = compile_shader(implicit_conversion_source, "ps_2_0"); if (ps_code) @@ -948,17 +933,14 @@ static void test_struct_assignment(void) if (!init_test_context(&test_context)) return; - todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); - if (ps_code) - { - draw_quad(test_context.device, ps_code); + ps_code = compile_shader(ps_source, "ps_2_0"); + draw_quad(test_context.device, ps_code); - v = get_color_vec4(test_context.device, 0, 0); - ok(compare_vec4(&v, 0.6f, 0.3f, 0.7f, 0.9f, 1), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(test_context.device, 0, 0); + ok(compare_vec4(&v, 0.6f, 0.3f, 0.7f, 0.9f, 1), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - ID3D10Blob_Release(ps_code); - } + ID3D10Blob_Release(ps_code); release_test_context(&test_context); } @@ -993,22 +975,19 @@ static void test_struct_semantics(void) if (!init_test_context(&test_context)) return; - todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); - if (ps_code) - { - draw_quad(test_context.device, ps_code); + ps_code = compile_shader(ps_source, "ps_2_0"); + draw_quad(test_context.device, ps_code); - v = get_color_vec4(test_context.device, 64, 48); - v.z = v.w = 0.0f; - todo_wine ok(compare_vec4(&v, 0.1f, 0.1f, 0.0f, 0.0f, 4096), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - v = get_color_vec4(test_context.device, 320, 240); - v.z = v.w = 0.0f; - todo_wine ok(compare_vec4(&v, 0.5f, 0.5f, 0.0f, 0.0f, 4096), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(test_context.device, 64, 48); + v.z = v.w = 0.0f; + ok(compare_vec4(&v, 0.1f, 0.1f, 0.0f, 0.0f, 4096), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(test_context.device, 320, 240); + v.z = v.w = 0.0f; + ok(compare_vec4(&v, 0.5f, 0.5f, 0.0f, 0.0f, 4096), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - ID3D10Blob_Release(ps_code); - } + ID3D10Blob_Release(ps_code); release_test_context(&test_context); } @@ -1122,7 +1101,7 @@ static void test_samplers(void) { hr = IDirect3DDevice9_Clear(test_context.device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(255, 0, 0), 1.0f, 0); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); - todo_wine ps_code = compile_shader(tests[i], "ps_2_0"); + todo_wine_if (i < 3) ps_code = compile_shader(tests[i], "ps_2_0"); if (ps_code) { draw_quad(test_context.device, ps_code); @@ -1434,12 +1413,9 @@ static void test_fail(void) { compiled = errors = NULL; hr = D3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", targets[j], 0, 0, &compiled, &errors); - todo_wine ok(hr == E_FAIL, "Test %u, target %s: Got unexpected hr %#lx.\n", i, targets[j], hr); - if (hr == E_FAIL) - { - ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); - ID3D10Blob_Release(errors); - } + ok(hr == E_FAIL, "Test %u, target %s: Got unexpected hr %#lx.\n", i, targets[j], hr); + ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); + ID3D10Blob_Release(errors); ok(!compiled, "Test %u, target %s, expected no compiled shader blob.\n", i, targets[j]); } } @@ -1634,7 +1610,7 @@ static void test_include(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); } - todo_wine_if (i == 1) + todo_wine_if (i != 0) ok(!errors, "Got unexpected errors.\n"); if (blob) { @@ -1644,7 +1620,7 @@ static void test_include(void) #if D3D_COMPILER_VERSION >= 46 hr = tests[i](NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, &blob, &errors); - todo_wine_if (i == 0) ok(hr == (i == 0 ? D3DXERR_INVALIDDATA : E_FAIL), "Got unexpected hr %#lx.\n", hr); + todo_wine_if (i != 1) ok(hr == (i == 0 ? D3DXERR_INVALIDDATA : E_FAIL), "Got unexpected hr %#lx.\n", hr); ok(!blob, "Got unexpected blob.\n"); ok(!!errors, "Got unexpected errors.\n"); ID3D10Blob_Release(errors); @@ -1658,9 +1634,8 @@ static void test_include(void) { ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); - } - todo_wine_if (i == 1) ok(!errors, "Got unexpected errors.\n"); + } if (blob) { ID3D10Blob_Release(blob); @@ -1676,7 +1651,7 @@ static void test_include(void) hr = D3DCompileFromFile(L"nonexistent", NULL, NULL, "main", "vs_2_0", 0, 0, &blob, &errors); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); ok(!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); hr = D3DCompileFromFile(filename, NULL, NULL, "main", "ps_2_0", 0, 0, &blob, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); @@ -1689,7 +1664,7 @@ static void test_include(void) hr = D3DCompileFromFile(filename, NULL, &include.ID3DInclude_iface, "main", "ps_2_0", 0, 0, &blob, &errors); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); if (blob) { ID3D10Blob_Release(blob); @@ -1702,7 +1677,7 @@ static void test_include(void) hr = D3DCompileFromFile(filename, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); if (blob) { ID3D10Blob_Release(blob); @@ -1733,9 +1708,8 @@ static void test_include(void) { ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); - } - todo_wine_if (i == 1) ok(!errors, "Got unexpected errors.\n"); + } if (blob) { ID3D10Blob_Release(blob); @@ -1748,7 +1722,7 @@ static void test_include(void) hr = D3DCompileFromFile(L"source.ps", NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); - ok(!errors, "Got unexpected errors.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); if (blob) { ID3D10Blob_Release(blob); diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 066bd6fdd1c..187535772be 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -1,8 +1,9 @@ MODULE = d3dcompiler_46.dll IMPORTLIB = d3dcompiler_46 -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=46 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index 379f0aa4b3a..bc6ce091108 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -1,8 +1,9 @@ MODULE = d3dcompiler_47.dll IMPORTLIB = d3dcompiler -IMPORTS = dxguid uuid +IMPORTS = wined3d dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../d3dcompiler_43 +EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -- 2.35.1

3 2

[PATCH 1/9] mshtml/tests: Add test for setting a prop with same name as a prototype accessor with no setter.
by Gabriel Ivăncescu 22 Mar '22

22 Mar '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Will be useful for mshtml proxy objects later, to show they don't behave like weird builtins on native. dlls/mshtml/tests/es5.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 6e92fb6..c03a2c2 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -526,6 +526,16 @@ sync_test("defineProperty", function() { obj.no_setter = false; ok(obj.no_setter === true, "no_setter = " + obj.no_setter); + ok((delete obj.no_setter) === true, "delete no_setter returned false"); + ok(!("no_setter" in obj), "no_setter still in obj after delete"); + + Object.defineProperty(child.prototype, "no_setter", desc); + test_accessor_prop_desc(child.prototype, "no_setter", desc); + ok(!obj.hasOwnProperty("no_setter"), "no_setter is a property of obj"); + obj.no_setter = false; + ok(obj.no_setter === true, "no_setter = " + obj.no_setter); + ok(!obj.hasOwnProperty("no_setter"), "no_setter is a property of obj"); + /* call prop with getter */ desc = { get: function() { -- 2.34.1

3 17

[PATCH 1/4] win32u: Add freelist cache allocator.
by Jinoh Kang 22 Mar '22

22 Mar '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/win32u/Makefile.in | 1 + dlls/win32u/alloc.c | 173 ++++++++++++++++++++++++++++++++++++ dlls/win32u/ntgdi_private.h | 4 + 3 files changed, 178 insertions(+) create mode 100644 dlls/win32u/alloc.c diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 2dea3682064..6c7eb383553 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -9,6 +9,7 @@ IMPORTS = ntdll winecrt0 EXTRADLLFLAGS = -nodefaultlibs -Wb,--syscall-table,1 C_SRCS = \ + alloc.c \ bitblt.c \ bitmap.c \ brush.c \ diff --git a/dlls/win32u/alloc.c b/dlls/win32u/alloc.c new file mode 100644 index 00000000000..350f0ea0c87 --- /dev/null +++ b/dlls/win32u/alloc.c @@ -0,0 +1,173 @@ +/* + * simple freelist cache allocator + * + * Copyright 2022 Jinoh Kang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> +#include <assert.h> +#include <pthread.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "ntgdi_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdi); + + +#define MEM_CACHE_NR_BUCKETS 1024 +#define MEM_CACHE_MIN_SIZE 16384 +#define MEM_CACHE_STEP 4096 +#ifdef _WIN64 +#define MEM_CACHE_THRESHOLD (32UL << 20) /* 32MB */ +#else +#define MEM_CACHE_THRESHOLD ( 8UL << 20) /* 8MB */ +#endif + +static pthread_mutex_t mem_cache_lock = PTHREAD_MUTEX_INITIALIZER; +static void **mem_cache_buckets[MEM_CACHE_NR_BUCKETS]; +static SIZE_T mem_cache_total_size; + +static SIZE_T get_bucket_index( SIZE_T size ) +{ + if (size < MEM_CACHE_MIN_SIZE) return (SIZE_T)-1; + return (size - MEM_CACHE_MIN_SIZE + MEM_CACHE_STEP - 1) / MEM_CACHE_STEP; +} + +static SIZE_T get_bucket_chunk_size( SIZE_T index ) +{ + return index * MEM_CACHE_STEP + MEM_CACHE_MIN_SIZE; +} + +static void *bucket_pop_chunk( SIZE_T i ) +{ + SIZE_T real_size = get_bucket_chunk_size( i ); + void *mem; + + if (!(mem = mem_cache_buckets[i])) + return NULL; + + assert(mem_cache_total_size >= real_size); + mem_cache_buckets[i] = *(void **)mem; + mem_cache_total_size -= real_size; + return mem; +} + +static void bucket_push_chunk( SIZE_T i, void *mem ) +{ + SIZE_T real_size = get_bucket_chunk_size( i ); + + mem_cache_total_size += real_size; + *(void **)mem = mem_cache_buckets[i]; + mem_cache_buckets[i] = mem; +} + +void *alloc_gdi_cache_memory( SIZE_T size, BOOL zero_mem ) +{ + SIZE_T i, real_size = size; + SIZE_T real_bucket_i; + void *mem = NULL; + + i = get_bucket_index( real_size ); + if (i < MEM_CACHE_NR_BUCKETS) + { + real_size = get_bucket_chunk_size( i ); + assert(real_size >= size); + + pthread_mutex_lock( &mem_cache_lock ); + + real_bucket_i = i; + while (!(mem = bucket_pop_chunk( real_bucket_i ))) + { + if (++real_bucket_i >= MEM_CACHE_NR_BUCKETS) break; + } + + pthread_mutex_unlock( &mem_cache_lock ); + + if (mem) + { + if (i != real_bucket_i) + { + void *realloc_mem = realloc( mem, real_size ); + if (realloc_mem) + mem = realloc_mem; + } + if (zero_mem) + memset(mem, 0, size); + } + else TRACE("no cache for %lu\n", real_size); + } + + if (!mem) + { + if (zero_mem) + mem = calloc( 1, real_size ); + else + mem = malloc( real_size ); + } + + return mem; +} + +void free_gdi_cache_memory( void *mem, SIZE_T size ) +{ + SIZE_T i, real_size; + SIZE_T free_bucket_i; + + i = get_bucket_index( size ); + if (i < MEM_CACHE_NR_BUCKETS) + { + real_size = get_bucket_chunk_size( i ); + + pthread_mutex_lock( &mem_cache_lock ); + + free_bucket_i = 0; + while (real_size > MEM_CACHE_THRESHOLD - mem_cache_total_size) + { + void *old_mem = bucket_pop_chunk( free_bucket_i ); + if (old_mem) + { + TRACE("pop cache %p (%lu)\n", old_mem, real_size); + free( old_mem ); + } + if (++free_bucket_i >= MEM_CACHE_NR_BUCKETS) break; + } + + if (real_size <= MEM_CACHE_THRESHOLD - mem_cache_total_size) + { + bucket_push_chunk( i, mem ); + mem = NULL; + } + else + { + TRACE("discard memory %p (%lu)\n", mem, real_size); + } + + pthread_mutex_unlock( &mem_cache_lock ); + } + + if (mem) + free( mem ); +} diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index 75cddc00fb3..5e5f6041865 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -427,6 +427,10 @@ extern HRGN create_polypolygon_region( const POINT *pts, const INT *count, INT n extern BOOL delete_dce( struct dce *dce ) DECLSPEC_HIDDEN; extern void update_dc( DC *dc ) DECLSPEC_HIDDEN; +/* alloc.c */ +extern void *alloc_gdi_cache_memory( SIZE_T size, BOOL zero_mem ) DECLSPEC_HIDDEN; +extern void free_gdi_cache_memory( void *mem, SIZE_T size ) DECLSPEC_HIDDEN; + #define RGN_DEFAULT_RECTS 4 typedef struct { -- 2.34.1

5 12

[PATCH v7 00/11] Fix sock_send reordering issue (#52401)
by Jinoh Kang 22 Mar '22

22 Mar '22

This fixes the send part of the issue #52401 [1]: "Improper synchronization in sock_recv/sock_send leads to arbitrary reordering of completion of I/O requests", which was initially reported (outside Bugzilla) by Dongwan Kim [2]. Changelog: v1 -> v2: - drop patch "server: Compact struct set_async_direct_result_reply." - add async and fd arguments to async_initial_status_callback - recv_socket_initial_callback: pass OOB flag via private instead of implementing two separate functions for OOB and non-OOB - detect short write in send_socket_initial_callback - preserve the behaviour of returning success if we had a short write and the socket is nonblocking and force_async is unset v2 -> v3: - fix typo in comment v3 -> v4: - fix typo in commit message - address feedback - drop patch "server: Defer postprocessing until after setting initial status in recv_socket handler." v4 -> v5: - drop patch "server: Add async_initial_status_callback." - drop patch "server: Defer postprocessing until after setting initial status in send_socket handler." - add patch "server: Ensure completion_callback is called before async is destroyed." - add patch "ws2_32/tests: Continue sending remaining data on short write in test_write_events." - add patch "server: Defer clearing events until async is either pending or completed in send_socket handler." - add patch "server: Ensure datagram sockets are bound in send_socket." v5 -> v6: - centralise status code computation in one place, even for bind errno translation - fix erroneous subject (s/either pending or completed/completed/) v6 -> v7: - drop patch "server: Ensure completion_callback is called before async is destroyed." - add patch "server: Ensure async completion callback is called on synchronous failure." - add patch "server: Allow async completion callback to retrieve status on synchronous failure." Supersedes 227636 - 227644. Supersedes 228988 - 228998. Supersedes 230246 - 230256. [1] https://bugs.winehq.org/show_bug.cgi?id=52401 [2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html Jinoh Kang (11): server: Actually set initial status in set_async_direct_result handler. server: Ensure initial status is set in async_set_result(). server: Ensure async completion callback is called on synchronous failure. server: Allow async completion callback to retrieve status on synchronous failure. ws2_32/tests: Continue sending remaining data on short write in test_write_events. server: Defer clearing events until async is completed in send_socket handler. server: Add mark_pending field to set_async_direct_result request. server: Attempt to complete I/O request immediately in send_socket. server: Ensure datagram sockets are bound in send_socket. ntdll: Don't call try_send before server call in sock_send. server: Replace redundant send_socket status fields with force_async boolean field. dlls/ntdll/unix/socket.c | 91 ++++++++++++------ dlls/ntdll/unix/sync.c | 9 +- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ws2_32/tests/sock.c | 23 ++--- server/async.c | 37 +++++--- server/protocol.def | 5 +- server/sock.c | 164 +++++++++++++++++++++++---------- 7 files changed, 220 insertions(+), 111 deletions(-) -- 2.34.1

3 18

[PATCH 1/4] winemac.drv: Simplify control flow in copy_display_modes.
by Tim Clem 22 Mar '22

22 Mar '22

Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/winemac.drv/display.c | 107 ++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 55 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 2ac8f32fa18a..a54e78c22376 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -620,74 +620,71 @@ 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); + 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; + CGDisplayModeRef old_mode, new_mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + BOOL old_is_original, new_is_original = display_mode_matches_descriptor(new_mode, desc); CFDictionaryRef key = create_mode_dict(new_mode, new_is_original); /* 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; + goto better; - if (pixel_encoding) + pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); + if (pixel_encoding) + { + BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); + CFRelease(pixel_encoding); + if (bpp30) { - 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; - } + /* 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. */ + goto next; } + } - old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); - if (old_mode) - { - BOOL old_is_original = display_mode_matches_descriptor(old_mode, desc); + old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); + if (!old_mode) + goto better; - 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; - } - } - } + /* Prefer the original mode over any similar mode. */ + old_is_original = display_mode_matches_descriptor(old_mode, desc); + if (old_is_original) + goto next; + + /* 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) + goto better; + else if (!new_size_same && old_size_same) + goto next; + else + { + /* Otherwise, prefer the mode with the smaller pixel size. */ + if (old_width_pixels < new_width_pixels || old_height_pixels < new_height_pixels) + goto next; } - if (better) - CFDictionarySetValue(modes_by_size, key, new_mode); +better: + CFDictionarySetValue(modes_by_size, key, new_mode); +next: CFRelease(key); } -- 2.34.1

4 7

[PATCH] comctl32/tests: Use correct width and height in create_bitmap() helper.
by Zhiyi Zhang 22 Mar '22

22 Mar '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index e7e3582ec35..8033a33e9cd 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -948,8 +948,8 @@ static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment memset(&bmi, 0, sizeof(bmi)); bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); - bmi.bmiHeader.biHeight = cx; - bmi.bmiHeader.biWidth = cy; + bmi.bmiHeader.biWidth = cx; + bmi.bmiHeader.biHeight = cy; bmi.bmiHeader.biBitCount = 24; bmi.bmiHeader.biPlanes = 1; bmi.bmiHeader.biCompression = BI_RGB; @@ -1156,7 +1156,7 @@ static void test_imagelist_storage(void) himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 0, 32); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 1, 32, ILC_COLOR24, "init 0 grow 32"); - hbm = create_bitmap(BMP_CX * 9, BMP_CX, 0, "9"); + hbm = create_bitmap(BMP_CX, BMP_CX * 9, 0, "9"); ret = pImageList_Add(himl, hbm, NULL); ok(ret == 0, "ImageList_Add returned %d, expected 0\n", ret); check_iml_data(himl, BMP_CX, BMP_CX, 1, 34, 32, ILC_COLOR24, "add 1 x 9"); @@ -1167,7 +1167,7 @@ static void test_imagelist_storage(void) himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 4, 4); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, ILC_COLOR24, "init 4 grow 4"); - hbm = create_bitmap(BMP_CX, BMP_CX * 9, 0, "9"); + hbm = create_bitmap(BMP_CX * 9, BMP_CX, 0, "9"); ret = pImageList_Add(himl, hbm, NULL); ok(ret == 0, "ImageList_Add returned %d, expected 0\n", ret); check_iml_data(himl, BMP_CX, BMP_CX, 9, 15, 4, ILC_COLOR24, "add 9 x 1"); -- 2.32.0

1 0

[PATCH v2 3/3] sc: Don't silently fail when something doesn't work as expected in a few more places.
by Dmitry Timoshkov 22 Mar '22

22 Mar '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/sc/sc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index a925f2cc999..5202980f32f 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -295,7 +295,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (parse_failure_params( argc - 3, argv + 3, &sfa )) { ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); - if (!ret) WINE_TRACE("failed to set service failure actions %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to set service failure actions %lu\n", GetLastError()); HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); } else @@ -310,7 +310,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = DeleteService( service ); - if (!ret) WINE_TRACE("failed to delete service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to delete service %lu\n", GetLastError()); CloseServiceHandle( service ); } else WINE_ERR("failed to open service %lu\n", GetLastError()); @@ -321,7 +321,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = StartServiceW( service, argc - 3, argv + 3 ); - if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to start service %lu\n", GetLastError()); else query_service( manager, argv[2] ); CloseServiceHandle( service ); } @@ -333,7 +333,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = ControlService( service, SERVICE_CONTROL_STOP, &status ); - if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to stop service %lu\n", GetLastError()); else query_service( manager, argv[2] ); CloseServiceHandle( service ); } -- 2.35.1

1 0

[PATCH v2 2/3] sc: Print service status after 'start' and 'stop' commands.
by Dmitry Timoshkov 22 Mar '22

22 Mar '22

Like Windows 10 sc.exe does. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/sc/sc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 50451accf73..a925f2cc999 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -322,6 +322,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) { ret = StartServiceW( service, argc - 3, argv + 3 ); if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); + else query_service( manager, argv[2] ); CloseServiceHandle( service ); } else WINE_ERR("failed to open service %lu\n", GetLastError()); @@ -333,6 +334,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) { ret = ControlService( service, SERVICE_CONTROL_STOP, &status ); if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); + else query_service( manager, argv[2] ); CloseServiceHandle( service ); } else WINE_ERR("failed to open service %lu\n", GetLastError()); -- 2.35.1

1 0

[PATCH v2 1/3] sc: Add support for the 'query' command.
by Dmitry Timoshkov 22 Mar '22

22 Mar '22

Output is modelled on behaviour observed under the Windows 10. v2: Fix the typos. Add a helper to use in the next patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/sc/sc.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 4e642874237..50451accf73 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -175,6 +175,58 @@ static void usage( void ) exit( 1 ); } +static const WCHAR *service_type_string( DWORD type ) +{ + switch (type) + { + case SERVICE_WIN32_OWN_PROCESS: return L"WIN32_OWN_PROCESS"; + case SERVICE_WIN32_SHARE_PROCESS: return L"WIN32_SHARE_PROCESS"; + case SERVICE_WIN32: return L"WIN32"; + default: return L""; + } +} + +static const WCHAR *service_state_string( DWORD state ) +{ + static const WCHAR * const state_str[] = { L"", L"STOPPED", L"START_PENDING", + L"STOP_PENDING", L"RUNNING", L"CONTINUE_PENDING", L"PAUSE_PENDING", L"PAUSED" }; + + if (state <= ARRAY_SIZE( state_str )) return state_str[ state ]; + return L""; +} + +static BOOL query_service( SC_HANDLE manager, const WCHAR *name ) +{ + SC_HANDLE service; + SERVICE_STATUS status; + BOOL ret = FALSE; + + service = OpenServiceW( manager, name, SERVICE_QUERY_STATUS ); + if (service) + { + ret = QueryServiceStatus( service, &status ); + if (!ret) + WINE_ERR("failed to query service status %lu\n", GetLastError()); + else + printf( "SERVICE_NAME: %ws\n" + " TYPE : %lx %ws\n" + " STATE : %lx %ws\n" + " WIN32_EXIT_CODE : %lu (0x%lx)\n" + " SERVICE_EXIT_CODE : %lu (0x%lx)\n" + " CHECKPOINT : 0x%lx\n" + " WAIT_HINT : 0x%lx\n", + name, status.dwServiceType, service_type_string( status.dwServiceType ), + status.dwCurrentState, service_state_string( status.dwCurrentState ), + status.dwWin32ExitCode, status.dwWin32ExitCode, + status.dwServiceSpecificExitCode, status.dwServiceSpecificExitCode, + status.dwCheckPoint, status.dwWaitHint ); + CloseServiceHandle( service ); + } + else WINE_ERR("failed to open service %lu\n", GetLastError()); + + return ret; +} + int __cdecl wmain( int argc, const WCHAR *argv[] ) { SC_HANDLE manager, service; @@ -285,6 +337,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_ERR("failed to open service %lu\n", GetLastError()); } + else if (!wcsicmp( argv[1], L"query" )) + { + ret = query_service( manager, argv[2] ); + } else if (!wcsicmp( argv[1], L"sdset" )) { WINE_FIXME("SdSet command not supported, faking success\n"); -- 2.35.1

1 0

[PATCH vkd3d 1/8] tests: Add support for running shader tests with a custom vertex shader.
by Zebediah Figura 22 Mar '22

22 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tests/shader_runner.c | 15 +++++++++++++++ tests/shader_runner.h | 1 + tests/shader_runner_d3d11.c | 2 +- tests/shader_runner_d3d12.c | 38 +++++++++++++++++++++++++------------ 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 910e6ecdc..033fee0a6 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -80,6 +80,7 @@ enum parse_state STATE_SAMPLER, STATE_SHADER_INVALID_PIXEL, STATE_SHADER_PIXEL, + STATE_SHADER_VERTEX, STATE_TEXTURE, STATE_TEST, }; @@ -501,6 +502,14 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const shader_source_size = 0; break; + case STATE_SHADER_VERTEX: + free(runner->vs_source); + runner->vs_source = shader_source; + shader_source = NULL; + shader_source_len = 0; + shader_source_size = 0; + break; + case STATE_SHADER_INVALID_PIXEL: { ID3D10Blob *blob = NULL, *errors = NULL; @@ -639,6 +648,10 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const { state = STATE_PREPROC_INVALID; } + else if (!strcmp(line, "[vertex shader]\n")) + { + state = STATE_SHADER_VERTEX; + } vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); } @@ -654,6 +667,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_PREPROC_INVALID: case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_PIXEL: + case STATE_SHADER_VERTEX: { size_t len = strlen(line); @@ -682,6 +696,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const } } + free(runner->vs_source); free(runner->ps_source); for (i = 0; i < runner->texture_count; ++i) { diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 26fa2367b..43ded8534 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -72,6 +72,7 @@ struct shader_runner { const struct shader_runner_ops *ops; + char *vs_source; char *ps_source; enum shader_model minimum_shader_model; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index c077718c9..fb73f80e9 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -434,7 +434,7 @@ static void d3d11_runner_draw_quad(struct shader_runner *r) if (!runner->vs) { - ID3D10Blob *vs_code = compile_shader(vs_source, "vs_4_0"); + ID3D10Blob *vs_code = compile_shader(runner->r.vs_source ? runner->r.vs_source : vs_source, "vs_4_0"); hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), NULL, &runner->vs); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 4f077b382..e124922fa 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -52,22 +52,23 @@ static struct d3d12_shader_runner *d3d12_shader_runner(struct shader_runner *r) return CONTAINING_RECORD(r, struct d3d12_shader_runner, r); } -static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_model) +static ID3D10Blob *compile_shader(const char *source, const char *type, enum shader_model shader_model) { ID3D10Blob *blob = NULL, *errors = NULL; + char profile[7]; HRESULT hr; static const char *const shader_models[] = { - [SHADER_MODEL_2_0] = "ps_4_0", - [SHADER_MODEL_4_0] = "ps_4_0", - [SHADER_MODEL_4_1] = "ps_4_1", - [SHADER_MODEL_5_0] = "ps_5_0", - [SHADER_MODEL_5_1] = "ps_5_1", + [SHADER_MODEL_2_0] = "4_0", + [SHADER_MODEL_4_0] = "4_0", + [SHADER_MODEL_4_1] = "4_1", + [SHADER_MODEL_5_0] = "5_0", + [SHADER_MODEL_5_1] = "5_1", }; - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", - shader_models[shader_model], 0, 0, &blob, &errors); + sprintf(profile, "%s_%s", type, shader_models[shader_model]); + hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); ok(hr == S_OK, "Failed to compile shader, hr %#x.\n", hr); if (errors) { @@ -132,17 +133,23 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) ID3D12CommandQueue *queue = test_context->queue; D3D12_STATIC_SAMPLER_DESC static_samplers[1]; ID3D12Device *device = test_context->device; + ID3D10Blob *vs_code = NULL, *ps_code; static const float clear_color[4]; + D3D12_SHADER_BYTECODE vs, ps; unsigned int uniform_index; - D3D12_SHADER_BYTECODE ps; ID3D12PipelineState *pso; - ID3D10Blob *ps_code; HRESULT hr; size_t i; - if (!(ps_code = compile_shader(runner->r.ps_source, runner->r.minimum_shader_model))) + if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) return; + if (runner->r.vs_source && !(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) + { + ID3D10Blob_Release(ps_code); + return; + } + root_signature_desc.NumParameters = 0; root_signature_desc.pParameters = root_params; root_signature_desc.NumStaticSamplers = 0; @@ -202,10 +209,17 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) hr = create_root_signature(device, &root_signature_desc, &test_context->root_signature); ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + if (vs_code) + { + vs.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs_code); + vs.BytecodeLength = ID3D10Blob_GetBufferSize(vs_code); + } ps.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_code); ps.BytecodeLength = ID3D10Blob_GetBufferSize(ps_code); pso = create_pipeline_state(device, test_context->root_signature, - test_context->render_target_desc.Format, NULL, &ps, NULL); + test_context->render_target_desc.Format, vs_code ? &vs : NULL, &ps, NULL); + if (vs_code) + ID3D10Blob_Release(vs_code); ID3D10Blob_Release(ps_code); if (!pso) return; -- 2.35.1

2 15

[PATCH 1/5] dinput/tests: Introduce a new Wine Test Bus driver.
by Rémi Bernon 22 Mar '22

22 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/Makefile.in | 4 + dlls/dinput/tests/dinput_test.h | 2 + dlls/dinput/tests/driver_bus.c | 294 ++++++++++++++++++++++++++++++ dlls/dinput/tests/driver_bus.spec | 1 + dlls/dinput/tests/hid.c | 90 ++++++++- 5 files changed, 382 insertions(+), 9 deletions(-) create mode 100644 dlls/dinput/tests/driver_bus.c create mode 100644 dlls/dinput/tests/driver_bus.spec diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index c1b887f8dcb..013235c77d9 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev driver_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver_bus_IMPORTS = winecrt0 ntoskrnl hal +driver_bus_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ device.c \ @@ -10,6 +12,8 @@ SOURCES = \ dinput.c \ driver.c \ driver.spec \ + driver_bus.c \ + driver_bus.spec \ force_feedback.c \ hid.c \ hotplug.c \ diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h index c0027c07094..cb1c42a7e86 100644 --- a/dlls/dinput/tests/dinput_test.h +++ b/dlls/dinput/tests/dinput_test.h @@ -54,6 +54,8 @@ extern BOOL localized; /* object names get translated */ BOOL hid_device_start(void); void hid_device_stop(void); +BOOL bus_device_start(void); +void bus_device_stop(void); void cleanup_registry_keys(void); diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c new file mode 100644 index 00000000000..aad7f3e2889 --- /dev/null +++ b/dlls/dinput/tests/driver_bus.c @@ -0,0 +1,294 @@ +/* + * Plug and Play test driver + * + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" + +#include "wine/list.h" + +#include "initguid.h" +#include "driver_hid.h" + +typedef ULONG PNP_DEVICE_STATE; +#define PNP_DEVICE_REMOVED 8 + +struct device +{ + KSPIN_LOCK lock; + PNP_DEVICE_STATE state; +}; + +static inline struct device *impl_from_DEVICE_OBJECT( DEVICE_OBJECT *device ) +{ + return (struct device *)device->DeviceExtension; +} + +struct func_device +{ + struct device base; + DEVICE_OBJECT *pdo; /* lower PDO */ + UNICODE_STRING control_iface; +}; + +static inline struct func_device *fdo_from_DEVICE_OBJECT( DEVICE_OBJECT *device ) +{ + struct device *impl = impl_from_DEVICE_OBJECT( device ); + return CONTAINING_RECORD( impl, struct func_device, base ); +} + +#ifdef __ASM_USE_FASTCALL_WRAPPER +extern void *WINAPI wrap_fastcall_func1( void *func, const void *a ); +__ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, + "popl %ecx\n\t" + "popl %eax\n\t" + "xchgl (%esp),%ecx\n\t" + "jmp *%eax" ); +#define call_fastcall_func1( func, a ) wrap_fastcall_func1( func, a ) +#else +#define call_fastcall_func1( func, a ) func( a ) +#endif + +static ULONG_PTR get_device_relations( DEVICE_OBJECT *device, DEVICE_RELATIONS *previous, + ULONG count, DEVICE_OBJECT **devices ) +{ + DEVICE_RELATIONS *relations; + ULONG new_count = count; + + if (previous) new_count += previous->Count; + if (!(relations = ExAllocatePool( PagedPool, offsetof( DEVICE_RELATIONS, Objects[new_count] ) ))) + { + ok( 0, "Failed to allocate memory\n" ); + return (ULONG_PTR)previous; + } + + if (!previous) relations->Count = 0; + else + { + memcpy( relations, previous, offsetof( DEVICE_RELATIONS, Objects[previous->Count] ) ); + ExFreePool( previous ); + } + + while (count--) + { + call_fastcall_func1( ObfReferenceObject, *devices ); + relations->Objects[relations->Count++] = *devices++; + } + + return (ULONG_PTR)relations; +} + +static NTSTATUS fdo_pnp( DEVICE_OBJECT *device, IRP *irp ) +{ + struct func_device *impl = fdo_from_DEVICE_OBJECT( device ); + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + ULONG code = stack->MinorFunction; + PNP_DEVICE_STATE state; + NTSTATUS status; + KIRQL irql; + + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_pnp(code) ); + + switch (code) + { + case IRP_MN_START_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + case IRP_MN_REMOVE_DEVICE: + state = (code == IRP_MN_START_DEVICE || code == IRP_MN_CANCEL_REMOVE_DEVICE) ? 0 : PNP_DEVICE_REMOVED; + KeAcquireSpinLock( &impl->base.lock, &irql ); + impl->base.state = state; + KeReleaseSpinLock( &impl->base.lock, irql ); + IoSetDeviceInterfaceState( &impl->control_iface, state != PNP_DEVICE_REMOVED ); + if (code != IRP_MN_REMOVE_DEVICE) status = STATUS_SUCCESS; + else + { + IoSkipCurrentIrpStackLocation( irp ); + status = IoCallDriver( impl->pdo, irp ); + IoDetachDevice( impl->pdo ); + RtlFreeUnicodeString( &impl->control_iface ); + IoDeleteDevice( device ); + if (winetest_debug > 1) trace( "Deleted Bus FDO %p from PDO %p, status %#lx\n", impl, impl->pdo, status ); + return status; + } + break; + case IRP_MN_QUERY_PNP_DEVICE_STATE: + KeAcquireSpinLock( &impl->base.lock, &irql ); + irp->IoStatus.Information = impl->base.state; + KeReleaseSpinLock( &impl->base.lock, irql ); + status = STATUS_SUCCESS; + break; + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + DEVICE_RELATION_TYPE type = stack->Parameters.QueryDeviceRelations.Type; + switch (type) + { + case BusRelations: + if (winetest_debug > 1) trace( "fdo_pnp IRP_MN_QUERY_DEVICE_RELATIONS BusRelations\n" ); + ok( !irp->IoStatus.Information, "got unexpected BusRelations relations\n" ); + irp->IoStatus.Information = get_device_relations( device, (void *)irp->IoStatus.Information, 0, NULL ); + if (!irp->IoStatus.Information) status = STATUS_NO_MEMORY; + else status = STATUS_SUCCESS; + break; + case RemovalRelations: + if (winetest_debug > 1) trace( "fdo_pnp IRP_MN_QUERY_DEVICE_RELATIONS RemovalRelations\n" ); + ok( !irp->IoStatus.Information, "got unexpected RemovalRelations relations\n" ); + irp->IoStatus.Information = get_device_relations( device, (void *)irp->IoStatus.Information, + 1, &impl->pdo ); + if (!irp->IoStatus.Information) status = STATUS_NO_MEMORY; + else status = STATUS_SUCCESS; + break; + default: + ok( 0, "got unexpected IRP_MN_QUERY_DEVICE_RELATIONS type %#x\n", type ); + status = irp->IoStatus.Status; + break; + } + break; + } + case IRP_MN_QUERY_CAPABILITIES: + { + DEVICE_CAPABILITIES *caps = stack->Parameters.DeviceCapabilities.Capabilities; + caps->EjectSupported = TRUE; + caps->Removable = TRUE; + caps->SilentInstall = TRUE; + caps->SurpriseRemovalOK = TRUE; + status = STATUS_SUCCESS; + break; + } + default: + if (winetest_debug > 1) trace( "fdo_pnp code %#lx %s, not implemented!\n", code, debugstr_pnp(code) ); + status = irp->IoStatus.Status; + break; + } + + irp->IoStatus.Status = status; + IoSkipCurrentIrpStackLocation( irp ); + return IoCallDriver( impl->pdo, irp ); +} + +static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) +{ + return fdo_pnp( device, irp ); +} + +static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; + + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) ); + ok( 0, "unexpected call\n" ); + + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_NOT_SUPPORTED; +} + +static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; + + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) ); + ok( 0, "unexpected call\n" ); + + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_NOT_SUPPORTED; +} + +static NTSTATUS WINAPI driver_add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT *device ) +{ + struct func_device *impl; + DEVICE_OBJECT *child; + NTSTATUS status; + + if (winetest_debug > 1) trace( "%s: driver %p, device %p\n", __func__, driver, device ); + + if ((status = IoCreateDevice( driver, sizeof(struct func_device), NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &child ))) + { + ok( 0, "Failed to create FDO, status %#lx.\n", status ); + return status; + } + + impl = (struct func_device *)child->DeviceExtension; + KeInitializeSpinLock( &impl->base.lock ); + impl->pdo = device; + + status = IoRegisterDeviceInterface( impl->pdo, &control_class, NULL, &impl->control_iface ); + ok( !status, "IoRegisterDeviceInterface returned %#lx\n", status ); + + if (winetest_debug > 1) trace( "Created Bus FDO %p for PDO %p\n", child, device ); + + IoAttachDeviceToDeviceStack( child, device ); + child->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; +} + +static NTSTATUS WINAPI driver_create( DEVICE_OBJECT *device, IRP *irp ) +{ + if (winetest_debug > 1) trace( "%s: device %p, irp %p\n", __func__, device, irp ); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + +static NTSTATUS WINAPI driver_close( DEVICE_OBJECT *device, IRP *irp ) +{ + if (winetest_debug > 1) trace( "%s: device %p, irp %p\n", __func__, device, irp ); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + +static void WINAPI driver_unload( DRIVER_OBJECT *driver ) +{ + if (winetest_debug > 1) trace( "%s: driver %p\n", __func__, driver ); + winetest_cleanup(); +} + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) +{ + NTSTATUS status; + + if ((status = winetest_init())) return status; + if (winetest_debug > 1) trace( "%s: driver %p\n", __func__, driver ); + + driver->DriverExtension->AddDevice = driver_add_device; + driver->DriverUnload = driver_unload; + driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_ioctl; + driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = driver_internal_ioctl; + driver->MajorFunction[IRP_MJ_CREATE] = driver_create; + driver->MajorFunction[IRP_MJ_CLOSE] = driver_close; + + return STATUS_SUCCESS; +} diff --git a/dlls/dinput/tests/driver_bus.spec b/dlls/dinput/tests/driver_bus.spec new file mode 100644 index 00000000000..ad33444716a --- /dev/null +++ b/dlls/dinput/tests/driver_bus.spec @@ -0,0 +1 @@ +# nothing here yet diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 6203f67bb25..bcaf949eb9c 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -315,6 +315,7 @@ static const char inf_text[] = "[mfg_section.NT" EXT "]\n" "Wine test root driver=device_section,test_hardware_id\n" + "Wine Test Bus Device=bus_section,WINETEST\\BUS\n" "[device_section.NT" EXT "]\n" "CopyFiles=file_section\n" @@ -322,14 +323,23 @@ static const char inf_text[] = "[device_section.NT" EXT ".Services]\n" "AddService=winetest,0x2,svc_section\n" + "[bus_section.NT" EXT "]\n" + "CopyFiles=file_section\n" + + "[bus_section.NT" EXT ".Services]\n" + "AddService=winetest_bus,0x2,bus_service\n" + "[file_section]\n" "winetest.sys\n" + "winetest_bus.sys\n" "[SourceDisksFiles]\n" "winetest.sys=1\n" + "winetest_bus.sys=1\n" "[SourceDisksNames]\n" "1=,winetest.sys\n" + "1=,winetest_bus.sys\n" "[DestinationDirs]\n" "DefaultDestDir=12\n" @@ -341,6 +351,14 @@ static const char inf_text[] = "ErrorControl=1\n" "LoadOrderGroup=WinePlugPlay\n" "DisplayName=\"winetest bus driver\"\n" + + "[bus_service]\n" + "ServiceBinary=%12%\\winetest_bus.sys\n" + "ServiceType=1\n" + "StartType=3\n" + "ErrorControl=1\n" + "LoadOrderGroup=WinePlugPlay\n" + "DisplayName=\"Wine Test Bus Driver\"\n" "; they don't sleep anymore, on the beach\n"; static void add_file_to_catalog( HANDLE catalog, const WCHAR *file ) @@ -415,9 +433,9 @@ static void unload_driver( SC_HANDLE service ) CloseServiceHandle( service ); } -static void pnp_driver_stop(void) +static void pnp_driver_stop( BOOL bus ) { - const WCHAR *service_name = L"winetest"; + const WCHAR *service_name = bus ? L"winetest_bus" : L"winetest"; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; WCHAR path[MAX_PATH], dest[MAX_PATH], *filepart; SC_HANDLE manager, service; @@ -484,9 +502,13 @@ static void pnp_driver_stop(void) ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ret = DeleteFileW( L"winetest.sys" ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); + ret = DeleteFileW( L"winetest_bus.sys" ); + ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); /* Windows 10 apparently deletes the image in SetupUninstallOEMInf(). */ ret = DeleteFileW( L"C:/windows/system32/drivers/winetest.sys" ); ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %lu\n", GetLastError() ); + ret = DeleteFileW( L"C:/windows/system32/drivers/winetest_bus.sys" ); + ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %lu\n", GetLastError() ); } static BOOL find_hid_device_path( WCHAR *device_path ) @@ -525,12 +547,13 @@ static BOOL find_hid_device_path( WCHAR *device_path ) return ret; } -static BOOL pnp_driver_start(void) +static BOOL pnp_driver_start( BOOL bus ) { static const WCHAR hardware_id[] = L"test_hardware_id\0"; + static const WCHAR bus_hardware_id[] = L"WINETEST\\BUS"; + const WCHAR *service_name = bus ? L"winetest_bus" : L"winetest"; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; WCHAR path[MAX_PATH], filename[MAX_PATH]; - const WCHAR *service_name = L"winetest"; SC_HANDLE manager, service; const CERT_CONTEXT *cert; int old_mute_threshold; @@ -546,6 +569,10 @@ static BOOL pnp_driver_start(void) ret = MoveFileExW( filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING ); ok( ret, "failed to move file, error %lu\n", GetLastError() ); + load_resource( L"driver_bus.dll", filename ); + ret = MoveFileExW( filename, L"winetest_bus.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING ); + ok( ret, "failed to move file, error %lu\n", GetLastError() ); + f = fopen( "winetest.inf", "w" ); ok( !!f, "failed to open winetest.inf: %s\n", strerror( errno ) ); fputs( inf_text, f ); @@ -557,6 +584,7 @@ static BOOL pnp_driver_start(void) ok( catalog != INVALID_HANDLE_VALUE, "Failed to create catalog, error %lu\n", GetLastError() ); add_file_to_catalog( catalog, L"winetest.sys" ); + add_file_to_catalog( catalog, L"winetest_bus.sys" ); add_file_to_catalog( catalog, L"winetest.inf" ); ret = CryptCATPersistStore( catalog ); @@ -572,6 +600,8 @@ static BOOL pnp_driver_start(void) ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ret = DeleteFileW( L"winetest.inf" ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); + ret = DeleteFileW( L"winetest_bus.sys" ); + ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); ret = DeleteFileW( L"winetest.sys" ); ok( ret, "Failed to delete file, error %lu\n", GetLastError() ); winetest_mute_threshold = old_mute_threshold; @@ -586,8 +616,9 @@ static BOOL pnp_driver_start(void) ret = SetupDiCreateDeviceInfoW( set, L"root\\winetest\\0", &GUID_NULL, NULL, NULL, 0, &device ); ok( ret, "failed to create device, error %#lx\n", GetLastError() ); - ret = SetupDiSetDeviceRegistryPropertyW( set, &device, SPDRP_HARDWAREID, (const BYTE *)hardware_id, - sizeof(hardware_id) ); + ret = SetupDiSetDeviceRegistryPropertyW( set, &device, SPDRP_HARDWAREID, + bus ? (const BYTE *)bus_hardware_id : (const BYTE *)hardware_id, + bus ? sizeof(bus_hardware_id) : sizeof(hardware_id) ); ok( ret, "failed to create set hardware ID, error %lu\n", GetLastError() ); ret = SetupDiCallClassInstaller( DIF_REGISTERDEVICE, set, &device ); @@ -598,7 +629,8 @@ static BOOL pnp_driver_start(void) GetFullPathNameW( L"winetest.inf", ARRAY_SIZE(path), path, NULL ); - ret = UpdateDriverForPlugAndPlayDevicesW( NULL, hardware_id, path, INSTALLFLAG_FORCE, &need_reboot ); + ret = UpdateDriverForPlugAndPlayDevicesW( NULL, bus ? bus_hardware_id : hardware_id, path, + INSTALLFLAG_FORCE, &need_reboot ); ok( ret, "failed to install device, error %lu\n", GetLastError() ); ok( !need_reboot, "expected no reboot necessary\n" ); @@ -630,12 +662,22 @@ static BOOL pnp_driver_start(void) void hid_device_stop(void) { - pnp_driver_stop(); + pnp_driver_stop( FALSE ); } BOOL hid_device_start(void) { - return pnp_driver_start(); + return pnp_driver_start( FALSE ); +} + +void bus_device_stop(void) +{ + pnp_driver_stop( TRUE ); +} + +BOOL bus_device_start(void) +{ + return pnp_driver_start( TRUE ); } #define check_hidp_caps( a, b ) check_hidp_caps_( __LINE__, a, b ) @@ -3398,6 +3440,7 @@ BOOL dinput_test_init_( const char *file, int line ) ok( okfile != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() ); subtest( "driver" ); + subtest( "driver_bus" ); return TRUE; } @@ -3566,10 +3609,39 @@ DWORD WINAPI dinput_test_device_thread( void *stop_event ) return 0; } +static void test_bus_driver(void) +{ + HANDLE control; + + if (!bus_device_start()) goto done; + + control = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, + NULL, OPEN_EXISTING, 0, NULL ); + ok( control != INVALID_HANDLE_VALUE, "CreateFile failed, error %lu\n", GetLastError() ); + CloseHandle( control ); + + bus_device_stop(); + + control = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, + NULL, OPEN_EXISTING, 0, NULL ); + ok( control == INVALID_HANDLE_VALUE, "CreateFile succeeded\n" ); + + bus_device_start(); + + control = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, + NULL, OPEN_EXISTING, 0, NULL ); + ok( control != INVALID_HANDLE_VALUE, "CreateFile failed, error %lu\n", GetLastError() ); + CloseHandle( control ); + +done: + bus_device_stop(); +} + START_TEST( hid ) { if (!dinput_test_init()) return; + test_bus_driver(); test_hidp_kdr(); test_hid_driver( 0, FALSE ); test_hid_driver( 1, FALSE ); -- 2.35.1

2 10

[PATCH 6/6 v2] winealsa: Pass the time relative to the start time to the callback.
by Andrew Eikum 22 Mar '22

22 Mar '22

From: Huw Davies <huw(a)codeweavers.com> This is equivalent to commit 01ad503004cf8ea6b0bd8f544ee131fc86abc580 in the coreaudio driver. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(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.35.1

1 0

[PATCH 5/6 v2] winealsa: Move MIDM_ADDBUFFER to the unixlib.
by Andrew Eikum 22 Mar '22

22 Mar '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Keep old locking order. 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 a78102745bc..80e677b3064 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; + + in_buffer_lock(); + + hdr->dwFlags &= ~WHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + hdr->dwBytesRecorded = 0; + hdr->lpNext = NULL; + + 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.35.1

1 0

[PATCH 4/6 v2] winealsa: Move the midi in buffer lock to the unixlib.
by Andrew Eikum 22 Mar '22

22 Mar '22

From: Huw Davies <huw(a)codeweavers.com> The syscall itself is temporary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(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 f12eefdd1a3..a78102745bc 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.35.1

1 0

[PATCH 3/6 v2] winealsa: Move MIDM_GETNUMDEVS to the unixlib.
by Andrew Eikum 22 Mar '22

22 Mar '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(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 037f404771b..f12eefdd1a3 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.35.1

1 0

[PATCH 2/6 v2] winealsa: Move MIDM_GETDEVCAPS to the unixlib.
by Andrew Eikum 22 Mar '22

22 Mar '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(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 5f1971e30c3..037f404771b 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.35.1

1 0

[PATCH 1/6 v2] winealsa: Move MIDM_PREPARE and MIDM_UNPREPARE to the unixlib.
by Andrew Eikum 22 Mar '22

22 Mar '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Fix !hdr check in midi_in_unprepare. 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..5f1971e30c3 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 || !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.35.1

1 0

[PATCH v3 2/2] winex11.drv: Call XIconifyWindow() after XMapWindow() for minimized windows.
by Zhiyi Zhang 22 Mar '22

22 Mar '22

Mutter always unminimizes windows when handling map requests. So a window could be in normal state as far as Mutter concerns while Wine mistakenly considers it still minimized. Fix Disgaea PC black screen after Alt+Tab in fullscreen mode. Also see https://gitlab.gnome.org/GNOME/mutter/-/blob/main/src/x11/events.c#L1525 for how map requests are handled. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 1 - dlls/winex11.drv/window.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f47fcd2fe65..a7c2dc47f9a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7714,7 +7714,6 @@ static void test_ShowWindow(void) /* The window rectangle of hwndMain is (100, 100, 300, 300). If the window manager unminimizes * hwnd, hwnd will end up obscuring hwndMain. Mutter is such a window manager that unminimizes * windows when handling map requests and thus can demonstrate this bug */ - todo_wine_if(color != 0xffffff) ok(color == 0xffffff, "Expected color %#x, got %#x.\n", 0xffffff, color); ReleaseDC(0, hdc); DestroyWindow(hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 36fb41ac710..7ccb139ba5d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1129,6 +1129,9 @@ static void map_window( HWND hwnd, DWORD new_style ) update_net_wm_states( data ); sync_window_style( data ); XMapWindow( data->display, data->whole_window ); + /* Mutter always unminimizes windows when handling map requests. Restore iconic state */ + if (new_style & WS_MINIMIZE) + XIconifyWindow( data->display, data->whole_window, data->vis.screen ); XFlush( data->display ); if (data->surface && data->vis.visualid != default_visual.visualid) data->surface->funcs->flush( data->surface ); @@ -2528,9 +2531,17 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags data->iconic = (new_style & WS_MINIMIZE) != 0; TRACE( "changing win %p iconic state to %u\n", data->hwnd, data->iconic ); if (data->iconic) + { XIconifyWindow( data->display, data->whole_window, data->vis.screen ); + } else if (is_window_rect_mapped( rectWindow )) + { + /* whole_window could be both iconic and mapped. Since XMapWindow() doesn't do + * anything if the window is already mapped, we need to unmap it first */ + if (data->mapped) + XUnmapWindow( data->display, data->whole_window ); XMapWindow( data->display, data->whole_window ); + } update_net_wm_states( data ); } else -- 2.32.0

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel