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
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
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
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
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/message.c | 50 +----------------
dlls/user32/user_main.c | 1 +
dlls/user32/user_private.h | 1 +
dlls/user32/winproc.c | 9 ++-
dlls/win32u/gdiobj.c | 1 +
dlls/win32u/message.c | 105 +++++++++++++++++++++++++++++++++++
dlls/win32u/sysparams.c | 2 +
dlls/win32u/win32u.spec | 2 +-
dlls/win32u/win32u_private.h | 2 +
dlls/win32u/wrappers.c | 6 ++
include/ntuser.h | 3 +
11 files changed, 131 insertions(+), 51 deletions(-)
3
2
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
1
0
[PATCH v2] ntdll: Avoid the lower 2GB region for large allocations on win64.
by Elaine Lefler 23 Mar '22
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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, ¶ms);
+
+ 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
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
[tools] testbot/web: Remove a dependency on FormPage::SaveProperties() in VMDetails.
by Francois Gouget 22 Mar '22
by Francois Gouget 22 Mar '22
22 Mar '22
Save() is already calling SaveProperties() to store the form fields in
the $VM object. Just make sure to check the old value of $VM->Errors
before it is ovewritten.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
testbot/web/admin/VMDetails.pl | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl
index 19983c643c..f39b0d6740 100644
--- a/testbot/web/admin/VMDetails.pl
+++ b/testbot/web/admin/VMDetails.pl
@@ -48,23 +48,21 @@ sub Save($)
{
my ($self) = @_;
- my $OldStatus = $self->{Item}->Status || "";
- return !1 if (!$self->SaveProperties());
-
- if ($OldStatus ne $self->{Item}->Status)
+ my $ResetErrors;
+ if (($self->GetParam("Status") || "") ne $self->{Item}->Status)
{
# The administrator action resets the consecutive error count
$self->{Item}->Errors(undef);
- my ($ErrProperty, $ErrMessage) = $self->{Item}->Validate();
- if (!defined $ErrMessage)
- {
- $self->{Item}->RecordStatus(undef, $self->{Item}->Status ." administrator");
- }
+ $ResetErrors = 1;
}
- my $ErrKey;
- ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save();
- return ! defined($self->{ErrMessage});
+ return undef if (!$self->SUPER::Save());
+
+ if ($ResetErrors)
+ {
+ $self->{Item}->RecordStatus(undef, $self->{Item}->Status ." administrator");
+ }
+ return 1;
}
sub GenerateFooter($)
--
2.30.2
1
0
[tools 1/2] testbot/web: Better initialize and check the Days main page parameter.
by Francois Gouget 22 Mar '22
by Francois Gouget 22 Mar '22
22 Mar '22
Set the FormPage property descriptors list. This allows
FormPage::Validate() to do most of the validation work and removes the
need for a custom Validate() method.
Treat "00" the same as "0".
Also remove the need for redefining OnAction().
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
testbot/web/index.pl | 42 ++++++++++++++++--------------------------
1 file changed, 16 insertions(+), 26 deletions(-)
diff --git a/testbot/web/index.pl b/testbot/web/index.pl
index 1336d1e0e6..605e23b6f1 100644
--- a/testbot/web/index.pl
+++ b/testbot/web/index.pl
@@ -2,6 +2,7 @@
# WineTestBot status page
#
# Copyright 2009 Ge van Geldorp
+# Copyright 2013-2022 Francois Gouget
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -31,6 +32,7 @@ use WineTestBot::Branches;
use WineTestBot::Users;
use WineTestBot::Utils;
+my $DAYS_DEFAULT = 4;
sub SortKeys($$)
@@ -239,6 +241,7 @@ package StatusPage;
use ObjectModel::CGI::FreeFormPage;
our @ISA = qw(ObjectModel::CGI::FreeFormPage);
+use ObjectModel::BasicPropertyDescriptor;
use ObjectModel::Collection;
use WineTestBot::Config;
@@ -253,29 +256,20 @@ sub _initialize($$$)
{
my ($self, $Request, $RequiredRole) = @_;
- $self->{Days} = $self->GetParam("Days");
- $self->Validate();
-
$self->{start} = Time();
- $self->SUPER::_initialize($Request, $RequiredRole);
-}
-
-sub Validate($)
-{
- my ($self) = @_;
+ my @PropertyDescriptors = (
+ CreateBasicPropertyDescriptor("Days", "Days ", !1, 1, "N", 2),
+ );
+ $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors);
- if (!defined $self->{Days} or !$self->{Days})
+ if (!$self->GetParam("Days") or !$self->Validate() or
+ !int($self->GetParam("Days"))) # 00 case!
{
- $self->{Days} = $DefaultIndexDays;
+ # Replace with the default value so the cutoff can be calculated
+ $self->SetParam("Days", $DAYS_DEFAULT);
}
- elsif ($self->{Days} !~ /^[0-9]{1,2}$/)
- {
- $self->{ErrField} = "Days";
- $self->{ErrMessage} = "The number of days must be between 1 and 99";
- $self->{Days} = $DefaultIndexDays;
- return undef;
- }
- return $self->SUPER::Validate();
+ # The action is a no-op so unset it to not need to redefine OnAction()
+ $self->SetParam("Action", undef);
}
sub OutputDot($$)
@@ -351,7 +345,8 @@ sub GenerateBody($)
print "<h2><a name='jobs'></a>Jobs</h2>\n";
my $Jobs = CreateJobs();
- my $CutOff = time() - $self->{Days} * 24 * 60 * 60;
+ my $Days = $self->GetParam("Days");
+ my $CutOff = time() - $Days * 24 * 60 * 60;
$Jobs->AddFilter("Submitted", [$CutOff], ">=");
my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self);
@@ -385,7 +380,7 @@ sub GenerateBody($)
<form id="Days" action='/' method='get'>
<div class='ItemProperty'><label>Show jobs for the past</label>
<div class='ItemValue'>
- <input type='text' name='Days' maxlength='2' size='2' value='$self->{Days}' /> days
+ <input type='text' name='Days' maxlength='2' size='2' value='$Days' /> days
<input type='submit' value='Update'/>
</div>
</div>
@@ -400,11 +395,6 @@ EOF
print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n";
}
-sub OnAction($$)
-{
- my ($self, $Action) = @_;
- return $self->Validate() ? 1 : undef;
-}
package main;
--
2.30.2
1
1
[tools] testbot/web: Better document the default Days stats page value.
by Francois Gouget 22 Mar '22
by Francois Gouget 22 Mar '22
22 Mar '22
Store it in a variable at the start of the file so it's easy to spot.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
testbot/web/Stats.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl
index 5ec69798f4..8433c6d373 100644
--- a/testbot/web/Stats.pl
+++ b/testbot/web/Stats.pl
@@ -32,6 +32,8 @@ use WineTestBot::Log; # For Elapsed()
use WineTestBot::Utils;
use WineTestBot::VMs;
+my $DAYS_DEFAULT = 7;
+
sub _initialize($$$)
{
@@ -46,7 +48,7 @@ sub _initialize($$$)
if (!$self->GetParam("Days") or !$self->Validate() or
!int($self->GetParam("Days"))) # 00 case!
{
- $self->SetParam("Days", 7) if (!defined $self->{ErrMessage});
+ $self->SetParam("Days", $DAYS_DEFAULT) if (!defined $self->{ErrMessage});
$self->{NoStats} = 1;
}
# The action is a no-op so unset it to not need to redefine OnAction()
--
2.30.2
1
0
[tools] testbot/web: Better initialize and check the Hours activity page parameter.
by Francois Gouget 22 Mar '22
by Francois Gouget 22 Mar '22
22 Mar '22
Set the FormPage property descriptors list. This allows
FormPage::Validate() to do most of the validation work.
Treat "00" the same as "0".
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
testbot/web/Activity.pl | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl
index 9444779433..272215f958 100644
--- a/testbot/web/Activity.pl
+++ b/testbot/web/Activity.pl
@@ -27,28 +27,35 @@ our @ISA = qw(ObjectModel::CGI::FreeFormPage);
use POSIX qw(strftime);
use URI::Escape;
+use ObjectModel::BasicPropertyDescriptor;
use WineTestBot::Config;
use WineTestBot::Activity;
use WineTestBot::Log; # For Elapsed()
use WineTestBot::Utils;
use WineTestBot::VMs;
-
my $HOURS_DEFAULT = 12;
+
sub _initialize($$$)
{
my ($self, $Request, $RequiredRole) = @_;
$self->{start} = Time();
- $self->{hours} = $self->GetParam("Hours");
- if (!defined $self->{hours} or $self->{hours} !~ /^\d{1,3}$/)
- {
- $self->{hours} = $HOURS_DEFAULT;
- }
-
+ my @PropertyDescriptors = (
+ CreateBasicPropertyDescriptor("Hours", "Hours", !1, 1, "N", 3),
+ );
$self->SUPER::_initialize($Request, $RequiredRole);
$self->{Method} = "get";
+
+ if (!$self->GetParam("Hours") or !$self->Validate() or
+ !int($self->GetParam("Hours"))) # 00 case!
+ {
+ # This page always needs a valid value to calculate the cutoff. So just
+ # replace invalid values with the default (no error message is shown
+ # either).
+ $self->SetParam("Hours", $HOURS_DEFAULT);
+ }
}
sub GetPageTitle($$)
@@ -61,7 +68,8 @@ sub GetPageTitle($$)
sub GeneratePage($)
{
my ($self) = @_;
- if ($self->{hours} and $self->{hours} <= $HOURS_DEFAULT)
+
+ if ($self->GetParam("Hours") <= $HOURS_DEFAULT)
{
$self->{Request}->headers_out->add("Refresh", "60");
}
@@ -101,7 +109,7 @@ sub GenerateBody($)
# Generate a custom form to let the user specify the Hours field.
$self->GenerateFormStart();
- print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='$self->{hours}'/></div> hours.</label></div>\n";
+ print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='", $self->GetParam("Hours"), "'/></div> hours.</label></div>\n";
$self->GenerateFormEnd();
print "<h1>${ProjectName} Test Bot activity</h1>\n";
@@ -148,7 +156,7 @@ EOF
### Generate the HTML table with the newest record first
print "<tbody>\n";
- my ($Activity, $_Counters) = GetActivity($VMs, $self->{hours} * 3600);
+ my ($Activity, $_Counters) = GetActivity($VMs, $self->GetParam("Hours") * 3600);
for (my $Index = @$Activity; $Index--; )
{
my $Group = $Activity->[$Index];
--
2.30.2
1
0
[tools] testbot/web: Better document the default Hours log page value.
by Francois Gouget 22 Mar '22
by Francois Gouget 22 Mar '22
22 Mar '22
Store it in a variable at the start of the file so it's easy to spot.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
testbot/web/admin/Log.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl
index ddc655f6d6..8d3a8ce8b7 100644
--- a/testbot/web/admin/Log.pl
+++ b/testbot/web/admin/Log.pl
@@ -28,6 +28,8 @@ use ObjectModel::BasicPropertyDescriptor;
use WineTestBot::Config;
use WineTestBot::Log;
+my $HOURS_DEFAULT = 1;
+
sub _initialize($$$)
{
@@ -41,7 +43,7 @@ sub _initialize($$$)
if (!$self->GetParam("Hours") or !$self->Validate() or
!int($self->GetParam("Hours"))) # 00 case!
{
- $self->SetParam("Hours", 1) if (!defined $self->{ErrMessage});
+ $self->SetParam("Hours", $HOURS_DEFAULT) if (!defined $self->{ErrMessage});
$self->SetParam("Action", undef);
}
}
--
2.30.2
1
0
[tools] testbot/cgi: Better select which FormPage fields can be shown / edited.
by Francois Gouget 22 Mar '22
by Francois Gouget 22 Mar '22
22 Mar '22
Also better document why each type of field can or cannot be edited /
shown.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
testbot/lib/ObjectModel/CGI/FormPage.pm | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm
index 3ac62239d5..e432fcbbd2 100644
--- a/testbot/lib/ObjectModel/CGI/FormPage.pm
+++ b/testbot/lib/ObjectModel/CGI/FormPage.pm
@@ -208,6 +208,8 @@ sub GetInputType($$)
{
my ($self, $PropertyDescriptor) = @_;
+ # Note: Editing Detailrefs and Itemrefs is not supported which leaves only
+ # Basic and Enum property descriptors here.
return $PropertyDescriptor->GetClass() eq "Enum" ? "select" :
$PropertyDescriptor->GetType() eq "B" ? "checkbox" :
$PropertyDescriptor->GetType() eq "textarea" ? "textarea" :
@@ -331,12 +333,20 @@ sub DisplayProperty($$)
{
my ($self, $PropertyDescriptor) = @_;
- if ($PropertyDescriptor->GetClass() eq "Detailref")
- {
- return "";
- }
-
- return "rw";
+ return # Detailref fields point to a Collection of objects matching the
+ # primary key of this form data. As such they can neither be shown
+ # nor edited.
+ $PropertyDescriptor->GetClass() eq "Detailref" ? "" :
+ # Itemref fields are keys identifying other objects and thus would
+ # require careful validation if edited. Requiring users to manually
+ # type the appropriate key value would also be cumbersome so this is
+ # currently not supported. But they can be displayed.
+ $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" :
+ # All other properties can be edited...
+ $PropertyDescriptor->GetClass() ne "Basic" ? "rw" :
+ $PropertyDescriptor->GetType() ne "S" ? "rw" :
+ # ...except autoincrement ones (shown as <unset> if undefined)
+ "ro";
}
sub GetActions($)
--
2.30.2
1
0
22 Mar '22
They don't have a value yet and cannot be edited.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
testbot/lib/ObjectModel/CGI/ItemPage.pm | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm
index 940115475f..a178aa6e09 100644
--- a/testbot/lib/ObjectModel/CGI/ItemPage.pm
+++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm
@@ -99,13 +99,16 @@ sub DisplayProperty($$)
my ($self, $PropertyDescriptor) = @_;
my $Display = $self->SUPER::DisplayProperty($PropertyDescriptor);
- if ($Display eq "rw" && ! $self->{Item}->GetIsNew() &&
- $PropertyDescriptor->GetIsKey())
- {
- $Display = "";
- }
-
- return $Display;
+ return # Don't show autoincrement fields of new items: they don't have a
+ # value yet and cannot be edited anyway so there is no point.
+ ($PropertyDescriptor->GetClass() eq "Basic" and
+ $PropertyDescriptor->GetType() eq "S" and
+ $self->{Item}->GetIsNew()) ? "" :
+ # Don't allow editing key attributes of existing items. Furthermore
+ # the item is identified in the page title so hide them altogether.
+ ($PropertyDescriptor->GetIsKey() and !$self->{Item}->GetIsNew() and
+ $Display eq "rw") ? "" :
+ $Display;
}
sub GetActions($)
--
2.30.2
1
0
22 Mar '22
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
winetest/patterns.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/winetest/patterns.js b/winetest/patterns.js
index be583a5f0c..042620b8f4 100644
--- a/winetest/patterns.js
+++ b/winetest/patterns.js
@@ -14,7 +14,7 @@
*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
"use strict";
--
2.30.2
1
0
22 Mar '22
The tests show that if we don't have a global IPv6 address, getaddrinfo()
will not return IPv6 results. Specifing AF_UNSPEC makes it return IPv4 results.
Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com>
---
v3: Use www.kernel.org instead of microsoft site.
dlls/ws2_32/tests/protocol.c | 65 ++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c
index 5f728a9c4a4..9a6c8610718 100644
--- a/dlls/ws2_32/tests/protocol.c
+++ b/dlls/ws2_32/tests/protocol.c
@@ -2122,6 +2122,17 @@ static void compare_addrinfo(ADDRINFO *a, ADDRINFO *b)
ok(!a && !b, "Expected both addresses null (%p != %p)\n", a, b);
}
+static BOOL ipv6_found(ADDRINFOA *addr)
+{
+ ADDRINFOA *p;
+ for (p = addr; p; p = p->ai_next)
+ {
+ if (p->ai_family == AF_INET6)
+ return TRUE;
+ }
+ return FALSE;
+}
+
static void test_getaddrinfo(void)
{
int i, ret;
@@ -2129,6 +2140,7 @@ static void test_getaddrinfo(void)
SOCKADDR_IN *sockaddr;
CHAR name[256], *ip;
DWORD size = sizeof(name);
+ BOOL has_ipv6_addr;
memset(&hint, 0, sizeof(ADDRINFOA));
GetComputerNameExA( ComputerNamePhysicalDnsHostname, name, &size );
@@ -2396,6 +2408,59 @@ static void test_getaddrinfo(void)
ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family);
ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port);
freeaddrinfo(result);
+
+ /* Check whether we have global IPv6 address */
+ result = NULL;
+ ret = getaddrinfo("", NULL, NULL, &result);
+ ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError());
+ has_ipv6_addr = FALSE;
+ for (p = result; p; p = p->ai_next)
+ {
+ if (p->ai_family == AF_INET6)
+ {
+ IN6_ADDR *a = &((SOCKADDR_IN6 *)p->ai_addr)->sin6_addr;
+ if (!IN6_IS_ADDR_LINKLOCAL(a) && !IN6_IS_ADDR_LOOPBACK(a) && !IN6_IS_ADDR_UNSPECIFIED(a))
+ {
+ has_ipv6_addr = TRUE;
+ break;
+ }
+ }
+ }
+ freeaddrinfo(result);
+
+ result = NULL;
+ ret = getaddrinfo("www.kernel.org", NULL, NULL, &result);
+ ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError());
+ if (!has_ipv6_addr)
+ todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n");
+ freeaddrinfo(result);
+
+ for (i = 0; i < ARRAY_SIZE(hinttests); i++)
+ {
+ if (hinttests[i].family != AF_UNSPEC || hinttests[i].error) continue;
+ winetest_push_context("Test %u", i);
+
+ hint.ai_flags = 0;
+ hint.ai_family = hinttests[i].family;
+ hint.ai_socktype = hinttests[i].socktype;
+ hint.ai_protocol = hinttests[i].protocol;
+
+ result = NULL;
+ ret = getaddrinfo("www.kernel.org", NULL, &hint, &result);
+ ok(!ret, "Got unexpected ret %d\n", ret);
+ if (!has_ipv6_addr)
+ todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n");
+ freeaddrinfo(result);
+
+ hint.ai_family = AF_INET6;
+ result = NULL;
+ ret = getaddrinfo("www.kernel.org", NULL, &hint, &result);
+ if (!has_ipv6_addr)
+ todo_wine ok(ret == WSANO_DATA, "Got unexpected ret %d\n", ret);
+ freeaddrinfo(result);
+
+ winetest_pop_context();
+ }
}
static void test_dns(void)
--
2.25.1
2
1
22 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/reg.c | 739 ++++++++++++++++++++++++------------------------
1 file changed, 370 insertions(+), 369 deletions(-)
diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c
index 7d069666604..c29d6f04818 100644
--- a/dlls/ntdll/tests/reg.c
+++ b/dlls/ntdll/tests/reg.c
@@ -21,6 +21,7 @@
* helper function RTL_GetKeyHandle().--Brad DeMorrow
*
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include "ntdll_test.h"
#include "winternl.h"
@@ -337,7 +338,7 @@ static void test_RtlQueryRegistryValues(void)
QueryTable[2].DefaultLength = 0;
status = pRtlQueryRegistryValues(RelativeTo, winetestpath.Buffer, QueryTable, 0, 0);
- ok(status == STATUS_SUCCESS, "RtlQueryRegistryValues return: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlQueryRegistryValues return: 0x%08lx\n", status);
pRtlFreeHeap(GetProcessHeap(), 0, QueryTable);
}
@@ -352,30 +353,30 @@ static void test_NtOpenKey(void)
/* All NULL */
status = pNtOpenKey(NULL, 0, NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08lx\n", status);
/* NULL attributes */
status = pNtOpenKey(&key, 0, NULL);
ok(status == STATUS_ACCESS_VIOLATION /* W2K3/XP/W2K */ || status == STATUS_INVALID_PARAMETER /* NT4 */,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08lx\n", status);
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
/* NULL key */
status = pNtOpenKey(NULL, am, &attr);
- ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08lx\n", status);
/* Length > sizeof(OBJECT_ATTRIBUTES) */
attr.Length *= 2;
status = pNtOpenKey(&key, am, &attr);
- 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);
/* Zero accessmask */
attr.Length = sizeof(attr);
key = (HANDLE)0xdeadbeef;
status = pNtOpenKey(&key, 0, &attr);
todo_wine
- ok(status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got: 0x%08x\n", status);
+ ok(status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got: 0x%08lx\n", status);
todo_wine
ok(!key, "key = %p\n", key);
if (status == STATUS_SUCCESS) NtClose(key);
@@ -385,7 +386,7 @@ static void test_NtOpenKey(void)
InitializeObjectAttributes(&attr, &str, 0, 0, 0);
key = (HANDLE)0xdeadbeef;
status = pNtOpenKey(&key, KEY_READ, &attr);
- todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08x\n", status);
+ todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08lx\n", status);
todo_wine
ok(!key, "key = %p\n", key);
pRtlFreeUnicodeString( &str );
@@ -394,68 +395,68 @@ static void test_NtOpenKey(void)
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine" );
status = pNtOpenKey(&key, KEY_READ, &attr);
ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */,
- "NtOpenKey Failed: 0x%08x\n", status);
+ "NtOpenKey Failed: 0x%08lx\n", status);
if (!status) pNtClose( key );
attr.Attributes = OBJ_CASE_INSENSITIVE;
status = pNtOpenKey(&key, KEY_READ, &attr);
- ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08lx\n", status);
pNtClose(key);
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "" );
status = pNtOpenKey(&key, KEY_READ, &attr);
todo_wine
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\" );
status = pNtOpenKey(&key, KEY_READ, &attr);
todo_wine
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" );
status = pNtOpenKey(&key, KEY_READ, &attr);
todo_wine
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
pNtClose( key );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\" );
status = pNtOpenKey(&key, KEY_READ, &attr);
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
pNtClose( key );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Foobar" );
status = pNtOpenKey(&key, KEY_READ, &attr);
todo_wine
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Foobar\\Machine" );
status = pNtOpenKey(&key, KEY_READ, &attr);
todo_wine
- ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Machine\\Software\\Classes" );
status = pNtOpenKey(&key, KEY_READ, &attr);
todo_wine
- ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "Machine\\Software\\Classes" );
status = pNtOpenKey(&key, KEY_READ, &attr);
todo_wine
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Device\\Null" );
status = pNtOpenKey(&key, KEY_READ, &attr);
todo_wine
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
if (!pNtOpenKeyEx)
@@ -466,7 +467,7 @@ static void test_NtOpenKey(void)
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
status = pNtOpenKeyEx(&key, KEY_WRITE|KEY_READ, &attr, 0);
- ok(status == STATUS_SUCCESS, "NtOpenKeyEx Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenKeyEx Failed: 0x%08lx\n", status);
pNtClose(key);
}
@@ -483,61 +484,61 @@ static void test_NtCreateKey(void)
/* All NULL */
status = pNtCreateKey(NULL, 0, NULL, 0, 0, 0, 0);
ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got: 0x%08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got: 0x%08lx\n", status);
/* Only the key */
status = pNtCreateKey(&key, 0, NULL, 0, 0, 0, 0);
ok(status == STATUS_ACCESS_VIOLATION /* W2K3/XP/W2K */ || status == STATUS_INVALID_PARAMETER /* NT4 */,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08lx\n", status);
/* Only accessmask */
status = pNtCreateKey(NULL, am, NULL, 0, 0, 0, 0);
ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got: 0x%08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got: 0x%08lx\n", status);
/* Key and accessmask */
status = pNtCreateKey(&key, am, NULL, 0, 0, 0, 0);
ok(status == STATUS_ACCESS_VIOLATION /* W2K3/XP/W2K */ || status == STATUS_INVALID_PARAMETER /* NT4 */,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08lx\n", status);
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
/* Only attributes */
status = pNtCreateKey(NULL, 0, &attr, 0, 0, 0, 0);
ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_ACCESS_DENIED /* Win7 */,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_ACCESS_DENIED, got: 0x%08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_ACCESS_DENIED, got: 0x%08lx\n", status);
/* Length > sizeof(OBJECT_ATTRIBUTES) */
attr.Length *= 2;
status = pNtCreateKey(&key, am, &attr, 0, 0, 0, 0);
- 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);
attr.Length = sizeof(attr);
status = pNtCreateKey(&key, am, &attr, 0, 0, 0, 0);
- ok(status == STATUS_SUCCESS, "NtCreateKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtCreateKey Failed: 0x%08lx\n", status);
attr.RootDirectory = key;
attr.ObjectName = &str;
pRtlCreateUnicodeStringFromAsciiz( &str, "test\\sub\\key" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "test\\subkey" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "test\\subkey\\" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey\\" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND), /* nt4 */
- "NtCreateKey failed: 0x%08x\n", status );
+ "NtCreateKey failed: 0x%08lx\n", status );
if (status == STATUS_SUCCESS)
{
pNtDeleteKey( subkey );
@@ -547,7 +548,7 @@ static void test_NtCreateKey(void)
pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pNtDeleteKey( subkey );
pNtClose( subkey );
@@ -558,64 +559,64 @@ static void test_NtCreateKey(void)
pRtlCreateUnicodeStringFromAsciiz( &str, "" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
todo_wine
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
todo_wine
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
todo_wine
ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED,
- "NtCreateKey failed: 0x%08x\n", status );
+ "NtCreateKey failed: 0x%08lx\n", status );
if (!status) pNtClose( subkey );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED,
- "NtCreateKey failed: 0x%08x\n", status );
+ "NtCreateKey failed: 0x%08lx\n", status );
if (!status) pNtClose( subkey );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Foobar" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
todo_wine
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Foobar\\Machine" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
todo_wine
- ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Machine\\Software\\Classes" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
todo_wine
- ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "Machine\\Software\\Classes" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
todo_wine
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Device\\Null" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
todo_wine
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED,
- "NtCreateKey failed: 0x%08x\n", status );
+ "NtCreateKey failed: 0x%08lx\n", status );
if (!status) pNtClose( subkey );
pRtlFreeUnicodeString( &str );
@@ -625,21 +626,21 @@ static void test_NtCreateKey(void)
pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */,
- "NtCreateKey failed: 0x%08x\n", status );
+ "NtCreateKey failed: 0x%08lx\n", status );
if (!status) pNtClose( subkey );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
ok( status == STATUS_SUCCESS,
- "NtCreateKey failed: 0x%08x\n", status );
+ "NtCreateKey failed: 0x%08lx\n", status );
if (!status) pNtClose( subkey );
pRtlFreeUnicodeString( &str );
pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" );
status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 );
ok( status == STATUS_SUCCESS,
- "NtCreateKey failed: 0x%08x\n", status );
+ "NtCreateKey failed: 0x%08lx\n", status );
if (!status) pNtClose( subkey );
pRtlFreeUnicodeString( &str );
@@ -657,16 +658,16 @@ static void test_NtSetValueKey(void)
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
status = pNtOpenKey(&key, am, &attr);
- ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08lx\n", status);
pRtlCreateUnicodeStringFromAsciiz(&ValName, "deletetest");
status = pNtSetValueKey(key, &ValName, 0, REG_DWORD, &data, sizeof(data));
- ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08lx\n", status);
pRtlFreeUnicodeString(&ValName);
pRtlCreateUnicodeStringFromAsciiz(&ValName, "stringtest");
status = pNtSetValueKey(key, &ValName, 0, REG_SZ, (VOID*)stringW, STR_TRUNC_SIZE);
- ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08lx\n", status);
pRtlFreeUnicodeString(&ValName);
pNtClose(key);
@@ -677,7 +678,7 @@ static void test_RtlOpenCurrentUser(void)
NTSTATUS status;
HANDLE handle;
status=pRtlOpenCurrentUser(KEY_READ, &handle);
- ok(status == STATUS_SUCCESS, "RtlOpenCurrentUser Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlOpenCurrentUser Failed: 0x%08lx\n", status);
pNtClose(handle);
}
@@ -687,22 +688,22 @@ static void test_RtlCheckRegistryKey(void)
NTSTATUS status;
status = pRtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, winetestpath.Buffer);
- ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE: 0x%08lx\n", status);
status = pRtlCheckRegistryKey((RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL), winetestpath.Buffer);
- ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE and RTL_REGISTRY_OPTIONAL: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE and RTL_REGISTRY_OPTIONAL: 0x%08lx\n", status);
status = pRtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, NULL);
- ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE and Path being NULL: 0x%08x\n", status);
+ ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE and Path being NULL: 0x%08lx\n", status);
status = pRtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, empty);
- ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE and Path being empty: 0x%08x\n", status);
+ ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE and Path being empty: 0x%08lx\n", status);
status = pRtlCheckRegistryKey(RTL_REGISTRY_USER, NULL);
- ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_USER and Path being NULL: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_USER and Path being NULL: 0x%08lx\n", status);
status = pRtlCheckRegistryKey(RTL_REGISTRY_USER, empty);
- ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_USER and Path being empty: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_USER and Path being empty: 0x%08lx\n", status);
}
static void test_NtFlushKey(void)
@@ -713,13 +714,13 @@ static void test_NtFlushKey(void)
ACCESS_MASK am = KEY_ALL_ACCESS;
status = pNtFlushKey(NULL);
- ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08x\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08lx\n", status);
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
pNtOpenKey(&hkey, am, &attr);
status = pNtFlushKey(hkey);
- ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08lx\n", status);
pNtClose(hkey);
}
@@ -739,67 +740,67 @@ static void test_NtQueryValueKey(void)
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
status = pNtOpenKey(&key, KEY_READ|KEY_SET_VALUE, &attr);
- ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08lx\n", status);
len = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]);
basic_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*basic_info));
status = pNtQueryValueKey(key, &ValName, KeyValueBasicInformation, basic_info, len, &len);
- ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status);
- ok(basic_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", basic_info->TitleIndex);
- ok(basic_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", basic_info->Type);
- ok(basic_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", basic_info->NameLength);
- ok(len == FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[basic_info->NameLength/sizeof(WCHAR)]), "NtQueryValueKey returned wrong len %d\n", len);
+ ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08lx\n", status);
+ ok(basic_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %ld\n", basic_info->TitleIndex);
+ ok(basic_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", basic_info->Type);
+ ok(basic_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %ld\n", basic_info->NameLength);
+ ok(len == FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[basic_info->NameLength/sizeof(WCHAR)]), "NtQueryValueKey returned wrong len %ld\n", len);
basic_info = HeapReAlloc(GetProcessHeap(), 0, basic_info, len);
status = pNtQueryValueKey(key, &ValName, KeyValueBasicInformation, basic_info, len, &len);
- ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08x\n", status);
- ok(basic_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", basic_info->TitleIndex);
- ok(basic_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", basic_info->Type);
- ok(basic_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", basic_info->NameLength);
- ok(len == FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[basic_info->NameLength/sizeof(WCHAR)]), "NtQueryValueKey returned wrong len %d\n", len);
+ ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08lx\n", status);
+ ok(basic_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %ld\n", basic_info->TitleIndex);
+ ok(basic_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", basic_info->Type);
+ ok(basic_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %ld\n", basic_info->NameLength);
+ ok(len == FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[basic_info->NameLength/sizeof(WCHAR)]), "NtQueryValueKey returned wrong len %ld\n", len);
ok(!memcmp(basic_info->Name, ValName.Buffer, ValName.Length), "incorrect Name returned\n");
HeapFree(GetProcessHeap(), 0, basic_info);
len = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]);
partial_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*partial_info));
status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, len, &len);
- ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status);
- ok(partial_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", partial_info->TitleIndex);
- ok(partial_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", partial_info->Type);
- ok(partial_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", partial_info->DataLength);
- ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[partial_info->DataLength]), "NtQueryValueKey returned wrong len %d\n", len);
+ ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08lx\n", status);
+ ok(partial_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %ld\n", partial_info->TitleIndex);
+ ok(partial_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", partial_info->Type);
+ ok(partial_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", partial_info->DataLength);
+ ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[partial_info->DataLength]), "NtQueryValueKey returned wrong len %ld\n", len);
partial_info = HeapReAlloc(GetProcessHeap(), 0, partial_info, len);
status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, len, &len);
- ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08x\n", status);
- ok(partial_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", partial_info->TitleIndex);
- ok(partial_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", partial_info->Type);
- ok(partial_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", partial_info->DataLength);
- ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[partial_info->DataLength]), "NtQueryValueKey returned wrong len %d\n", len);
- ok(*(DWORD *)partial_info->Data == 711, "incorrect Data returned: 0x%x\n", *(DWORD *)partial_info->Data);
+ ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08lx\n", status);
+ ok(partial_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %ld\n", partial_info->TitleIndex);
+ ok(partial_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", partial_info->Type);
+ ok(partial_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", partial_info->DataLength);
+ ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[partial_info->DataLength]), "NtQueryValueKey returned wrong len %ld\n", len);
+ ok(*(DWORD *)partial_info->Data == 711, "incorrect Data returned: 0x%lx\n", *(DWORD *)partial_info->Data);
HeapFree(GetProcessHeap(), 0, partial_info);
len = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]);
full_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*full_info));
status = pNtQueryValueKey(key, &ValName, KeyValueFullInformation, full_info, len, &len);
- ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status);
- ok(full_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", full_info->TitleIndex);
- ok(full_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", full_info->Type);
- ok(full_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", full_info->DataLength);
- ok(full_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", full_info->NameLength);
+ ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08lx\n", status);
+ ok(full_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %ld\n", full_info->TitleIndex);
+ ok(full_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", full_info->Type);
+ ok(full_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", full_info->DataLength);
+ ok(full_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %ld\n", full_info->NameLength);
ok(len == FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) + full_info->DataLength + full_info->NameLength,
- "NtQueryValueKey returned wrong len %d\n", len);
+ "NtQueryValueKey returned wrong len %ld\n", len);
len = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) + full_info->DataLength + full_info->NameLength;
full_info = HeapReAlloc(GetProcessHeap(), 0, full_info, len);
status = pNtQueryValueKey(key, &ValName, KeyValueFullInformation, full_info, len, &len);
- ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08x\n", status);
- ok(full_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", full_info->TitleIndex);
- ok(full_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", full_info->Type);
- ok(full_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", full_info->DataLength);
- ok(full_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", full_info->NameLength);
+ ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08lx\n", status);
+ ok(full_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %ld\n", full_info->TitleIndex);
+ ok(full_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %ld\n", full_info->Type);
+ ok(full_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %ld\n", full_info->DataLength);
+ ok(full_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %ld\n", full_info->NameLength);
ok(!memcmp(full_info->Name, ValName.Buffer, ValName.Length), "incorrect Name returned\n");
- ok(*(DWORD *)((char *)full_info + full_info->DataOffset) == 711, "incorrect Data returned: 0x%x\n",
+ ok(*(DWORD *)((char *)full_info + full_info->DataOffset) == 711, "incorrect Data returned: 0x%lx\n",
*(DWORD *)((char *)full_info + full_info->DataOffset));
HeapFree(GetProcessHeap(), 0, full_info);
@@ -807,42 +808,42 @@ static void test_NtQueryValueKey(void)
pRtlCreateUnicodeStringFromAsciiz(&ValName, "stringtest");
status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, NULL, 0, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryValueKey should have returned STATUS_BUFFER_TOO_SMALL instead of 0x%08x\n", status);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryValueKey should have returned STATUS_BUFFER_TOO_SMALL instead of 0x%08lx\n", status);
partial_info = HeapAlloc(GetProcessHeap(), 0, len+1);
memset(partial_info, 0xbd, len+1);
status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, len, &len);
- ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08x\n", status);
- ok(partial_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", partial_info->TitleIndex);
- ok(partial_info->Type == REG_SZ, "NtQueryValueKey returned wrong Type %d\n", partial_info->Type);
- ok(partial_info->DataLength == STR_TRUNC_SIZE, "NtQueryValueKey returned wrong DataLength %d\n", partial_info->DataLength);
+ ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08lx\n", status);
+ ok(partial_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %ld\n", partial_info->TitleIndex);
+ ok(partial_info->Type == REG_SZ, "NtQueryValueKey returned wrong Type %ld\n", partial_info->Type);
+ ok(partial_info->DataLength == STR_TRUNC_SIZE, "NtQueryValueKey returned wrong DataLength %ld\n", partial_info->DataLength);
ok(!memcmp(partial_info->Data, stringW, STR_TRUNC_SIZE), "incorrect Data returned\n");
ok(*(partial_info->Data+STR_TRUNC_SIZE) == 0xbd, "string overflowed %02x\n", *(partial_info->Data+STR_TRUNC_SIZE));
expected = len;
status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, 0, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryValueKey wrong status 0x%08x\n", status);
- ok(len == expected, "NtQueryValueKey wrong len %u\n", len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryValueKey wrong status 0x%08lx\n", status);
+ ok(len == expected, "NtQueryValueKey wrong len %lu\n", len);
status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, 1, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryValueKey wrong status 0x%08x\n", status);
- ok(len == expected, "NtQueryValueKey wrong len %u\n", len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryValueKey wrong status 0x%08lx\n", status);
+ ok(len == expected, "NtQueryValueKey wrong len %lu\n", len);
status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) - 1, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryValueKey wrong status 0x%08x\n", status);
- ok(len == expected, "NtQueryValueKey wrong len %u\n", len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryValueKey wrong status 0x%08lx\n", status);
+ ok(len == expected, "NtQueryValueKey wrong len %lu\n", len);
status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data), &len);
- ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey wrong status 0x%08x\n", status);
- ok(len == expected, "NtQueryValueKey wrong len %u\n", len);
+ ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey wrong status 0x%08lx\n", status);
+ ok(len == expected, "NtQueryValueKey wrong len %lu\n", len);
HeapFree(GetProcessHeap(), 0, partial_info);
pRtlFreeUnicodeString(&ValName);
pRtlCreateUnicodeStringFromAsciiz(&ValName, "custtest");
status = pNtSetValueKey(key, &ValName, 0, 0xff00ff00, NULL, 0);
- ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08lx\n", status);
status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, &pi, sizeof(pi), &len);
- ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08x\n", status);
- ok(pi.Type == 0xff00ff00, "Type=%x\n", pi.Type);
- ok(pi.DataLength == 0, "DataLength=%u\n", pi.DataLength);
+ ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08lx\n", status);
+ ok(pi.Type == 0xff00ff00, "Type=%lx\n", pi.Type);
+ ok(pi.DataLength == 0, "DataLength=%lu\n", pi.DataLength);
pRtlFreeUnicodeString(&ValName);
pNtClose(key);
@@ -858,53 +859,53 @@ static void test_NtDeleteKey(void)
DWORD size;
status = pNtDeleteKey(NULL);
- ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08x\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08lx\n", status);
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
status = pNtOpenKey(&hkey, KEY_ALL_ACCESS, &attr);
- ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08lx\n", status);
status = pNtDeleteKey(hkey);
- ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08lx\n", status);
status = pNtQueryKey(hkey, KeyNameInformation, buffer, sizeof(buffer), &size);
- ok(status == STATUS_KEY_DELETED, "got %#x\n", status);
+ ok(status == STATUS_KEY_DELETED, "got %#lx\n", status);
status = pNtEnumerateKey(hkey, 0, KeyFullInformation, buffer, sizeof(buffer), &size);
- ok(status == STATUS_KEY_DELETED, "got %#x\n", status);
+ ok(status == STATUS_KEY_DELETED, "got %#lx\n", status);
pRtlInitUnicodeString(&string, L"value");
status = pNtQueryValueKey(hkey, &string, KeyValueBasicInformation, buffer, sizeof(buffer), &size);
- ok(status == STATUS_KEY_DELETED, "got %#x\n", status);
+ ok(status == STATUS_KEY_DELETED, "got %#lx\n", status);
status = pNtEnumerateValueKey(hkey, 0, KeyValuePartialInformation, buffer, sizeof(buffer), &size);
- ok(status == STATUS_KEY_DELETED, "got %#x\n", status);
+ ok(status == STATUS_KEY_DELETED, "got %#lx\n", status);
status = pNtSetValueKey(hkey, &string, 0, REG_SZ, "test", 5);
- ok(status == STATUS_KEY_DELETED, "got %#x\n", status);
+ ok(status == STATUS_KEY_DELETED, "got %#lx\n", status);
status = pNtDeleteValueKey(hkey, &string);
- ok(status == STATUS_KEY_DELETED, "got %#x\n", status);
+ ok(status == STATUS_KEY_DELETED, "got %#lx\n", status);
status = pNtDeleteKey(hkey);
- todo_wine ok(!status, "got %#x\n", status);
+ todo_wine ok(!status, "got %#lx\n", status);
RtlInitUnicodeString(&string, L"subkey");
InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, hkey, NULL);
status = pNtOpenKey(&hkey2, KEY_READ, &attr);
- ok(status == STATUS_KEY_DELETED, "got %#x\n", status);
+ ok(status == STATUS_KEY_DELETED, "got %#lx\n", status);
status = pNtCreateKey(&hkey2, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL);
- ok(status == STATUS_KEY_DELETED, "got %#x\n", status);
+ ok(status == STATUS_KEY_DELETED, "got %#lx\n", status);
status = pNtQueryObject(hkey, ObjectNameInformation, buffer, sizeof(buffer), &size);
- ok(status == STATUS_KEY_DELETED, "got %#x\n", status);
+ ok(status == STATUS_KEY_DELETED, "got %#lx\n", status);
status = pNtQueryObject(hkey, ObjectBasicInformation, buffer, sizeof(OBJECT_BASIC_INFORMATION), &size);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
status = pNtClose(hkey);
- ok(status == STATUS_SUCCESS, "got %#x\n", status);
+ ok(status == STATUS_SUCCESS, "got %#lx\n", status);
}
static void test_NtQueryLicenseKey(void)
@@ -926,9 +927,9 @@ static void test_NtQueryLicenseKey(void)
len = 0xbeef;
memset(&name, 0, sizeof(name));
status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len);
- ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status);
- ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
- ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len);
+ ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08lx, expected STATUS_INVALID_PARAMETER\n", status);
+ ok(type == 0xdead, "expected unmodified value for type, got %lu\n", type);
+ ok(len == 0xbeef, "expected unmodified value for len, got %lu\n", len);
/* test with empty key */
pRtlCreateUnicodeStringFromAsciiz(&name, "");
@@ -936,26 +937,26 @@ static void test_NtQueryLicenseKey(void)
type = 0xdead;
len = 0xbeef;
status = pNtQueryLicenseValue(NULL, &type, buffer, sizeof(buffer), &len);
- ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status);
- ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
- ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len);
+ ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08lx, expected STATUS_INVALID_PARAMETER\n", status);
+ ok(type == 0xdead, "expected unmodified value for type, got %lu\n", type);
+ ok(len == 0xbeef, "expected unmodified value for len, got %lu\n", len);
type = 0xdead;
status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), NULL);
- ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status);
- ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
+ ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08lx, expected STATUS_INVALID_PARAMETER\n", status);
+ ok(type == 0xdead, "expected unmodified value for type, got %lu\n", type);
len = 0xbeef;
status = pNtQueryLicenseValue(&name, NULL, buffer, sizeof(buffer), &len);
- ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status);
- ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len);
+ ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08lx, expected STATUS_INVALID_PARAMETER\n", status);
+ ok(len == 0xbeef, "expected unmodified value for len, got %lu\n", len);
type = 0xdead;
len = 0xbeef;
status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len);
- ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status);
- ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
- ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len);
+ ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08lx, expected STATUS_INVALID_PARAMETER\n", status);
+ ok(type == 0xdead, "expected unmodified value for type, got %lu\n", type);
+ ok(len == 0xbeef, "expected unmodified value for len, got %lu\n", len);
pRtlFreeUnicodeString(&name);
@@ -965,26 +966,26 @@ static void test_NtQueryLicenseKey(void)
type = 0xdead;
len = 0xbeef;
status = pNtQueryLicenseValue(NULL, &type, buffer, sizeof(buffer), &len);
- ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status);
- ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
- ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len);
+ ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08lx, expected STATUS_INVALID_PARAMETER\n", status);
+ ok(type == 0xdead, "expected unmodified value for type, got %lu\n", type);
+ ok(len == 0xbeef, "expected unmodified value for len, got %lu\n", len);
type = 0xdead;
status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), NULL);
- ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status);
- ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
+ ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08lx, expected STATUS_INVALID_PARAMETER\n", status);
+ ok(type == 0xdead, "expected unmodified value for type, got %lu\n", type);
len = 0xbeef;
status = pNtQueryLicenseValue(&name, NULL, buffer, sizeof(buffer), &len);
- ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue returned %08x, expected STATUS_OBJECT_NAME_NOT_FOUND\n", status);
- ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len);
+ ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue returned %08lx, expected STATUS_OBJECT_NAME_NOT_FOUND\n", status);
+ ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %lu\n", len);
type = 0xdead;
len = 0xbeef;
status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len);
ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected succeeded\n");
- ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
- ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len);
+ ok(type == 0xdead, "expected unmodified value for type, got %lu\n", type);
+ ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %lu\n", len);
pRtlFreeUnicodeString(&name);
@@ -994,43 +995,43 @@ static void test_NtQueryLicenseKey(void)
type = 0xdead;
len = 0xbeef;
status = pNtQueryLicenseValue(NULL, &type, buffer, sizeof(buffer), &len);
- ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status);
- ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
- ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len);
+ ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08lx, expected STATUS_INVALID_PARAMETER\n", status);
+ ok(type == 0xdead, "expected unmodified value for type, got %lu\n", type);
+ ok(len == 0xbeef, "expected unmodified value for len, got %lu\n", len);
type = 0xdead;
status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), NULL);
- ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status);
- ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
+ ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08lx, expected STATUS_INVALID_PARAMETER\n", status);
+ ok(type == 0xdead, "expected unmodified value for type, got %lu\n", type);
type = 0xdead;
len = 0;
status = pNtQueryLicenseValue(&name, &type, buffer, 0, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status);
- ok(type == REG_SZ, "expected type = REG_SZ, got %u\n", type);
- ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08lx, expected STATUS_BUFFER_TOO_SMALL\n", status);
+ ok(type == REG_SZ, "expected type = REG_SZ, got %lu\n", type);
+ ok(len == sizeof(emptyW), "expected len = %lu, got %lu\n", (DWORD)sizeof(emptyW), len);
len = 0;
status = pNtQueryLicenseValue(&name, NULL, buffer, 0, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status);
- ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08lx, expected STATUS_BUFFER_TOO_SMALL\n", status);
+ ok(len == sizeof(emptyW), "expected len = %lu, got %lu\n", (DWORD)sizeof(emptyW), len);
type = 0xdead;
len = 0;
memset(buffer, 0x11, sizeof(buffer));
status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len);
- ok(status == STATUS_SUCCESS, "NtQueryLicenseValue returned %08x, expected STATUS_SUCCESS\n", status);
- ok(type == REG_SZ, "expected type = REG_SZ, got %u\n", type);
- ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len);
+ ok(status == STATUS_SUCCESS, "NtQueryLicenseValue returned %08lx, expected STATUS_SUCCESS\n", status);
+ ok(type == REG_SZ, "expected type = REG_SZ, got %lu\n", type);
+ ok(len == sizeof(emptyW), "expected len = %lu, got %lu\n", (DWORD)sizeof(emptyW), len);
ok(!memcmp(buffer, emptyW, sizeof(emptyW)), "unexpected buffer content\n");
type = 0xdead;
len = 0;
memset(buffer, 0x11, sizeof(buffer));
status = pNtQueryLicenseValue(&name, &type, buffer, 2, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status);
- ok(type == REG_SZ, "expected type REG_SZ, got %u\n", type);
- ok(len == sizeof(emptyW), "expected len = %u, got %u\n", (DWORD)sizeof(emptyW), len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08lx, expected STATUS_BUFFER_TOO_SMALL\n", status);
+ ok(type == REG_SZ, "expected type REG_SZ, got %lu\n", type);
+ ok(len == sizeof(emptyW), "expected len = %lu, got %lu\n", (DWORD)sizeof(emptyW), len);
ok(buffer[0] == 0x1111, "expected buffer[0] = 0x1111, got %u\n", buffer[0]);
pRtlFreeUnicodeString(&name);
@@ -1041,42 +1042,42 @@ static void test_NtQueryLicenseKey(void)
type = 0xdead;
len = 0xbeef;
status = pNtQueryLicenseValue(NULL, &type, &value, sizeof(value), &len);
- ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status);
- ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
- ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len);
+ ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08lx, expected STATUS_INVALID_PARAMETER\n", status);
+ ok(type == 0xdead, "expected unmodified value for type, got %lu\n", type);
+ ok(len == 0xbeef, "expected unmodified value for len, got %lu\n", len);
type = 0xdead;
status = pNtQueryLicenseValue(&name, &type, &value, sizeof(value), NULL);
- ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08x, expected STATUS_INVALID_PARAMETER\n", status);
- ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
+ ok(status == STATUS_INVALID_PARAMETER, "NtQueryLicenseValue returned %08lx, expected STATUS_INVALID_PARAMETER\n", status);
+ ok(type == 0xdead, "expected unmodified value for type, got %lu\n", type);
type = 0xdead;
len = 0;
status = pNtQueryLicenseValue(&name, &type, &value, 0, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status);
- ok(type == REG_DWORD, "expected type = REG_DWORD, got %u\n", type);
- ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08lx, expected STATUS_BUFFER_TOO_SMALL\n", status);
+ ok(type == REG_DWORD, "expected type = REG_DWORD, got %lu\n", type);
+ ok(len == sizeof(value), "expected len = %lu, got %lu\n", (DWORD)sizeof(value), len);
len = 0;
status = pNtQueryLicenseValue(&name, NULL, &value, 0, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status);
- ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08lx, expected STATUS_BUFFER_TOO_SMALL\n", status);
+ ok(len == sizeof(value), "expected len = %lu, got %lu\n", (DWORD)sizeof(value), len);
type = 0xdead;
len = 0;
value = 0xdeadbeef;
status = pNtQueryLicenseValue(&name, &type, &value, sizeof(value), &len);
- ok(status == STATUS_SUCCESS, "NtQueryLicenseValue returned %08x, expected STATUS_SUCCESS\n", status);
- ok(type == REG_DWORD, "expected type = REG_DWORD, got %u\n", type);
- ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len);
+ ok(status == STATUS_SUCCESS, "NtQueryLicenseValue returned %08lx, expected STATUS_SUCCESS\n", status);
+ ok(type == REG_DWORD, "expected type = REG_DWORD, got %lu\n", type);
+ ok(len == sizeof(value), "expected len = %lu, got %lu\n", (DWORD)sizeof(value), len);
ok(value != 0xdeadbeef, "expected value != 0xdeadbeef\n");
type = 0xdead;
len = 0;
status = pNtQueryLicenseValue(&name, &type, &value, 2, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08x, expected STATUS_BUFFER_TOO_SMALL\n", status);
- ok(type == REG_DWORD, "expected type REG_DWORD, got %u\n", type);
- ok(len == sizeof(value), "expected len = %u, got %u\n", (DWORD)sizeof(value), len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryLicenseValue returned %08lx, expected STATUS_BUFFER_TOO_SMALL\n", status);
+ ok(type == REG_DWORD, "expected type REG_DWORD, got %lu\n", type);
+ ok(len == sizeof(value), "expected len = %lu, got %lu\n", (DWORD)sizeof(value), len);
pRtlFreeUnicodeString(&name);
}
@@ -1086,7 +1087,7 @@ static void test_RtlpNtQueryValueKey(void)
NTSTATUS status;
status = pRtlpNtQueryValueKey(NULL, NULL, NULL, NULL, NULL);
- ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08x\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08lx\n", status);
}
static void test_symlinks(void)
@@ -1123,75 +1124,75 @@ static void test_symlinks(void)
attr.SecurityQualityOfService = NULL;
status = pNtCreateKey( &root, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
attr.RootDirectory = root;
attr.ObjectName = &link_str;
status = pNtCreateKey( &link, KEY_ALL_ACCESS, &attr, 0, 0, REG_OPTION_CREATE_LINK, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
/* REG_SZ is not allowed */
status = pNtSetValueKey( link, &symlink_str, 0, REG_SZ, target, target_len );
- ok( status == STATUS_ACCESS_DENIED, "NtSetValueKey wrong status 0x%08x\n", status );
+ ok( status == STATUS_ACCESS_DENIED, "NtSetValueKey wrong status 0x%08lx\n", status );
status = pNtSetValueKey( link, &symlink_str, 0, REG_LINK, target, target_len - sizeof(WCHAR) );
- ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status );
/* other values are not allowed */
status = pNtSetValueKey( link, &link_str, 0, REG_LINK, target, target_len - sizeof(WCHAR) );
- ok( status == STATUS_ACCESS_DENIED, "NtSetValueKey wrong status 0x%08x\n", status );
+ ok( status == STATUS_ACCESS_DENIED, "NtSetValueKey wrong status 0x%08lx\n", status );
/* try opening the target through the link */
attr.ObjectName = &link_str;
key = (HANDLE)0xdeadbeef;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08lx\n", status );
ok( !key, "key = %p\n", key );
attr.ObjectName = &target_str;
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
dw = 0xbeef;
status = pNtSetValueKey( key, &value_str, 0, REG_DWORD, &dw, sizeof(dw) );
- ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status );
pNtClose( key );
attr.ObjectName = &link_str;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &value_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
- ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + sizeof(DWORD), "wrong len %u\n", len );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
+ ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + sizeof(DWORD), "wrong len %lu\n", len );
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08lx\n", status );
/* REG_LINK can be created in non-link keys */
status = pNtSetValueKey( key, &symlink_str, 0, REG_LINK, target, target_len - sizeof(WCHAR) );
- ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR),
- "wrong len %u\n", len );
+ "wrong len %lu\n", len );
status = pNtDeleteValueKey( key, &symlink_str );
- ok( status == STATUS_SUCCESS, "NtDeleteValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtDeleteValueKey failed: 0x%08lx\n", status );
pNtClose( key );
attr.Attributes = 0;
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &value_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
- ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + sizeof(DWORD), "wrong len %u\n", len );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
+ ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + sizeof(DWORD), "wrong len %lu\n", len );
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08lx\n", status );
pNtClose( key );
/* now open the symlink itself */
@@ -1200,87 +1201,87 @@ static void test_symlinks(void)
attr.Attributes = OBJ_OPENLINK;
attr.ObjectName = &link_str;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR),
- "wrong len %u\n", len );
+ "wrong len %lu\n", len );
pNtClose( key );
if (pNtOpenKeyEx)
{
/* REG_OPTION_OPEN_LINK flag doesn't matter */
status = pNtOpenKeyEx( &key, KEY_ALL_ACCESS, &attr, REG_OPTION_OPEN_LINK );
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR),
- "wrong len %u\n", len );
+ "wrong len %lu\n", len );
pNtClose( key );
status = pNtOpenKeyEx( &key, KEY_ALL_ACCESS, &attr, 0 );
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR),
- "wrong len %u\n", len );
+ "wrong len %lu\n", len );
pNtClose( key );
attr.Attributes = 0;
status = pNtOpenKeyEx( &key, KEY_ALL_ACCESS, &attr, REG_OPTION_OPEN_LINK );
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08lx\n", status );
pNtClose( key );
}
attr.Attributes = OBJ_OPENLINK;
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR),
- "wrong len %u\n", len );
+ "wrong len %lu\n", len );
pNtClose( key );
/* delete target and create by NtCreateKey on link */
attr.ObjectName = &target_str;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
status = pNtDeleteKey( key );
- ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08lx\n", status );
pNtClose( key );
attr.ObjectName = &link_str;
attr.Attributes = 0;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08lx\n", status );
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- todo_wine ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ todo_wine ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
pNtClose( key );
if (status) /* can be removed once todo_wine above is fixed */
{
attr.ObjectName = &target_str;
attr.Attributes = OBJ_OPENLINK;
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
pNtClose( key );
}
attr.ObjectName = &target_str;
attr.Attributes = OBJ_OPENLINK;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
- ok( status == STATUS_SUCCESS, "NtOpenKey wrong status 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey wrong status 0x%08lx\n", status );
if (0) /* crashes the Windows kernel on some Vista systems */
{
@@ -1290,21 +1291,21 @@ static void test_symlinks(void)
attr.Attributes = OBJ_OPENLINK;
attr.ObjectName = &null_str;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR),
- "wrong len %u\n", len );
+ "wrong len %lu\n", len );
pNtClose( key );
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR),
- "wrong len %u\n", len );
+ "wrong len %lu\n", len );
pNtClose( key );
}
@@ -1314,79 +1315,79 @@ static void test_symlinks(void)
attr.Attributes = 0;
attr.ObjectName = &null_str;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08lx\n", status );
pNtClose( key );
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08lx\n", status );
pNtClose( key );
}
/* target with terminating null doesn't work */
status = pNtSetValueKey( link, &symlink_str, 0, REG_LINK, target, target_len );
- ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status );
attr.RootDirectory = root;
attr.Attributes = 0;
attr.ObjectName = &link_str;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
- ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08lx\n", status );
/* relative symlink, works only on win2k */
status = pNtSetValueKey( link, &symlink_str, 0, REG_LINK, targetW+1, sizeof(targetW)-2*sizeof(WCHAR) );
- ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status );
attr.ObjectName = &link_str;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
ok( status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_OBJECT_NAME_INVALID /* Win10 1607+ */,
- "NtOpenKey wrong status 0x%08x\n", status );
+ "NtOpenKey wrong status 0x%08lx\n", status );
key = (HKEY)0xdeadbeef;
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, REG_OPTION_CREATE_LINK, NULL );
- ok( status == STATUS_OBJECT_NAME_COLLISION, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_COLLISION, "NtCreateKey failed: 0x%08lx\n", status );
ok( !key, "key = %p\n", key );
status = pNtDeleteKey( link );
- ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08lx\n", status );
pNtClose( link );
attr.ObjectName = &target_str;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
status = pNtDeleteKey( key );
- ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08lx\n", status );
pNtClose( key );
/* symlink loop */
status = pNtCreateKey( &link, KEY_ALL_ACCESS, &attr, 0, 0, REG_OPTION_CREATE_LINK, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
memcpy( target + target_len/sizeof(WCHAR) - 1, targetW, sizeof(targetW) );
status = pNtSetValueKey( link, &symlink_str, 0, REG_LINK,
target, target_len + sizeof(targetW) - sizeof(WCHAR) );
- ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status );
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
ok( status == STATUS_OBJECT_NAME_NOT_FOUND /* XP */
|| status == STATUS_NAME_TOO_LONG
|| status == STATUS_INVALID_PARAMETER /* Win10 1607+ */,
- "NtOpenKey failed: 0x%08x\n", status );
+ "NtOpenKey failed: 0x%08lx\n", status );
attr.Attributes = OBJ_OPENLINK;
status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr );
- ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status );
pNtClose( key );
status = pNtDeleteKey( link );
- ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08lx\n", status );
pNtClose( link );
status = pNtDeleteKey( root );
- ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08lx\n", status );
pNtClose( root );
pRtlFreeHeap(GetProcessHeap(), 0, target);
@@ -1416,14 +1417,14 @@ static DWORD get_key_value( HANDLE root, const char *name, DWORD flags )
status = pNtCreateKey( &key, flags | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
if (status == STATUS_OBJECT_NAME_NOT_FOUND) return 0;
- ok( status == STATUS_SUCCESS, "%08x: NtCreateKey failed: 0x%08x\n", flags, status );
+ ok( status == STATUS_SUCCESS, "%08lx: NtCreateKey failed: 0x%08lx\n", flags, status );
status = pNtQueryValueKey( key, &value_str, KeyValuePartialInformation, info, len, &len );
if (status == STATUS_OBJECT_NAME_NOT_FOUND)
dw = 0;
else
{
- ok( status == STATUS_SUCCESS, "%08x: NtQueryValueKey failed: 0x%08x\n", flags, status );
+ ok( status == STATUS_SUCCESS, "%08lx: NtQueryValueKey failed: 0x%08lx\n", flags, status );
dw = *(DWORD *)info->Data;
}
pNtClose( key );
@@ -1434,7 +1435,7 @@ static DWORD get_key_value( HANDLE root, const char *name, DWORD flags )
static void _check_key_value( int line, HANDLE root, const char *name, DWORD flags, DWORD expect )
{
DWORD dw = get_key_value( root, name, flags );
- ok_(__FILE__,line)( dw == expect, "%08x: wrong value %u/%u\n", flags, dw, expect );
+ ok_(__FILE__,line)( dw == expect, "%08lx: wrong value %lu/%lu\n", flags, dw, expect );
}
#define check_key_value(root,name,flags,expect) _check_key_value( __LINE__, root, name, flags, expect )
@@ -1511,43 +1512,43 @@ static void test_redirection(void)
skip("Not authorized to modify KEY_WOW64_64KEY, no redirection\n");
return;
}
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
pRtlInitUnicodeString( &str, wine32W );
status = pNtCreateKey( &root32, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
pRtlInitUnicodeString( &str, key64W );
status = pNtCreateKey( &key64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
pRtlInitUnicodeString( &str, key32W );
status = pNtCreateKey( &key32, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
dw = 64;
status = pNtSetValueKey( key64, &value_str, 0, REG_DWORD, &dw, sizeof(dw) );
- ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status );
dw = 32;
status = pNtSetValueKey( key32, &value_str, 0, REG_DWORD, &dw, sizeof(dw) );
- ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key32, &value_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
dw = *(DWORD *)info->Data;
- ok( dw == 32, "wrong value %u\n", dw );
+ ok( dw == 32, "wrong value %lu\n", dw );
len = sizeof(buffer);
status = pNtQueryValueKey( key64, &value_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
dw = *(DWORD *)info->Data;
- ok( dw == 64, "wrong value %u\n", dw );
+ ok( dw == 64, "wrong value %lu\n", dw );
pRtlInitUnicodeString( &str, softwareW );
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
if (ptr_size == 32)
{
@@ -1575,19 +1576,19 @@ static void test_redirection(void)
if (ptr_size == 32)
{
status = pNtCreateKey( &key, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
dw = get_key_value( key, "Wine\\Winetest", 0 );
- ok( dw == 64 || broken(dw == 32) /* xp64 */, "wrong value %u\n", dw );
+ ok( dw == 64 || broken(dw == 32) /* xp64 */, "wrong value %lu\n", dw );
check_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY, 64 );
check_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY, 32 );
check_key_value( key, "Wow6432Node\\Wine\\Winetest", 0, 32 );
dw = get_key_value( key, "Wow6432Node\\Wine\\Winetest", KEY_WOW64_64KEY );
- ok( dw == 32 || broken(dw == 64) /* xp64 */, "wrong value %u\n", dw );
+ ok( dw == 32 || broken(dw == 64) /* xp64 */, "wrong value %lu\n", dw );
check_key_value( key, "Wow6432Node\\Wine\\Winetest", KEY_WOW64_32KEY, 32 );
pNtClose( key );
status = pNtCreateKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
check_key_value( key, "Wine\\Winetest", 0, 32 );
check_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY, is_vista ? 64 : 32 );
check_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY, 32 );
@@ -1617,7 +1618,7 @@ static void test_redirection(void)
pRtlInitUnicodeString( &str, wownodeW );
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
check_key_value( key, "Wine\\Winetest", 0, 32 );
check_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY, (ptr_size == 64) ? 32 : (is_vista ? 64 : 32) );
check_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY, 32 );
@@ -1626,15 +1627,15 @@ static void test_redirection(void)
if (ptr_size == 32)
{
status = pNtCreateKey( &key, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
dw = get_key_value( key, "Wine\\Winetest", 0 );
- ok( dw == (is_vista ? 64 : 32) || broken(dw == 32) /* xp64 */, "wrong value %u\n", dw );
+ ok( dw == (is_vista ? 64 : 32) || broken(dw == 32) /* xp64 */, "wrong value %lu\n", dw );
check_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY, is_vista ? 64 : 32 );
check_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY, 32 );
pNtClose( key );
status = pNtCreateKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
check_key_value( key, "Wine\\Winetest", 0, 32 );
check_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY, is_vista ? 64 : 32 );
check_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY, 32 );
@@ -1643,7 +1644,7 @@ static void test_redirection(void)
pRtlInitUnicodeString( &str, wine32W );
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
check_key_value( key, "Winetest", 0, 32 );
check_key_value( key, "Winetest", KEY_WOW64_64KEY, (ptr_size == 32 && is_vista) ? 64 : 32 );
check_key_value( key, "Winetest", KEY_WOW64_32KEY, 32 );
@@ -1652,15 +1653,15 @@ static void test_redirection(void)
if (ptr_size == 32)
{
status = pNtCreateKey( &key, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
dw = get_key_value( key, "Winetest", 0 );
- ok( dw == 32 || (is_vista && dw == 64), "wrong value %u\n", dw );
+ ok( dw == 32 || (is_vista && dw == 64), "wrong value %lu\n", dw );
check_key_value( key, "Winetest", KEY_WOW64_64KEY, is_vista ? 64 : 32 );
check_key_value( key, "Winetest", KEY_WOW64_32KEY, 32 );
pNtClose( key );
status = pNtCreateKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
check_key_value( key, "Winetest", 0, 32 );
check_key_value( key, "Winetest", KEY_WOW64_64KEY, is_vista ? 64 : 32 );
check_key_value( key, "Winetest", KEY_WOW64_32KEY, 32 );
@@ -1669,7 +1670,7 @@ static void test_redirection(void)
pRtlInitUnicodeString( &str, wine64W );
status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
check_key_value( key, "Winetest", 0, ptr_size );
check_key_value( key, "Winetest", KEY_WOW64_64KEY, is_vista ? 64 : ptr_size );
check_key_value( key, "Winetest", KEY_WOW64_32KEY, ptr_size );
@@ -1678,16 +1679,16 @@ static void test_redirection(void)
if (ptr_size == 32)
{
status = pNtCreateKey( &key, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
dw = get_key_value( key, "Winetest", 0 );
- ok( dw == 64 || broken(dw == 32) /* xp64 */, "wrong value %u\n", dw );
+ ok( dw == 64 || broken(dw == 32) /* xp64 */, "wrong value %lu\n", dw );
check_key_value( key, "Winetest", KEY_WOW64_64KEY, 64 );
dw = get_key_value( key, "Winetest", KEY_WOW64_32KEY );
- todo_wine ok( dw == 32, "wrong value %u\n", dw );
+ todo_wine ok( dw == 32, "wrong value %lu\n", dw );
pNtClose( key );
status = pNtCreateKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
check_key_value( key, "Winetest", 0, 32 );
check_key_value( key, "Winetest", KEY_WOW64_64KEY, is_vista ? 64 : 32 );
check_key_value( key, "Winetest", KEY_WOW64_32KEY, 32 );
@@ -1695,11 +1696,11 @@ static void test_redirection(void)
}
status = pNtDeleteKey( key32 );
- ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08lx\n", status );
pNtClose( key32 );
status = pNtDeleteKey( key64 );
- ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08lx\n", status );
pNtClose( key64 );
pNtDeleteKey( root32 );
@@ -1716,39 +1717,39 @@ static void test_redirection(void)
skip("Not authorized to modify the Classes key\n");
return;
}
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
pRtlInitUnicodeString( &str, classes32W );
status = pNtCreateKey( &key32, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
dw = 64;
status = pNtSetValueKey( key64, &value_str, 0, REG_DWORD, &dw, sizeof(dw) );
- ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status );
pNtClose( key64 );
dw = 32;
status = pNtSetValueKey( key32, &value_str, 0, REG_DWORD, &dw, sizeof(dw) );
- ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status );
pNtClose( key32 );
pRtlInitUnicodeString( &str, classes64W );
status = pNtCreateKey( &key64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key64, &value_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
dw = *(DWORD *)info->Data;
- ok( dw == ptr_size, "wrong value %u\n", dw );
+ ok( dw == ptr_size, "wrong value %lu\n", dw );
pRtlInitUnicodeString( &str, classes32W );
status = pNtCreateKey( &key32, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status );
len = sizeof(buffer);
status = pNtQueryValueKey( key32, &value_str, KeyValuePartialInformation, info, len, &len );
- ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08lx\n", status );
dw = *(DWORD *)info->Data;
- ok( dw == 32, "wrong value %u\n", dw );
+ ok( dw == 32, "wrong value %lu\n", dw );
pNtDeleteKey( key32 );
pNtClose( key32 );
@@ -1766,7 +1767,7 @@ static void test_long_value_name(void)
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
status = pNtOpenKey(&key, KEY_WRITE|KEY_READ, &attr);
- ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08lx\n", status);
ValName.MaximumLength = 0xfffc;
ValName.Length = ValName.MaximumLength - sizeof(WCHAR);
@@ -1776,16 +1777,16 @@ static void test_long_value_name(void)
ValName.Buffer[i] = 0;
status = pNtDeleteValueKey(key, &ValName);
- ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtDeleteValueKey with nonexistent long value name returned 0x%08x\n", status);
+ ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtDeleteValueKey with nonexistent long value name returned 0x%08lx\n", status);
status = pNtSetValueKey(key, &ValName, 0, REG_DWORD, &i, sizeof(i));
ok(status == STATUS_INVALID_PARAMETER || broken(status == STATUS_SUCCESS) /* nt4 */,
- "NtSetValueKey with long value name returned 0x%08x\n", status);
+ "NtSetValueKey with long value name returned 0x%08lx\n", status);
expected = (status == STATUS_SUCCESS) ? STATUS_SUCCESS : STATUS_OBJECT_NAME_NOT_FOUND;
status = pNtDeleteValueKey(key, &ValName);
- ok(status == expected, "NtDeleteValueKey with long value name returned 0x%08x\n", status);
+ ok(status == expected, "NtDeleteValueKey with long value name returned 0x%08lx\n", status);
status = pNtQueryValueKey(key, &ValName, KeyValueBasicInformation, NULL, 0, &i);
- ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey with nonexistent long value name returned 0x%08x\n", status);
+ ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey with nonexistent long value name returned 0x%08lx\n", status);
pRtlFreeUnicodeString(&ValName);
pNtClose(key);
@@ -1804,7 +1805,7 @@ static void test_NtQueryKey(void)
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
status = pNtOpenKey(&key, KEY_READ, &attr);
- ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08lx\n", status);
status = pNtQueryKey(key, KeyNameInformation, NULL, 0, &length);
if (status == STATUS_INVALID_PARAMETER) {
@@ -1812,20 +1813,20 @@ static void test_NtQueryKey(void)
pNtClose(key);
return;
}
- todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08x\n", status);
+ todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status);
info = HeapAlloc(GetProcessHeap(), 0, length);
/* non-zero buffer size, but insufficient */
status = pNtQueryKey(key, KeyNameInformation, info, sizeof(*info), &len);
- ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryKey Failed: 0x%08x\n", status);
- ok(length == len, "got %d, expected %d\n", len, length);
- ok(info->NameLength == winetestpath.Length, "got %d, expected %d\n",
+ ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryKey Failed: 0x%08lx\n", status);
+ ok(length == len, "got %ld, expected %ld\n", len, length);
+ ok(info->NameLength == winetestpath.Length, "got %ld, expected %d\n",
info->NameLength, winetestpath.Length);
/* correct buffer size */
status = pNtQueryKey(key, KeyNameInformation, info, length, &len);
- ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status);
- ok(length == len, "got %d, expected %d\n", len, length);
+ ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08lx\n", status);
+ ok(length == len, "got %ld, expected %ld\n", len, length);
str.Buffer = info->Name;
str.Length = info->NameLength;
@@ -1840,54 +1841,54 @@ static void test_NtQueryKey(void)
attr.ObjectName = &str;
pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey");
status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0);
- ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status);
pRtlFreeUnicodeString(&str);
status = pNtQueryKey(subkey, KeyCachedInformation, &cached_info, sizeof(cached_info), &len);
- ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08lx\n", status);
if (status == STATUS_SUCCESS)
{
- ok(len == sizeof(cached_info), "got unexpected length %d\n", len);
- ok(cached_info.SubKeys == 0, "cached_info.SubKeys = %u\n", cached_info.SubKeys);
- ok(cached_info.MaxNameLen == 0, "cached_info.MaxNameLen = %u\n", cached_info.MaxNameLen);
- ok(cached_info.Values == 0, "cached_info.Values = %u\n", cached_info.Values);
- ok(cached_info.MaxValueNameLen == 0, "cached_info.MaxValueNameLen = %u\n", cached_info.MaxValueNameLen);
- ok(cached_info.MaxValueDataLen == 0, "cached_info.MaxValueDataLen = %u\n", cached_info.MaxValueDataLen);
- ok(cached_info.NameLength == 22, "cached_info.NameLength = %u\n", cached_info.NameLength);
+ ok(len == sizeof(cached_info), "got unexpected length %ld\n", len);
+ ok(cached_info.SubKeys == 0, "cached_info.SubKeys = %lu\n", cached_info.SubKeys);
+ ok(cached_info.MaxNameLen == 0, "cached_info.MaxNameLen = %lu\n", cached_info.MaxNameLen);
+ ok(cached_info.Values == 0, "cached_info.Values = %lu\n", cached_info.Values);
+ ok(cached_info.MaxValueNameLen == 0, "cached_info.MaxValueNameLen = %lu\n", cached_info.MaxValueNameLen);
+ ok(cached_info.MaxValueDataLen == 0, "cached_info.MaxValueDataLen = %lu\n", cached_info.MaxValueDataLen);
+ ok(cached_info.NameLength == 22, "cached_info.NameLength = %lu\n", cached_info.NameLength);
}
attr.RootDirectory = subkey;
attr.ObjectName = &str;
pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey2");
status = pNtCreateKey(&subkey2, GENERIC_ALL, &attr, 0, 0, 0, 0);
- ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status);
pRtlFreeUnicodeString(&str);
pRtlCreateUnicodeStringFromAsciiz(&str, "val");
dw = 64;
status = pNtSetValueKey( subkey, &str, 0, REG_DWORD, &dw, sizeof(dw) );
- ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08lx\n", status );
pRtlFreeUnicodeString(&str);
status = pNtQueryKey(subkey, KeyCachedInformation, &cached_info, sizeof(cached_info), &len);
- ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08lx\n", status);
if (status == STATUS_SUCCESS)
{
- ok(len == sizeof(cached_info), "got unexpected length %d\n", len);
- ok(cached_info.SubKeys == 1, "cached_info.SubKeys = %u\n", cached_info.SubKeys);
- ok(cached_info.MaxNameLen == 24, "cached_info.MaxNameLen = %u\n", cached_info.MaxNameLen);
- ok(cached_info.Values == 1, "cached_info.Values = %u\n", cached_info.Values);
- ok(cached_info.MaxValueNameLen == 6, "cached_info.MaxValueNameLen = %u\n", cached_info.MaxValueNameLen);
- ok(cached_info.MaxValueDataLen == 4, "cached_info.MaxValueDataLen = %u\n", cached_info.MaxValueDataLen);
- ok(cached_info.NameLength == 22, "cached_info.NameLength = %u\n", cached_info.NameLength);
+ ok(len == sizeof(cached_info), "got unexpected length %ld\n", len);
+ ok(cached_info.SubKeys == 1, "cached_info.SubKeys = %lu\n", cached_info.SubKeys);
+ ok(cached_info.MaxNameLen == 24, "cached_info.MaxNameLen = %lu\n", cached_info.MaxNameLen);
+ ok(cached_info.Values == 1, "cached_info.Values = %lu\n", cached_info.Values);
+ ok(cached_info.MaxValueNameLen == 6, "cached_info.MaxValueNameLen = %lu\n", cached_info.MaxValueNameLen);
+ ok(cached_info.MaxValueDataLen == 4, "cached_info.MaxValueDataLen = %lu\n", cached_info.MaxValueDataLen);
+ ok(cached_info.NameLength == 22, "cached_info.NameLength = %lu\n", cached_info.NameLength);
}
status = pNtDeleteKey(subkey2);
- ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %lx\n", status);
status = pNtDeleteKey(subkey);
- ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %lx\n", status);
pNtClose(subkey2);
pNtClose(subkey);
@@ -1906,114 +1907,114 @@ static void test_notify(void)
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr);
- ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08lx\n", status);
status = pNtOpenKey(&key2, KEY_ALL_ACCESS, &attr);
- ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08lx\n", status);
for (i = 0; i < ARRAY_SIZE(events); ++i)
events[i] = CreateEventW(NULL, TRUE, TRUE, NULL);
status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE);
- ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+ ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %lx\n", status);
status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE);
- ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+ ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %lx\n", status);
status = pNtNotifyChangeKey(key2, events[2], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE);
- ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+ ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %lx\n", status);
status = pNtNotifyChangeKey(key2, events[3], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE);
- ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+ ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %lx\n", status);
status = WaitForMultipleObjects(4, events, FALSE, 0);
- ok(status == WAIT_TIMEOUT, "got %d\n", status);
+ ok(status == WAIT_TIMEOUT, "got %ld\n", status);
attr.RootDirectory = key;
attr.ObjectName = &str;
pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey");
status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0);
- ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status);
pRtlFreeUnicodeString(&str);
status = pNtWaitForSingleObject(events[0], FALSE, &timeout);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[1], FALSE, &timeout);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[2], FALSE, &timeout);
- ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+ ok(status == STATUS_TIMEOUT, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[3], FALSE, &timeout);
- ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+ ok(status == STATUS_TIMEOUT, "got %#lx\n", status);
status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE);
- ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+ ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %lx\n", status);
status = pNtWaitForSingleObject(events[0], FALSE, &timeout);
- ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+ ok(status == STATUS_TIMEOUT, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[1], FALSE, &timeout);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[2], FALSE, &timeout);
- ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+ ok(status == STATUS_TIMEOUT, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[3], FALSE, &timeout);
- ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+ ok(status == STATUS_TIMEOUT, "got %#lx\n", status);
status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE);
- ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+ ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %lx\n", status);
status = WaitForMultipleObjects(4, events, FALSE, 0);
- ok(status == WAIT_TIMEOUT, "got %d\n", status);
+ ok(status == WAIT_TIMEOUT, "got %ld\n", status);
status = pNtDeleteKey(subkey);
- ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %lx\n", status);
status = pNtWaitForSingleObject(events[0], FALSE, &timeout);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[1], FALSE, &timeout);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[2], FALSE, &timeout);
- ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+ ok(status == STATUS_TIMEOUT, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[3], FALSE, &timeout);
- ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+ ok(status == STATUS_TIMEOUT, "got %#lx\n", status);
pNtClose(subkey);
status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE);
- ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+ ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %lx\n", status);
status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE);
- ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+ ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %lx\n", status);
pNtClose(key);
status = pNtWaitForSingleObject(events[0], FALSE, &timeout);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[1], FALSE, &timeout);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[2], FALSE, &timeout);
- ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+ ok(status == STATUS_TIMEOUT, "got %#lx\n", status);
status = pNtWaitForSingleObject(events[3], FALSE, &timeout);
- ok(status == STATUS_TIMEOUT, "got %#x\n", status);
+ ok(status == STATUS_TIMEOUT, "got %#lx\n", status);
if (pNtNotifyChangeMultipleKeys)
{
InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);
status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr);
- ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08lx\n", status);
status = pNtNotifyChangeMultipleKeys(key, 0, NULL, events[0], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE);
- ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status);
+ ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %lx\n", status);
status = pNtWaitForSingleObject(events[0], FALSE, &timeout);
- ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status);
+ ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %lx\n", status);
attr.RootDirectory = key;
attr.ObjectName = &str;
pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey");
status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0);
- ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status);
pRtlFreeUnicodeString(&str);
status = pNtWaitForSingleObject(events[0], FALSE, &timeout);
- ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %lx\n", status);
status = pNtDeleteKey(subkey);
- ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %lx\n", status);
pNtClose(subkey);
pNtClose(key);
}
@@ -2043,55 +2044,55 @@ static void test_RtlCreateRegistryKey(void)
/* should work */
status = pRtlCreateRegistryKey(RTL_REGISTRY_ABSOLUTE, winetestpath.Buffer);
- ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08lx\n", status);
status = pRtlCreateRegistryKey(RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL, winetestpath.Buffer);
- ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08lx\n", status);
status = pRtlCreateRegistryKey(RTL_REGISTRY_USER, NULL);
- ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08lx\n", status);
status = pRtlCreateRegistryKey(RTL_REGISTRY_USER | RTL_REGISTRY_OPTIONAL, NULL);
- ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08lx\n", status);
status = pRtlCreateRegistryKey(RTL_REGISTRY_USER, empty);
- ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08lx\n", status);
status = pRtlCreateRegistryKey(RTL_REGISTRY_USER | RTL_REGISTRY_OPTIONAL, empty);
- ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08x\n", status);
+ ok(status == STATUS_SUCCESS, "RtlCreateRegistryKey failed: %08lx\n", status);
/* invalid first parameter */
status = pRtlCreateRegistryKey(RTL_REGISTRY_USER+1, winetestpath.Buffer);
- ok(status == STATUS_INVALID_PARAMETER, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_INVALID_PARAMETER);
+ ok(status == STATUS_INVALID_PARAMETER, "RtlCreateRegistryKey unexpected return value: %08lx, expected %08lx\n", status, STATUS_INVALID_PARAMETER);
status = pRtlCreateRegistryKey((RTL_REGISTRY_USER+1) | RTL_REGISTRY_OPTIONAL, winetestpath.Buffer);
- ok(status == STATUS_INVALID_PARAMETER, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_INVALID_PARAMETER);
+ ok(status == STATUS_INVALID_PARAMETER, "RtlCreateRegistryKey unexpected return value: %08lx, expected %08lx\n", status, STATUS_INVALID_PARAMETER);
/* invalid second parameter */
status = pRtlCreateRegistryKey(RTL_REGISTRY_ABSOLUTE, NULL);
- ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_OBJECT_PATH_SYNTAX_BAD);
+ ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCreateRegistryKey unexpected return value: %08lx, expected %08lx\n", status, STATUS_OBJECT_PATH_SYNTAX_BAD);
status = pRtlCreateRegistryKey(RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL, NULL);
- ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_OBJECT_PATH_SYNTAX_BAD);
+ ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCreateRegistryKey unexpected return value: %08lx, expected %08lx\n", status, STATUS_OBJECT_PATH_SYNTAX_BAD);
status = pRtlCreateRegistryKey(RTL_REGISTRY_ABSOLUTE, empty);
- ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_OBJECT_PATH_SYNTAX_BAD);
+ ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCreateRegistryKey unexpected return value: %08lx, expected %08lx\n", status, STATUS_OBJECT_PATH_SYNTAX_BAD);
status = pRtlCreateRegistryKey(RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL, empty);
- ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_OBJECT_PATH_SYNTAX_BAD);
+ ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCreateRegistryKey unexpected return value: %08lx, expected %08lx\n", status, STATUS_OBJECT_PATH_SYNTAX_BAD);
status = pRtlCreateRegistryKey(RTL_REGISTRY_ABSOLUTE, str.Buffer);
- ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_OBJECT_NAME_NOT_FOUND);
+ ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "RtlCreateRegistryKey unexpected return value: %08lx, expected %08lx\n", status, STATUS_OBJECT_NAME_NOT_FOUND);
status = pRtlCreateRegistryKey(RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL, str.Buffer);
- ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_OBJECT_NAME_NOT_FOUND);
+ ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "RtlCreateRegistryKey unexpected return value: %08lx, expected %08lx\n", status, STATUS_OBJECT_NAME_NOT_FOUND);
/* both parameters invalid */
status = pRtlCreateRegistryKey(RTL_REGISTRY_USER+1, NULL);
- ok(status == STATUS_INVALID_PARAMETER, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_INVALID_PARAMETER);
+ ok(status == STATUS_INVALID_PARAMETER, "RtlCreateRegistryKey unexpected return value: %08lx, expected %08lx\n", status, STATUS_INVALID_PARAMETER);
status = pRtlCreateRegistryKey((RTL_REGISTRY_USER+1) | RTL_REGISTRY_OPTIONAL, NULL);
- ok(status == STATUS_INVALID_PARAMETER, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_INVALID_PARAMETER);
+ ok(status == STATUS_INVALID_PARAMETER, "RtlCreateRegistryKey unexpected return value: %08lx, expected %08lx\n", status, STATUS_INVALID_PARAMETER);
pRtlFreeUnicodeString(&str);
}
1
0
22 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/port.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c
index 2406a63d8f1..9c8c26a8174 100644
--- a/dlls/ntdll/tests/port.c
+++ b/dlls/ntdll/tests/port.c
@@ -16,6 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include <stdio.h>
#include <stdarg.h>
@@ -183,10 +184,10 @@ static void ProcessConnectionRequest(union lpc_message *LpcMessage, PHANDLE pAcc
}
status = pNtAcceptConnectPort(pAcceptPortHandle, 0, &LpcMessage->msg, 1, NULL, NULL);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status);
status = pNtCompleteConnectPort(*pAcceptPortHandle);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status);
}
static void ProcessLpcRequest(HANDLE PortHandle, union lpc_message *LpcMessage)
@@ -202,7 +203,7 @@ static void ProcessLpcRequest(HANDLE PortHandle, union lpc_message *LpcMessage)
strcpy((LPSTR)LpcMessage->msg64.Data, REPLY);
status = pNtReplyPort(PortHandle, &LpcMessage->msg);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status);
ok(LpcMessage->msg64.MessageType == LPC_REQUEST,
"Expected LPC_REQUEST, got %d\n", LpcMessage->msg64.MessageType);
ok(!strcmp((LPSTR)LpcMessage->msg64.Data, REPLY),
@@ -217,7 +218,7 @@ static void ProcessLpcRequest(HANDLE PortHandle, union lpc_message *LpcMessage)
strcpy((LPSTR)LpcMessage->msg.Data, REPLY);
status = pNtReplyPort(PortHandle, &LpcMessage->msg);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status);
ok(LpcMessage->msg.MessageType == LPC_REQUEST,
"Expected LPC_REQUEST, got %d\n", LpcMessage->msg.MessageType);
ok(!strcmp((LPSTR)LpcMessage->msg.Data, REPLY),
@@ -239,11 +240,11 @@ static DWORD WINAPI test_ports_client(LPVOID arg)
sqos.EffectiveOnly = TRUE;
status = pNtConnectPort(&PortHandle, &port, &sqos, 0, 0, &len, NULL, NULL);
- todo_wine ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status);
+ todo_wine ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status);
if (status != STATUS_SUCCESS) return 1;
status = pNtRegisterThreadTerminatePort(PortHandle);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status);
if (is_wow64)
{
@@ -256,7 +257,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg)
strcpy((LPSTR)LpcMessage->msg64.Data, REQUEST1);
status = pNtRequestPort(PortHandle, &LpcMessage->msg);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status);
ok(LpcMessage->msg64.MessageType == 0, "Expected 0, got %d\n", LpcMessage->msg64.MessageType);
ok(!strcmp((LPSTR)LpcMessage->msg64.Data, REQUEST1),
"Expected %s, got %s\n", REQUEST1, LpcMessage->msg64.Data);
@@ -269,7 +270,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg)
/* Send the message and wait for the reply */
status = pNtRequestWaitReplyPort(PortHandle, &LpcMessage->msg, &out->msg);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status);
ok(!strcmp((LPSTR)out->msg64.Data, REPLY), "Expected %s, got %s\n", REPLY, out->msg64.Data);
ok(out->msg64.MessageType == LPC_REPLY, "Expected LPC_REPLY, got %d\n", out->msg64.MessageType);
}
@@ -284,7 +285,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg)
strcpy((LPSTR)LpcMessage->msg.Data, REQUEST1);
status = pNtRequestPort(PortHandle, &LpcMessage->msg);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status);
ok(LpcMessage->msg.MessageType == 0, "Expected 0, got %d\n", LpcMessage->msg.MessageType);
ok(!strcmp((LPSTR)LpcMessage->msg.Data, REQUEST1),
"Expected %s, got %s\n", REQUEST1, LpcMessage->msg.Data);
@@ -297,7 +298,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg)
/* Send the message and wait for the reply */
status = pNtRequestWaitReplyPort(PortHandle, &LpcMessage->msg, &out->msg);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status);
ok(!strcmp((LPSTR)out->msg.Data, REPLY), "Expected %s, got %s\n", REPLY, out->msg.Data);
ok(out->msg.MessageType == LPC_REPLY, "Expected LPC_REPLY, got %d\n", out->msg.MessageType);
}
@@ -324,7 +325,7 @@ static void test_ports_server( HANDLE PortHandle )
status = pNtReplyWaitReceivePort(PortHandle, NULL, NULL, &LpcMessage->msg);
todo_wine
{
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d(%x)\n", status, status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %ld(%lx)\n", status, status);
}
/* STATUS_INVALID_HANDLE: win2k without admin rights will perform an
* endless loop here
@@ -384,7 +385,7 @@ START_TEST(port)
status = pNtCreatePort(&port_handle, &obj, 100, 100, 0);
if (status == STATUS_ACCESS_DENIED) skip("Not enough rights\n");
- else ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status);
+ else ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %ld\n", status);
if (status == STATUS_SUCCESS)
{
1
0
22 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/pipe.c | 749 ++++++++++++++++++++++++-----------------------
1 file changed, 375 insertions(+), 374 deletions(-)
diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c
index 6940e0020b7..38d1d92b4a9 100644
--- a/dlls/ntdll/tests/pipe.c
+++ b/dlls/ntdll/tests/pipe.c
@@ -16,6 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include <stdio.h>
#include <stdarg.h>
@@ -128,8 +129,8 @@ static void _test_file_access(unsigned line, HANDLE handle, DWORD expected_acces
memset(&info, 0x11, sizeof(info));
status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileAccessInformation);
- ok_(__FILE__,line)(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
- ok_(__FILE__,line)(info.AccessFlags == expected_access, "got access %08x expected %08x\n",
+ ok_(__FILE__,line)(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
+ ok_(__FILE__,line)(info.AccessFlags == expected_access, "got access %08lx expected %08lx\n",
info.AccessFlags, expected_access);
}
@@ -201,36 +202,36 @@ static void test_create_invalid(void)
/* create a pipe with FILE_OVERWRITE */
res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ, 4 /*FILE_OVERWRITE*/,
0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout);
- todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res);
+ todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %lx\n", res);
if (!res)
CloseHandle(handle);
/* create a pipe with FILE_OVERWRITE_IF */
res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ, 5 /*FILE_OVERWRITE_IF*/,
0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout);
- todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res);
+ todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %lx\n", res);
if (!res)
CloseHandle(handle);
/* create a pipe with sharing = 0 */
res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, 0, 2 /*FILE_CREATE*/,
0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout);
- ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res);
+ ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %lx\n", res);
if (!res)
CloseHandle(handle);
/* create a pipe without r/w access */
res = pNtCreateNamedPipeFile(&handle, SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, 2 /*FILE_CREATE*/,
0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout);
- ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
+ ok(!res, "NtCreateNamedPipeFile returned %lx\n", res);
res = pNtQueryInformationFile(handle, &iosb, &info, sizeof(info), FilePipeLocalInformation);
- ok(res == STATUS_ACCESS_DENIED, "NtQueryInformationFile returned %x\n", res);
+ ok(res == STATUS_ACCESS_DENIED, "NtQueryInformationFile returned %lx\n", res);
/* test FILE_CREATE creation disposition */
res = pNtCreateNamedPipeFile(&handle2, SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, 2 /*FILE_CREATE*/,
0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout);
- todo_wine ok(res == STATUS_ACCESS_DENIED, "NtCreateNamedPipeFile returned %x\n", res);
+ todo_wine ok(res == STATUS_ACCESS_DENIED, "NtCreateNamedPipeFile returned %lx\n", res);
if (!res)
CloseHandle(handle2);
@@ -257,28 +258,28 @@ static void test_create(void)
res = create_pipe(&hserver, 0, sharing[j], 0);
if (res) {
- ok(0, "NtCreateNamedPipeFile returned %x, sharing: %x\n", res, sharing[j]);
+ ok(0, "NtCreateNamedPipeFile returned %lx, sharing: %lx\n", res, sharing[j]);
continue;
}
res = listen_pipe(hserver, hEvent, &iosb, FALSE);
- ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res);
+ ok(res == STATUS_PENDING, "NtFsControlFile returned %lx\n", res);
res = pNtQueryInformationFile(hserver, &iosb, &info, sizeof(info), FilePipeLocalInformation);
- ok(!res, "NtQueryInformationFile for server returned %x, sharing: %x\n", res, sharing[j]);
- ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n",
+ ok(!res, "NtQueryInformationFile for server returned %lx, sharing: %lx\n", res, sharing[j]);
+ ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %ld, expected %ld\n",
info.NamedPipeConfiguration, pipe_config[j]);
hclient = CreateFileW(testpipe, access[k], 0, 0, OPEN_EXISTING, 0, 0);
if (hclient != INVALID_HANDLE_VALUE) {
res = pNtQueryInformationFile(hclient, &iosb, &info, sizeof(info), FilePipeLocalInformation);
- ok(!res, "NtQueryInformationFile for client returned %x, access: %x, sharing: %x\n",
+ ok(!res, "NtQueryInformationFile for client returned %lx, access: %lx, sharing: %lx\n",
res, access[k], sharing[j]);
- ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n",
+ ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %ld, expected %ld\n",
info.NamedPipeConfiguration, pipe_config[j]);
res = listen_pipe(hclient, hEvent, &iosb, FALSE);
- ok(res == STATUS_ILLEGAL_FUNCTION, "expected STATUS_ILLEGAL_FUNCTION, got %x\n", res);
+ ok(res == STATUS_ILLEGAL_FUNCTION, "expected STATUS_ILLEGAL_FUNCTION, got %lx\n", res);
CloseHandle(hclient);
}
@@ -288,10 +289,10 @@ static void test_create(void)
should_succeed &= !!(sharing[j] & FILE_SHARE_READ);
if (should_succeed)
- ok(hclient != INVALID_HANDLE_VALUE, "CreateFile failed for sharing %x, access: %x, GetLastError: %d\n",
+ ok(hclient != INVALID_HANDLE_VALUE, "CreateFile failed for sharing %lx, access: %lx, GetLastError: %ld\n",
sharing[j], access[k], GetLastError());
else
- ok(hclient == INVALID_HANDLE_VALUE, "CreateFile succeeded for sharing %x, access: %x\n", sharing[j], access[k]);
+ ok(hclient == INVALID_HANDLE_VALUE, "CreateFile succeeded for sharing %lx, access: %lx\n", sharing[j], access[k]);
CloseHandle(hserver);
}
@@ -308,20 +309,20 @@ static void test_overlapped(void)
NTSTATUS res;
hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
- ok(hEvent != INVALID_HANDLE_VALUE, "can't create event, GetLastError: %x\n", GetLastError());
+ ok(hEvent != INVALID_HANDLE_VALUE, "can't create event, GetLastError: %lx\n", GetLastError());
res = create_pipe(&hPipe, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */);
- ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
+ ok(!res, "NtCreateNamedPipeFile returned %lx\n", res);
memset(&iosb, 0x55, sizeof(iosb));
res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
- ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res);
- ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status);
+ ok(res == STATUS_PENDING, "NtFsControlFile returned %lx\n", res);
+ ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %lx\n", U(iosb).Status);
hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
- ok(hClient != INVALID_HANDLE_VALUE, "can't open pipe, GetLastError: %x\n", GetLastError());
+ ok(hClient != INVALID_HANDLE_VALUE, "can't open pipe, GetLastError: %lx\n", GetLastError());
- ok(U(iosb).Status == 0, "Wrong iostatus %x\n", U(iosb).Status);
+ ok(U(iosb).Status == 0, "Wrong iostatus %lx\n", U(iosb).Status);
ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n");
ok(!ioapc_called, "IOAPC ran too early\n");
@@ -334,19 +335,19 @@ static void test_overlapped(void)
CloseHandle(hClient);
res = create_pipe(&hPipe, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */);
- ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
+ ok(!res, "NtCreateNamedPipeFile returned %lx\n", res);
hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
ok(hClient != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_PIPE_BUSY) /* > Win 8 */,
- "can't open pipe, GetLastError: %x\n", GetLastError());
+ "can't open pipe, GetLastError: %lx\n", GetLastError());
if (hClient != INVALID_HANDLE_VALUE)
{
SetEvent(hEvent);
memset(&iosb, 0x55, sizeof(iosb));
res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
- ok(res == STATUS_PIPE_CONNECTED, "NtFsControlFile returned %x\n", res);
- ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status);
+ ok(res == STATUS_PIPE_CONNECTED, "NtFsControlFile returned %lx\n", res);
+ ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %lx\n", U(iosb).Status);
ok(!is_signaled(hEvent), "hEvent not signaled\n");
CloseHandle(hClient);
@@ -373,7 +374,7 @@ static DWORD WINAPI thread(PVOID main_thread)
DWORD ret;
userapc_called = FALSE;
ret = pQueueUserAPC(&userapc, main_thread, 0);
- ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError());
+ ok(ret, "can't queue user apc, GetLastError: %lx\n", GetLastError());
CloseHandle(main_thread);
}
@@ -403,35 +404,35 @@ static void test_alertable(void)
memset(&iosb, 0x55, sizeof(iosb));
hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
- ok(hEvent != INVALID_HANDLE_VALUE, "can't create event, GetLastError: %x\n", GetLastError());
+ ok(hEvent != INVALID_HANDLE_VALUE, "can't create event, GetLastError: %lx\n", GetLastError());
res = create_pipe(&hPipe, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_ALERT);
- ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
+ ok(!res, "NtCreateNamedPipeFile returned %lx\n", res);
/* queue an user apc before calling listen */
userapc_called = FALSE;
ret = pQueueUserAPC(&userapc, GetCurrentThread(), 0);
- ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError());
+ ok(ret, "can't queue user apc, GetLastError: %lx\n", GetLastError());
res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
- todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %x\n", res);
+ todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %lx\n", res);
ok(userapc_called, "user apc didn't run\n");
- ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status);
+ ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %lx\n", U(iosb).Status);
ok(WaitForSingleObjectEx(hEvent, 0, TRUE) == WAIT_TIMEOUT, "hEvent signaled\n");
ok(!ioapc_called, "IOAPC ran\n");
/* queue an user apc from a different thread */
hThread = CreateThread(NULL, 0, &thread, pOpenThread(MAXIMUM_ALLOWED, FALSE, GetCurrentThreadId()), 0, 0);
- ok(hThread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %x\n", GetLastError());
+ ok(hThread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %lx\n", GetLastError());
/* wine_todo: the earlier NtFsControlFile call gets cancelled after the pipe gets set into listen state
instead of before, so this NtFsControlFile will fail STATUS_INVALID_HANDLE */
res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
- todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %x\n", res);
+ todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %lx\n", res);
ok(userapc_called, "user apc didn't run\n");
- ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %x\n", U(iosb).Status);
+ ok(U(iosb).Status == 0x55555555, "iosb.Status got changed to %lx\n", U(iosb).Status);
ok(WaitForSingleObjectEx(hEvent, 0, TRUE) == WAIT_TIMEOUT, "hEvent signaled\n");
ok(!ioapc_called, "IOAPC ran\n");
@@ -446,13 +447,13 @@ static void test_alertable(void)
/* finally try without an apc */
hThread = CreateThread(NULL, 0, &thread, 0, 0, 0);
- ok(hThread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %x\n", GetLastError());
+ ok(hThread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %lx\n", GetLastError());
res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
- ok(!res, "NtFsControlFile returned %x\n", res);
+ ok(!res, "NtFsControlFile returned %lx\n", res);
ok(open_succeeded, "couldn't open client side pipe\n");
- ok(!U(iosb).Status, "Wrong iostatus %x\n", U(iosb).Status);
+ ok(!U(iosb).Status, "Wrong iostatus %lx\n", U(iosb).Status);
ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n");
WaitForSingleObject(hThread, INFINITE);
@@ -473,23 +474,23 @@ static void test_nonalertable(void)
memset(&iosb, 0x55, sizeof(iosb));
hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
- ok(hEvent != INVALID_HANDLE_VALUE, "can't create event, GetLastError: %x\n", GetLastError());
+ ok(hEvent != INVALID_HANDLE_VALUE, "can't create event, GetLastError: %lx\n", GetLastError());
res = create_pipe(&hPipe, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT);
- ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
+ ok(!res, "NtCreateNamedPipeFile returned %lx\n", res);
hThread = CreateThread(NULL, 0, &thread, 0, 0, 0);
- ok(hThread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %x\n", GetLastError());
+ ok(hThread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %lx\n", GetLastError());
userapc_called = FALSE;
ret = pQueueUserAPC(&userapc, GetCurrentThread(), 0);
- ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError());
+ ok(ret, "can't queue user apc, GetLastError: %lx\n", GetLastError());
res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
- ok(!res, "NtFsControlFile returned %x\n", res);
+ ok(!res, "NtFsControlFile returned %lx\n", res);
ok(open_succeeded, "couldn't open client side pipe\n");
- ok(!U(iosb).Status, "Wrong iostatus %x\n", U(iosb).Status);
+ ok(!U(iosb).Status, "Wrong iostatus %lx\n", U(iosb).Status);
ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n");
ok(!ioapc_called, "IOAPC ran too early\n");
@@ -515,20 +516,20 @@ static void test_cancelio(void)
NTSTATUS res;
hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
- ok(hEvent != INVALID_HANDLE_VALUE, "can't create event, GetLastError: %x\n", GetLastError());
+ ok(hEvent != INVALID_HANDLE_VALUE, "can't create event, GetLastError: %lx\n", GetLastError());
res = create_pipe(&hPipe, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */);
- ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
+ ok(!res, "NtCreateNamedPipeFile returned %lx\n", res);
memset(&iosb, 0x55, sizeof(iosb));
res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
- ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res);
+ ok(res == STATUS_PENDING, "NtFsControlFile returned %lx\n", res);
res = pNtCancelIoFile(hPipe, &cancel_sb);
- ok(!res, "NtCancelIoFile returned %x\n", res);
+ ok(!res, "NtCancelIoFile returned %lx\n", res);
- ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status);
+ ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %lx\n", U(iosb).Status);
ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n");
ok(!ioapc_called, "IOAPC ran too early\n");
@@ -542,16 +543,16 @@ static void test_cancelio(void)
if (pNtCancelIoFileEx)
{
res = create_pipe(&hPipe, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */);
- ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
+ ok(!res, "NtCreateNamedPipeFile returned %lx\n", res);
memset(&iosb, 0x55, sizeof(iosb));
res = listen_pipe(hPipe, hEvent, &iosb, FALSE);
- ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res);
+ ok(res == STATUS_PENDING, "NtFsControlFile returned %lx\n", res);
res = pNtCancelIoFileEx(hPipe, &iosb, &cancel_sb);
- ok(!res, "NtCancelIoFileEx returned %x\n", res);
+ ok(!res, "NtCancelIoFileEx returned %lx\n", res);
- ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status);
+ ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %lx\n", U(iosb).Status);
ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n");
CloseHandle(hPipe);
@@ -571,10 +572,10 @@ static void _check_pipe_handle_state(int line, HANDLE handle, ULONG read, ULONG
{
memset(&fpi, 0x55, sizeof(fpi));
res = pNtQueryInformationFile(handle, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok_(__FILE__, line)(!res, "NtQueryInformationFile returned %x\n", res);
- ok_(__FILE__, line)(fpi.ReadMode == read, "Unexpected ReadMode, expected %x, got %x\n",
+ ok_(__FILE__, line)(!res, "NtQueryInformationFile returned %lx\n", res);
+ ok_(__FILE__, line)(fpi.ReadMode == read, "Unexpected ReadMode, expected %lx, got %lx\n",
read, fpi.ReadMode);
- ok_(__FILE__, line)(fpi.CompletionMode == completion, "Unexpected CompletionMode, expected %x, got %x\n",
+ ok_(__FILE__, line)(fpi.CompletionMode == completion, "Unexpected CompletionMode, expected %lx, got %lx\n",
completion, fpi.CompletionMode);
}
}
@@ -604,24 +605,24 @@ static void test_filepipeinfo(void)
/* test with INVALID_HANDLE_VALUE */
res = pNtQueryInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(res == STATUS_OBJECT_TYPE_MISMATCH, "NtQueryInformationFile returned %x\n", res);
+ ok(res == STATUS_OBJECT_TYPE_MISMATCH, "NtQueryInformationFile returned %lx\n", res);
fpi.ReadMode = 0;
fpi.CompletionMode = 0;
res = pNtSetInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(res == STATUS_OBJECT_TYPE_MISMATCH, "NtSetInformationFile returned %x\n", res);
+ ok(res == STATUS_OBJECT_TYPE_MISMATCH, "NtSetInformationFile returned %lx\n", res);
/* server end with read-only attributes */
res = pNtCreateNamedPipeFile(&hServer, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb,
FILE_SHARE_READ | FILE_SHARE_WRITE, 2 /* FILE_CREATE */,
0, 0, 0, 1, 0xFFFFFFFF, 500, 500, &timeout);
- ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
+ ok(!res, "NtCreateNamedPipeFile returned %lx\n", res);
check_pipe_handle_state(hServer, 0, 1);
hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
ok(hClient != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_PIPE_BUSY) /* > Win 8 */,
- "can't open pipe, GetLastError: %x\n", GetLastError());
+ "can't open pipe, GetLastError: %lx\n", GetLastError());
check_pipe_handle_state(hServer, 0, 1);
check_pipe_handle_state(hClient, 0, 0);
@@ -629,7 +630,7 @@ static void test_filepipeinfo(void)
fpi.ReadMode = 0;
fpi.CompletionMode = 0;
res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res);
+ ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %lx\n", res);
check_pipe_handle_state(hServer, 0, 1);
check_pipe_handle_state(hClient, 0, 0);
@@ -637,7 +638,7 @@ static void test_filepipeinfo(void)
fpi.ReadMode = 1; /* invalid on a byte stream pipe */
fpi.CompletionMode = 1;
res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res);
+ ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %lx\n", res);
check_pipe_handle_state(hServer, 0, 1);
check_pipe_handle_state(hClient, 0, 0);
@@ -647,7 +648,7 @@ static void test_filepipeinfo(void)
fpi.ReadMode = 1; /* invalid on a byte stream pipe */
fpi.CompletionMode = 1;
res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(res == STATUS_INVALID_PARAMETER, "NtSetInformationFile returned %x\n", res);
+ ok(res == STATUS_INVALID_PARAMETER, "NtSetInformationFile returned %lx\n", res);
}
check_pipe_handle_state(hServer, 0, 1);
@@ -658,7 +659,7 @@ static void test_filepipeinfo(void)
fpi.ReadMode = 0;
fpi.CompletionMode = 1;
res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(!res, "NtSetInformationFile returned %x\n", res);
+ ok(!res, "NtSetInformationFile returned %lx\n", res);
}
check_pipe_handle_state(hServer, 0, 1);
@@ -669,12 +670,12 @@ static void test_filepipeinfo(void)
fpi.ReadMode = 0;
fpi.CompletionMode = 2; /* not in range 0-1 */
res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res);
+ ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %lx\n", res);
fpi.ReadMode = 2; /* not in range 0-1 */
fpi.CompletionMode = 0;
res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res);
+ ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %lx\n", res);
}
CloseHandle(hClient);
@@ -684,7 +685,7 @@ static void test_filepipeinfo(void)
fpi.ReadMode = 0;
fpi.CompletionMode = 0;
res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res);
+ ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %lx\n", res);
CloseHandle(hServer);
@@ -692,13 +693,13 @@ static void test_filepipeinfo(void)
res = pNtCreateNamedPipeFile(&hServer, FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb,
FILE_SHARE_READ | FILE_SHARE_WRITE, 2 /* FILE_CREATE */,
0, 1, 1, 0, 0xFFFFFFFF, 500, 500, &timeout);
- ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
+ ok(!res, "NtCreateNamedPipeFile returned %lx\n", res);
check_pipe_handle_state(hServer, 1, 0);
hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
ok(hClient != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_PIPE_BUSY) /* > Win 8 */,
- "can't open pipe, GetLastError: %x\n", GetLastError());
+ "can't open pipe, GetLastError: %lx\n", GetLastError());
check_pipe_handle_state(hServer, 1, 0);
check_pipe_handle_state(hClient, 0, 0);
@@ -708,7 +709,7 @@ static void test_filepipeinfo(void)
fpi.ReadMode = 1;
fpi.CompletionMode = 1;
res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(!res, "NtSetInformationFile returned %x\n", res);
+ ok(!res, "NtSetInformationFile returned %lx\n", res);
}
check_pipe_handle_state(hServer, 1, 0);
@@ -717,7 +718,7 @@ static void test_filepipeinfo(void)
fpi.ReadMode = 0;
fpi.CompletionMode = 1;
res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(!res, "NtSetInformationFile returned %x\n", res);
+ ok(!res, "NtSetInformationFile returned %lx\n", res);
check_pipe_handle_state(hServer, 0, 1);
check_pipe_handle_state(hClient, 1, 1);
@@ -727,12 +728,12 @@ static void test_filepipeinfo(void)
fpi.ReadMode = 0;
fpi.CompletionMode = 2; /* not in range 0-1 */
res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res);
+ ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %lx\n", res);
fpi.ReadMode = 2; /* not in range 0-1 */
fpi.CompletionMode = 0;
res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res);
+ ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %lx\n", res);
}
CloseHandle(hClient);
@@ -742,7 +743,7 @@ static void test_filepipeinfo(void)
fpi.ReadMode = 1;
fpi.CompletionMode = 0;
res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), FilePipeInformation);
- ok(!res, "NtSetInformationFile returned %x\n", res);
+ ok(!res, "NtSetInformationFile returned %lx\n", res);
check_pipe_handle_state(hServer, 1, 0);
@@ -752,27 +753,27 @@ static void test_filepipeinfo(void)
FILE_READ_DATA | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE,
&attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE,
0, 1, 1, 0, 0xFFFFFFFF, 500, 500, &timeout);
- ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
+ ok(!res, "NtCreateNamedPipeFile returned %lx\n", res);
res = NtCreateFile(&hClient, SYNCHRONIZE, &attr, &iosb, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 );
- ok(!res, "NtCreateFile returned %x\n", res);
+ ok(!res, "NtCreateFile returned %lx\n", res);
test_file_access(hClient, SYNCHRONIZE);
res = pNtQueryInformationFile(hClient, &iosb, &local_info, sizeof(local_info),
FilePipeLocalInformation);
ok(res == STATUS_ACCESS_DENIED,
- "NtQueryInformationFile(FilePipeLocalInformation) returned: %x\n", res);
+ "NtQueryInformationFile(FilePipeLocalInformation) returned: %lx\n", res);
res = pNtQueryInformationFile(hClient, &iosb, &local_info, sizeof(local_info),
FilePipeInformation);
ok(res == STATUS_ACCESS_DENIED,
- "NtQueryInformationFile(FilePipeInformation) returned: %x\n", res);
+ "NtQueryInformationFile(FilePipeInformation) returned: %lx\n", res);
res = pNtQueryInformationFile(hClient, &iosb, &local_info, sizeof(local_info),
FileNameInformation);
- ok(res == STATUS_SUCCESS, "NtQueryInformationFile(FileNameInformation) returned: %x\n", res);
+ ok(res == STATUS_SUCCESS, "NtQueryInformationFile(FileNameInformation) returned: %lx\n", res);
CloseHandle(hClient);
CloseHandle(hServer);
@@ -782,7 +783,7 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved )
{
int *count = arg;
(*count)++;
- ok( !reserved, "reserved is not 0: %x\n", reserved );
+ ok( !reserved, "reserved is not 0: %lx\n", reserved );
}
static void test_peek(HANDLE pipe)
@@ -794,16 +795,16 @@ static void test_peek(HANDLE pipe)
memset(&iosb, 0x55, sizeof(iosb));
status = NtFsControlFile(pipe, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, &buf, sizeof(buf));
- ok(!status || status == STATUS_PENDING, "NtFsControlFile failed: %x\n", status);
- ok(!iosb.Status, "iosb.Status = %x\n", iosb.Status);
- ok(buf.ReadDataAvailable == 1, "ReadDataAvailable = %u\n", buf.ReadDataAvailable);
+ ok(!status || status == STATUS_PENDING, "NtFsControlFile failed: %lx\n", status);
+ ok(!iosb.Status, "iosb.Status = %lx\n", iosb.Status);
+ ok(buf.ReadDataAvailable == 1, "ReadDataAvailable = %lu\n", buf.ReadDataAvailable);
ResetEvent(event);
memset(&iosb, 0x55, sizeof(iosb));
status = NtFsControlFile(pipe, event, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, &buf, sizeof(buf));
- ok(!status || status == STATUS_PENDING, "NtFsControlFile failed: %x\n", status);
- ok(buf.ReadDataAvailable == 1, "ReadDataAvailable = %u\n", buf.ReadDataAvailable);
- ok(!iosb.Status, "iosb.Status = %x\n", iosb.Status);
+ ok(!status || status == STATUS_PENDING, "NtFsControlFile failed: %lx\n", status);
+ ok(buf.ReadDataAvailable == 1, "ReadDataAvailable = %lu\n", buf.ReadDataAvailable);
+ ok(!iosb.Status, "iosb.Status = %lx\n", iosb.Status);
ok(is_signaled(event), "event is not signaled\n");
CloseHandle(event);
@@ -823,7 +824,7 @@ static BOOL create_pipe_pair( HANDLE *read, HANDLE *write, ULONG flags, ULONG ty
| (flags & PIPE_ACCESS_OUTBOUND ? GENERIC_READ : 0)
| FILE_WRITE_ATTRIBUTES, 0,
NULL, OPEN_EXISTING, flags & FILE_FLAG_OVERLAPPED, 0);
- ok(client != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError());
+ ok(client != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError());
if ((type & PIPE_READMODE_MESSAGE) && (flags & PIPE_ACCESS_OUTBOUND))
{
@@ -862,17 +863,17 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
iosb.Information = 0xdeadbeef;
ok( is_signaled( read ), "read handle is not signaled\n" );
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL );
- ok( status == STATUS_PENDING, "wrong status %x\n", status );
+ ok( status == STATUS_PENDING, "wrong status %lx\n", status );
ok( !is_signaled( read ), "read handle is signaled\n" );
ok( !is_signaled( event ), "event is signaled\n" );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( !apc_count, "apc was called\n" );
ret = WriteFile( write, buffer, 1, &written, NULL );
- ok(ret && written == 1, "WriteFile error %d\n", GetLastError());
+ ok(ret && written == 1, "WriteFile error %ld\n", GetLastError());
/* iosb updated here by async i/o */
- ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 1, "wrong info %Iu\n", iosb.Information );
ok( !is_signaled( read ), "read handle is signaled\n" );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
@@ -888,16 +889,16 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
iosb.Information = 0xdeadbeef;
ok( !is_signaled( read ), "read handle is signaled\n" );
status = NtReadFile( read, 0, apc, &apc_count, &iosb, buffer, 1, NULL, NULL );
- ok( status == STATUS_PENDING, "wrong status %x\n", status );
+ ok( status == STATUS_PENDING, "wrong status %lx\n", status );
ok( !is_signaled( read ), "read handle is signaled\n" );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( !apc_count, "apc was called\n" );
ret = WriteFile( write, buffer, 1, &written, NULL );
- ok(ret && written == 1, "WriteFile error %d\n", GetLastError());
+ ok(ret && written == 1, "WriteFile error %ld\n", GetLastError());
/* iosb updated here by async i/o */
- ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 1, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( read ), "read handle is not signaled\n" );
ok( !apc_count, "apc was called\n" );
apc_count = 0;
@@ -912,14 +913,14 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
iosb.Information = 0xdeadbeef;
ResetEvent( event );
ret = WriteFile( write, buffer, 1, &written, NULL );
- ok(ret && written == 1, "WriteFile error %d\n", GetLastError());
+ ok(ret && written == 1, "WriteFile error %ld\n", GetLastError());
test_peek(read);
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL );
- ok( status == STATUS_SUCCESS, "wrong status %x\n", status );
- ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information );
+ ok( status == STATUS_SUCCESS, "wrong status %lx\n", status );
+ ok( U(iosb).Status == 0, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 1, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, FALSE ); /* non-alertable sleep */
@@ -933,7 +934,7 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
iosb.Information = 0xdeadbeef;
ResetEvent( event );
ret = WriteFile( write, buffer, 2, &written, NULL );
- ok(ret && written == 2, "WriteFile error %d\n", GetLastError());
+ ok(ret && written == 2, "WriteFile error %ld\n", GetLastError());
memset( &iosb, 0xcc, sizeof(iosb) );
status = NtFsControlFile( read, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, buffer,
@@ -941,29 +942,29 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
if (pipe_type & PIPE_TYPE_MESSAGE)
{
ok( status == STATUS_BUFFER_OVERFLOW || status == STATUS_PENDING,
- "FSCTL_PIPE_PEEK returned %x\n", status );
- ok( U(iosb).Status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", U(iosb).Status );
+ "FSCTL_PIPE_PEEK returned %lx\n", status );
+ ok( U(iosb).Status == STATUS_BUFFER_OVERFLOW, "wrong status %lx\n", U(iosb).Status );
}
else
{
- ok( !status || status == STATUS_PENDING, "FSCTL_PIPE_PEEK returned %x\n", status );
- ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );
+ ok( !status || status == STATUS_PENDING, "FSCTL_PIPE_PEEK returned %lx\n", status );
+ ok( U(iosb).Status == 0, "wrong status %lx\n", U(iosb).Status );
}
ok( iosb.Information == FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[1]),
- "wrong info %lu\n", iosb.Information );
+ "wrong info %Iu\n", iosb.Information );
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL );
if (pipe_type & PIPE_READMODE_MESSAGE)
{
- ok( status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", status );
- ok( U(iosb).Status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", U(iosb).Status );
+ ok( status == STATUS_BUFFER_OVERFLOW, "wrong status %lx\n", status );
+ ok( U(iosb).Status == STATUS_BUFFER_OVERFLOW, "wrong status %lx\n", U(iosb).Status );
}
else
{
- ok( status == STATUS_SUCCESS, "wrong status %x\n", status );
- ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );
+ ok( status == STATUS_SUCCESS, "wrong status %lx\n", status );
+ ok( U(iosb).Status == 0, "wrong status %lx\n", U(iosb).Status );
}
- ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information );
+ ok( iosb.Information == 1, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, FALSE ); /* non-alertable sleep */
@@ -972,9 +973,9 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
ok( apc_count == 1, "apc not called\n" );
apc_count = 0;
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL );
- ok( status == STATUS_SUCCESS, "wrong status %x\n", status );
- ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information );
+ ok( status == STATUS_SUCCESS, "wrong status %lx\n", status );
+ ok( U(iosb).Status == 0, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 1, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, FALSE ); /* non-alertable sleep */
@@ -988,18 +989,18 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
iosb.Information = 0xdeadbeef;
ok( is_signaled( event ), "event is not signaled\n" ); /* check that read resets the event */
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 2, NULL, NULL );
- ok( status == STATUS_PENDING, "wrong status %x\n", status );
+ ok( status == STATUS_PENDING, "wrong status %lx\n", status );
ok( !is_signaled( event ), "event is signaled\n" );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( !apc_count, "apc was called\n" );
ret = WriteFile( write, buffer, 1, &written, NULL );
- ok(ret && written == 1, "WriteFile error %d\n", GetLastError());
+ ok(ret && written == 1, "WriteFile error %ld\n", GetLastError());
/* partial read is good enough */
Sleep(1); /* FIXME: needed for wine to run the i/o apc */
ok( is_signaled( event ), "event is not signaled\n" );
- ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 1, "wrong info %Iu\n", iosb.Information );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
ok( apc_count == 1, "apc was not called\n" );
@@ -1010,9 +1011,9 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
iosb.Information = 0xdeadbeef;
CloseHandle( write );
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL );
- ok( status == STATUS_PIPE_BROKEN, "wrong status %x\n", status );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( status == STATUS_PIPE_BROKEN, "wrong status %lx\n", status );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( !is_signaled( event ), "event is signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -1024,9 +1025,9 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
U(iosb).Status = 0xdeadbabe;
iosb.Information = 0xdeadbeef;
status = NtReadFile( read, (HANDLE)0xdeadbeef, apc, &apc_count, &iosb, buffer, 1, NULL, NULL );
- ok( status == STATUS_INVALID_HANDLE, "wrong status %x\n", status );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( status == STATUS_INVALID_HANDLE, "wrong status %lx\n", status );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
ok( !apc_count, "apc was called\n" );
@@ -1038,9 +1039,9 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
iosb.Information = 0xdeadbeef;
SetEvent( event );
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL );
- ok( status == STATUS_INVALID_HANDLE, "wrong status %x\n", status );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( status == STATUS_INVALID_HANDLE, "wrong status %lx\n", status );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" ); /* not reset on invalid handle */
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -1052,15 +1053,15 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
U(iosb).Status = 0xdeadbabe;
iosb.Information = 0xdeadbeef;
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 2, NULL, NULL );
- ok( status == STATUS_PENDING, "wrong status %x\n", status );
+ ok( status == STATUS_PENDING, "wrong status %lx\n", status );
ok( !is_signaled( event ), "event is signaled\n" );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( !apc_count, "apc was called\n" );
CloseHandle( write );
Sleep(1); /* FIXME: needed for wine to run the i/o apc */
- ok( U(iosb).Status == STATUS_PIPE_BROKEN, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_PIPE_BROKEN, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -1069,23 +1070,23 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
if (!create_pipe_pair( &read, &write, FILE_FLAG_OVERLAPPED | pipe_flags, pipe_type, 4096 )) return;
ret = DuplicateHandle(GetCurrentProcess(), read, GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS);
- ok(ret, "Failed to duplicate handle: %d\n", GetLastError());
+ ok(ret, "Failed to duplicate handle: %ld\n", GetLastError());
apc_count = 0;
U(iosb).Status = 0xdeadbabe;
iosb.Information = 0xdeadbeef;
status = NtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, NULL, NULL );
- ok( status == STATUS_PENDING, "wrong status %x\n", status );
+ ok( status == STATUS_PENDING, "wrong status %lx\n", status );
ok( !is_signaled( event ), "event is signaled\n" );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( !apc_count, "apc was called\n" );
/* Cancel by other handle */
status = pNtCancelIoFile( read, &iosb2 );
- ok(status == STATUS_SUCCESS, "failed to cancel by different handle: %x\n", status);
+ ok(status == STATUS_SUCCESS, "failed to cancel by different handle: %lx\n", status);
Sleep(1); /* FIXME: needed for wine to run the i/o apc */
- ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -1095,23 +1096,23 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
U(iosb).Status = 0xdeadbabe;
iosb.Information = 0xdeadbeef;
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 2, NULL, NULL );
- ok( status == STATUS_PENDING, "wrong status %x\n", status );
+ ok( status == STATUS_PENDING, "wrong status %lx\n", status );
ok( !is_signaled( event ), "event is signaled\n" );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( !apc_count, "apc was called\n" );
/* Close queued handle */
CloseHandle( read );
SleepEx( 1, TRUE ); /* alertable sleep */
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
status = pNtCancelIoFile( read, &iosb2 );
ok(status == STATUS_INVALID_HANDLE, "cancelled by closed handle?\n");
status = pNtCancelIoFile( handle, &iosb2 );
- ok(status == STATUS_SUCCESS, "failed to cancel: %x\n", status);
+ ok(status == STATUS_SUCCESS, "failed to cancel: %lx\n", status);
Sleep(1); /* FIXME: needed for wine to run the i/o apc */
- ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -1128,16 +1129,16 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
U(iosb).Status = 0xdeadbabe;
iosb.Information = 0xdeadbeef;
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 2, NULL, NULL );
- ok( status == STATUS_PENDING, "wrong status %x\n", status );
+ ok( status == STATUS_PENDING, "wrong status %lx\n", status );
ok( !is_signaled( event ), "event is signaled\n" );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( !apc_count, "apc was called\n" );
status = pNtCancelIoFileEx( read, &iosb, &iosb2 );
ok(status == STATUS_SUCCESS, "Failed to cancel I/O\n");
Sleep(1); /* FIXME: needed for wine to run the i/o apc */
- ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -1148,22 +1149,22 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
U(iosb).Status = 0xdeadbabe;
iosb.Information = 0xdeadbeef;
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 2, NULL, NULL );
- ok( status == STATUS_PENDING, "wrong status %x\n", status );
+ ok( status == STATUS_PENDING, "wrong status %lx\n", status );
ok( !is_signaled( event ), "event is signaled\n" );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( !apc_count, "apc was called\n" );
status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 2, NULL, NULL );
- ok( status == STATUS_PENDING, "wrong status %x\n", status );
+ ok( status == STATUS_PENDING, "wrong status %lx\n", status );
ok( !is_signaled( event ), "event is signaled\n" );
- ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0xdeadbabe, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0xdeadbeef, "wrong info %Iu\n", iosb.Information );
ok( !apc_count, "apc was called\n" );
status = pNtCancelIoFileEx( read, &iosb, &iosb2 );
ok(status == STATUS_SUCCESS, "Failed to cancel I/O\n");
Sleep(1); /* FIXME: needed for wine to run the i/o apc */
- ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -1193,14 +1194,14 @@ static void test_transceive(void)
status = NtFsControlFile( caller, event, NULL, NULL, &iosb, FSCTL_PIPE_TRANSCEIVE,
(BYTE*)"test", 4, buffer, sizeof(buffer) );
- ok( status == STATUS_PENDING, "NtFsControlFile(FSCTL_PIPE_TRANSCEIVE) returned %x\n", status);
+ ok( status == STATUS_PENDING, "NtFsControlFile(FSCTL_PIPE_TRANSCEIVE) returned %lx\n", status);
ok( !is_signaled( event ), "event is signaled\n" );
ret = WriteFile( callee, buffer, 2, &written, NULL );
- ok(ret && written == 2, "WriteFile error %d\n", GetLastError());
+ ok(ret && written == 2, "WriteFile error %ld\n", GetLastError());
- ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 2, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == 0, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 2, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
CloseHandle( caller );
@@ -1218,7 +1219,7 @@ static void _test_no_queued_completion(unsigned line, HANDLE port)
pov = (void *)0xdeadbeef;
ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 10);
ok_(__FILE__,line)(!ret && GetLastError() == WAIT_TIMEOUT,
- "GetQueuedCompletionStatus returned %x(%u)\n", ret, GetLastError());
+ "GetQueuedCompletionStatus returned %x(%lu)\n", ret, GetLastError());
}
#define test_queued_completion(a,b,c,d) _test_queued_completion(__LINE__,a,b,c,d)
@@ -1232,11 +1233,11 @@ static void _test_queued_completion(unsigned line, HANDLE port, IO_STATUS_BLOCK
NTSTATUS status;
status = pNtRemoveIoCompletion(port, &key, &value, &iosb, &timeout);
- ok_(__FILE__,line)(status == STATUS_SUCCESS, "NtRemoveIoCompletion returned %x\n", status);
- ok_(__FILE__,line)(value == (ULONG_PTR)io, "value = %lx\n", value);
- ok_(__FILE__,line)(io->Status == expected_status, "Status = %x\n", io->Status);
+ ok_(__FILE__,line)(status == STATUS_SUCCESS, "NtRemoveIoCompletion returned %lx\n", status);
+ ok_(__FILE__,line)(value == (ULONG_PTR)io, "value = %Ix\n", value);
+ ok_(__FILE__,line)(io->Status == expected_status, "Status = %lx\n", io->Status);
ok_(__FILE__,line)(io->Information == expected_information,
- "Information = %lu\n", io->Information);
+ "Information = %Iu\n", io->Information);
}
static void test_completion(void)
@@ -1258,7 +1259,7 @@ static void test_completion(void)
status = pNtQueryInformationFile(pipe, &io, &info, sizeof(info),
FileIoCompletionNotificationInformation);
ok(status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS),
- "status = %x\n", status);
+ "status = %lx\n", status);
if (status)
{
win_skip("FileIoCompletionNotificationInformation not supported\n");
@@ -1269,52 +1270,52 @@ static void test_completion(void)
memset(&ov, 0, sizeof(ov));
ov.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
- ok(ov.hEvent != INVALID_HANDLE_VALUE, "CreateEvent failed, error %u\n", GetLastError());
+ ok(ov.hEvent != INVALID_HANDLE_VALUE, "CreateEvent failed, error %lu\n", GetLastError());
port = CreateIoCompletionPort(client, NULL, 0xdeadbeef, 0);
- ok(port != NULL, "CreateIoCompletionPort failed, error %u\n", GetLastError());
+ ok(port != NULL, "CreateIoCompletionPort failed, error %lu\n", GetLastError());
ret = WriteFile(client, buf, sizeof(buf), &num_bytes, &ov);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
- ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes);
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
+ ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %lu\n", num_bytes);
test_queued_completion(port, (IO_STATUS_BLOCK*)&ov, STATUS_SUCCESS, num_bytes);
status = NtFsControlFile(client, NULL, NULL, &io, &io, FSCTL_PIPE_PEEK,
NULL, 0, &peek_buf, sizeof(peek_buf));
- ok(status == STATUS_PENDING || status == STATUS_SUCCESS, "FSCTL_PIPE_PEEK returned %x\n", status);
+ ok(status == STATUS_PENDING || status == STATUS_SUCCESS, "FSCTL_PIPE_PEEK returned %lx\n", status);
test_queued_completion(port, &io, STATUS_SUCCESS, FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data));
info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS;
status = pNtSetInformationFile(client, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
ret = WriteFile(client, buf, sizeof(buf), &num_bytes, &ov);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
- ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes);
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
+ ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %lu\n", num_bytes);
test_no_queued_completion(port);
ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, &ov);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
- ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes);
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
+ ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %lu\n", num_bytes);
status = NtReadFile(client, NULL, NULL, &io, &io, read_buf, 1, NULL, NULL);
- ok(status == STATUS_BUFFER_OVERFLOW || status == STATUS_PENDING, "status = %x\n", status);
- ok(io.Status == STATUS_BUFFER_OVERFLOW, "Status = %x\n", io.Status);
- ok(io.Information == 1, "Information = %lu\n", io.Information);
+ ok(status == STATUS_BUFFER_OVERFLOW || status == STATUS_PENDING, "status = %lx\n", status);
+ ok(io.Status == STATUS_BUFFER_OVERFLOW, "Status = %lx\n", io.Status);
+ ok(io.Information == 1, "Information = %Iu\n", io.Information);
if(status == STATUS_PENDING) /* win8+ */
test_queued_completion(port, &io, STATUS_BUFFER_OVERFLOW, 1);
else
test_no_queued_completion(port);
status = NtReadFile(client, NULL, NULL, &io, &io, read_buf, sizeof(read_buf), NULL, NULL);
- ok(status == STATUS_SUCCESS, "status = %x\n", status);
- ok(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status);
- ok(io.Information == sizeof(buf)-1, "Information = %lu\n", io.Information);
+ ok(status == STATUS_SUCCESS, "status = %lx\n", status);
+ ok(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status);
+ ok(io.Information == sizeof(buf)-1, "Information = %Iu\n", io.Information);
test_no_queued_completion(port);
status = NtFsControlFile(client, NULL, NULL, &io, &io, FSCTL_PIPE_PEEK,
NULL, 0, &peek_buf, sizeof(peek_buf));
- ok(status == STATUS_PENDING || status == STATUS_SUCCESS, "FSCTL_PIPE_PEEK returned %x\n", status);
+ ok(status == STATUS_PENDING || status == STATUS_SUCCESS, "FSCTL_PIPE_PEEK returned %lx\n", status);
if(status == STATUS_PENDING) /* win8+ */
test_queued_completion(port, &io, STATUS_SUCCESS, FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data));
else
@@ -1322,20 +1323,20 @@ static void test_completion(void)
memset(&io, 0xcc, sizeof(io));
status = NtReadFile(client, ov.hEvent, NULL, &io, &io, read_buf, sizeof(read_buf), NULL, NULL);
- ok(status == STATUS_PENDING, "status = %x\n", status);
+ ok(status == STATUS_PENDING, "status = %lx\n", status);
ok(!is_signaled(ov.hEvent), "event is signtaled\n");
test_no_queued_completion(port);
ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
test_queued_completion(port, &io, STATUS_SUCCESS, sizeof(buf));
ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
status = NtFsControlFile(client, NULL, NULL, &io, &io, FSCTL_PIPE_PEEK,
NULL, 0, &peek_buf, sizeof(peek_buf));
ok(status == STATUS_PENDING || status == STATUS_BUFFER_OVERFLOW,
- "FSCTL_PIPE_PEEK returned %x\n", status);
+ "FSCTL_PIPE_PEEK returned %lx\n", status);
if(status == STATUS_PENDING) /* win8+ */
test_queued_completion(port, &io, STATUS_BUFFER_OVERFLOW, sizeof(peek_buf));
else
@@ -1355,41 +1356,41 @@ static void test_completion(void)
/* no event, APC nor completion: only signals on handle */
memset(&io, 0xcc, sizeof(io));
status = NtReadFile(client, NULL, NULL, NULL, &io, read_buf, sizeof(read_buf), NULL, NULL);
- ok(status == STATUS_PENDING, "status = %x\n", status);
+ ok(status == STATUS_PENDING, "status = %lx\n", status);
ok(!is_signaled(client), "client is signaled\n");
ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
ok(is_signaled(client), "client is signaled\n");
- ok(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status);
- ok(io.Information == sizeof(buf), "Information = %lu\n", io.Information);
+ ok(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status);
+ ok(io.Information == sizeof(buf), "Information = %Iu\n", io.Information);
/* event with no APC nor completion: signals only event */
memset(&io, 0xcc, sizeof(io));
status = NtReadFile(client, event, NULL, NULL, &io, read_buf, sizeof(read_buf), NULL, NULL);
- ok(status == STATUS_PENDING, "status = %x\n", status);
+ ok(status == STATUS_PENDING, "status = %lx\n", status);
ok(!is_signaled(client), "client is signaled\n");
ok(!is_signaled(event), "event is signaled\n");
ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
ok(!is_signaled(client), "client is signaled\n");
ok(is_signaled(event), "event is not signaled\n");
- ok(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status);
- ok(io.Information == sizeof(buf), "Information = %lu\n", io.Information);
+ ok(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status);
+ ok(io.Information == sizeof(buf), "Information = %Iu\n", io.Information);
/* APC with no event: handle is signaled */
ioapc_called = FALSE;
memset(&io, 0xcc, sizeof(io));
status = NtReadFile(client, NULL, ioapc, &io, &io, read_buf, sizeof(read_buf), NULL, NULL);
- ok(status == STATUS_PENDING, "status = %x\n", status);
+ ok(status == STATUS_PENDING, "status = %lx\n", status);
ok(!is_signaled(client), "client is signaled\n");
ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
ok(is_signaled(client), "client is signaled\n");
- ok(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status);
- ok(io.Information == sizeof(buf), "Information = %lu\n", io.Information);
+ ok(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status);
+ ok(io.Information == sizeof(buf), "Information = %Iu\n", io.Information);
ok(!ioapc_called, "ioapc called\n");
SleepEx(0, TRUE);
@@ -1398,53 +1399,53 @@ static void test_completion(void)
/* completion with no completion port: handle signaled */
memset(&io, 0xcc, sizeof(io));
status = NtReadFile(client, NULL, NULL, &io, &io, read_buf, sizeof(read_buf), NULL, NULL);
- ok(status == STATUS_PENDING, "status = %x\n", status);
+ ok(status == STATUS_PENDING, "status = %lx\n", status);
ok(!is_signaled(client), "client is signaled\n");
ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
ok(is_signaled(client), "client is not signaled\n");
port = CreateIoCompletionPort(client, NULL, 0xdeadbeef, 0);
- ok(port != NULL, "CreateIoCompletionPort failed, error %u\n", GetLastError());
+ ok(port != NULL, "CreateIoCompletionPort failed, error %lu\n", GetLastError());
/* skipping completion on success: handle is signaled */
info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS;
status = pNtSetInformationFile(client, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
ok(is_signaled(client), "client is not signaled\n");
memset(&io, 0xcc, sizeof(io));
status = NtReadFile(client, NULL, NULL, &io, &io, read_buf, sizeof(read_buf), NULL, NULL);
- ok(status == STATUS_PENDING, "status = %x\n", status);
+ ok(status == STATUS_PENDING, "status = %lx\n", status);
ok(!is_signaled(client), "client is signaled\n");
ret = WriteFile(client, buf, 1, &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
ok(is_signaled(client), "client is not signaled\n");
/* skipping set event on handle: handle is never signaled */
info.Flags = FILE_SKIP_SET_EVENT_ON_HANDLE;
status = pNtSetInformationFile(client, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
ok(!is_signaled(client), "client is not signaled\n");
ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
ok(!is_signaled(client), "client is signaled\n");
test_queued_completion(port, &io, STATUS_SUCCESS, sizeof(buf));
memset(&io, 0xcc, sizeof(io));
status = NtReadFile(client, NULL, NULL, NULL, &io, read_buf, sizeof(read_buf), NULL, NULL);
- ok(status == STATUS_PENDING, "status = %x\n", status);
+ ok(status == STATUS_PENDING, "status = %lx\n", status);
ok(!is_signaled(client), "client is signaled\n");
ret = WriteFile(client, buf, 1, &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
ok(!is_signaled(client), "client is signaled\n");
ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
ok(!is_signaled(client), "client is signaled\n");
CloseHandle(port);
@@ -1477,7 +1478,7 @@ static DWORD WINAPI blocking_thread(void *arg)
for (;;)
{
res = WaitForSingleObject(ctx->wait, 10000);
- ok(res == WAIT_OBJECT_0, "wait returned %x\n", res);
+ ok(res == WAIT_OBJECT_0, "wait returned %lx\n", res);
if (res != WAIT_OBJECT_0) break;
switch(ctx->cmd) {
case BLOCKING_THREAD_WRITE:
@@ -1488,7 +1489,7 @@ static DWORD WINAPI blocking_thread(void *arg)
ok(!is_signaled(ctx->client), "client is signaled\n");
ok(is_signaled(ctx->pipe), "pipe is not signaled\n");
ret = WriteFile(ctx->pipe, buf, 1, &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
break;
case BLOCKING_THREAD_READ:
Sleep(100);
@@ -1498,7 +1499,7 @@ static DWORD WINAPI blocking_thread(void *arg)
ok(!is_signaled(ctx->client), "client is signaled\n");
ok(is_signaled(ctx->pipe), "pipe is not signaled\n");
ret = ReadFile(ctx->pipe, read_buf, 1, &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
break;
case BLOCKING_THREAD_QUIT:
return 0;
@@ -1526,11 +1527,11 @@ static void test_blocking(ULONG options)
ctx.wait = CreateEventW(NULL, FALSE, FALSE, NULL);
ctx.done = CreateEventW(NULL, FALSE, FALSE, NULL);
thread = CreateThread(NULL, 0, blocking_thread, &ctx, 0, 0);
- ok(thread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %x\n", GetLastError());
+ ok(thread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %lx\n", GetLastError());
status = create_pipe(&ctx.pipe, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
options);
- ok(status == STATUS_SUCCESS, "NtCreateNamedPipeFile returned %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtCreateNamedPipeFile returned %lx\n", status);
pRtlInitUnicodeString(&name, testpipe_nt);
attr.Length = sizeof(attr);
@@ -1542,7 +1543,7 @@ static void test_blocking(ULONG options)
status = NtCreateFile(&ctx.client, SYNCHRONIZE | GENERIC_READ | GENERIC_WRITE, &attr, &io,
NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN,
options, NULL, 0 );
- ok(status == STATUS_SUCCESS, "NtCreateFile returned %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtCreateFile returned %lx\n", status);
ok(is_signaled(ctx.client), "client is not signaled\n");
ok(is_signaled(ctx.pipe), "pipe is not signaled\n");
@@ -1554,14 +1555,14 @@ static void test_blocking(ULONG options)
ctx.event = NULL;
SetEvent(ctx.wait);
status = NtReadFile(ctx.client, NULL, NULL, NULL, &io, read_buf, sizeof(read_buf), NULL, NULL);
- ok(status == STATUS_SUCCESS, "status = %x\n", status);
- ok(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status);
- ok(io.Information == 1, "Information = %lu\n", io.Information);
+ ok(status == STATUS_SUCCESS, "status = %lx\n", status);
+ ok(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status);
+ ok(io.Information == 1, "Information = %Iu\n", io.Information);
ok(is_signaled(ctx.client), "client is not signaled\n");
ok(is_signaled(ctx.pipe), "pipe is not signaled\n");
res = WaitForSingleObject(ctx.done, 10000);
- ok(res == WAIT_OBJECT_0, "wait returned %x\n", res);
+ ok(res == WAIT_OBJECT_0, "wait returned %lx\n", res);
/* blocking read with event and APC */
ioapc_called = FALSE;
@@ -1571,9 +1572,9 @@ static void test_blocking(ULONG options)
SetEvent(ctx.wait);
status = NtReadFile(ctx.client, ctx.event, ioapc, &io, &io, read_buf,
sizeof(read_buf), NULL, NULL);
- ok(status == STATUS_SUCCESS, "status = %x\n", status);
- ok(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status);
- ok(io.Information == 1, "Information = %lu\n", io.Information);
+ ok(status == STATUS_SUCCESS, "status = %lx\n", status);
+ ok(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status);
+ ok(io.Information == 1, "Information = %Iu\n", io.Information);
ok(is_signaled(ctx.event), "event is not signaled\n");
todo_wine
ok(is_signaled(ctx.client), "client is not signaled\n");
@@ -1585,27 +1586,27 @@ static void test_blocking(ULONG options)
ok(ioapc_called, "ioapc not called\n");
res = WaitForSingleObject(ctx.done, 10000);
- ok(res == WAIT_OBJECT_0, "wait returned %x\n", res);
+ ok(res == WAIT_OBJECT_0, "wait returned %lx\n", res);
ioapc_called = FALSE;
CloseHandle(ctx.event);
ctx.event = NULL;
/* blocking flush */
ret = WriteFile(ctx.client, read_buf, 1, &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
ioapc_called = FALSE;
memset(&io, 0xff, sizeof(io));
ctx.cmd = BLOCKING_THREAD_READ;
SetEvent(ctx.wait);
status = NtFlushBuffersFile(ctx.client, &io);
- ok(status == STATUS_SUCCESS, "status = %x\n", status);
- ok(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status);
- ok(io.Information == 0, "Information = %lu\n", io.Information);
+ ok(status == STATUS_SUCCESS, "status = %lx\n", status);
+ ok(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status);
+ ok(io.Information == 0, "Information = %Iu\n", io.Information);
ok(is_signaled(ctx.client), "client is not signaled\n");
res = WaitForSingleObject(ctx.done, 10000);
- ok(res == WAIT_OBJECT_0, "wait returned %x\n", res);
+ ok(res == WAIT_OBJECT_0, "wait returned %lx\n", res);
ok(is_signaled(ctx.pipe), "pipe is not signaled\n");
CloseHandle(ctx.pipe);
@@ -1619,7 +1620,7 @@ static void test_blocking(ULONG options)
ok(is_signaled(ctx.pipe), "pipe is not signaled\n");
ret = WriteFile(ctx.client, read_buf, 1, &num_bytes, NULL);
- ok(ret, "WriteFile failed, error %u\n", GetLastError());
+ ok(ret, "WriteFile failed, error %lu\n", GetLastError());
ok(is_signaled(ctx.client), "client is not signaled\n");
ok(is_signaled(ctx.pipe), "pipe is not signaled\n");
@@ -1629,13 +1630,13 @@ static void test_blocking(ULONG options)
ctx.cmd = BLOCKING_THREAD_READ;
SetEvent(ctx.wait);
status = NtFlushBuffersFile(ctx.client, &io);
- ok(status == STATUS_SUCCESS, "status = %x\n", status);
- ok(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status);
- ok(io.Information == 0, "Information = %lu\n", io.Information);
+ ok(status == STATUS_SUCCESS, "status = %lx\n", status);
+ ok(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status);
+ ok(io.Information == 0, "Information = %Iu\n", io.Information);
/* client signaling is inconsistent in this case */
res = WaitForSingleObject(ctx.done, 10000);
- ok(res == WAIT_OBJECT_0, "wait returned %x\n", res);
+ ok(res == WAIT_OBJECT_0, "wait returned %lx\n", res);
CloseHandle(ctx.pipe);
CloseHandle(ctx.client);
@@ -1643,7 +1644,7 @@ static void test_blocking(ULONG options)
ctx.cmd = BLOCKING_THREAD_QUIT;
SetEvent(ctx.wait);
res = WaitForSingleObject(thread, 10000);
- ok(res == WAIT_OBJECT_0, "wait returned %x\n", res);
+ ok(res == WAIT_OBJECT_0, "wait returned %lx\n", res);
CloseHandle(ctx.wait);
CloseHandle(ctx.done);
@@ -1664,24 +1665,24 @@ static void test_volume_info(void)
memset( buffer, 0xaa, sizeof(buffer) );
memset( &iosb, 0xaa, sizeof(iosb) );
status = pNtQueryVolumeInformationFile( read, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation );
- ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status );
- ok( iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status );
- ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information );
+ ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %lx\n", status );
+ ok( iosb.Status == STATUS_SUCCESS, "got status %#lx\n", iosb.Status );
+ ok( iosb.Information == sizeof(*device_info), "Information = %Iu\n", iosb.Information );
device_info = (FILE_FS_DEVICE_INFORMATION*)buffer;
- ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType );
+ ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %lu\n", device_info->DeviceType );
ok( !(device_info->Characteristics & ~FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL),
- "Characteristics = %x\n", device_info->Characteristics );
+ "Characteristics = %lx\n", device_info->Characteristics );
memset( buffer, 0xaa, sizeof(buffer) );
memset( &iosb, 0xaa, sizeof(iosb) );
status = pNtQueryVolumeInformationFile( write, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation );
- ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status );
- ok( iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status );
- ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information );
+ ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %lx\n", status );
+ ok( iosb.Status == STATUS_SUCCESS, "got status %#lx\n", iosb.Status );
+ ok( iosb.Information == sizeof(*device_info), "Information = %Iu\n", iosb.Information );
device_info = (FILE_FS_DEVICE_INFORMATION*)buffer;
- ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType );
+ ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %lu\n", device_info->DeviceType );
ok( !(device_info->Characteristics & ~FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL),
- "Characteristics = %x\n", device_info->Characteristics );
+ "Characteristics = %lx\n", device_info->Characteristics );
CloseHandle( read );
CloseHandle( write );
@@ -1696,11 +1697,11 @@ static void _test_file_name_fail(unsigned line, HANDLE pipe, NTSTATUS expected_s
status = NtQueryInformationFile( pipe, &iosb, buffer, 0, FileNameInformation );
ok_(__FILE__,line)( status == STATUS_INFO_LENGTH_MISMATCH,
- "expected STATUS_INFO_LENGTH_MISMATCH, got %#x\n", status );
+ "expected STATUS_INFO_LENGTH_MISMATCH, got %#lx\n", status );
status = NtQueryInformationFile( pipe, &iosb, buffer, sizeof(buffer), FileNameInformation );
todo_wine_if (todo)
- ok_(__FILE__,line)( status == expected_status, "expected %#x, got %#x\n", expected_status, status );
+ ok_(__FILE__,line)( status == expected_status, "expected %#lx, got %#lx\n", expected_status, status );
}
#define test_file_name(a) _test_file_name(__LINE__,a)
@@ -1717,28 +1718,28 @@ static void _test_file_name(unsigned line, HANDLE pipe)
memset( buffer, 0xaa, sizeof(buffer) );
memset( &iosb, 0xaa, sizeof(iosb) );
status = NtQueryInformationFile( pipe, &iosb, buffer, sizeof(buffer), FileNameInformation );
- ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryInformationFile failed: %x\n", status );
- ok_(__FILE__,line)( iosb.Status == STATUS_SUCCESS, "Status = %x\n", iosb.Status );
+ ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryInformationFile failed: %lx\n", status );
+ ok_(__FILE__,line)( iosb.Status == STATUS_SUCCESS, "Status = %lx\n", iosb.Status );
ok_(__FILE__,line)( iosb.Information == sizeof(name_info->FileNameLength) + sizeof(nameW),
- "Information = %lu\n", iosb.Information );
- ok( name_info->FileNameLength == sizeof(nameW), "FileNameLength = %u\n", name_info->FileNameLength );
+ "Information = %Iu\n", iosb.Information );
+ ok( name_info->FileNameLength == sizeof(nameW), "FileNameLength = %lu\n", name_info->FileNameLength );
ok( !memcmp(name_info->FileName, nameW, sizeof(nameW)), "FileName = %s\n", wine_dbgstr_w(name_info->FileName) );
/* too small buffer */
memset( buffer, 0xaa, sizeof(buffer) );
memset( &iosb, 0xaa, sizeof(iosb) );
status = NtQueryInformationFile( pipe, &iosb, buffer, 20, FileNameInformation );
- ok( status == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile failed: %x\n", status );
- ok( iosb.Status == STATUS_BUFFER_OVERFLOW, "Status = %x\n", iosb.Status );
- ok( iosb.Information == 20, "Information = %lu\n", iosb.Information );
- ok( name_info->FileNameLength == sizeof(nameW), "FileNameLength = %u\n", name_info->FileNameLength );
+ ok( status == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile failed: %lx\n", status );
+ ok( iosb.Status == STATUS_BUFFER_OVERFLOW, "Status = %lx\n", iosb.Status );
+ ok( iosb.Information == 20, "Information = %Iu\n", iosb.Information );
+ ok( name_info->FileNameLength == sizeof(nameW), "FileNameLength = %lu\n", name_info->FileNameLength );
ok( !memcmp(name_info->FileName, nameW, 16), "FileName = %s\n", wine_dbgstr_w(name_info->FileName) );
/* too small buffer */
memset( buffer, 0xaa, sizeof(buffer) );
memset( &iosb, 0xaa, sizeof(iosb) );
status = NtQueryInformationFile( pipe, &iosb, buffer, 4, FileNameInformation );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile failed: %x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile failed: %lx\n", status );
}
static HANDLE create_pipe_server(void)
@@ -1747,7 +1748,7 @@ static HANDLE create_pipe_server(void)
NTSTATUS status;
status = create_pipe(&handle, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0);
- ok(status == STATUS_SUCCESS, "create_pipe failed: %x\n", status);
+ ok(status == STATUS_SUCCESS, "create_pipe failed: %lx\n", status);
return handle;
}
@@ -1757,7 +1758,7 @@ static HANDLE connect_pipe(HANDLE server)
client = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING,
FILE_FLAG_OVERLAPPED, 0);
- ok(client != INVALID_HANDLE_VALUE, "can't open pipe: %u\n", GetLastError());
+ ok(client != INVALID_HANDLE_VALUE, "can't open pipe: %lu\n", GetLastError());
return client;
}
@@ -1772,9 +1773,9 @@ static HANDLE connect_and_write_pipe(HANDLE server)
client = connect_pipe(server);
res = WriteFile(client, buf, sizeof(buf), &written, NULL);
- ok(res, "WriteFile failed: %u\n", GetLastError());
+ ok(res, "WriteFile failed: %lu\n", GetLastError());
res = WriteFile(server, buf, sizeof(buf), &written, NULL);
- ok(res, "WriteFile failed: %u\n", GetLastError());
+ ok(res, "WriteFile failed: %lu\n", GetLastError());
return client;
}
@@ -1806,10 +1807,10 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state)
expected_status = STATUS_PIPE_BROKEN;
break;
}
- ok(status == expected_status, "status = %x, expected %x in %s state %u\n",
+ ok(status == expected_status, "status = %lx, expected %lx in %s state %lu\n",
status, expected_status, is_server ? "server" : "client", state);
if (!status)
- ok(peek_buf.NamedPipeState == state, "NamedPipeState = %u, expected %u\n",
+ ok(peek_buf.NamedPipeState == state, "NamedPipeState = %lu, expected %lu\n",
peek_buf.NamedPipeState, state);
if (state != FILE_PIPE_CONNECTED_STATE)
@@ -1821,7 +1822,7 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state)
if (!status || status == STATUS_PENDING)
status = io.Status;
ok(status == expected_status,
- "NtFsControlFile(FSCTL_PIPE_TRANSCEIVE) failed in %s state %u: %x\n",
+ "NtFsControlFile(FSCTL_PIPE_TRANSCEIVE) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
}
@@ -1829,15 +1830,15 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state)
status = NtFlushBuffersFile(pipe, &io);
if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE)
{
- ok(status == STATUS_PIPE_DISCONNECTED, "status = %x in %s state %u\n",
+ ok(status == STATUS_PIPE_DISCONNECTED, "status = %lx in %s state %lu\n",
status, is_server ? "server" : "client", state);
}
else
{
- ok(status == STATUS_SUCCESS, "status = %x in %s state %u\n",
+ ok(status == STATUS_SUCCESS, "status = %lx in %s state %lu\n",
status, is_server ? "server" : "client", state);
- ok(io.Status == status, "io.Status = %x\n", io.Status);
- ok(!io.Information, "io.Information = %lx\n", io.Information);
+ ok(io.Status == status, "io.Status = %lx\n", io.Status);
+ ok(!io.Information, "io.Information = %Ix\n", io.Information);
}
if (state != FILE_PIPE_CONNECTED_STATE)
@@ -1855,7 +1856,7 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state)
break;
}
status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL);
- ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n",
+ ok(status == expected_status, "NtReadFile failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
}
@@ -1864,7 +1865,7 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state)
memset(&io, 0xcc, sizeof(io));
status = listen_pipe(pipe, NULL, &io, FALSE);
ok(status == (state == FILE_PIPE_CLOSING_STATE ? STATUS_PIPE_CLOSING : STATUS_PIPE_CONNECTED),
- "status = %x in %u state\n", status, state);
+ "status = %lx in %lu state\n", status, state);
}
}
@@ -1881,42 +1882,42 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state)
status = pNtQueryInformationFile(pipe, &io, &local_info, sizeof(local_info), FilePipeLocalInformation);
if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE)
ok(status == STATUS_PIPE_DISCONNECTED,
- "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n",
+ "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
else
ok(status == STATUS_SUCCESS,
- "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n",
+ "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
if (!status)
{
- ok(local_info.NamedPipeState == state, "%s NamedPipeState = %u, expected %u\n",
+ ok(local_info.NamedPipeState == state, "%s NamedPipeState = %lu, expected %lu\n",
is_server ? "server" : "client", local_info.NamedPipeState, state);
if (state != FILE_PIPE_DISCONNECTED_STATE && state != FILE_PIPE_LISTENING_STATE)
- ok(local_info.ReadDataAvailable != 0, "ReadDataAvailable, expected non-zero, in %s state %u\n",
+ ok(local_info.ReadDataAvailable != 0, "ReadDataAvailable, expected non-zero, in %s state %lu\n",
is_server ? "server" : "client", state);
else
- ok(local_info.ReadDataAvailable == 0, "ReadDataAvailable, expected zero, in %s state %u\n",
+ ok(local_info.ReadDataAvailable == 0, "ReadDataAvailable, expected zero, in %s state %lu\n",
is_server ? "server" : "client", state);
}
status = pNtQueryInformationFile(pipe, &io, &pipe_info, sizeof(pipe_info), FilePipeInformation);
if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE)
ok(status == STATUS_PIPE_DISCONNECTED,
- "NtQueryInformationFile(FilePipeInformation) failed in %s state %u: %x\n",
+ "NtQueryInformationFile(FilePipeInformation) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
else
ok(status == STATUS_SUCCESS,
- "NtQueryInformationFile(FilePipeInformation) failed in %s state %u: %x\n",
+ "NtQueryInformationFile(FilePipeInformation) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
status = NtQueryInformationFile(pipe, &io, buf, sizeof(buf), FileNameInformation);
if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE)
ok(status == STATUS_PIPE_DISCONNECTED,
- "NtQueryInformationFile(FileNameInformation) failed: %x\n", status);
+ "NtQueryInformationFile(FileNameInformation) failed: %lx\n", status);
else
todo_wine_if(!is_server && state == FILE_PIPE_CLOSING_STATE)
ok(status == STATUS_SUCCESS,
- "NtQueryInformationFile(FileNameInformation) failed: %x\n", status);
+ "NtQueryInformationFile(FileNameInformation) failed: %lx\n", status);
memset(&peek_buf, 0xcc, sizeof(peek_buf));
memset(&io, 0xcc, sizeof(io));
@@ -1935,10 +1936,10 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state)
expected_status = STATUS_BUFFER_OVERFLOW;
break;
}
- ok(status == expected_status, "status = %x, expected %x in %s state %u\n",
+ ok(status == expected_status, "status = %lx, expected %lx in %s state %lu\n",
status, expected_status, is_server ? "server" : "client", state);
if (status == STATUS_BUFFER_OVERFLOW)
- ok(peek_buf.NamedPipeState == state, "NamedPipeState = %u, expected %u\n",
+ ok(peek_buf.NamedPipeState == state, "NamedPipeState = %lu, expected %lu\n",
peek_buf.NamedPipeState, state);
switch (state)
@@ -1957,13 +1958,13 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state)
break;
}
status = NtWriteFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL);
- ok(status == expected_status, "NtWriteFile failed in %s state %u: %x\n",
+ ok(status == expected_status, "NtWriteFile failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
if (state == FILE_PIPE_CLOSING_STATE)
expected_status = STATUS_SUCCESS;
status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL);
- ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n",
+ ok(status == expected_status, "NtReadFile failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
}
@@ -1983,7 +1984,7 @@ static void pipe_for_each_state(HANDLE (*create_server)(void),
test(server, TRUE, FILE_PIPE_LISTENING_STATE);
status = listen_pipe(server, event, &iosb, FALSE);
- ok(status == STATUS_PENDING, "listen_pipe returned %x\n", status);
+ ok(status == STATUS_PENDING, "listen_pipe returned %lx\n", status);
test(server, TRUE, FILE_PIPE_LISTENING_STATE);
client = connect_client(server);
@@ -1997,11 +1998,11 @@ static void pipe_for_each_state(HANDLE (*create_server)(void),
server = create_server();
status = listen_pipe(server, event, &iosb, FALSE);
- ok(status == STATUS_PENDING, "listen_pipe returned %x\n", status);
+ ok(status == STATUS_PENDING, "listen_pipe returned %lx\n", status);
client = connect_client(server);
ret = DisconnectNamedPipe(server);
- ok(ret, "DisconnectNamedPipe failed: %u\n", GetLastError());
+ ok(ret, "DisconnectNamedPipe failed: %lu\n", GetLastError());
test(server, TRUE, FILE_PIPE_DISCONNECTED_STATE);
test(client, FALSE, FILE_PIPE_DISCONNECTED_STATE);
CloseHandle(server);
@@ -2010,17 +2011,17 @@ static void pipe_for_each_state(HANDLE (*create_server)(void),
server = create_server();
status = listen_pipe(server, event, &iosb, FALSE);
- ok(status == STATUS_PENDING, "listen_pipe returned %x\n", status);
+ ok(status == STATUS_PENDING, "listen_pipe returned %lx\n", status);
client = connect_client(server);
CloseHandle(client);
test(server, TRUE, FILE_PIPE_CLOSING_STATE);
ret = DisconnectNamedPipe(server);
- ok(ret, "DisconnectNamedPipe failed: %u\n", GetLastError());
+ ok(ret, "DisconnectNamedPipe failed: %lu\n", GetLastError());
test(server, TRUE, FILE_PIPE_DISCONNECTED_STATE);
status = listen_pipe(server, event, &iosb, FALSE);
- ok(status == STATUS_PENDING, "listen_pipe returned %x\n", status);
+ ok(status == STATUS_PENDING, "listen_pipe returned %lx\n", status);
client = connect_client(server);
test(server, TRUE, FILE_PIPE_CONNECTED_STATE);
test(client, FALSE, FILE_PIPE_CONNECTED_STATE);
@@ -2053,7 +2054,7 @@ static HANDLE create_local_info_test_pipe(void)
status = pNtCreateNamedPipeFile(&pipe, FILE_READ_ATTRIBUTES | SYNCHRONIZE | GENERIC_WRITE,
&attr, &iosb, FILE_SHARE_READ, FILE_CREATE, 0, 1, 0, 0, 1,
100, 200, &timeout);
- ok(status == STATUS_SUCCESS, "NtCreateNamedPipeFile failed: %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtCreateNamedPipeFile failed: %lx\n", status);
return pipe;
}
@@ -2064,7 +2065,7 @@ static HANDLE connect_pipe_reader(HANDLE server)
client = CreateFileW(testpipe, GENERIC_READ | FILE_WRITE_ATTRIBUTES, 0, 0, OPEN_EXISTING,
FILE_FLAG_OVERLAPPED, 0);
- ok(client != INVALID_HANDLE_VALUE, "can't open pipe: %u\n", GetLastError());
+ ok(client != INVALID_HANDLE_VALUE, "can't open pipe: %lu\n", GetLastError());
return client;
}
@@ -2085,34 +2086,34 @@ static void test_pipe_local_info(HANDLE pipe, BOOL is_server, DWORD state)
status = pNtQueryInformationFile(pipe, &iosb, &local_info, sizeof(local_info), FilePipeLocalInformation);
if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE)
ok(status == STATUS_PIPE_DISCONNECTED,
- "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n",
+ "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
else
ok(status == STATUS_SUCCESS,
- "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n",
+ "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
if (!status)
{
- ok(local_info.NamedPipeType == 1, "NamedPipeType = %u\n", local_info.NamedPipeType);
- ok(local_info.NamedPipeConfiguration == 1, "NamedPipeConfiguration = %u\n",
+ ok(local_info.NamedPipeType == 1, "NamedPipeType = %lu\n", local_info.NamedPipeType);
+ ok(local_info.NamedPipeConfiguration == 1, "NamedPipeConfiguration = %lu\n",
local_info.NamedPipeConfiguration);
- ok(local_info.MaximumInstances == 1, "MaximumInstances = %u\n", local_info.MaximumInstances);
+ ok(local_info.MaximumInstances == 1, "MaximumInstances = %lu\n", local_info.MaximumInstances);
if (!is_server && state == FILE_PIPE_CLOSING_STATE)
ok(local_info.CurrentInstances == 0 || broken(local_info.CurrentInstances == 1 /* winxp */),
- "CurrentInstances = %u\n", local_info.CurrentInstances);
+ "CurrentInstances = %lu\n", local_info.CurrentInstances);
else
ok(local_info.CurrentInstances == 1,
- "CurrentInstances = %u\n", local_info.CurrentInstances);
- ok(local_info.InboundQuota == 100, "InboundQuota = %u\n", local_info.InboundQuota);
- ok(local_info.ReadDataAvailable == 0, "ReadDataAvailable = %u\n",
+ "CurrentInstances = %lu\n", local_info.CurrentInstances);
+ ok(local_info.InboundQuota == 100, "InboundQuota = %lu\n", local_info.InboundQuota);
+ ok(local_info.ReadDataAvailable == 0, "ReadDataAvailable = %lu\n",
local_info.ReadDataAvailable);
- ok(local_info.OutboundQuota == 200, "OutboundQuota = %u\n", local_info.OutboundQuota);
+ ok(local_info.OutboundQuota == 200, "OutboundQuota = %lu\n", local_info.OutboundQuota);
todo_wine
- ok(local_info.WriteQuotaAvailable == (is_server ? 200 : 100), "WriteQuotaAvailable = %u\n",
+ ok(local_info.WriteQuotaAvailable == (is_server ? 200 : 100), "WriteQuotaAvailable = %lu\n",
local_info.WriteQuotaAvailable);
- ok(local_info.NamedPipeState == state, "%s NamedPipeState = %u, expected %u\n",
+ ok(local_info.NamedPipeState == state, "%s NamedPipeState = %lu, expected %lu\n",
is_server ? "server" : "client", local_info.NamedPipeState, state);
- ok(local_info.NamedPipeEnd == is_server, "NamedPipeEnd = %u\n", local_info.NamedPipeEnd);
+ ok(local_info.NamedPipeEnd == is_server, "NamedPipeEnd = %lu\n", local_info.NamedPipeEnd);
/* try to create another, incompatible, instance of pipe */
pRtlInitUnicodeString(&name, testpipe_nt);
@@ -2130,41 +2131,41 @@ static void test_pipe_local_info(HANDLE pipe, BOOL is_server, DWORD state)
&attr, &iosb, FILE_SHARE_WRITE, FILE_CREATE, 0, 0, 0, 0, 1,
100, 200, &timeout);
if (!local_info.CurrentInstances)
- ok(status == STATUS_SUCCESS, "NtCreateNamedPipeFile failed: %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtCreateNamedPipeFile failed: %lx\n", status);
else
- ok(status == STATUS_INSTANCE_NOT_AVAILABLE, "NtCreateNamedPipeFile failed: %x\n", status);
+ ok(status == STATUS_INSTANCE_NOT_AVAILABLE, "NtCreateNamedPipeFile failed: %lx\n", status);
if (!status) CloseHandle(new_pipe);
memset(&iosb, 0xcc, sizeof(iosb));
status = pNtQueryInformationFile(pipe, &iosb, &local_info, sizeof(local_info),
FilePipeLocalInformation);
ok(status == STATUS_SUCCESS,
- "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n",
+ "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
if (!is_server && state == FILE_PIPE_CLOSING_STATE)
ok(local_info.CurrentInstances == 0 || broken(local_info.CurrentInstances == 1 /* winxp */),
- "CurrentInstances = %u\n", local_info.CurrentInstances);
+ "CurrentInstances = %lu\n", local_info.CurrentInstances);
else
ok(local_info.CurrentInstances == 1,
- "CurrentInstances = %u\n", local_info.CurrentInstances);
+ "CurrentInstances = %lu\n", local_info.CurrentInstances);
}
memset(&iosb, 0xcc, sizeof(iosb));
status = pNtQueryInformationFile(pipe, &iosb, &pipe_info, sizeof(pipe_info), FilePipeInformation);
if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE)
ok(status == STATUS_PIPE_DISCONNECTED,
- "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n",
+ "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
else
ok(status == STATUS_SUCCESS,
- "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n",
+ "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
if (!status)
{
- ok(pipe_info.ReadMode == 0, "ReadMode = %u\n", pipe_info.ReadMode);
- ok(pipe_info.CompletionMode == 0, "CompletionMode = %u\n", pipe_info.CompletionMode);
+ ok(pipe_info.ReadMode == 0, "ReadMode = %lu\n", pipe_info.ReadMode);
+ ok(pipe_info.CompletionMode == 0, "CompletionMode = %lu\n", pipe_info.CompletionMode);
}
pipe_info.ReadMode = 0;
@@ -2173,11 +2174,11 @@ static void test_pipe_local_info(HANDLE pipe, BOOL is_server, DWORD state)
status = pNtSetInformationFile(pipe, &iosb, &pipe_info, sizeof(pipe_info), FilePipeInformation);
if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE)
ok(status == STATUS_PIPE_DISCONNECTED,
- "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n",
+ "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
else
ok(status == STATUS_SUCCESS,
- "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n",
+ "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %lu: %lx\n",
is_server ? "server" : "client", state, status);
}
@@ -2198,7 +2199,7 @@ static void test_file_info(void)
CloseHandle( client );
device = CreateFileA("\\\\.\\pipe", 0, 0, NULL, OPEN_EXISTING, 0, NULL);
- ok(device != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError());
+ ok(device != INVALID_HANDLE_VALUE, "got error %lu\n", GetLastError());
test_file_name_fail( device, STATUS_INVALID_PARAMETER, TRUE );
@@ -2215,14 +2216,14 @@ static PSECURITY_DESCRIPTOR get_security_descriptor(HANDLE handle, BOOL todo)
NULL, 0, &length);
todo_wine_if(todo && status == STATUS_PIPE_DISCONNECTED)
ok(status == STATUS_BUFFER_TOO_SMALL,
- "Failed to query object security descriptor length: %08x\n", status);
+ "Failed to query object security descriptor length: %08lx\n", status);
if(status != STATUS_BUFFER_TOO_SMALL) return NULL;
ok(length != 0, "length = 0\n");
sec_desc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, length);
status = NtQuerySecurityObject(handle, GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION,
sec_desc, length, &length);
- ok(status == STATUS_SUCCESS, "Failed to query object security descriptor: %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to query object security descriptor: %08lx\n", status);
return sec_desc;
}
@@ -2235,16 +2236,16 @@ static TOKEN_OWNER *get_current_owner(void)
BOOL ret;
ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &token);
- ok(ret, "Failed to get process token: %u\n", GetLastError());
+ ok(ret, "Failed to get process token: %lu\n", GetLastError());
ret = GetTokenInformation(token, TokenOwner, NULL, 0, &length);
ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER,
- "GetTokenInformation failed: %u\n", GetLastError());
- ok(length != 0, "Failed to get token owner information length: %u\n", GetLastError());
+ "GetTokenInformation failed: %lu\n", GetLastError());
+ ok(length != 0, "Failed to get token owner information length: %lu\n", GetLastError());
owner = HeapAlloc(GetProcessHeap(), 0, length);
ret = GetTokenInformation(token, TokenOwner, owner, length, &length);
- ok(ret, "Failed to get token owner information: %u)\n", GetLastError());
+ ok(ret, "Failed to get token owner information: %lu)\n", GetLastError());
CloseHandle(token);
return owner;
@@ -2258,16 +2259,16 @@ static TOKEN_PRIMARY_GROUP *get_current_group(void)
BOOL ret;
ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &token);
- ok(ret, "Failed to get process token: %u\n", GetLastError());
+ ok(ret, "Failed to get process token: %lu\n", GetLastError());
ret = GetTokenInformation(token, TokenPrimaryGroup, NULL, 0, &length);
ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER,
- "GetTokenInformation failed: %u\n", GetLastError());
- ok(length != 0, "Failed to get primary group token information length: %u\n", GetLastError());
+ "GetTokenInformation failed: %lu\n", GetLastError());
+ ok(length != 0, "Failed to get primary group token information length: %lu\n", GetLastError());
group = HeapAlloc(GetProcessHeap(), 0, length);
ret = GetTokenInformation(token, TokenPrimaryGroup, group, length, &length);
- ok(ret, "Failed to get primary group token information: %u\n", GetLastError());
+ ok(ret, "Failed to get primary group token information: %lu\n", GetLastError());
CloseHandle(token);
return group;
@@ -2281,7 +2282,7 @@ static SID *well_known_sid(WELL_KNOWN_SID_TYPE sid_type)
sid = HeapAlloc(GetProcessHeap(), 0, size);
ret = CreateWellKnownSid(sid_type, NULL, sid, &size);
- ok(ret, "CreateWellKnownSid failed: %u\n", GetLastError());
+ ok(ret, "CreateWellKnownSid failed: %lu\n", GetLastError());
return sid;
}
@@ -2298,7 +2299,7 @@ static void _test_group(unsigned line, HANDLE handle, SID *expected_sid, BOOL to
status = RtlGetGroupSecurityDescriptor(sec_desc, &group_sid, &defaulted);
ok_(__FILE__,line)(status == STATUS_SUCCESS,
- "Failed to query group from security descriptor: %08x\n", status);
+ "Failed to query group from security descriptor: %08lx\n", status);
todo_wine_if(todo)
ok_(__FILE__,line)(EqualSid(group_sid, expected_sid), "SIDs are not equal\n");
@@ -2335,10 +2336,10 @@ static void test_security_info(void)
server = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | WRITE_OWNER, PIPE_TYPE_BYTE, 10,
0x20000, 0x20000, 0, NULL);
- ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError());
+ ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError());
client = CreateFileA(PIPENAME, GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, NULL);
- ok(client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError());
+ ok(client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError());
test_group(server, process_group->PrimaryGroup, TRUE);
test_group(client, process_group->PrimaryGroup, TRUE);
@@ -2347,7 +2348,7 @@ static void test_security_info(void)
ret = SetSecurityDescriptorGroup(sec_desc, world_sid, FALSE);
ok(ret, "SetSecurityDescriptorGroup failed\n");
status = NtSetSecurityObject(server, GROUP_SECURITY_INFORMATION, sec_desc);
- ok(status == STATUS_SUCCESS, "NtSetSecurityObject failed: %08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtSetSecurityObject failed: %08lx\n", status);
test_group(server, world_sid, FALSE);
test_group(client, world_sid, FALSE);
@@ -2355,14 +2356,14 @@ static void test_security_info(void)
/* new instance of pipe server has the same security descriptor */
server2 = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE, 10,
0x20000, 0x20000, 0, NULL);
- ok(server2 != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError());
+ ok(server2 != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError());
test_group(server2, world_sid, FALSE);
/* set client group, server changes as well */
ret = SetSecurityDescriptorGroup(sec_desc, local_sid, FALSE);
ok(ret, "SetSecurityDescriptorGroup failed\n");
status = NtSetSecurityObject(server, GROUP_SECURITY_INFORMATION, sec_desc);
- ok(status == STATUS_SUCCESS, "NtSetSecurityObject failed: %08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtSetSecurityObject failed: %08lx\n", status);
test_group(server, local_sid, FALSE);
test_group(client, local_sid, FALSE);
@@ -2375,20 +2376,20 @@ static void test_security_info(void)
server = server2;
client = CreateFileA(PIPENAME, GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, NULL);
- ok(client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError());
+ ok(client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError());
test_group(client, local_sid, FALSE);
ret = DisconnectNamedPipe(server);
- ok(ret, "DisconnectNamedPipe failed: %u\n", GetLastError());
+ ok(ret, "DisconnectNamedPipe failed: %lu\n", GetLastError());
/* disconnected server may be queried for security info, but client does not */
test_group(server, local_sid, FALSE);
status = NtQuerySecurityObject(client, GROUP_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION,
NULL, 0, &length);
- ok(status == STATUS_PIPE_DISCONNECTED, "NtQuerySecurityObject returned %08x\n", status);
+ ok(status == STATUS_PIPE_DISCONNECTED, "NtQuerySecurityObject returned %08lx\n", status);
status = NtSetSecurityObject(client, GROUP_SECURITY_INFORMATION, sec_desc);
- ok(status == STATUS_PIPE_DISCONNECTED, "NtQuerySecurityObject returned %08x\n", status);
+ ok(status == STATUS_PIPE_DISCONNECTED, "NtQuerySecurityObject returned %08lx\n", status);
/* attempting to create another pipe instance with specified sd fails */
sec_attr.nLength = sizeof(sec_attr);
@@ -2400,7 +2401,7 @@ static void test_security_info(void)
0x20000, 0x20000, 0, &sec_attr);
todo_wine
ok(server2 == INVALID_HANDLE_VALUE && GetLastError() == ERROR_ACCESS_DENIED,
- "CreateNamedPipe failed: %u\n", GetLastError());
+ "CreateNamedPipe failed: %lu\n", GetLastError());
if (server2 != INVALID_HANDLE_VALUE) CloseHandle(server2);
CloseHandle(server);
@@ -2408,7 +2409,7 @@ static void test_security_info(void)
server = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | WRITE_OWNER, PIPE_TYPE_BYTE, 10,
0x20000, 0x20000, 0, &sec_attr);
- ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError());
+ ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError());
test_group(server, local_sid, FALSE);
CloseHandle(server);
@@ -2448,7 +2449,7 @@ static void test_empty_name(void)
status = NtCreateFile(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 );
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
name.Buffer = NULL;
name.Length = 0;
@@ -2459,7 +2460,7 @@ static void test_empty_name(void)
status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr,
&io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT,
0, 0, 0, 3, 4096, 4096, &timeout);
- todo_wine ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status);
+ todo_wine ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#lx.\n", status);
if (!status)
CloseHandle(hpipe);
CloseHandle(hdirectory);
@@ -2469,11 +2470,11 @@ static void test_empty_name(void)
attr.ObjectName = &name;
status = pNtCreateDirectoryObject(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr);
- todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status);
+ todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status);
status = NtCreateFile(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 );
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
name.Buffer = NULL;
name.Length = 0;
@@ -2484,30 +2485,30 @@ static void test_empty_name(void)
status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ | SYNCHRONIZE, &attr,
&io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT,
0, 0, 0, 3, 4096, 4096, &timeout);
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
type_info->TypeName.Buffer = NULL;
status = pNtQueryObject(hpipe, ObjectTypeInformation, type_info, sizeof(buffer), NULL);
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
ok(type_info->TypeName.Buffer && !wcscmp(type_info->TypeName.Buffer, L"File"),
"Got unexpected type %s.\n", debugstr_w(type_info->TypeName.Buffer));
status = pNtQueryObject(hpipe, ObjectNameInformation, name_info, sizeof(buffer), NULL);
- ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#lx.\n", status);
status = pNtCreateNamedPipeFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr,
&io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT,
0, 0, 0, 1, 4096, 4096, &timeout);
- todo_wine ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "Got unexpected status %#x.\n", status);
+ todo_wine ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "Got unexpected status %#lx.\n", status);
status = pNtCreateNamedPipeFile(&hpipe2, GENERIC_READ | SYNCHRONIZE, &attr,
&io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT,
0, 0, 0, 3, 4096, 4096, &timeout);
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
attr.RootDirectory = hpipe;
pRtlInitUnicodeString(&name, L"a");
status = NtCreateFile(&hwrite, GENERIC_WRITE | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr, &io, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );
- ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#lx.\n", status);
name.Buffer = NULL;
name.Length = 0;
@@ -2515,53 +2516,53 @@ static void test_empty_name(void)
attr.RootDirectory = hpipe;
status = NtCreateFile(&hwrite, GENERIC_WRITE | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr, &io, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
type_info->TypeName.Buffer = NULL;
status = pNtQueryObject(hwrite, ObjectTypeInformation, type_info, sizeof(buffer), NULL);
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
ok(type_info->TypeName.Buffer && !wcscmp(type_info->TypeName.Buffer, L"File"),
"Got unexpected type %s.\n", debugstr_w(type_info->TypeName.Buffer));
status = pNtQueryObject(hwrite, ObjectNameInformation, name_info, sizeof(buffer), NULL);
- ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#lx.\n", status);
attr.RootDirectory = hpipe;
status = NtCreateFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN,
FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );
- ok(status == STATUS_PIPE_NOT_AVAILABLE, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_PIPE_NOT_AVAILABLE, "Got unexpected status %#lx.\n", status);
attr.RootDirectory = hpipe;
status = NtCreateFile(&handle, GENERIC_WRITE | SYNCHRONIZE, &attr, &io, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );
- ok(status == STATUS_PIPE_NOT_AVAILABLE, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_PIPE_NOT_AVAILABLE, "Got unexpected status %#lx.\n", status);
attr.RootDirectory = hpipe2;
status = NtCreateFile(&hwrite2, GENERIC_WRITE | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr, &io, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
data = 0xdeadbeef;
ret = WriteFile(hwrite, &data, sizeof(data), &length, NULL);
- ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());
- ok(length == sizeof(data), "Got unexpected length %#x.\n", length);
+ ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError());
+ ok(length == sizeof(data), "Got unexpected length %#lx.\n", length);
data = 0xfeedcafe;
ret = WriteFile(hwrite2, &data, sizeof(data), &length, NULL);
- ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());
- ok(length == sizeof(data), "Got unexpected length %#x.\n", length);
+ ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError());
+ ok(length == sizeof(data), "Got unexpected length %#lx.\n", length);
data = 0;
ret = ReadFile(hpipe, &data, sizeof(data), &length, NULL);
- ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());
- ok(length == sizeof(data), "Got unexpected length %#x.\n", length);
- ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data);
+ ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError());
+ ok(length == sizeof(data), "Got unexpected length %#lx.\n", length);
+ ok(data == 0xdeadbeef, "Got unexpected data %#lx.\n", data);
data = 0;
ret = ReadFile(hpipe2, &data, sizeof(data), &length, NULL);
- ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());
- ok(length == sizeof(data), "Got unexpected length %#x.\n", length);
- ok(data == 0xfeedcafe, "Got unexpected data %#x.\n", data);
+ ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError());
+ ok(length == sizeof(data), "Got unexpected length %#lx.\n", length);
+ ok(data == 0xfeedcafe, "Got unexpected data %#lx.\n", data);
CloseHandle(hwrite);
CloseHandle(hpipe);
1
0
22 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/path.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c
index 5211945437c..dba42688e05 100644
--- a/dlls/ntdll/tests/path.c
+++ b/dlls/ntdll/tests/path.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 "ntdll_test.h"
#include "winnls.h"
@@ -375,7 +376,7 @@ static void test_RtlGetFullPathName_U(void)
file_part = (WCHAR *)0xdeadbeef;
lstrcpyW(rbufferW, deadbeefW);
ret = pRtlGetFullPathName_U(NULL, MAX_PATH, rbufferW, &file_part);
- ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret);
+ ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %lu\n", ret);
ok(!lstrcmpW(rbufferW, deadbeefW),
"Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW));
ok(file_part == (WCHAR *)0xdeadbeef ||
@@ -385,7 +386,7 @@ static void test_RtlGetFullPathName_U(void)
file_part = (WCHAR *)0xdeadbeef;
lstrcpyW(rbufferW, deadbeefW);
ret = pRtlGetFullPathName_U(emptyW, MAX_PATH, rbufferW, &file_part);
- ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret);
+ ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %lu\n", ret);
ok(!lstrcmpW(rbufferW, deadbeefW),
"Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW));
ok(file_part == (WCHAR *)0xdeadbeef ||
@@ -398,7 +399,7 @@ static void test_RtlGetFullPathName_U(void)
pRtlMultiByteToUnicodeN(pathbufW , sizeof(pathbufW), NULL, test->path, strlen(test->path)+1 );
ret = pRtlGetFullPathName_U( pathbufW,MAX_PATH, rbufferW, &file_part);
ok( ret == len || (test->alt_rname && ret == strlen(test->alt_rname)*sizeof(WCHAR)),
- "Wrong result %d/%d for \"%s\"\n", ret, len, test->path );
+ "Wrong result %ld/%d for \"%s\"\n", ret, len, test->path );
ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,(lstrlenW(rbufferW) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS,
"RtlUnicodeToMultiByteN failed\n");
ok(!lstrcmpA(rbufferA,test->rname) || (test->alt_rname && !lstrcmpA(rbufferA,test->alt_rname)),
@@ -580,7 +581,7 @@ static void test_RtlDosPathNameToNtPathName_U(void)
if (pRtlDosPathNameToNtPathName_U_WithStatus)
{
status = pRtlDosPathNameToNtPathName_U_WithStatus(error_paths[i], &nameW, &file_part, NULL);
- ok(status == STATUS_OBJECT_NAME_INVALID, "Got status %#x.\n", status);
+ ok(status == STATUS_OBJECT_NAME_INVALID, "Got status %#lx.\n", status);
}
winetest_pop_context();
@@ -600,7 +601,7 @@ static void test_RtlDosPathNameToNtPathName_U(void)
{
RtlFreeUnicodeString(&nameW);
status = pRtlDosPathNameToNtPathName_U_WithStatus(tests[i].dos, &nameW, &file_part, NULL);
- ok(status == STATUS_SUCCESS, "%s: Got status %#x.\n", debugstr_w(tests[i].dos), status);
+ ok(status == STATUS_SUCCESS, "%s: Got status %#lx.\n", debugstr_w(tests[i].dos), status);
}
ok(!wcscmp(nameW.Buffer, tests[i].nt)
@@ -711,7 +712,7 @@ static void test_nt_names(void)
if (handle) NtClose( handle );
todo_wine_if( tests[i].todo )
ok( status == tests[i].expect || broken( tests[i].broken && status == tests[i].broken ),
- "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect,
+ "%u: got %lx / %lx for %s + %s\n", i, status, tests[i].expect,
debugstr_w( tests[i].root ), debugstr_w( tests[i].name ));
}
}
1
0
22 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/info.c | 1289 ++++++++++++++++++++++++-----------------------
1 file changed, 645 insertions(+), 644 deletions(-)
diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index d6b323dd9d7..d3e70842b00 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include "ntdll_test.h"
#include <winnls.h>
@@ -124,30 +125,30 @@ static void test_query_basic(void)
/* Use a nonexistent info class */
status = pNtQuerySystemInformation(-1, NULL, 0, NULL);
ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* vista */,
- "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08x\n", status);
+ "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08lx\n", status);
/* Use an existing class but with a zero-length buffer */
status = pNtQuerySystemInformation(SystemBasicInformation, NULL, 0, NULL);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
/* Use an existing class, correct length but no SystemInformation buffer */
status = pNtQuerySystemInformation(SystemBasicInformation, NULL, sizeof(sbi), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* vista */,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got %08lx\n", status);
/* Use an existing class, correct length, a pointer to a buffer but no ReturnLength pointer */
status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
/* Check a too large buffer size */
status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi) * 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
/* Finally some correct calls */
memset(&sbi, 0xcc, sizeof(sbi));
status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(sbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(sbi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
/* Check if we have some return values */
if (winetest_debug > 1) trace("Number of Processors : %d\n", sbi.NumberOfProcessors);
@@ -155,28 +156,28 @@ static void test_query_basic(void)
memset(&sbi2, 0xcc, sizeof(sbi2));
status = pRtlGetNativeSystemInformation(SystemBasicInformation, &sbi2, sizeof(sbi2), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status);
- ok( sizeof(sbi2) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status);
+ ok( sizeof(sbi2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
- ok( sbi.unknown == sbi2.unknown, "Expected unknown %#x, got %#x.\n", sbi.unknown, sbi2.unknown);
- ok( sbi.KeMaximumIncrement == sbi2.KeMaximumIncrement, "Expected KeMaximumIncrement %u, got %u.\n",
+ ok( sbi.unknown == sbi2.unknown, "Expected unknown %#lx, got %#lx.\n", sbi.unknown, sbi2.unknown);
+ ok( sbi.KeMaximumIncrement == sbi2.KeMaximumIncrement, "Expected KeMaximumIncrement %lu, got %lu.\n",
sbi.KeMaximumIncrement, sbi2.KeMaximumIncrement);
- ok( sbi.PageSize == sbi2.PageSize, "Expected PageSize field %u, %u.\n", sbi.PageSize, sbi2.PageSize);
+ ok( sbi.PageSize == sbi2.PageSize, "Expected PageSize field %lu, %lu.\n", sbi.PageSize, sbi2.PageSize);
ok( sbi.MmNumberOfPhysicalPages == sbi2.MmNumberOfPhysicalPages,
- "Expected MmNumberOfPhysicalPages %u, got %u.\n",
+ "Expected MmNumberOfPhysicalPages %lu, got %lu.\n",
sbi.MmNumberOfPhysicalPages, sbi2.MmNumberOfPhysicalPages);
- ok( sbi.MmLowestPhysicalPage == sbi2.MmLowestPhysicalPage, "Expected MmLowestPhysicalPage %u, got %u.\n",
+ ok( sbi.MmLowestPhysicalPage == sbi2.MmLowestPhysicalPage, "Expected MmLowestPhysicalPage %lu, got %lu.\n",
sbi.MmLowestPhysicalPage, sbi2.MmLowestPhysicalPage);
- ok( sbi.MmHighestPhysicalPage == sbi2.MmHighestPhysicalPage, "Expected MmHighestPhysicalPage %u, got %u.\n",
+ ok( sbi.MmHighestPhysicalPage == sbi2.MmHighestPhysicalPage, "Expected MmHighestPhysicalPage %lu, got %lu.\n",
sbi.MmHighestPhysicalPage, sbi2.MmHighestPhysicalPage);
/* Higher 32 bits of AllocationGranularity is sometimes garbage on Windows. */
ok( (ULONG)sbi.AllocationGranularity == (ULONG)sbi2.AllocationGranularity,
- "Expected AllocationGranularity %#lx, got %#lx.\n",
+ "Expected AllocationGranularity %#Ix, got %#Ix.\n",
sbi.AllocationGranularity, sbi2.AllocationGranularity);
ok( sbi.LowestUserAddress == sbi2.LowestUserAddress, "Expected LowestUserAddress %p, got %p.\n",
sbi.LowestUserAddress, sbi2.LowestUserAddress);
ok( sbi.ActiveProcessorsAffinityMask == sbi2.ActiveProcessorsAffinityMask,
- "Expected ActiveProcessorsAffinityMask %#lx, got %#lx.\n",
+ "Expected ActiveProcessorsAffinityMask %#Ix, got %#Ix.\n",
sbi.ActiveProcessorsAffinityMask, sbi2.ActiveProcessorsAffinityMask);
ok( sbi.NumberOfProcessors == sbi2.NumberOfProcessors, "Expected NumberOfProcessors %u, got %u.\n",
sbi.NumberOfProcessors, sbi2.NumberOfProcessors);
@@ -193,26 +194,26 @@ static void test_query_basic(void)
memset(&sbi3, 0xcc, sizeof(sbi3));
status = pNtQuerySystemInformation(SystemNativeBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength);
#ifdef _WIN64
- ok( status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS), "got %08x\n", status);
+ ok( status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS), "got %08lx\n", status);
if (!status)
{
- ok( sizeof(sbi3) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( sizeof(sbi3) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
ok( !memcmp( &sbi2, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ),
"info is different\n" );
}
#else
ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), /* vista */
- "got %08x\n", status);
+ "got %08lx\n", status);
status = pRtlGetNativeSystemInformation( SystemNativeBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength );
ok( !status || status == STATUS_INFO_LENGTH_MISMATCH ||
broken(status == STATUS_INVALID_INFO_CLASS) || broken(status == STATUS_NOT_IMPLEMENTED),
- "failed %x\n", status );
+ "failed %lx\n", status );
if (!status || status == STATUS_INFO_LENGTH_MISMATCH)
todo_wine_if( is_wow64 )
- ok( !status == !is_wow64, "got wrong status %x wow64 %u\n", status, is_wow64 );
+ ok( !status == !is_wow64, "got wrong status %lx wow64 %u\n", status, is_wow64 );
if (!status)
{
- ok( sizeof(sbi3) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( sizeof(sbi3) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
ok( !memcmp( &sbi2, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ),
"info is different\n" );
}
@@ -234,23 +235,23 @@ static void test_query_basic(void)
BYTE NumberOfProcessors;
} sbi64;
- ok( ReturnLength == sizeof(sbi64), "len %x\n", ReturnLength );
+ ok( ReturnLength == sizeof(sbi64), "len %lx\n", ReturnLength );
memset( &sbi64, 0xcc, sizeof(sbi64) );
ReturnLength = 0;
status = pRtlGetNativeSystemInformation( SystemNativeBasicInformation, &sbi64, sizeof(sbi64), &ReturnLength );
- ok( !status, "failed %x\n", status );
- ok( ReturnLength == sizeof(sbi64), "len %x\n", ReturnLength );
+ ok( !status, "failed %lx\n", status );
+ ok( ReturnLength == sizeof(sbi64), "len %lx\n", ReturnLength );
- ok( sbi.unknown == sbi64.unknown, "unknown %#x / %#x\n", sbi.unknown, sbi64.unknown);
- ok( sbi.KeMaximumIncrement == sbi64.KeMaximumIncrement, "KeMaximumIncrement %u / %u\n",
+ ok( sbi.unknown == sbi64.unknown, "unknown %#lx / %#lx\n", sbi.unknown, sbi64.unknown);
+ ok( sbi.KeMaximumIncrement == sbi64.KeMaximumIncrement, "KeMaximumIncrement %lu / %lu\n",
sbi.KeMaximumIncrement, sbi64.KeMaximumIncrement);
- ok( sbi.PageSize == sbi64.PageSize, "PageSize %u / %u\n", sbi.PageSize, sbi64.PageSize);
+ ok( sbi.PageSize == sbi64.PageSize, "PageSize %lu / %lu\n", sbi.PageSize, sbi64.PageSize);
ok( sbi.MmNumberOfPhysicalPages == sbi64.MmNumberOfPhysicalPages,
- "MmNumberOfPhysicalPages %u / %u\n",
+ "MmNumberOfPhysicalPages %lu / %lu\n",
sbi.MmNumberOfPhysicalPages, sbi64.MmNumberOfPhysicalPages);
- ok( sbi.MmLowestPhysicalPage == sbi64.MmLowestPhysicalPage, "MmLowestPhysicalPage %u / %u\n",
+ ok( sbi.MmLowestPhysicalPage == sbi64.MmLowestPhysicalPage, "MmLowestPhysicalPage %lu / %lu\n",
sbi.MmLowestPhysicalPage, sbi64.MmLowestPhysicalPage);
- ok( sbi.MmHighestPhysicalPage == sbi64.MmHighestPhysicalPage, "MmHighestPhysicalPage %u / %u\n",
+ ok( sbi.MmHighestPhysicalPage == sbi64.MmHighestPhysicalPage, "MmHighestPhysicalPage %lu / %lu\n",
sbi.MmHighestPhysicalPage, sbi64.MmHighestPhysicalPage);
ok( sbi.AllocationGranularity == (ULONG_PTR)sbi64.AllocationGranularity,
"AllocationGranularity %#lx / %#lx\n", sbi.AllocationGranularity,
@@ -269,8 +270,8 @@ static void test_query_basic(void)
memset(&sbi3, 0xcc, sizeof(sbi3));
status = pNtQuerySystemInformation(SystemEmulationBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status);
- ok( sizeof(sbi3) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status);
+ ok( sizeof(sbi3) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
ok( !memcmp( &sbi, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ),
"info is different\n" );
@@ -282,22 +283,22 @@ static void test_query_basic(void)
{
case SystemNativeBasicInformation:
ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_INFO_LENGTH_MISMATCH ||
- broken(status == STATUS_NOT_IMPLEMENTED) /* vista */, "%u: %x / %x\n", i, status, expect );
+ broken(status == STATUS_NOT_IMPLEMENTED) /* vista */, "%lu: %lx / %lx\n", i, status, expect );
break;
case SystemBasicInformation:
case SystemCpuInformation:
case SystemEmulationBasicInformation:
case SystemEmulationProcessorInformation:
- ok( status == expect, "%u: %x / %x\n", i, status, expect );
+ ok( status == expect, "%lu: %lx / %lx\n", i, status, expect );
break;
default:
if (is_wow64) /* only a few info classes are supported on Wow64 */
todo_wine_if (is_wow64 && status != STATUS_INVALID_INFO_CLASS)
ok( status == STATUS_INVALID_INFO_CLASS ||
broken(status == STATUS_NOT_IMPLEMENTED), /* vista */
- "%u: %x\n", i, status );
+ "%lu: %lx\n", i, status );
else
- ok( status == expect, "%u: %x / %x\n", i, status, expect );
+ ok( status == expect, "%lu: %lx / %lx\n", i, status, expect );
break;
}
}
@@ -311,18 +312,18 @@ static void test_query_cpu(void)
memset(&sci, 0xcc, sizeof(sci));
status = pNtQuerySystemInformation(SystemCpuInformation, &sci, sizeof(sci), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(sci) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(sci) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
/* Check if we have some return values */
- if (winetest_debug > 1) trace("Processor FeatureSet : %08x\n", sci.ProcessorFeatureBits);
- ok( sci.ProcessorFeatureBits != 0, "Expected some features for this processor, got %08x\n",
+ if (winetest_debug > 1) trace("Processor FeatureSet : %08lx\n", sci.ProcessorFeatureBits);
+ ok( sci.ProcessorFeatureBits != 0, "Expected some features for this processor, got %08lx\n",
sci.ProcessorFeatureBits);
memset(&sci2, 0xcc, sizeof(sci2));
status = pRtlGetNativeSystemInformation(SystemCpuInformation, &sci2, sizeof(sci2), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status);
- ok( sizeof(sci2) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status);
+ ok( sizeof(sci2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
if (is_wow64)
{
@@ -343,13 +344,13 @@ static void test_query_cpu(void)
sci.ProcessorRevision, sci2.ProcessorRevision );
ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n",
sci.MaximumProcessors, sci2.MaximumProcessors );
- ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %x / %x\n",
+ ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n",
sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits );
memset(&sci2, 0xcc, sizeof(sci2));
status = pNtQuerySystemInformation(SystemEmulationProcessorInformation, &sci2, sizeof(sci2), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status);
- ok( sizeof(sci2) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status);
+ ok( sizeof(sci2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
#ifdef _WIN64
ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n",
@@ -365,7 +366,7 @@ static void test_query_cpu(void)
sci.ProcessorRevision, sci2.ProcessorRevision );
ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n",
sci.MaximumProcessors, sci2.MaximumProcessors );
- ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %x / %x\n",
+ ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n",
sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits );
}
@@ -377,7 +378,7 @@ static void test_query_performance(void)
DWORD size = sizeof(SYSTEM_PERFORMANCE_INFORMATION);
status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, 0, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size, &ReturnLength);
if (status == STATUS_INFO_LENGTH_MISMATCH && is_wow64)
@@ -386,13 +387,13 @@ static void test_query_performance(void)
size += 16;
status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size, &ReturnLength);
}
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( ReturnLength == size, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( ReturnLength == size, "Inconsistent length %ld\n", ReturnLength);
status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size + 2, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( ReturnLength == size || ReturnLength == size + 2 /* win8+ */,
- "Inconsistent length %d\n", ReturnLength);
+ "Inconsistent length %ld\n", ReturnLength);
/* Not return values yet, as struct members are unknown */
}
@@ -414,32 +415,32 @@ static void test_query_timeofday(void)
SYSTEM_TIMEOFDAY_INFORMATION_PRIVATE sti;
status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 0, &ReturnLength );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( 0 == ReturnLength, "ReturnLength should be 0, it is (%d)\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( 0 == ReturnLength, "ReturnLength should be 0, it is (%ld)\n", ReturnLength);
sti.uCurrentTimeZoneId = 0xdeadbeef;
status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 24, &ReturnLength );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( 24 == ReturnLength, "ReturnLength should be 24, it is (%d)\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( 24 == ReturnLength, "ReturnLength should be 24, it is (%ld)\n", ReturnLength);
ok( 0xdeadbeef == sti.uCurrentTimeZoneId, "This part of the buffer should not have been filled\n");
sti.uCurrentTimeZoneId = 0xdeadbeef;
status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 32, &ReturnLength );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( 32 == ReturnLength, "ReturnLength should be 32, it is (%d)\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( 32 == ReturnLength, "ReturnLength should be 32, it is (%ld)\n", ReturnLength);
ok( 0xdeadbeef != sti.uCurrentTimeZoneId, "Buffer should have been partially filled\n");
status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 49, &ReturnLength );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
ok( ReturnLength == 0 || ReturnLength == sizeof(sti) /* vista */,
- "ReturnLength should be 0, it is (%d)\n", ReturnLength);
+ "ReturnLength should be 0, it is (%ld)\n", ReturnLength);
status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, sizeof(sti), &ReturnLength );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(sti) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(sti) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
/* Check if we have some return values */
- if (winetest_debug > 1) trace("uCurrentTimeZoneId : (%d)\n", sti.uCurrentTimeZoneId);
+ if (winetest_debug > 1) trace("uCurrentTimeZoneId : (%ld)\n", sti.uCurrentTimeZoneId);
}
static void test_query_process( BOOL extended )
@@ -498,7 +499,7 @@ static void test_query_process( BOOL extended )
/* test ReturnLength */
ReturnLength = 0;
status = pNtQuerySystemInformation( info_class, NULL, 0, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08lx\n", status);
ok( ReturnLength > 0, "got 0 length\n" );
/* W2K3 and later returns the needed length, the rest returns 0. */
@@ -516,7 +517,7 @@ static void test_query_process( BOOL extended )
/* Sometimes new process or threads appear between the call and increase the size,
* otherwise the previously returned buffer size should be sufficient. */
ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH,
- "Expected STATUS_SUCCESS, got %08x\n", status );
+ "Expected STATUS_SUCCESS, got %08lx\n", status );
spi = spi_buf;
@@ -542,14 +543,14 @@ static void test_query_process( BOOL extended )
cid.UniqueThread = 0;
status = NtOpenProcess( &handle, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid );
ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED,
- "Got unexpected status %#x, pid %p.\n", status, spi->UniqueProcessId );
+ "Got unexpected status %#lx, pid %p.\n", status, spi->UniqueProcessId );
if (!status)
{
ULONG_PTR info;
status = NtQueryInformationProcess( handle, ProcessWow64Information, &info, sizeof(info), NULL );
- ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status );
+ ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status );
is_process_wow64 = !!info;
NtClose( handle );
}
@@ -583,12 +584,12 @@ static void test_query_process( BOOL extended )
THREAD_BASIC_INFORMATION tbi;
status = pNtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status );
+ ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status );
expected_address = tbi.TebBaseAddress;
if (is_wow64 && is_process_wow64)
expected_address = (BYTE *)expected_address - 0x2000;
if (!is_wow64 && !is_process_wow64 && !tbi.TebBaseAddress)
- win_skip( "Could not get TebBaseAddress, thread %u.\n", j );
+ win_skip( "Could not get TebBaseAddress, thread %lu.\n", j );
else
ok( ti->TebBase == expected_address || (is_wow64 && !expected_address && !!ti->TebBase),
"Got unexpected TebBase %p, expected %p.\n", ti->TebBase, expected_address );
@@ -623,11 +624,11 @@ static void test_query_process( BOOL extended )
status = NtOpenProcess( &handle, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid );
ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */,
- "NtOpenProcess returned:%x\n", status );
+ "NtOpenProcess returned:%lx\n", status );
if (status != STATUS_SUCCESS) continue;
status = pNtQueryInformationProcess( handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL );
- ok( status == STATUS_SUCCESS, "NtQueryInformationProcess returned:%x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryInformationProcess returned:%lx\n", status );
ok( pbi.UniqueProcessId == GetCurrentProcessId(),
"Expected pid %p, got %p\n", ULongToHandle(GetCurrentProcessId()), ULongToHandle(pbi.UniqueProcessId) );
@@ -642,11 +643,11 @@ static void test_query_process( BOOL extended )
status = NtOpenThread( &handle, THREAD_QUERY_LIMITED_INFORMATION, &attr, &cid );
ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */,
- "NtOpenThread returned:%x\n", status );
+ "NtOpenThread returned:%lx\n", status );
if (status != STATUS_SUCCESS) continue;
status = pNtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "NtQueryInformationThread returned:%x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryInformationThread returned:%lx\n", status );
ok( tbi.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()),
"Expected tid %p, got %p\n", ULongToHandle(GetCurrentThreadId()), tbi.ClientId.UniqueThread );
@@ -665,13 +666,13 @@ static void test_query_procperf(void)
/* Find out the number of processors */
status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
NeededLength = sbi.NumberOfProcessors * sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION);
sppi = HeapAlloc(GetProcessHeap(), 0, NeededLength);
status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, 0, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
/* Try it for 1 processor */
sppi->KernelTime.QuadPart = 0xdeaddead;
@@ -679,9 +680,9 @@ static void test_query_procperf(void)
sppi->IdleTime.QuadPart = 0xdeaddead;
status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi,
sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) == ReturnLength,
- "Inconsistent length %d\n", ReturnLength);
+ "Inconsistent length %ld\n", ReturnLength);
ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n");
ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n");
ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n");
@@ -691,8 +692,8 @@ static void test_query_procperf(void)
sppi->UserTime.QuadPart = 0xdeaddead;
sppi->IdleTime.QuadPart = 0xdeaddead;
status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, NeededLength, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( NeededLength == ReturnLength, "Inconsistent length (%d) <-> (%d)\n", NeededLength, ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( NeededLength == ReturnLength, "Inconsistent length (%ld) <-> (%ld)\n", NeededLength, ReturnLength);
ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n");
ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n");
ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n");
@@ -704,8 +705,8 @@ static void test_query_procperf(void)
sppi->IdleTime.QuadPart = 0xdeaddead;
status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, NeededLength + 2, &ReturnLength);
ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH /* vista */,
- "Expected STATUS_SUCCESS or STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( NeededLength == ReturnLength, "Inconsistent length (%d) <-> (%d)\n", NeededLength, ReturnLength);
+ "Expected STATUS_SUCCESS or STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( NeededLength == ReturnLength, "Inconsistent length (%ld) <-> (%ld)\n", NeededLength, ReturnLength);
if (status == STATUS_SUCCESS)
{
ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n");
@@ -731,12 +732,12 @@ static void test_query_module(void)
char *buffer;
status = pNtQuerySystemInformation(SystemModuleInformation, NULL, 0, &size);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status);
ok(size > 0, "expected nonzero size\n");
info = malloc(size);
status = pNtQuerySystemInformation(SystemModuleInformation, info, size, &size);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
ok(info->ModulesCount > 0, "Expected some modules to be loaded\n");
@@ -744,10 +745,10 @@ static void test_query_module(void)
{
RTL_PROCESS_MODULE_INFORMATION *module = &info->Modules[i];
- ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex);
- ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name);
- ok(module->ImageSize, "%u: got 0 size\n", i);
- ok(module->LoadCount, "%u: got 0 load count\n", i);
+ ok(module->LoadOrderIndex == i, "%lu: got index %u\n", i, module->LoadOrderIndex);
+ ok(module->ImageBaseAddress || is_wow64, "%lu: got NULL address for %s\n", i, module->Name);
+ ok(module->ImageSize, "%lu: got 0 size\n", i);
+ ok(module->LoadCount, "%lu: got 0 load count\n", i);
}
free(info);
@@ -758,27 +759,27 @@ static void test_query_module(void)
win_skip("SystemModuleInformationEx is not supported.\n");
return;
}
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status);
ok(size > 0, "expected nonzero size\n");
buffer = malloc(size);
status = pNtQuerySystemInformation(SystemModuleInformationEx, buffer, size, &size);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
infoex = (const void *)buffer;
for (i = 0; infoex->NextOffset; i++)
{
const RTL_PROCESS_MODULE_INFORMATION *module = &infoex->BaseInfo;
- ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex);
- ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name);
- ok(module->ImageSize, "%u: got 0 size\n", i);
- ok(module->LoadCount, "%u: got 0 load count\n", i);
+ ok(module->LoadOrderIndex == i, "%lu: got index %u\n", i, module->LoadOrderIndex);
+ ok(module->ImageBaseAddress || is_wow64, "%lu: got NULL address for %s\n", i, module->Name);
+ ok(module->ImageSize, "%lu: got 0 size\n", i);
+ ok(module->LoadCount, "%lu: got 0 load count\n", i);
infoex = (const void *)((const char *)infoex + infoex->NextOffset);
}
ok(((char *)infoex - buffer) + sizeof(infoex->NextOffset) == size,
- "got size %u, null terminator %u\n", size, (char *)infoex - buffer);
+ "got size %lu, null terminator %Iu\n", size, (char *)infoex - buffer);
free(buffer);
@@ -795,15 +796,15 @@ static void test_query_handle(void)
INT i;
EventHandle = CreateEventA(NULL, FALSE, FALSE, NULL);
- ok( EventHandle != NULL, "CreateEventA failed %u\n", GetLastError() );
+ ok( EventHandle != NULL, "CreateEventA failed %lu\n", GetLastError() );
ret = SetHandleInformation(EventHandle, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE,
HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE);
- ok(ret, "got error %u\n", GetLastError());
+ ok(ret, "got error %lu\n", GetLastError());
/* Request the needed length : a SystemInformationLength greater than one struct sets ReturnLength */
ReturnLength = 0xdeadbeef;
status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
ok( ReturnLength != 0xdeadbeef, "Expected valid ReturnLength\n" );
SystemInformationLength = ReturnLength;
@@ -819,11 +820,11 @@ static void test_query_handle(void)
memset(shi, 0x55, SystemInformationLength);
status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength);
}
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
ExpectedLength = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION, Handle[shi->Count]);
ok( ReturnLength == ExpectedLength || broken(ReturnLength == ExpectedLength - sizeof(DWORD)), /* Vista / 2008 */
- "Expected length %u, got %u\n", ExpectedLength, ReturnLength );
- ok( shi->Count > 1, "Expected more than 1 handle, got %u\n", shi->Count );
+ "Expected length %lu, got %lu\n", ExpectedLength, ReturnLength );
+ ok( shi->Count > 1, "Expected more than 1 handle, got %lu\n", shi->Count );
ok( shi->Handle[1].HandleValue != 0x5555 || broken( shi->Handle[1].HandleValue == 0x5555 ), /* Vista / 2008 */
"Uninitialized second handle\n" );
if (shi->Handle[1].HandleValue == 0x5555)
@@ -845,10 +846,10 @@ static void test_query_handle(void)
break;
}
}
- ok( found, "Expected to find event handle %p (pid %x) in handle list\n", EventHandle, GetCurrentProcessId() );
+ ok( found, "Expected to find event handle %p (pid %lx) in handle list\n", EventHandle, GetCurrentProcessId() );
ret = SetHandleInformation(EventHandle, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0);
- ok(ret, "got error %u\n", GetLastError());
+ ok(ret, "got error %lu\n", GetLastError());
CloseHandle(EventHandle);
ReturnLength = 0xdeadbeef;
@@ -859,14 +860,14 @@ static void test_query_handle(void)
shi = HeapReAlloc(GetProcessHeap(), 0, shi, SystemInformationLength);
status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength);
}
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
for (i = 0, found = FALSE; i < shi->Count && !found; i++)
found = (shi->Handle[i].OwnerPid == GetCurrentProcessId()) &&
((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle);
ok( !found, "Unexpectedly found event handle in handle list\n" );
status = pNtQuerySystemInformation(SystemHandleInformation, NULL, SystemInformationLength, &ReturnLength);
- ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status );
done:
HeapFree( GetProcessHeap(), 0, shi);
@@ -882,24 +883,24 @@ static void test_query_handle_ex(void)
BOOL found, ret;
event = CreateEventA(NULL, FALSE, FALSE, NULL);
- ok(event != NULL, "failed to create event, error %u\n", GetLastError());
+ ok(event != NULL, "failed to create event, error %lu\n", GetLastError());
ret = SetHandleInformation(event, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE,
HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE);
- ok(ret, "got error %u\n", GetLastError());
+ ok(ret, "got error %lu\n", GetLastError());
size = 0;
status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status);
- ok(size > sizeof(SYSTEM_HANDLE_INFORMATION_EX), "got size %u\n", size);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status);
+ ok(size > sizeof(SYSTEM_HANDLE_INFORMATION_EX), "got size %lu\n", size);
while (status == STATUS_INFO_LENGTH_MISMATCH)
{
info = realloc(info, size);
status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size);
}
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]);
- ok(size == expect_size, "expected size %u, got %u\n", expect_size, size);
+ ok(size == expect_size, "expected size %lu, got %lu\n", expect_size, size);
ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles);
found = FALSE;
@@ -909,8 +910,8 @@ static void test_query_handle_ex(void)
&& (HANDLE)info->Handles[i].HandleValue == event)
{
ok(info->Handles[i].HandleAttributes == (OBJ_INHERIT | OBJ_PROTECT_CLOSE),
- "got flags %#x\n", info->Handles[i].HandleAttributes);
- ok(info->Handles[i].GrantedAccess == EVENT_ALL_ACCESS, "got access %#x\n", info->Handles[i].GrantedAccess);
+ "got flags %#lx\n", info->Handles[i].HandleAttributes);
+ ok(info->Handles[i].GrantedAccess == EVENT_ALL_ACCESS, "got access %#lx\n", info->Handles[i].GrantedAccess);
found = TRUE;
}
ok(!info->Handles[i].CreatorBackTraceIndex, "got backtrace index %u\n", info->Handles[i].CreatorBackTraceIndex);
@@ -918,7 +919,7 @@ static void test_query_handle_ex(void)
ok(found, "event handle not found\n");
ret = SetHandleInformation(event, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0);
- ok(ret, "got error %u\n", GetLastError());
+ ok(ret, "got error %lu\n", GetLastError());
CloseHandle(event);
status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size);
@@ -927,9 +928,9 @@ static void test_query_handle_ex(void)
info = realloc(info, size);
status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size);
}
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]);
- ok(size == expect_size, "expected size %u, got %u\n", expect_size, size);
+ ok(size == expect_size, "expected size %lu, got %lu\n", expect_size, size);
ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles);
found = FALSE;
@@ -945,7 +946,7 @@ static void test_query_handle_ex(void)
ok(!found, "event handle found\n");
status = pNtQuerySystemInformation(SystemExtendedHandleInformation, NULL, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size);
- ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status );
free(info);
}
@@ -965,7 +966,7 @@ static void test_query_cache(void)
ReturnLength = 0xdeadbeef;
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength);
ok(!status && (ReturnLength == expected),
- "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected);
+ "%d: got 0x%lx and %lu (expected STATUS_SUCCESS and %lu)\n", i, status, ReturnLength, expected);
}
/* buffer too small for the full result.
@@ -979,7 +980,7 @@ static void test_query_cache(void)
ReturnLength = 0xdeadbeef;
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength);
ok(!status && (ReturnLength == expected),
- "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected);
+ "%d: got 0x%lx and %lu (expected STATUS_SUCCESS and %lu)\n", i, status, ReturnLength, expected);
}
}
@@ -988,7 +989,7 @@ static void test_query_cache(void)
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength);
ok( status == STATUS_INFO_LENGTH_MISMATCH &&
((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)),
- "%d: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", i, status, ReturnLength, expected);
+ "%d: got 0x%lx and %lu (expected STATUS_INFO_LENGTH_MISMATCH and %lu)\n", i, status, ReturnLength, expected);
if (0) {
/* this crashes on some vista / win7 machines */
@@ -996,7 +997,7 @@ static void test_query_cache(void)
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, 0, &ReturnLength);
ok( status == STATUS_INFO_LENGTH_MISMATCH &&
((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)),
- "0: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", status, ReturnLength, expected);
+ "0: got 0x%lx and %lu (expected STATUS_INFO_LENGTH_MISMATCH and %lu)\n", status, ReturnLength, expected);
}
}
@@ -1010,18 +1011,18 @@ static void test_query_interrupt(void)
/* Find out the number of processors */
status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
NeededLength = sbi.NumberOfProcessors * sizeof(SYSTEM_INTERRUPT_INFORMATION);
sii = HeapAlloc(GetProcessHeap(), 0, NeededLength);
status = pNtQuerySystemInformation(SystemInterruptInformation, sii, 0, &ReturnLength);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok(ReturnLength == NeededLength, "got %u\n", ReturnLength);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok(ReturnLength == NeededLength, "got %lu\n", ReturnLength);
/* Try it for all processors */
status = pNtQuerySystemInformation(SystemInterruptInformation, sii, NeededLength, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
/* Windows XP and W2K3 (and others?) always return 0 for the ReturnLength
* No test added for this as it's highly unlikely that an app depends on this
@@ -1039,29 +1040,29 @@ static void test_time_adjustment(void)
memset( &query, 0xcc, sizeof(query) );
status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query), &len );
- ok( status == STATUS_SUCCESS, "got %08x\n", status );
- ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len );
+ ok( status == STATUS_SUCCESS, "got %08lx\n", status );
+ ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %lu\n", len );
ok( query.TimeAdjustmentDisabled == TRUE || query.TimeAdjustmentDisabled == FALSE,
"wrong value %x\n", query.TimeAdjustmentDisabled );
status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query)-1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status );
- ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status );
+ ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %lu\n", len );
status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query)+1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status );
- ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status );
+ ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %lu\n", len );
adjust.TimeAdjustment = query.TimeAdjustment;
adjust.TimeAdjustmentDisabled = query.TimeAdjustmentDisabled;
status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust) );
- ok( status == STATUS_SUCCESS || status == STATUS_PRIVILEGE_NOT_HELD, "got %08x\n", status );
+ ok( status == STATUS_SUCCESS || status == STATUS_PRIVILEGE_NOT_HELD, "got %08lx\n", status );
status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust)-1 );
todo_wine
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status );
status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust)+1 );
todo_wine
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status );
}
static void test_query_kerndebug(void)
@@ -1072,21 +1073,21 @@ static void test_query_kerndebug(void)
SYSTEM_KERNEL_DEBUGGER_INFORMATION skdi;
status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, 0, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, sizeof(skdi), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(skdi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(skdi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, sizeof(skdi) + 2, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(skdi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(skdi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex, 0, &ReturnLength);
ok( status == STATUS_INFO_LENGTH_MISMATCH
|| status == STATUS_NOT_IMPLEMENTED /* before win7 */
|| status == STATUS_INVALID_INFO_CLASS /* wow64 on Win10 */,
- "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
if (status != STATUS_INFO_LENGTH_MISMATCH)
{
@@ -1096,13 +1097,13 @@ static void test_query_kerndebug(void)
{
status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex,
sizeof(skdi_ex), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex,
sizeof(skdi_ex) + 2, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
}
}
@@ -1113,15 +1114,15 @@ static void test_query_regquota(void)
SYSTEM_REGISTRY_QUOTA_INFORMATION srqi;
status = pNtQuerySystemInformation(SystemRegistryQuotaInformation, &srqi, 0, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQuerySystemInformation(SystemRegistryQuotaInformation, &srqi, sizeof(srqi), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(srqi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(srqi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQuerySystemInformation(SystemRegistryQuotaInformation, &srqi, sizeof(srqi) + 2, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(srqi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(srqi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
}
static void test_query_logicalproc(void)
@@ -1139,12 +1140,12 @@ static void test_query_logicalproc(void)
win_skip("SystemLogicalProcessorInformation is not supported\n");
return;
}
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok(len%sizeof(*slpi) == 0, "Incorrect length %d\n", len);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok(len%sizeof(*slpi) == 0, "Incorrect length %ld\n", len);
slpi = HeapAlloc(GetProcessHeap(), 0, len);
status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, slpi, len, &len);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
proc_no = 0;
for(i=0; i<len/sizeof(*slpi); i++) {
@@ -1160,7 +1161,7 @@ static void test_query_logicalproc(void)
}
ok(proc_no > 0, "No processors were found\n");
if(si.dwNumberOfProcessors <= 32)
- ok(proc_no == si.dwNumberOfProcessors, "Incorrect number of logical processors: %d, expected %d\n",
+ ok(proc_no == si.dwNumberOfProcessors, "Incorrect number of logical processors: %ld, expected %ld\n",
proc_no, si.dwNumberOfProcessors);
HeapFree(GetProcessHeap(), 0, slpi);
@@ -1181,43 +1182,43 @@ static void test_query_logicalprocex(void)
len = 0;
relationship = RelationAll;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len > 0, "got %u\n", len);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len > 0, "got %lu\n", len);
len_core = 0;
relationship = RelationProcessorCore;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_core);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len_core > 0, "got %u\n", len_core);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len_core > 0, "got %lu\n", len_core);
len_numa = 0;
relationship = RelationNumaNode;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_numa);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len_numa > 0, "got %u\n", len_numa);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len_numa > 0, "got %lu\n", len_numa);
len_cache = 0;
relationship = RelationCache;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_cache);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len_cache > 0, "got %u\n", len_cache);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len_cache > 0, "got %lu\n", len_cache);
len_package = 0;
relationship = RelationProcessorPackage;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_package);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len_package > 0, "got %u\n", len_package);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len_package > 0, "got %lu\n", len_package);
len_group = 0;
relationship = RelationGroup;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_group);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len_group > 0, "got %u\n", len_group);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len_group > 0, "got %lu\n", len_group);
len_public = 0;
ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, &len_public);
- ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError());
- ok(len == len_public, "got %u, expected %u\n", len_public, len);
+ ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %ld\n", ret, GetLastError());
+ ok(len == len_public, "got %lu, expected %lu\n", len_public, len);
infoex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
infoex_public = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_public);
@@ -1229,10 +1230,10 @@ static void test_query_logicalprocex(void)
relationship = RelationAll;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &len);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
ret = pGetLogicalProcessorInformationEx(RelationAll, infoex_public, &len_public);
- ok(ret, "got %d, error %d\n", ret, GetLastError());
+ ok(ret, "got %d, error %ld\n", ret, GetLastError());
ok(!memcmp(infoex, infoex_public, len), "returned info data mismatch\n");
/* Test for RelationAll. */
@@ -1247,7 +1248,7 @@ static void test_query_logicalprocex(void)
continue;
}
- trace("infoex[%u].Size: %u\n", i, ex->Size);
+ trace("infoex[%u].Size: %lu\n", i, ex->Size);
switch (ex->Relationship)
{
case RelationProcessorCore:
@@ -1258,14 +1259,14 @@ static void test_query_logicalprocex(void)
trace("infoex[%u].Processor.GroupCount: 0x%x\n", i, ex->Processor.GroupCount);
for (j = 0; j < ex->Processor.GroupCount; ++j)
{
- trace("infoex[%u].Processor.GroupMask[%u].Mask: 0x%lx\n", i, j, ex->Processor.GroupMask[j].Mask);
+ trace("infoex[%u].Processor.GroupMask[%u].Mask: 0x%Ix\n", i, j, ex->Processor.GroupMask[j].Mask);
trace("infoex[%u].Processor.GroupMask[%u].Group: 0x%x\n", i, j, ex->Processor.GroupMask[j].Group);
}
break;
case RelationNumaNode:
trace("infoex[%u].Relationship: 0x%x (NumaNode)\n", i, ex->Relationship);
- trace("infoex[%u].NumaNode.NodeNumber: 0x%x\n", i, ex->NumaNode.NodeNumber);
- trace("infoex[%u].NumaNode.GroupMask.Mask: 0x%lx\n", i, ex->NumaNode.GroupMask.Mask);
+ trace("infoex[%u].NumaNode.NodeNumber: 0x%lx\n", i, ex->NumaNode.NodeNumber);
+ trace("infoex[%u].NumaNode.GroupMask.Mask: 0x%Ix\n", i, ex->NumaNode.GroupMask.Mask);
trace("infoex[%u].NumaNode.GroupMask.Group: 0x%x\n", i, ex->NumaNode.GroupMask.Group);
break;
case RelationCache:
@@ -1273,9 +1274,9 @@ static void test_query_logicalprocex(void)
trace("infoex[%u].Cache.Level: 0x%x\n", i, ex->Cache.Level);
trace("infoex[%u].Cache.Associativity: 0x%x\n", i, ex->Cache.Associativity);
trace("infoex[%u].Cache.LineSize: 0x%x\n", i, ex->Cache.LineSize);
- trace("infoex[%u].Cache.CacheSize: 0x%x\n", i, ex->Cache.CacheSize);
+ trace("infoex[%u].Cache.CacheSize: 0x%lx\n", i, ex->Cache.CacheSize);
trace("infoex[%u].Cache.Type: 0x%x\n", i, ex->Cache.Type);
- trace("infoex[%u].Cache.GroupMask.Mask: 0x%lx\n", i, ex->Cache.GroupMask.Mask);
+ trace("infoex[%u].Cache.GroupMask.Mask: 0x%Ix\n", i, ex->Cache.GroupMask.Mask);
trace("infoex[%u].Cache.GroupMask.Group: 0x%x\n", i, ex->Cache.GroupMask.Group);
break;
case RelationGroup:
@@ -1286,7 +1287,7 @@ static void test_query_logicalprocex(void)
{
trace("infoex[%u].Group.GroupInfo[%u].MaximumProcessorCount: 0x%x\n", i, j, ex->Group.GroupInfo[j].MaximumProcessorCount);
trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorCount: 0x%x\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorCount);
- trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorMask: 0x%lx\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorMask);
+ trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorMask: 0x%Ix\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorMask);
}
break;
default:
@@ -1301,7 +1302,7 @@ static void test_query_logicalprocex(void)
relationship = RelationProcessorCore;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_core, len_core, &len_core);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
for (i = 0; status == STATUS_SUCCESS && i < len_core;)
{
@@ -1313,7 +1314,7 @@ static void test_query_logicalprocex(void)
relationship = RelationNumaNode;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_numa, len_numa, &len_numa);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
for (i = 0; status == STATUS_SUCCESS && i < len_numa;)
{
@@ -1325,7 +1326,7 @@ static void test_query_logicalprocex(void)
relationship = RelationCache;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_cache, len_cache, &len_cache);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
for (i = 0; status == STATUS_SUCCESS && i < len_cache;)
{
@@ -1337,7 +1338,7 @@ static void test_query_logicalprocex(void)
relationship = RelationProcessorPackage;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_package, len_package, &len_package);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
for (i = 0; status == STATUS_SUCCESS && i < len_package;)
{
@@ -1349,7 +1350,7 @@ static void test_query_logicalprocex(void)
relationship = RelationGroup;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_group, len_group, &len_group);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
for (i = 0; status == STATUS_SUCCESS && i < len_group;)
{
@@ -1360,7 +1361,7 @@ static void test_query_logicalprocex(void)
}
len_union = len_core + len_numa + len_cache + len_package + len_group;
- ok(len == len_union, "Expected 0x%x, got 0x%0x\n", len, len_union);
+ ok(len == len_union, "Expected 0x%lx, got 0x%0lx\n", len, len_union);
HeapFree(GetProcessHeap(), 0, infoex);
HeapFree(GetProcessHeap(), 0, infoex_public);
@@ -1396,56 +1397,56 @@ static void test_query_cpusetinfo(void)
return;
}
- ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status);
- ok(len == expected_len, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#lx.\n", status);
+ ok(len == expected_len, "Got unexpected length %lu.\n", len);
len = 0xdeadbeef;
status = pNtQuerySystemInformation(SystemCpuSetInformation, NULL, 0, &len);
ok(status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_INFO_CLASS,
- "Got unexpected status %#x.\n", status);
- ok(len == 0xdeadbeef, "Got unexpected len %u.\n", len);
+ "Got unexpected status %#lx.\n", status);
+ ok(len == 0xdeadbeef, "Got unexpected len %lu.\n", len);
len = 0xdeadbeef;
process = (HANDLE)0xdeadbeef;
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len);
- ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status);
- ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#lx.\n", status);
+ ok(len == 0xdeadbeef, "Got unexpected length %lu.\n", len);
len = 0xdeadbeef;
process = NULL;
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, 4 * sizeof(process), NULL, 0, &len);
ok((status == STATUS_INVALID_PARAMETER && len == 0xdeadbeef)
|| (status == STATUS_BUFFER_TOO_SMALL && len == expected_len),
- "Got unexpected status %#x, length %u.\n", status, len);
+ "Got unexpected status %#lx, length %lu.\n", status, len);
len = 0xdeadbeef;
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, NULL, sizeof(process), NULL, 0, &len);
- ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status);
- ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#lx.\n", status);
+ ok(len == 0xdeadbeef, "Got unexpected length %lu.\n", len);
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status);
- ok(len == expected_len, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#lx.\n", status);
+ ok(len == expected_len, "Got unexpected length %lu.\n", len);
len = 0xdeadbeef;
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL,
expected_len, &len);
- ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status);
- ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#lx.\n", status);
+ ok(len == 0xdeadbeef, "Got unexpected length %lu.\n", len);
info = malloc(expected_len);
len = 0;
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), info, expected_len, &len);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
- ok(len == expected_len, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
+ ok(len == expected_len, "Got unexpected length %lu.\n", len);
for (i = 0; i < cpu_count; ++i)
{
SYSTEM_CPU_SET_INFORMATION *d = &info[i];
- ok(d->Size == sizeof(*d), "Got unexpected size %u, i %u.\n", d->Size, i);
+ ok(d->Size == sizeof(*d), "Got unexpected size %lu, i %u.\n", d->Size, i);
ok(d->Type == CpuSetInformation, "Got unexpected type %u, i %u.\n", d->Type, i);
- ok(d->CpuSet.Id == 0x100 + i, "Got unexpected Id %#x, i %u.\n", d->CpuSet.Id, i);
+ ok(d->CpuSet.Id == 0x100 + i, "Got unexpected Id %#lx, i %u.\n", d->CpuSet.Id, i);
ok(!d->CpuSet.Group, "Got unexpected Group %u, i %u.\n", d->CpuSet.Group, i);
ok(d->CpuSet.LogicalProcessorIndex == i, "Got unexpected LogicalProcessorIndex %u, i %u.\n",
d->CpuSet.LogicalProcessorIndex, i);
@@ -1470,36 +1471,36 @@ static void test_query_firmware(void)
status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len - 1, &len1);
ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* xp */,
- "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
if (len1 == 0) /* xp, 2003 */
{
win_skip("SystemFirmwareTableInformation is not available\n");
HeapFree(GetProcessHeap(), 0, sfti);
return;
}
- ok(len1 == min_sfti_len, "Expected length %u, got %u\n", min_sfti_len, len1);
+ ok(len1 == min_sfti_len, "Expected length %lu, got %lu\n", min_sfti_len, len1);
status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &len1);
- ok(status == STATUS_NOT_IMPLEMENTED, "Expected STATUS_NOT_IMPLEMENTED, got %08x\n", status);
- ok(len1 == 0, "Expected length 0, got %u\n", len1);
+ ok(status == STATUS_NOT_IMPLEMENTED, "Expected STATUS_NOT_IMPLEMENTED, got %08lx\n", status);
+ ok(len1 == 0, "Expected length 0, got %lu\n", len1);
sfti->ProviderSignature = RSMB;
sfti->Action = SystemFirmwareTable_Get;
status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &len1);
- ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status);
- ok(len1 >= min_sfti_len, "Expected length >= %u, got %u\n", min_sfti_len, len1);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08lx\n", status);
+ ok(len1 >= min_sfti_len, "Expected length >= %lu, got %lu\n", min_sfti_len, len1);
ok(sfti->TableBufferLength == len1 - min_sfti_len,
- "Expected length %u, got %u\n", len1 - min_sfti_len, sfti->TableBufferLength);
+ "Expected length %lu, got %lu\n", len1 - min_sfti_len, sfti->TableBufferLength);
sfti = HeapReAlloc(GetProcessHeap(), 0, sfti, len1);
ok(!!sfti, "Failed to allocate memory\n");
status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, len1, &len2);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok(len2 == len1, "Expected length %u, got %u\n", len1, len2);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(len2 == len1, "Expected length %lu, got %lu\n", len1, len2);
ok(sfti->TableBufferLength == len1 - min_sfti_len,
- "Expected length %u, got %u\n", len1 - min_sfti_len, sfti->TableBufferLength);
+ "Expected length %lu, got %lu\n", len1 - min_sfti_len, sfti->TableBufferLength);
HeapFree(GetProcessHeap(), 0, sfti);
}
@@ -1527,16 +1528,16 @@ static void test_query_battery(void)
trace("Charging : %u\n", bs.Charging);
trace("Discharging : %u\n", bs.Discharging);
trace("Tag : %u\n", bs.Tag);
- trace("MaxCapacity : %u\n", bs.MaxCapacity);
- trace("RemainingCapacity : %u\n", bs.RemainingCapacity);
- trace("Rate : %d\n", (LONG)bs.Rate);
- trace("EstimatedTime : %u\n", bs.EstimatedTime);
- trace("DefaultAlert1 : %u\n", bs.DefaultAlert1);
- trace("DefaultAlert2 : %u\n", bs.DefaultAlert2);
+ trace("MaxCapacity : %lu\n", bs.MaxCapacity);
+ trace("RemainingCapacity : %lu\n", bs.RemainingCapacity);
+ trace("Rate : %ld\n", (LONG)bs.Rate);
+ trace("EstimatedTime : %lu\n", bs.EstimatedTime);
+ trace("DefaultAlert1 : %lu\n", bs.DefaultAlert1);
+ trace("DefaultAlert2 : %lu\n", bs.DefaultAlert2);
}
ok(bs.MaxCapacity >= bs.RemainingCapacity,
- "expected MaxCapacity %u to be greater than or equal to RemainingCapacity %u\n",
+ "expected MaxCapacity %lu to be greater than or equal to RemainingCapacity %lu\n",
bs.MaxCapacity, bs.RemainingCapacity);
if (!bs.BatteryPresent)
@@ -1546,7 +1547,7 @@ static void test_query_battery(void)
else
time_left = ~0u;
ok(bs.EstimatedTime == time_left,
- "expected %u minutes remaining got %u minutes\n", time_left, bs.EstimatedTime);
+ "expected %lu minutes remaining got %lu minutes\n", time_left, bs.EstimatedTime);
}
static void test_query_processor_power_info(void)
@@ -1588,12 +1589,12 @@ static void test_query_processor_power_info(void)
"Expected all but the last record to be overwritten.\n");
status = pNtPowerInformation(ProcessorInformation, 0, 0, 0, size);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
for(i = 0; i < si.dwNumberOfProcessors; i++)
ppi[i].Number = 0xDEADBEEF;
status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, sizeof(PROCESSOR_POWER_INFORMATION) - 1);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
for(i = 0; i < si.dwNumberOfProcessors; i++)
if (ppi[i].Number != 0xDEADBEEF) break;
ok( i == si.dwNumberOfProcessors, "Expected untouched buffer\n");
@@ -1602,13 +1603,13 @@ static void test_query_processor_power_info(void)
{
/* picky version found on newer Windows like Win7 */
ok( ppi[1].Number == 0xDEADBEEF, "Expected untouched buffer.\n");
- ok( status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status);
+ ok( status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08lx\n", status);
status = pNtPowerInformation(ProcessorInformation, 0, 0, 0, size);
- ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "Got %08x\n", status);
+ ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "Got %08lx\n", status);
status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, 0);
- ok( status == STATUS_BUFFER_TOO_SMALL || status == STATUS_INVALID_PARAMETER, "Got %08x\n", status);
+ ok( status == STATUS_BUFFER_TOO_SMALL || status == STATUS_INVALID_PARAMETER, "Got %08lx\n", status);
}
}
else
@@ -1617,7 +1618,7 @@ static void test_query_processor_power_info(void)
}
status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, size);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
HeapFree(GetProcessHeap(), 0, ppi);
}
@@ -1632,38 +1633,38 @@ static void test_query_process_wow64(void)
/* Do not give a handle and buffer */
status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, 0, NULL);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
/* Use a correct info class and buffer size, but still no handle and buffer */
status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE, got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE, got %08lx\n", status);
/* Use a correct info class, buffer size and handle, but no buffer */
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL);
- ok( status == STATUS_ACCESS_VIOLATION , "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status);
+ ok( status == STATUS_ACCESS_VIOLATION , "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status);
/* Use a correct info class, buffer and buffer size, but no handle */
pbi[0] = pbi[1] = dummy;
status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
- ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
+ ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
/* Use a greater buffer size */
pbi[0] = pbi[1] = dummy;
status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, NULL);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
/* Use no ReturnLength */
pbi[0] = pbi[1] = dummy;
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]);
- ok( pbi[0] != dummy, "pbi[0] %lx\n", pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %Ix\n", is_wow64, pbi[0]);
+ ok( pbi[0] != dummy, "pbi[0] %Ix\n", pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
/* Test written size on 64 bit by checking high 32 bit buffer */
if (sizeof(ULONG_PTR) > sizeof(DWORD))
{
@@ -1675,28 +1676,28 @@ static void test_query_process_wow64(void)
pbi[0] = pbi[1] = dummy;
ReturnLength = 0xdeadbeef;
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
- ok( ReturnLength == sizeof(ULONG_PTR), "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %Ix\n", is_wow64, pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
+ ok( ReturnLength == sizeof(ULONG_PTR), "Inconsistent length %ld\n", ReturnLength);
/* Everything is correct except a too small buffer size */
pbi[0] = pbi[1] = dummy;
ReturnLength = 0xdeadbeef;
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) - 1, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
- todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
+ todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", ReturnLength);
/* Everything is correct except a too large buffer size */
pbi[0] = pbi[1] = dummy;
ReturnLength = 0xdeadbeef;
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
- todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
+ todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", ReturnLength);
}
static void test_query_process_basic(void)
@@ -1721,50 +1722,50 @@ static void test_query_process_basic(void)
status = pNtQueryInformationProcess(NULL, -1, NULL, 0, NULL);
ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* vista */,
- "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08x\n", status);
+ "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, NULL, 0, NULL);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, NULL, sizeof(pbi), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, &pbi, sizeof(pbi), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, &pbi, sizeof(pbi) * 2, NULL);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(pbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(pbi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi) * 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( sizeof(pbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( sizeof(pbi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
- if (winetest_debug > 1) trace("ProcessID : %lx\n", pbi.UniqueProcessId);
+ if (winetest_debug > 1) trace("ProcessID : %Ix\n", pbi.UniqueProcessId);
ok( pbi.UniqueProcessId > 0, "Expected a ProcessID > 0, got 0\n");
}
static void dump_vm_counters(const char *header, const VM_COUNTERS_EX *pvi)
{
trace("%s:\n", header);
- trace("PeakVirtualSize : %lu\n", pvi->PeakVirtualSize);
- trace("VirtualSize : %lu\n", pvi->VirtualSize);
- trace("PageFaultCount : %u\n", pvi->PageFaultCount);
- trace("PeakWorkingSetSize : %lu\n", pvi->PeakWorkingSetSize);
- trace("WorkingSetSize : %lu\n", pvi->WorkingSetSize);
- trace("QuotaPeakPagedPoolUsage : %lu\n", pvi->QuotaPeakPagedPoolUsage);
- trace("QuotaPagedPoolUsage : %lu\n", pvi->QuotaPagedPoolUsage);
- trace("QuotaPeakNonPagePoolUsage : %lu\n", pvi->QuotaPeakNonPagedPoolUsage);
- trace("QuotaNonPagePoolUsage : %lu\n", pvi->QuotaNonPagedPoolUsage);
- trace("PagefileUsage : %lu\n", pvi->PagefileUsage);
- trace("PeakPagefileUsage : %lu\n", pvi->PeakPagefileUsage);
+ trace("PeakVirtualSize : %Iu\n", pvi->PeakVirtualSize);
+ trace("VirtualSize : %Iu\n", pvi->VirtualSize);
+ trace("PageFaultCount : %lu\n", pvi->PageFaultCount);
+ trace("PeakWorkingSetSize : %Iu\n", pvi->PeakWorkingSetSize);
+ trace("WorkingSetSize : %Iu\n", pvi->WorkingSetSize);
+ trace("QuotaPeakPagedPoolUsage : %Iu\n", pvi->QuotaPeakPagedPoolUsage);
+ trace("QuotaPagedPoolUsage : %Iu\n", pvi->QuotaPagedPoolUsage);
+ trace("QuotaPeakNonPagePoolUsage : %Iu\n", pvi->QuotaPeakNonPagedPoolUsage);
+ trace("QuotaNonPagePoolUsage : %Iu\n", pvi->QuotaNonPagedPoolUsage);
+ trace("PagefileUsage : %Iu\n", pvi->PagefileUsage);
+ trace("PeakPagefileUsage : %Iu\n", pvi->PeakPagefileUsage);
}
static void test_query_process_vm(void)
@@ -1779,21 +1780,21 @@ static void test_query_process_vm(void)
status = pNtQueryInformationProcess(NULL, ProcessVmCounters, NULL, sizeof(pvi), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 24, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( ReturnLength == sizeof(VM_COUNTERS), "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( ReturnLength == sizeof(VM_COUNTERS), "Inconsistent length %ld\n", ReturnLength);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 46, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- todo_wine ok( ReturnLength == sizeof(VM_COUNTERS), "wrong size %d\n", ReturnLength);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ todo_wine ok( ReturnLength == sizeof(VM_COUNTERS), "wrong size %ld\n", ReturnLength);
/* Check if we have some return values */
if (winetest_debug > 1)
@@ -1803,19 +1804,19 @@ static void test_query_process_vm(void)
process = OpenProcess(PROCESS_VM_READ, FALSE, GetCurrentProcessId());
status = pNtQueryInformationProcess(process, ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got %08x\n", status);
+ ok( status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got %08lx\n", status);
CloseHandle(process);
process = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentProcessId());
status = pNtQueryInformationProcess(process, ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS || broken(!process) /* XP */, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS || broken(!process) /* XP */, "Expected STATUS_SUCCESS, got %08lx\n", status);
CloseHandle(process);
memset(&pvi, 0, sizeof(pvi));
process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId());
status = pNtQueryInformationProcess(process, ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage );
/* Check if we have some return values */
if (winetest_debug > 1)
@@ -1827,48 +1828,48 @@ static void test_query_process_vm(void)
/* Check if we have real counters */
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage );
prev_size = pvi.VirtualSize;
if (winetest_debug > 1)
dump_vm_counters("VM counters before VirtualAlloc", &pvi);
ptr = VirtualAlloc(NULL, alloc_size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
- ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError());
+ ok( ptr != NULL, "VirtualAlloc failed, err %lu\n", GetLastError());
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ 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 %lu, got %lu\n", prev_size + alloc_size, pvi.VirtualSize);
+ "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize);
VirtualFree( ptr, 0, MEM_RELEASE);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage );
prev_size = pvi.VirtualSize;
if (winetest_debug > 1)
dump_vm_counters("VM counters before VirtualAlloc", &pvi);
ptr = VirtualAlloc(NULL, alloc_size, MEM_RESERVE, PAGE_READWRITE);
- ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError());
+ ok( ptr != NULL, "VirtualAlloc failed, err %lu\n", GetLastError());
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ 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 %lu, got %lu\n", prev_size + alloc_size, pvi.VirtualSize);
+ "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize);
prev_size = pvi.VirtualSize;
ptr = VirtualAlloc(ptr, alloc_size, MEM_COMMIT, PAGE_READWRITE);
- ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError());
+ ok( ptr != NULL, "VirtualAlloc failed, err %lu\n", GetLastError());
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ 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_COMMIT)", &pvi);
ok( pvi.VirtualSize == prev_size,
- "Expected to equal to %lu, got %lu\n", prev_size, pvi.VirtualSize);
+ "Expected to equal to %Iu, got %Iu\n", prev_size, pvi.VirtualSize);
VirtualFree( ptr, 0, MEM_RELEASE);
}
@@ -1880,21 +1881,21 @@ static void test_query_process_io(void)
status = pNtQueryInformationProcess(NULL, ProcessIoCounters, NULL, sizeof(pii), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessIoCounters, &pii, sizeof(pii), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessIoCounters, &pii, 24, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessIoCounters, &pii, sizeof(pii), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(pii) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(pii) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessIoCounters, &pii, sizeof(pii) * 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( sizeof(pii) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( sizeof(pii) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
/* Check if we have some return values */
if (winetest_debug > 1) trace("OtherOperationCount : 0x%s\n", wine_dbgstr_longlong(pii.OtherOperationCount));
@@ -1914,26 +1915,26 @@ static void test_query_process_times(void)
status = pNtQueryInformationProcess(NULL, ProcessTimes, NULL, sizeof(spti), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessTimes, &spti, sizeof(spti), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessTimes, &spti, 24, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, one_before_last_pid);
if (!process)
{
- if (winetest_debug > 1) trace("Could not open process with ID : %d, error : %u. Going to use current one.\n", one_before_last_pid, GetLastError());
+ if (winetest_debug > 1) trace("Could not open process with ID : %ld, error : %lu. Going to use current one.\n", one_before_last_pid, GetLastError());
process = GetCurrentProcess();
}
else
- trace("ProcessTimes for process with ID : %d\n", one_before_last_pid);
+ trace("ProcessTimes for process with ID : %ld\n", one_before_last_pid);
status = pNtQueryInformationProcess( process, ProcessTimes, &spti, sizeof(spti), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(spti) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(spti) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
CloseHandle(process);
FileTimeToSystemTime((const FILETIME *)&spti.CreateTime, &UTC);
@@ -1953,11 +1954,11 @@ static void test_query_process_times(void)
if (winetest_debug > 1) trace("UserTime : %02d:%02d:%02d.%03d\n", Local.wHour, Local.wMinute, Local.wSecond, Local.wMilliseconds);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessTimes, &spti, sizeof(spti) * 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
ok( sizeof(spti) == ReturnLength ||
ReturnLength == 0 /* vista */ ||
broken(is_wow64), /* returns garbage on wow64 */
- "Inconsistent length %d\n", ReturnLength);
+ "Inconsistent length %ld\n", ReturnLength);
}
static void test_query_process_debug_port(int argc, char **argv)
@@ -1973,62 +1974,62 @@ static void test_query_process_debug_port(int argc, char **argv)
si.cb = sizeof(si);
ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi);
- ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError());
+ ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError());
if (!ret) return;
status = pNtQueryInformationProcess(NULL, ProcessDebugPort,
NULL, 0, NULL);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
status = pNtQueryInformationProcess(NULL, ProcessDebugPort,
NULL, sizeof(debug_port), NULL);
- ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION /* XP */, "got %#x\n", status);
+ ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION /* XP */, "got %#lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort,
NULL, sizeof(debug_port), NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#lx.\n", status);
status = pNtQueryInformationProcess(NULL, ProcessDebugPort,
&debug_port, sizeof(debug_port), NULL);
- ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#x.\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort,
&debug_port, sizeof(debug_port) - 1, NULL);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort,
&debug_port, sizeof(debug_port) + 1, NULL);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort,
&debug_port, sizeof(debug_port), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_port == 0, "Expected port 0, got %#lx.\n", debug_port);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_port == 0, "Expected port 0, got %#Ix.\n", debug_port);
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugPort,
&debug_port, sizeof(debug_port), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_port == ~(DWORD_PTR)0, "Expected port %#lx, got %#lx.\n", ~(DWORD_PTR)0, debug_port);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_port == ~(DWORD_PTR)0, "Expected port %#Ix, got %#Ix.\n", ~(DWORD_PTR)0, debug_port);
for (;;)
{
DEBUG_EVENT ev;
ret = WaitForDebugEvent(&ev, INFINITE);
- ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "WaitForDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break;
ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE);
- ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
}
ret = CloseHandle(pi.hThread);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
ret = CloseHandle(pi.hProcess);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
}
static void subtest_query_process_debug_port_custom_dacl(int argc, char **argv, ACCESS_MASK access, PSID sid)
@@ -2056,37 +2057,37 @@ static void subtest_query_process_debug_port_custom_dacl(int argc, char **argv,
InitializeObjectAttributes(&attr, NULL, 0, NULL, &sd);
status = NtCreateDebugObject(&debug_obj, MAXIMUM_ALLOWED, &attr, DEBUG_KILL_ON_CLOSE);
- ok(SUCCEEDED(status), "Failed to create debug object: %#010x\n", status);
+ ok(SUCCEEDED(status), "Failed to create debug object: %#010lx\n", status);
if (!SUCCEEDED(status)) return;
old_debug_obj = pDbgUiGetThreadDebugObject();
pDbgUiSetThreadDebugObject(debug_obj);
- sprintf(cmdline, "%s %s %s %u", argv[0], argv[1], "debuggee:dbgport", access);
+ sprintf(cmdline, "%s %s %s %lu", argv[0], argv[1], "debuggee:dbgport", access);
memset(&si, 0, sizeof(si));
si.cb = sizeof(si);
ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE,
DEBUG_PROCESS, NULL, NULL, &si, &pi);
- ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError());
+ ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError());
if (!ret) goto close_debug_obj;
do
{
ret = WaitForDebugEvent(&ev, INFINITE);
- ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "WaitForDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE);
- ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
} while (ev.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT);
wait_child_process(pi.hProcess);
ret = CloseHandle(pi.hThread);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
ret = CloseHandle(pi.hProcess);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
close_debug_obj:
pDbgUiSetThreadDebugObject(old_debug_obj);
@@ -2101,16 +2102,16 @@ static TOKEN_OWNER *get_current_owner(void)
BOOL ret;
ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &token);
- ok(ret, "Failed to get process token: %u\n", GetLastError());
+ ok(ret, "Failed to get process token: %lu\n", GetLastError());
ret = GetTokenInformation(token, TokenOwner, NULL, 0, &length);
ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER,
- "GetTokenInformation failed: %u\n", GetLastError());
- ok(length != 0, "Failed to get token owner information length: %u\n", GetLastError());
+ "GetTokenInformation failed: %lu\n", GetLastError());
+ ok(length != 0, "Failed to get token owner information length: %lu\n", GetLastError());
owner = HeapAlloc(GetProcessHeap(), 0, length);
ret = GetTokenInformation(token, TokenOwner, owner, length, &length);
- ok(ret, "Failed to get token owner information: %u)\n", GetLastError());
+ ok(ret, "Failed to get token owner information: %lu)\n", GetLastError());
CloseHandle(token);
return owner;
@@ -2144,7 +2145,7 @@ static void test_query_process_debug_port_custom_dacl(int argc, char **argv)
{
ACCESS_MASK access = all_access_masks[i];
- winetest_push_context("debug object access %08x", access);
+ winetest_push_context("debug object access %08lx", access);
subtest_query_process_debug_port_custom_dacl(argc, argv, access, owner->Owner);
winetest_pop_context();
}
@@ -2162,28 +2163,28 @@ static void test_query_process_priority(void)
status = pNtQueryInformationProcess(NULL, ProcessPriorityClass, NULL, sizeof(priority[0]), NULL);
ok(status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_INVALID_HANDLE) /* w2k3 */,
- "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessPriorityClass, &priority, sizeof(priority[0]), NULL);
- ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, 1, &ReturnLength);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, sizeof(priority), &ReturnLength);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
orig_priority = GetPriorityClass(GetCurrentProcess());
ret = SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS);
- ok(ret, "Failed to set priority class: %u\n", GetLastError());
+ ok(ret, "Failed to set priority class: %lu\n", GetLastError());
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, sizeof(priority[0]), &ReturnLength);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok(priority[0].PriorityClass == PROCESS_PRIOCLASS_BELOW_NORMAL,
"Expected PROCESS_PRIOCLASS_BELOW_NORMAL, got %u\n", priority[0].PriorityClass);
ret = SetPriorityClass(GetCurrentProcess(), orig_priority);
- ok(ret, "Failed to reset priority class: %u\n", GetLastError());
+ ok(ret, "Failed to reset priority class: %lu\n", GetLastError());
}
static void test_query_process_handlecount(void)
@@ -2196,35 +2197,35 @@ static void test_query_process_handlecount(void)
status = pNtQueryInformationProcess(NULL, ProcessHandleCount, NULL, sizeof(handlecount), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessHandleCount, &handlecount, sizeof(handlecount), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessHandleCount, &handlecount, 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, one_before_last_pid);
if (!process)
{
- trace("Could not open process with ID : %d, error : %u. Going to use current one.\n", one_before_last_pid, GetLastError());
+ trace("Could not open process with ID : %ld, error : %lu. Going to use current one.\n", one_before_last_pid, GetLastError());
process = GetCurrentProcess();
}
else
- if (winetest_debug > 1) trace("ProcessHandleCount for process with ID : %d\n", one_before_last_pid);
+ if (winetest_debug > 1) trace("ProcessHandleCount for process with ID : %ld\n", one_before_last_pid);
status = pNtQueryInformationProcess( process, ProcessHandleCount, &handlecount, sizeof(handlecount), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
CloseHandle(process);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessHandleCount, buffer, sizeof(buffer), &ReturnLength);
ok( status == STATUS_INFO_LENGTH_MISMATCH || status == STATUS_SUCCESS,
- "Expected STATUS_INFO_LENGTH_MISMATCH or STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ "Expected STATUS_INFO_LENGTH_MISMATCH or STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
/* Check if we have some return values */
- if (winetest_debug > 1) trace("HandleCount : %d\n", handlecount);
+ if (winetest_debug > 1) trace("HandleCount : %ld\n", handlecount);
todo_wine
{
ok( handlecount > 0, "Expected some handles, got 0\n");
@@ -2240,17 +2241,17 @@ static void test_query_process_image_file_name(void)
UNICODE_STRING *buffer = NULL;
status = pNtQueryInformationProcess(NULL, ProcessImageFileName, &image_file_name, sizeof(image_file_name), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, sizeof(image_file_name), &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
buffer = heap_alloc(ReturnLength);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, buffer, ReturnLength, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
todo_wine
ok(!memcmp(buffer->Buffer, deviceW, sizeof(deviceW)),
"Expected image name to begin with \\Device\\, got %s\n",
@@ -2263,17 +2264,17 @@ static void test_query_process_image_file_name(void)
win_skip("ProcessImageFileNameWin32 is not supported\n");
return;
}
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileNameWin32, &image_file_name, 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileNameWin32, &image_file_name, sizeof(image_file_name), &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
buffer = heap_alloc(ReturnLength);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileNameWin32, buffer, ReturnLength, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok(memcmp(buffer->Buffer, deviceW, sizeof(deviceW)),
"Expected image name not to begin with \\Device\\, got %s\n",
wine_dbgstr_wn(buffer->Buffer, buffer->Length / sizeof(WCHAR)));
@@ -2289,18 +2290,18 @@ static void test_query_process_image_info(void)
status = pNtQueryInformationProcess( NULL, ProcessImageInformation, &info, sizeof(info), &len );
ok( status == STATUS_INVALID_HANDLE || broken(status == STATUS_INVALID_PARAMETER), /* winxp */
- "got %08x\n", status);
+ "got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info)-1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info)+1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status);
memset( &info, 0xcc, sizeof(info) );
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info), &len );
- ok( status == STATUS_SUCCESS, "got %08x\n", status);
- ok( len == sizeof(info), "wrong len %u\n", len );
+ ok( status == STATUS_SUCCESS, "got %08lx\n", status);
+ ok( len == sizeof(info), "wrong len %lu\n", len );
ok( info.MajorSubsystemVersion == nt->OptionalHeader.MajorSubsystemVersion,
"wrong major version %x/%x\n",
@@ -2331,49 +2332,49 @@ static void test_query_process_debug_object_handle(int argc, char **argv)
si.cb = sizeof(si);
ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL,
NULL, &si, &pi);
- ok(ret, "CreateProcess failed with last error %u\n", GetLastError());
+ ok(ret, "CreateProcess failed with last error %lu\n", GetLastError());
if (!ret) return;
status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL,
0, NULL);
ok(status == STATUS_INFO_LENGTH_MISMATCH,
- "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n",
+ "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n",
status);
status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL,
sizeof(debug_object), NULL);
ok(status == STATUS_INVALID_HANDLE ||
status == STATUS_ACCESS_VIOLATION, /* XP */
- "Expected NtQueryInformationProcess to return STATUS_INVALID_HANDLE, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_INVALID_HANDLE, got 0x%08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, NULL, sizeof(debug_object), NULL);
ok(status == STATUS_ACCESS_VIOLATION,
- "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle,
&debug_object, sizeof(debug_object), NULL);
ok(status == STATUS_INVALID_HANDLE,
- "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, &debug_object,
sizeof(debug_object) - 1, NULL);
ok(status == STATUS_INFO_LENGTH_MISMATCH,
- "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, &debug_object,
sizeof(debug_object) + 1, NULL);
ok(status == STATUS_INFO_LENGTH_MISMATCH,
- "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n", status);
debug_object = (HANDLE)0xdeadbeef;
status = pNtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, &debug_object,
sizeof(debug_object), NULL);
ok(status == STATUS_PORT_NOT_SET,
- "Expected NtQueryInformationProcess to return STATUS_PORT_NOT_SET, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_PORT_NOT_SET, got 0x%08lx\n", status);
ok(debug_object == NULL ||
broken(debug_object == (HANDLE)0xdeadbeef), /* Wow64 */
"Expected debug object handle to be NULL, got %p\n", debug_object);
@@ -2382,31 +2383,31 @@ static void test_query_process_debug_object_handle(int argc, char **argv)
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugObjectHandle,
&debug_object, sizeof(debug_object), NULL);
ok(status == STATUS_SUCCESS,
- "Expected NtQueryInformationProcess to return STATUS_SUCCESS, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_SUCCESS, got 0x%08lx\n", status);
ok(debug_object != NULL,
"Expected debug object handle to be non-NULL, got %p\n", debug_object);
status = NtClose( debug_object );
- ok( !status, "NtClose failed %x\n", status );
+ ok( !status, "NtClose failed %lx\n", status );
for (;;)
{
DEBUG_EVENT ev;
ret = WaitForDebugEvent(&ev, INFINITE);
- ok(ret, "WaitForDebugEvent failed with last error %u\n", GetLastError());
+ ok(ret, "WaitForDebugEvent failed with last error %lu\n", GetLastError());
if (!ret) break;
if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break;
ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE);
- ok(ret, "ContinueDebugEvent failed with last error %u\n", GetLastError());
+ ok(ret, "ContinueDebugEvent failed with last error %lu\n", GetLastError());
if (!ret) break;
}
ret = CloseHandle(pi.hThread);
- ok(ret, "CloseHandle failed with last error %u\n", GetLastError());
+ ok(ret, "CloseHandle failed with last error %lu\n", GetLastError());
ret = CloseHandle(pi.hProcess);
- ok(ret, "CloseHandle failed with last error %u\n", GetLastError());
+ ok(ret, "CloseHandle failed with last error %lu\n", GetLastError());
}
static void test_query_process_debug_flags(int argc, char **argv)
@@ -2428,34 +2429,34 @@ static void test_query_process_debug_flags(int argc, char **argv)
/* test invalid arguments */
status = pNtQueryInformationProcess(NULL, ProcessDebugFlags, NULL, 0, NULL);
ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* WOW64 */,
- "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
status = pNtQueryInformationProcess(NULL, ProcessDebugFlags, NULL, sizeof(debug_flags), NULL);
ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_INVALID_INFO_CLASS) /* WOW64 */,
- "Expected STATUS_INVALID_HANDLE, got %#x.\n", status);
+ "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags,
NULL, sizeof(debug_flags), NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#lx.\n", status);
status = pNtQueryInformationProcess(NULL, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
ok(status == STATUS_INVALID_HANDLE || broken(status == STATUS_INVALID_INFO_CLASS) /* WOW64 */,
- "Expected STATUS_INVALID_HANDLE, got %#x.\n", status);
+ "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags,
&debug_flags, sizeof(debug_flags) - 1, NULL);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags,
&debug_flags, sizeof(debug_flags) + 1, NULL);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
/* test ProcessDebugFlags of current process */
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == TRUE, "Expected flag TRUE, got %x.\n", debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == TRUE, "Expected flag TRUE, got %lx.\n", debug_flags);
for (i = 0; i < ARRAY_SIZE(test_flags); i++)
{
@@ -2464,26 +2465,26 @@ static void test_query_process_debug_flags(int argc, char **argv)
si.cb = sizeof(si);
ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, test_flags[i], NULL, NULL, &si, &pi);
- ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError());
+ ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError());
if (!(test_flags[i] & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS)))
{
/* test ProcessDebugFlags before attaching with debugger */
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == TRUE, "Expected flag TRUE, got %x.\n", debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == TRUE, "Expected flag TRUE, got %lx.\n", debug_flags);
ret = DebugActiveProcess(pi.dwProcessId);
- ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError());
+ ok(ret, "DebugActiveProcess failed, last error %#lx.\n", GetLastError());
expected_flags = FALSE;
}
/* test ProcessDebugFlags after attaching with debugger */
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == expected_flags, "Expected flag %lx, got %lx.\n", expected_flags, debug_flags);
if (!(test_flags[i] & CREATE_SUSPENDED))
{
@@ -2492,40 +2493,40 @@ static void test_query_process_debug_flags(int argc, char **argv)
for (;;)
{
ret = WaitForDebugEvent(&ev, 1000);
- ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "WaitForDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
if (ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) break;
ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE);
- ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
}
result = SuspendThread(pi.hThread);
- ok(result == 0, "Expected 0, got %u.\n", result);
+ ok(result == 0, "Expected 0, got %lu.\n", result);
}
ret = DebugActiveProcessStop(pi.dwProcessId);
- ok(ret, "DebugActiveProcessStop failed, last error %#x.\n", GetLastError());
+ ok(ret, "DebugActiveProcessStop failed, last error %#lx.\n", GetLastError());
/* test ProcessDebugFlags after detaching debugger */
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == expected_flags, "Expected flag %lx, got %lx.\n", expected_flags, debug_flags);
ret = DebugActiveProcess(pi.dwProcessId);
- ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError());
+ ok(ret, "DebugActiveProcess failed, last error %#lx.\n", GetLastError());
/* test ProcessDebugFlags after re-attaching debugger */
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == FALSE, "Expected flag FALSE, got %x.\n", debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == FALSE, "Expected flag FALSE, got %lx.\n", debug_flags);
result = ResumeThread(pi.hThread);
- todo_wine ok(result == 2, "Expected 2, got %u.\n", result);
+ todo_wine ok(result == 2, "Expected 2, got %lu.\n", result);
/* Wait until the process is terminated. On Windows XP the process randomly
* gets stuck in a non-continuable exception, so stop after 100 iterations.
@@ -2535,13 +2536,13 @@ static void test_query_process_debug_flags(int argc, char **argv)
{
ret = WaitForDebugEvent(&ev, 1000);
ok(ret || broken(GetLastError() == ERROR_SEM_TIMEOUT),
- "WaitForDebugEvent failed, last error %#x.\n", GetLastError());
+ "WaitForDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break;
ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE);
- ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
}
ok(j < 100 || broken(j >= 100) /* Win XP */, "Expected less than 100 debug events.\n");
@@ -2549,13 +2550,13 @@ static void test_query_process_debug_flags(int argc, char **argv)
/* test ProcessDebugFlags after process has terminated */
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == FALSE, "Expected flag FALSE, got %x.\n", debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == FALSE, "Expected flag FALSE, got %lx.\n", debug_flags);
ret = CloseHandle(pi.hThread);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
ret = CloseHandle(pi.hProcess);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
}
}
@@ -2572,42 +2573,42 @@ static void test_readvirtualmemory(void)
/* normal operation */
status = pNtReadVirtualMemory(process, teststring, buffer, 12, &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == 12, "Expected to read 12 bytes, got %Id\n",readcount);
ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n");
/* no number of bytes */
memset(buffer, 0, 12);
status = pNtReadVirtualMemory(process, teststring, buffer, 12, NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n");
/* illegal remote address */
todo_wine{
status = pNtReadVirtualMemory(process, (void *) 0x1234, buffer, 12, &readcount);
- ok( status == STATUS_PARTIAL_COPY, "Expected STATUS_PARTIAL_COPY, got %08x\n", status);
+ ok( status == STATUS_PARTIAL_COPY, "Expected STATUS_PARTIAL_COPY, got %08lx\n", status);
if (status == STATUS_PARTIAL_COPY)
- ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount);
+ ok( readcount == 0, "Expected to read 0 bytes, got %Id\n",readcount);
}
/* 0 handle */
status = pNtReadVirtualMemory(0, teststring, buffer, 12, &readcount);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
- ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
+ ok( readcount == 0, "Expected to read 0 bytes, got %Id\n",readcount);
/* pseudo handle for current process*/
memset(buffer, 0, 12);
status = pNtReadVirtualMemory((HANDLE)-1, teststring, buffer, 12, &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == 12, "Expected to read 12 bytes, got %Id\n",readcount);
ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n");
/* illegal local address */
status = pNtReadVirtualMemory(process, teststring, (void *)0x1234, 12, &readcount);
ok( status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_PARTIAL_COPY) /* Win10 */,
- "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status);
if (status == STATUS_ACCESS_VIOLATION)
- ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount);
+ ok( readcount == 0, "Expected to read 0 bytes, got %Id\n",readcount);
CloseHandle(process);
}
@@ -2631,8 +2632,8 @@ static void test_mapprotection(void)
skip("Unable to query process execute flags on this platform\n");
return;
}
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
- if (winetest_debug > 1) trace("Process execute flags %08x\n", oldflags);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
+ if (winetest_debug > 1) trace("Process execute flags %08lx\n", oldflags);
if (!(oldflags & MEM_EXECUTE_OPTION_ENABLE))
{
@@ -2649,7 +2650,7 @@ static void test_mapprotection(void)
}
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
reset_flags = TRUE;
}
@@ -2663,14 +2664,14 @@ static void test_mapprotection(void)
SEC_COMMIT | SEC_NOCACHE,
0
);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
offset.u.LowPart = 0;
offset.u.HighPart = 0;
count = 0x2000;
addr = NULL;
status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
#if defined(__x86_64__) || defined(__i386__)
*(unsigned char*)addr = 0xc3; /* lret ... in both i386 and x86_64 */
@@ -2686,12 +2687,12 @@ static void test_mapprotection(void)
if (winetest_debug > 1) trace("...done.\n");
status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08x\n", status);
- ok((info.Protect & ~PAGE_NOCACHE) == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok((info.Protect & ~PAGE_NOCACHE) == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%lx\n", info.Protect);
status = pNtUnmapViewOfSection( GetCurrentProcess(), (char *)addr + 0x1050 );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
pNtClose (h);
if (reset_flags)
@@ -2709,52 +2710,52 @@ static void test_threadstack(void)
info.ReserveSize = 0x100000;
info.StackBase = (void *)0xdeadbeef;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, &info, sizeof(info) );
- ok( !status, "NtSetInformationProcess failed %08x\n", status );
+ ok( !status, "NtSetInformationProcess failed %08lx\n", status );
ok( info.StackBase != (void *)0xdeadbeef, "stackbase not set\n" );
status = pNtQueryVirtualMemory( GetCurrentProcess(), info.StackBase, MemoryBasicInformation,
&meminfo, sizeof(meminfo), &retlen );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( meminfo.AllocationBase == info.StackBase, "wrong base %p/%p\n",
meminfo.AllocationBase, info.StackBase );
- ok( meminfo.RegionSize == info.ReserveSize, "wrong size %lx/%lx\n",
+ ok( meminfo.RegionSize == info.ReserveSize, "wrong size %Ix/%Ix\n",
meminfo.RegionSize, info.ReserveSize );
- ok( meminfo.State == MEM_RESERVE, "wrong state %x\n", meminfo.State );
- ok( meminfo.Protect == 0, "wrong protect %x\n", meminfo.Protect );
- ok( meminfo.Type == MEM_PRIVATE, "wrong type %x\n", meminfo.Type );
+ ok( meminfo.State == MEM_RESERVE, "wrong state %lx\n", meminfo.State );
+ ok( meminfo.Protect == 0, "wrong protect %lx\n", meminfo.Protect );
+ ok( meminfo.Type == MEM_PRIVATE, "wrong type %lx\n", meminfo.Type );
info_ex.AllocInfo = info;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation,
&info_ex, sizeof(info_ex) );
if (status != STATUS_INVALID_PARAMETER)
{
- ok( !status, "NtSetInformationProcess failed %08x\n", status );
+ ok( !status, "NtSetInformationProcess failed %08lx\n", status );
ok( info_ex.AllocInfo.StackBase != info.StackBase, "stackbase not set\n" );
status = pNtQueryVirtualMemory( GetCurrentProcess(), info_ex.AllocInfo.StackBase,
MemoryBasicInformation, &meminfo, sizeof(meminfo), &retlen );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( meminfo.AllocationBase == info_ex.AllocInfo.StackBase, "wrong base %p/%p\n",
meminfo.AllocationBase, info_ex.AllocInfo.StackBase );
- ok( meminfo.RegionSize == info_ex.AllocInfo.ReserveSize, "wrong size %lx/%lx\n",
+ ok( meminfo.RegionSize == info_ex.AllocInfo.ReserveSize, "wrong size %Ix/%Ix\n",
meminfo.RegionSize, info_ex.AllocInfo.ReserveSize );
- ok( meminfo.State == MEM_RESERVE, "wrong state %x\n", meminfo.State );
- ok( meminfo.Protect == 0, "wrong protect %x\n", meminfo.Protect );
- ok( meminfo.Type == MEM_PRIVATE, "wrong type %x\n", meminfo.Type );
+ ok( meminfo.State == MEM_RESERVE, "wrong state %lx\n", meminfo.State );
+ ok( meminfo.Protect == 0, "wrong protect %lx\n", meminfo.Protect );
+ ok( meminfo.Type == MEM_PRIVATE, "wrong type %lx\n", meminfo.Type );
VirtualFree( info_ex.AllocInfo.StackBase, 0, MEM_FREE );
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation,
&info, sizeof(info) - 1 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status );
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation,
&info, sizeof(info) + 1 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status );
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation,
&info_ex, sizeof(info_ex) - 1 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status );
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation,
&info_ex, sizeof(info_ex) + 1 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status );
}
else win_skip( "ProcessThreadStackAllocation ex not supported\n" );
@@ -2777,161 +2778,161 @@ static void test_queryvirtualmemory(void)
module = GetModuleHandleA( "ntdll.dll" );
status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module);
- ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT);
- ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READONLY);
- ok (mbi.Type == MEM_IMAGE, "mbi.Type is 0x%x, expected 0x%x\n", mbi.Type, MEM_IMAGE);
+ ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT);
+ ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%lx, expected 0x%x\n", mbi.Protect, PAGE_READONLY);
+ ok (mbi.Type == MEM_IMAGE, "mbi.Type is 0x%lx, expected 0x%x\n", mbi.Type, MEM_IMAGE);
module = GetModuleHandleA( "ntdll.dll" );
status = pNtQueryVirtualMemory(NtCurrentProcess(), pNtQueryVirtualMemory, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module);
- ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT);
- ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ);
+ ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT);
+ ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%lx, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ);
status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok (mbi.AllocationProtect == PAGE_READWRITE || mbi.AllocationProtect == PAGE_EXECUTE_READWRITE,
- "mbi.AllocationProtect is 0x%x\n", mbi.AllocationProtect);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT);
+ "mbi.AllocationProtect is 0x%lx\n", mbi.AllocationProtect);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT);
ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_EXECUTE_READWRITE,
- "mbi.Protect is 0x%x\n", mbi.Protect);
+ "mbi.Protect is 0x%lx\n", mbi.Protect);
status = pNtQueryVirtualMemory(NtCurrentProcess(), stackbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
- ok (mbi.AllocationProtect == PAGE_READWRITE, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_READWRITE);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT);
- ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READWRITE);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok (mbi.AllocationProtect == PAGE_READWRITE, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_READWRITE);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT);
+ ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%lx, expected 0x%x\n", mbi.Protect, PAGE_READWRITE);
module = GetModuleHandleA( NULL );
status = pNtQueryVirtualMemory(NtCurrentProcess(), teststring, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module);
- ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT);
- ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READONLY);
+ ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT);
+ ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%lx, expected 0x%X\n", mbi.Protect, PAGE_READONLY);
status = pNtQueryVirtualMemory(NtCurrentProcess(), datatestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module);
- ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT);
+ ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT);
ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_WRITECOPY,
- "mbi.Protect is 0x%x\n", mbi.Protect);
+ "mbi.Protect is 0x%lx\n", mbi.Protect);
status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
if (mbi.AllocationBase == module)
{
- ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT);
+ ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT);
ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_WRITECOPY,
- "mbi.Protect is 0x%x\n", mbi.Protect);
+ "mbi.Protect is 0x%lx\n", mbi.Protect);
}
else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */
status = pNtQueryVirtualMemory(NtCurrentProcess(), user_shared_data, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok(readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok(mbi.AllocationBase == user_shared_data, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, user_shared_data);
- ok(mbi.AllocationProtect == PAGE_READONLY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_READONLY);
- ok(mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT);
- ok(mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x\n", mbi.Protect);
- ok(mbi.Type == MEM_PRIVATE, "mbi.Type is 0x%x, expected 0x%x\n", mbi.Type, MEM_PRIVATE);
- ok(mbi.RegionSize == 0x1000, "mbi.RegionSize is 0x%lx, expected 0x%x\n", mbi.RegionSize, 0x1000);
+ ok(mbi.AllocationProtect == PAGE_READONLY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_READONLY);
+ ok(mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT);
+ ok(mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%lx\n", mbi.Protect);
+ ok(mbi.Type == MEM_PRIVATE, "mbi.Type is 0x%lx, expected 0x%x\n", mbi.Type, MEM_PRIVATE);
+ ok(mbi.RegionSize == 0x1000, "mbi.RegionSize is 0x%Ix, expected 0x%x\n", mbi.RegionSize, 0x1000);
/* check error code when addr is higher than working set limit */
status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount);
- ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
/* check error code when len is less than MEMORY_BASIC_INFORMATION size */
status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION) - 1, &readcount);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
module = GetModuleHandleA( "ntdll.dll" );
memset(buffer, 0xcc, sizeof(buffer));
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemoryMappedFilenameInformation,
name, sizeof(*name) + 16, &readcount);
- ok(status == STATUS_BUFFER_OVERFLOW, "got %08x\n", status);
+ ok(status == STATUS_BUFFER_OVERFLOW, "got %08lx\n", status);
ok(name->SectionFileName.Length == 0xcccc || broken(!name->SectionFileName.Length), /* vista64 */
"Wrong len %u\n", name->SectionFileName.Length);
- ok(readcount > sizeof(*name), "Wrong count %lu\n", readcount);
+ ok(readcount > sizeof(*name), "Wrong count %Iu\n", readcount);
memset(buffer, 0xcc, sizeof(buffer));
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemoryMappedFilenameInformation,
name, sizeof(buffer), &readcount);
- ok(status == STATUS_SUCCESS, "got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "got %08lx\n", status);
ok(name->SectionFileName.Buffer == (WCHAR *)(name + 1), "Wrong ptr %p/%p\n",
name->SectionFileName.Buffer, name + 1 );
ok(name->SectionFileName.Length != 0xcccc, "Wrong len %u\n", name->SectionFileName.Length);
ok(name->SectionFileName.MaximumLength == name->SectionFileName.Length + sizeof(WCHAR),
"Wrong maxlen %u/%u\n", name->SectionFileName.MaximumLength, name->SectionFileName.Length);
ok(readcount == sizeof(name->SectionFileName) + name->SectionFileName.MaximumLength,
- "Wrong count %lu/%u\n", readcount, name->SectionFileName.MaximumLength);
+ "Wrong count %Iu/%u\n", readcount, name->SectionFileName.MaximumLength);
ok( !name->SectionFileName.Buffer[name->SectionFileName.Length / sizeof(WCHAR)],
"buffer not null-terminated\n" );
memset(buffer, 0xcc, sizeof(buffer));
status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemoryMappedFilenameInformation,
name, sizeof(buffer), NULL);
- ok(status == STATUS_SUCCESS, "got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "got %08lx\n", status);
status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemoryMappedFilenameInformation,
NULL, sizeof(buffer), NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "got %08x\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "got %08lx\n", status);
memset(buffer, 0xcc, sizeof(buffer));
prev = readcount;
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 321, MemoryMappedFilenameInformation,
name, sizeof(*name) - 1, &readcount);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status);
ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length);
- ok(readcount == prev, "Wrong count %lu\n", readcount);
+ ok(readcount == prev, "Wrong count %Iu\n", readcount);
memset(buffer, 0xcc, sizeof(buffer));
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory((HANDLE)0xdead, (char *)module + 1234, MemoryMappedFilenameInformation,
name, sizeof(buffer), &readcount);
- ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "got %08lx\n", status);
ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */
- "Wrong count %lu\n", readcount);
+ "Wrong count %Iu\n", readcount);
memset(buffer, 0xcc, sizeof(buffer));
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), buffer, MemoryMappedFilenameInformation,
name, sizeof(buffer), &readcount);
- ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status);
+ ok(status == STATUS_INVALID_ADDRESS, "got %08lx\n", status);
ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length);
ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */
- "Wrong count %lu\n", readcount);
+ "Wrong count %Iu\n", readcount);
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)0x1234, MemoryMappedFilenameInformation,
name, sizeof(buffer), &readcount);
- ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status);
+ ok(status == STATUS_INVALID_ADDRESS, "got %08lx\n", status);
ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length);
ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */
- "Wrong count %lu\n", readcount);
+ "Wrong count %Iu\n", readcount);
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)0x1234, MemoryMappedFilenameInformation,
name, sizeof(*name) - 1, &readcount);
- ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status);
+ ok(status == STATUS_INVALID_ADDRESS, "got %08lx\n", status);
ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length);
ok(readcount == 0xdeadbeef || broken(readcount == 15), /* wow64 */
- "Wrong count %lu\n", readcount);
+ "Wrong count %Iu\n", readcount);
}
static void test_affinity(void)
@@ -2944,64 +2945,64 @@ static void test_affinity(void)
GetSystemInfo(&si);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
proc_affinity = pbi.AffinityMask;
ok( proc_affinity == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected process affinity\n" );
proc_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) );
ok( status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
proc_affinity = 0;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) );
ok( status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected thread affinity\n" );
thread_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
ok( status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
thread_affinity = 0;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
ok( status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
thread_affinity = 1;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" );
/* NOTE: Pre-Vista does not allow bits to be set that are higher than the highest set bit in process affinity mask */
thread_affinity = (pbi.AffinityMask << 1) | pbi.AffinityMask;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
- ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08lx\n", status );
if (status == STATUS_SUCCESS)
{
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
- ok( tbi.AffinityMask == pbi.AffinityMask, "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask, tbi.AffinityMask );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
+ ok( tbi.AffinityMask == pbi.AffinityMask, "Unexpected thread affinity. Expected %Ix, got %Ix\n", pbi.AffinityMask, tbi.AffinityMask );
}
thread_affinity = ~(DWORD_PTR)0 - 1;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
- ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08lx\n", status );
if (status == STATUS_SUCCESS)
{
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
- ok( tbi.AffinityMask == (pbi.AffinityMask & (~(DWORD_PTR)0 - 1)), "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask & (~(DWORD_PTR)0 - 1), tbi.AffinityMask );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
+ ok( tbi.AffinityMask == (pbi.AffinityMask & (~(DWORD_PTR)0 - 1)), "Unexpected thread affinity. Expected %Ix, got %Ix\n", pbi.AffinityMask & (~(DWORD_PTR)0 - 1), tbi.AffinityMask );
}
/* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */
thread_affinity = ~(DWORD_PTR)0;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
ok( broken(status == STATUS_INVALID_PARAMETER) || status == STATUS_SUCCESS,
- "Expected STATUS_SUCCESS, got %08x\n", status);
+ "Expected STATUS_SUCCESS, got %08lx\n", status);
if (si.dwNumberOfProcessors <= 1)
{
@@ -3013,35 +3014,35 @@ static void test_affinity(void)
if (status == STATUS_SUCCESS)
{
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "unexpected affinity %#lx\n", tbi.AffinityMask );
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "unexpected affinity %#Ix\n", tbi.AffinityMask );
}
else
skip("Cannot test thread affinity mask for 'all processors' flag\n");
proc_affinity = 2;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
proc_affinity = pbi.AffinityMask;
ok( proc_affinity == 2, "Unexpected process affinity\n" );
/* Setting the process affinity changes the thread affinity to match */
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( tbi.AffinityMask == 2, "Unexpected thread affinity\n" );
/* The thread affinity is restricted to the process affinity */
thread_affinity = 1;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
ok( status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
proc_affinity = get_affinity_mask( si.dwNumberOfProcessors );
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
/* Resetting the process affinity also resets the thread affinity */
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ),
"Unexpected thread affinity\n" );
}
@@ -3061,14 +3062,14 @@ static void test_HideFromDebugger(void)
dummy = 0;
status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG) );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
dummy = 0;
status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, NULL, 0 );
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status );
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status );
status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, NULL, 0 );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
dummy = 0;
status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL );
if (status == STATUS_INVALID_INFO_CLASS)
@@ -3077,32 +3078,32 @@ static void test_HideFromDebugger(void)
return;
}
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
dummy = 0;
status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
dummy = 0;
status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
- ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
+ ok( dummy == 1, "Expected dummy == 1, got %08lx\n", dummy );
stop_event = CreateEventA( NULL, FALSE, FALSE, NULL );
ok( stop_event != NULL, "CreateEvent failed\n" );
thread = CreateThread( NULL, 0, hide_from_debugger_thread, stop_event, 0, NULL );
- ok( thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError() );
+ ok( thread != INVALID_HANDLE_VALUE, "CreateThread failed with %ld\n", GetLastError() );
dummy = 0;
status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL );
- ok( status == STATUS_SUCCESS, "got %#x\n", status );
- ok( dummy == 0, "Expected dummy == 0, got %08x\n", dummy );
+ ok( status == STATUS_SUCCESS, "got %#lx\n", status );
+ ok( dummy == 0, "Expected dummy == 0, got %08lx\n", dummy );
status = pNtSetInformationThread( thread, ThreadHideFromDebugger, NULL, 0 );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
dummy = 0;
status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL );
- ok( status == STATUS_SUCCESS, "got %#x\n", status );
- ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy );
+ ok( status == STATUS_SUCCESS, "got %#lx\n", status );
+ ok( dummy == 1, "Expected dummy == 1, got %08lx\n", dummy );
SetEvent( stop_event );
WaitForSingleObject( thread, INFINITE );
@@ -3129,41 +3130,41 @@ static void test_NtGetCurrentProcessorNumber(void)
GetSystemInfo(&si);
current_cpu = pNtGetCurrentProcessorNumber();
- if (winetest_debug > 1) trace("dwNumberOfProcessors: %d, current processor: %d\n", si.dwNumberOfProcessors, current_cpu);
+ if (winetest_debug > 1) trace("dwNumberOfProcessors: %ld, current processor: %ld\n", si.dwNumberOfProcessors, current_cpu);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL);
old_process_mask = pbi.AffinityMask;
- ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status);
status = pNtQueryInformationThread(GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL);
old_thread_mask = tbi.AffinityMask;
- ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status);
/* allow the test to run on all processors */
new_mask = get_affinity_mask( si.dwNumberOfProcessors );
status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &new_mask, sizeof(new_mask));
- ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status);
for (i = 0; i < si.dwNumberOfProcessors; i++)
{
new_mask = (DWORD_PTR)1 << i;
status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &new_mask, sizeof(new_mask));
- ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status);
+ ok(status == STATUS_SUCCESS, "%ld: got 0x%lx (expected STATUS_SUCCESS)\n", i, status);
status = pNtQueryInformationThread(GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL);
- ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status);
+ ok(status == STATUS_SUCCESS, "%ld: got 0x%lx (expected STATUS_SUCCESS)\n", i, status);
current_cpu = pNtGetCurrentProcessorNumber();
- ok((current_cpu == i), "%d (new_mask 0x%lx): running on processor %d (AffinityMask: 0x%lx)\n",
+ ok((current_cpu == i), "%ld (new_mask 0x%Ix): running on processor %ld (AffinityMask: 0x%Ix)\n",
i, new_mask, current_cpu, tbi.AffinityMask);
}
/* restore old values */
status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &old_process_mask, sizeof(old_process_mask));
- ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status);
status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &old_thread_mask, sizeof(old_thread_mask));
- ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status);
}
static void test_ThreadEnableAlignmentFaultFixup(void)
@@ -3173,28 +3174,28 @@ static void test_ThreadEnableAlignmentFaultFixup(void)
dummy = 0;
status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG), NULL );
- ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status );
+ ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status );
status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1, NULL );
- ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status );
+ ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status );
dummy = 1;
status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG) );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 0 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 1 );
- ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status );
status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, &dummy, 1 );
- todo_wine ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status );
+ todo_wine ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status );
status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 1 );
- todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status );
+ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Expected STATUS_OBJECT_TYPE_MISMATCH, got %08lx\n", status );
dummy = 1;
status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1 );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
dummy = 0;
status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 8 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
}
static DWORD WINAPI start_address_thread(void *arg)
@@ -3207,8 +3208,8 @@ static DWORD WINAPI start_address_thread(void *arg)
ret = 0xdeadbeef;
status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress,
&entry, sizeof(entry), &ret);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
- ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(ret == sizeof(entry), "NtQueryInformationThread returned %lu bytes\n", ret);
ok(entry == (void *)start_address_thread, "expected %p, got %p\n", start_address_thread, entry);
return 0;
}
@@ -3231,8 +3232,8 @@ static void test_thread_start_address(void)
ret = 0xdeadbeef;
status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress,
&entry, sizeof(entry), &ret);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
- ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(ret == sizeof(entry), "NtQueryInformationThread returned %lu bytes\n", ret);
expected_entry = (void *)((char *)module + nt->OptionalHeader.AddressOfEntryPoint);
ok(entry == expected_entry, "expected %p, got %p\n", expected_entry, entry);
@@ -3240,7 +3241,7 @@ static void test_thread_start_address(void)
status = pNtSetInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress,
&entry, sizeof(entry));
ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, /* >= Vista */
- "expected STATUS_SUCCESS or STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "expected STATUS_SUCCESS or STATUS_INVALID_PARAMETER, got %08lx\n", status);
if (status == STATUS_SUCCESS)
{
@@ -3248,15 +3249,15 @@ static void test_thread_start_address(void)
ret = 0xdeadbeef;
status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress,
&entry, sizeof(entry), &ret);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
- ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(ret == sizeof(entry), "NtQueryInformationThread returned %lu bytes\n", ret);
ok(entry == (void *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", entry);
}
thread = CreateThread(NULL, 0, start_address_thread, NULL, 0, NULL);
- ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError());
+ ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %ld\n", GetLastError());
ret = WaitForSingleObject(thread, 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);
CloseHandle(thread);
}
@@ -3268,12 +3269,12 @@ static void test_query_data_alignment(void)
value = 0xdeadbeef;
status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &ReturnLength);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok(sizeof(value) == ReturnLength, "Inconsistent length %u\n", ReturnLength);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(sizeof(value) == ReturnLength, "Inconsistent length %lu\n", ReturnLength);
#ifdef __arm__
ok(value == 32, "Expected 32, got %u\n", value);
#else
- ok(value == 64, "Expected 64, got %u\n", value);
+ ok(value == 64, "Expected 64, got %lu\n", value);
#endif
}
@@ -3290,34 +3291,34 @@ static void test_thread_lookup(void)
cid.UniqueProcess = ULongToHandle(GetCurrentProcessId());
cid.UniqueThread = ULongToHandle(GetCurrentThreadId());
status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid);
- ok(!status, "NtOpenThread returned %#x\n", status);
+ ok(!status, "NtOpenThread returned %#lx\n", status);
status = pNtOpenThread((HANDLE *)0xdeadbee0, THREAD_QUERY_INFORMATION, &attr, &cid);
- ok( status == STATUS_ACCESS_VIOLATION, "NtOpenThread returned %#x\n", status);
+ ok( status == STATUS_ACCESS_VIOLATION, "NtOpenThread returned %#lx\n", status);
status = pNtQueryObject(handle, ObjectBasicInformation, &obj_info, sizeof(obj_info), NULL);
- ok(!status, "NtQueryObject returned: %#x\n", status);
+ ok(!status, "NtQueryObject returned: %#lx\n", status);
ok(obj_info.GrantedAccess == (THREAD_QUERY_LIMITED_INFORMATION | THREAD_QUERY_INFORMATION)
|| broken(obj_info.GrantedAccess == THREAD_QUERY_INFORMATION), /* winxp */
- "GrantedAccess = %x\n", obj_info.GrantedAccess);
+ "GrantedAccess = %lx\n", obj_info.GrantedAccess);
status = pNtQueryInformationThread(handle, ThreadBasicInformation, &info, sizeof(info), NULL);
- ok(!status, "NtQueryInformationThread returned %#x\n", status);
+ ok(!status, "NtQueryInformationThread returned %#lx\n", status);
ok(info.ClientId.UniqueProcess == ULongToHandle(GetCurrentProcessId()),
- "UniqueProcess = %p expected %x\n", info.ClientId.UniqueProcess, GetCurrentProcessId());
+ "UniqueProcess = %p expected %lx\n", info.ClientId.UniqueProcess, GetCurrentProcessId());
ok(info.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()),
- "UniqueThread = %p expected %x\n", info.ClientId.UniqueThread, GetCurrentThreadId());
+ "UniqueThread = %p expected %lx\n", info.ClientId.UniqueThread, GetCurrentThreadId());
pNtClose(handle);
cid.UniqueProcess = 0;
cid.UniqueThread = ULongToHandle(GetCurrentThreadId());
status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid);
- ok(!status, "NtOpenThread returned %#x\n", status);
+ ok(!status, "NtOpenThread returned %#lx\n", status);
status = pNtQueryInformationThread(handle, ThreadBasicInformation, &info, sizeof(info), NULL);
- ok(!status, "NtQueryInformationThread returned %#x\n", status);
+ ok(!status, "NtQueryInformationThread returned %#lx\n", status);
ok(info.ClientId.UniqueProcess == ULongToHandle(GetCurrentProcessId()),
- "UniqueProcess = %p expected %x\n", info.ClientId.UniqueProcess, GetCurrentProcessId());
+ "UniqueProcess = %p expected %lx\n", info.ClientId.UniqueProcess, GetCurrentProcessId());
ok(info.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()),
- "UniqueThread = %p expected %x\n", info.ClientId.UniqueThread, GetCurrentThreadId());
+ "UniqueThread = %p expected %lx\n", info.ClientId.UniqueThread, GetCurrentThreadId());
pNtClose(handle);
cid.UniqueProcess = ULongToHandle(0xdeadbeef);
@@ -3325,7 +3326,7 @@ static void test_thread_lookup(void)
handle = (HANDLE)0xdeadbeef;
status = NtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid);
todo_wine
- ok(status == STATUS_INVALID_CID, "NtOpenThread returned %#x\n", status);
+ ok(status == STATUS_INVALID_CID, "NtOpenThread returned %#lx\n", status);
todo_wine
ok( !handle || broken(handle == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle );
if (!status) pNtClose(handle);
@@ -3335,7 +3336,7 @@ static void test_thread_lookup(void)
handle = (HANDLE)0xdeadbeef;
status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid);
ok(status == STATUS_INVALID_CID || broken(status == STATUS_INVALID_PARAMETER) /* winxp */,
- "NtOpenThread returned %#x\n", status);
+ "NtOpenThread returned %#lx\n", status);
ok( !handle || broken(handle == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle );
}
@@ -3348,25 +3349,25 @@ static void test_thread_info(void)
data = 0xcccccccc;
status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread,
&data, sizeof(data), &len );
- ok( !status, "failed %x\n", status );
- ok( data == 0 || data == 1, "wrong data %x\n", data );
- ok( len == sizeof(data), "wrong len %u\n", len );
+ ok( !status, "failed %lx\n", status );
+ ok( data == 0 || data == 1, "wrong data %lx\n", data );
+ ok( len == sizeof(data), "wrong len %lu\n", len );
len = 0xdeadbeef;
data = 0xcccccccc;
status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread,
&data, sizeof(data) - 1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %x\n", status );
- ok( data == 0xcccccccc, "wrong data %x\n", data );
- ok( len == 0xdeadbeef, "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %lx\n", status );
+ ok( data == 0xcccccccc, "wrong data %lx\n", data );
+ ok( len == 0xdeadbeef, "wrong len %lu\n", len );
len = 0xdeadbeef;
data = 0xcccccccc;
status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread,
&data, sizeof(data) + 1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %x\n", status );
- ok( data == 0xcccccccc, "wrong data %x\n", data );
- ok( len == 0xdeadbeef, "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %lx\n", status );
+ ok( data == 0xcccccccc, "wrong data %lx\n", data );
+ ok( len == 0xdeadbeef, "wrong len %lu\n", len );
}
static void test_debug_object(void)
@@ -3379,44 +3380,44 @@ static void test_debug_object(void)
DEBUG_EVENT event;
status = pNtCreateDebugObject( &handle, DEBUG_ALL_ACCESS, &attr, 0 );
- ok( !status, "NtCreateDebugObject failed %x\n", status );
+ ok( !status, "NtCreateDebugObject failed %lx\n", status );
status = pNtSetInformationDebugObject( handle, 0, &flag, sizeof(ULONG), &len );
- ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %lx\n", status );
status = pNtSetInformationDebugObject( handle, 2, &flag, sizeof(ULONG), &len );
- ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %lx\n", status );
status = pNtSetInformationDebugObject( (HANDLE)0xdead, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG), &len );
- ok( status == STATUS_INVALID_HANDLE, "NtSetInformationDebugObject failed %x\n", status );
+ ok( status == STATUS_INVALID_HANDLE, "NtSetInformationDebugObject failed %lx\n", status );
len = 0xdead;
status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG) + 1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %x\n", status );
- ok( len == sizeof(ULONG), "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %lx\n", status );
+ ok( len == sizeof(ULONG), "wrong len %lu\n", len );
len = 0xdead;
status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG) - 1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %x\n", status );
- ok( len == sizeof(ULONG), "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %lx\n", status );
+ ok( len == sizeof(ULONG), "wrong len %lu\n", len );
len = 0xdead;
status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG), &len );
- ok( !status, "NtSetInformationDebugObject failed %x\n", status );
- ok( !len, "wrong len %u\n", len );
+ ok( !status, "NtSetInformationDebugObject failed %lx\n", status );
+ ok( !len, "wrong len %lu\n", len );
flag = DEBUG_KILL_ON_CLOSE;
status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG), &len );
- ok( !status, "NtSetInformationDebugObject failed %x\n", status );
- ok( !len, "wrong len %u\n", len );
+ ok( !status, "NtSetInformationDebugObject failed %lx\n", status );
+ ok( !len, "wrong len %lu\n", len );
for (flag = 2; flag; flag <<= 1)
{
status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG), &len );
- ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %lx\n", status );
}
pNtClose( handle );
@@ -3425,39 +3426,39 @@ static void test_debug_object(void)
state.NewState = DbgIdle;
memset( &event, 0xcc, sizeof(event) );
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
+ ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
state.NewState = DbgReplyPending;
memset( &event, 0xcc, sizeof(event) );
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
+ ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
state.NewState = 11;
memset( &event, 0xcc, sizeof(event) );
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
+ ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
state.NewState = DbgExitProcessStateChange;
state.StateInfo.ExitProcess.ExitStatus = 0x123456;
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( !status, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
- ok( event.u.ExitProcess.dwExitCode == 0x123456, "event not updated %x\n", event.u.ExitProcess.dwExitCode );
+ ok( !status, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
+ ok( event.u.ExitProcess.dwExitCode == 0x123456, "event not updated %lx\n", event.u.ExitProcess.dwExitCode );
memset( &state, 0xdd, sizeof(state) );
state.NewState = DbgCreateProcessStateChange;
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( !status, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
- ok( event.u.CreateProcessInfo.nDebugInfoSize == 0xdddddddd, "event not updated %x\n", event.u.CreateProcessInfo.nDebugInfoSize );
+ ok( !status, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
+ ok( event.u.CreateProcessInfo.nDebugInfoSize == 0xdddddddd, "event not updated %lx\n", event.u.CreateProcessInfo.nDebugInfoSize );
ok( event.u.CreateProcessInfo.lpThreadLocalBase == NULL, "event not updated %p\n", event.u.CreateProcessInfo.lpThreadLocalBase );
ok( event.u.CreateProcessInfo.lpImageName == NULL, "event not updated %p\n", event.u.CreateProcessInfo.lpImageName );
ok( event.u.CreateProcessInfo.fUnicode == TRUE, "event not updated %x\n", event.u.CreateProcessInfo.fUnicode );
@@ -3465,10 +3466,10 @@ static void test_debug_object(void)
memset( &state, 0xdd, sizeof(state) );
state.NewState = DbgLoadDllStateChange;
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( !status, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
- ok( event.u.LoadDll.nDebugInfoSize == 0xdddddddd, "event not updated %x\n", event.u.LoadDll.nDebugInfoSize );
+ ok( !status, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
+ ok( event.u.LoadDll.nDebugInfoSize == 0xdddddddd, "event not updated %lx\n", event.u.LoadDll.nDebugInfoSize );
ok( PtrToUlong(event.u.LoadDll.lpImageName) == 0xdddddddd, "event not updated %p\n", event.u.LoadDll.lpImageName );
ok( event.u.LoadDll.fUnicode == TRUE, "event not updated %x\n", event.u.LoadDll.fUnicode );
}
@@ -3480,7 +3481,7 @@ static void test_process_instrumentation_callback(void)
status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, NULL, 0 );
ok( status == STATUS_INFO_LENGTH_MISMATCH /* Win10 */ || status == STATUS_INVALID_INFO_CLASS
- || status == STATUS_NOT_SUPPORTED, "Got unexpected status %#x.\n", status );
+ || status == STATUS_NOT_SUPPORTED, "Got unexpected status %#lx.\n", status );
if (status != STATUS_INFO_LENGTH_MISMATCH)
{
win_skip( "ProcessInstrumentationCallback is not supported.\n" );
@@ -3490,13 +3491,13 @@ static void test_process_instrumentation_callback(void)
memset(&info, 0, sizeof(info));
status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, sizeof(info) );
ok( status == STATUS_SUCCESS /* Win 10 */ || broken( status == STATUS_PRIVILEGE_NOT_HELD )
- || broken( status == STATUS_INFO_LENGTH_MISMATCH ), "Got unexpected status %#x.\n", status );
+ || broken( status == STATUS_INFO_LENGTH_MISMATCH ), "Got unexpected status %#lx.\n", status );
memset(&info, 0, sizeof(info));
status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, 2 * sizeof(info) );
ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH
|| broken( status == STATUS_PRIVILEGE_NOT_HELD ) /* some versions and machines before Win10 */,
- "Got unexpected status %#x.\n", status );
+ "Got unexpected status %#lx.\n", status );
}
static void test_debuggee_dbgport(int argc, char **argv)
@@ -3514,21 +3515,21 @@ static void test_debuggee_dbgport(int argc, char **argv)
}
access = strtoul(argv[1], NULL, 0);
- winetest_push_context("debug object access %08x", access);
+ winetest_push_context("debug object access %08lx", access);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugPort,
&debug_port, sizeof(debug_port), NULL );
- ok( !status, "NtQueryInformationProcess ProcessDebugPort failed, status %#x.\n", status );
- ok( debug_port == ~(DWORD_PTR)0, "Expected port %#lx, got %#lx.\n", ~(DWORD_PTR)0, debug_port );
+ ok( !status, "NtQueryInformationProcess ProcessDebugPort failed, status %#lx.\n", status );
+ ok( debug_port == ~(DWORD_PTR)0, "Expected port %#Ix, got %#Ix.\n", ~(DWORD_PTR)0, debug_port );
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL );
- ok( !status, "NtQueryInformationProcess ProcessDebugFlags failed, status %#x.\n", status );
+ ok( !status, "NtQueryInformationProcess ProcessDebugFlags failed, status %#lx.\n", status );
expect_status = access ? STATUS_SUCCESS : STATUS_ACCESS_DENIED;
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugObjectHandle,
&handle, sizeof(handle), NULL );
- ok( status == expect_status, "NtQueryInformationProcess ProcessDebugObjectHandle expected status %#x, actual %#x.\n", expect_status, status );
+ ok( status == expect_status, "NtQueryInformationProcess ProcessDebugObjectHandle expected status %#lx, actual %#lx.\n", expect_status, status );
if (SUCCEEDED( status )) NtClose( handle );
winetest_pop_context();
1
0
22 Mar '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
v2: Remove useless MF_MT_FRAME_RATE query from patch 5.
dlls/mf/tests/mf.c | 6 ------
dlls/winegstreamer/h264_decoder.c | 16 ++++++++++++++--
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index e58d8278b82..6563ca81b29 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -6790,17 +6790,11 @@ static void test_h264_decoder(void)
flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE;
memset(&input_info, 0xcd, sizeof(input_info));
hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info);
- todo_wine
ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr);
- todo_wine
ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency));
- todo_wine
ok(input_info.dwFlags == flags, "got dwFlags %#lx\n", input_info.dwFlags);
- todo_wine
ok(input_info.cbSize == 0x1000, "got cbSize %lu\n", input_info.cbSize);
- todo_wine
ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead);
- todo_wine
ok(input_info.cbAlignment == 0, "got cbAlignment %#lx\n", input_info.cbAlignment);
flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE;
diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index 2f4b42ed101..f24b07ef496 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -217,8 +217,20 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si
static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info)
{
- FIXME("iface %p, id %#lx, info %p stub!\n", iface, id, info);
- return E_NOTIMPL;
+ struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+
+ TRACE("iface %p, id %#lx, info %p.\n", iface, id, info);
+
+ if (!decoder->input_type)
+ return MF_E_TRANSFORM_TYPE_NOT_SET;
+
+ info->hnsMaxLatency = 0;
+ info->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE;
+ info->cbSize = 0x1000;
+ info->cbMaxLookahead = 0;
+ info->cbAlignment = 0;
+
+ return S_OK;
}
static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info)
--
2.35.1
3
11
[PATCH vkd3d 1/2] vkd3d: Use Vulkan null descriptors if EXT_robustness2 is available.
by Conor McCarthy 22 Mar '22
by Conor McCarthy 22 Mar '22
22 Mar '22
Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
---
libs/vkd3d/device.c | 8 +++
libs/vkd3d/resource.c | 101 +++++++++++++++++++++++++++++++++++--
libs/vkd3d/vkd3d_private.h | 5 ++
3 files changed, 109 insertions(+), 5 deletions(-)
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index bd471a72..0d2d1696 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -135,6 +135,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] =
VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker),
VK_EXTENSION(EXT_DEPTH_CLIP_ENABLE, EXT_depth_clip_enable),
VK_EXTENSION(EXT_DESCRIPTOR_INDEXING, EXT_descriptor_indexing),
+ VK_EXTENSION(EXT_ROBUSTNESS_2, EXT_robustness2),
VK_EXTENSION(EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION, EXT_shader_demote_to_helper_invocation),
VK_EXTENSION(EXT_SHADER_STENCIL_EXPORT, EXT_shader_stencil_export),
VK_EXTENSION(EXT_TEXEL_BUFFER_ALIGNMENT, EXT_texel_buffer_alignment),
@@ -797,6 +798,7 @@ struct vkd3d_physical_device_info
VkPhysicalDeviceConditionalRenderingFeaturesEXT conditional_rendering_features;
VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features;
VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features;
+ VkPhysicalDeviceRobustness2FeaturesEXT robustness2_features;
VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT demote_features;
VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT texel_buffer_alignment_features;
VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features;
@@ -813,6 +815,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i
VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties;
VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT *buffer_alignment_properties;
VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features;
+ VkPhysicalDeviceRobustness2FeaturesEXT *robustness2_features;
VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features;
VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *buffer_alignment_features;
VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT *demote_features;
@@ -827,6 +830,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i
conditional_rendering_features = &info->conditional_rendering_features;
depth_clip_features = &info->depth_clip_features;
descriptor_indexing_features = &info->descriptor_indexing_features;
+ robustness2_features = &info->robustness2_features;
descriptor_indexing_properties = &info->descriptor_indexing_properties;
maintenance3_properties = &info->maintenance3_properties;
demote_features = &info->demote_features;
@@ -845,6 +849,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i
vk_prepend_struct(&info->features2, depth_clip_features);
descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT;
vk_prepend_struct(&info->features2, descriptor_indexing_features);
+ robustness2_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT;
+ vk_prepend_struct(&info->features2, robustness2_features);
demote_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT;
vk_prepend_struct(&info->features2, demote_features);
buffer_alignment_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT;
@@ -1577,6 +1583,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device,
vulkan_info->EXT_conditional_rendering = false;
if (!physical_device_info->depth_clip_features.depthClipEnable)
vulkan_info->EXT_depth_clip_enable = false;
+ if (!physical_device_info->robustness2_features.nullDescriptor)
+ vulkan_info->EXT_robustness2 = false;
if (!physical_device_info->demote_features.shaderDemoteToHelperInvocation)
vulkan_info->EXT_shader_demote_to_helper_invocation = false;
if (!physical_device_info->texel_buffer_alignment_features.texelBufferAlignment)
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index cbbd4170..01e0b67a 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -2423,10 +2423,10 @@ bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, c
VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ VkBufferView vk_view = VK_NULL_HANDLE;
struct vkd3d_view *object;
- VkBufferView vk_view;
- if (!vkd3d_create_vk_buffer_view(device, vk_buffer, format, offset, size, &vk_view))
+ if (vk_buffer && !vkd3d_create_vk_buffer_view(device, vk_buffer, format, offset, size, &vk_view))
return false;
if (!(object = vkd3d_view_create(VKD3D_VIEW_TYPE_BUFFER)))
@@ -2782,7 +2782,7 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor,
/* NULL descriptor */
buffer_info->buffer = device->null_resources.vk_buffer;
buffer_info->offset = 0;
- buffer_info->range = VKD3D_NULL_BUFFER_SIZE;
+ buffer_info->range = device->null_resources.vk_buffer ? VKD3D_NULL_BUFFER_SIZE : VK_WHOLE_SIZE;
}
descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_CBV;
@@ -2864,6 +2864,55 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor,
descriptor->u.view_info.written_serial_id = view->serial_id;
}
+static bool vkd3d_create_null_texture_view(const struct d3d12_device *device, struct vkd3d_view **view)
+{
+ struct vkd3d_view *object;
+
+ if (!(object = vkd3d_view_create(VKD3D_VIEW_TYPE_IMAGE)))
+ return false;
+
+ object->u.vk_image_view = VK_NULL_HANDLE;
+ object->format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, false);
+ object->info.texture.vk_view_type = VK_IMAGE_VIEW_TYPE_2D;
+ object->info.texture.miplevel_idx = 0;
+ object->info.texture.layer_idx = 0;
+ object->info.texture.layer_count = 1;
+ *view = object;
+ return true;
+}
+
+static void vkd3d_create_vk_null_srv(struct d3d12_desc *descriptor, struct d3d12_device *device,
+ const D3D12_SHADER_RESOURCE_VIEW_DESC *desc)
+{
+ struct vkd3d_view *view;
+
+ if (!desc)
+ {
+ WARN("View desc is required for NULL view.\n");
+ return;
+ }
+
+ if (desc->ViewDimension == D3D12_SRV_DIMENSION_BUFFER)
+ {
+ if (!vkd3d_create_buffer_view(device, VK_NULL_HANDLE, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false),
+ 0, VKD3D_NULL_BUFFER_SIZE, &view))
+ {
+ return;
+ }
+ descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
+ }
+ else
+ {
+ if (!vkd3d_create_null_texture_view(device, &view))
+ return;
+ descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
+ }
+
+ descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV;
+ descriptor->u.view_info.view = view;
+ descriptor->u.view_info.written_serial_id = view->serial_id;
+}
+
static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor,
struct d3d12_device *device, struct d3d12_resource *resource,
const D3D12_SHADER_RESOURCE_VIEW_DESC *desc)
@@ -2925,7 +2974,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor,
if (!resource)
{
- vkd3d_create_null_srv(descriptor, device, desc);
+ device->create_null_srv(descriptor, device, desc);
return;
}
@@ -3101,6 +3150,38 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor,
descriptor->u.view_info.written_serial_id = view->serial_id;
}
+static void vkd3d_create_vk_null_uav(struct d3d12_desc *descriptor, struct d3d12_device *device,
+ const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc)
+{
+ struct vkd3d_view *view;
+
+ if (!desc)
+ {
+ WARN("View desc is required for NULL view.\n");
+ return;
+ }
+
+ if (desc->ViewDimension == D3D12_UAV_DIMENSION_BUFFER)
+ {
+ if (!vkd3d_create_buffer_view(device, VK_NULL_HANDLE, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false),
+ 0, VKD3D_NULL_BUFFER_SIZE, &view))
+ {
+ return;
+ }
+ descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
+ }
+ else
+ {
+ if (!vkd3d_create_null_texture_view(device, &view))
+ return;
+ descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
+ }
+
+ descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV;
+ descriptor->u.view_info.view = view;
+ descriptor->u.view_info.written_serial_id = view->serial_id;
+}
+
static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_device *device,
struct d3d12_resource *resource, struct d3d12_resource *counter_resource,
const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc)
@@ -3216,7 +3297,7 @@ void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *d
{
if (counter_resource)
FIXME("Ignoring counter resource %p.\n", counter_resource);
- vkd3d_create_null_uav(descriptor, device, desc);
+ device->create_null_uav(descriptor, device, desc);
return;
}
@@ -4421,6 +4502,16 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources,
memset(null_resources, 0, sizeof(*null_resources));
+ if (device->vk_info.EXT_robustness2)
+ {
+ device->create_null_srv = vkd3d_create_vk_null_srv;
+ device->create_null_uav = vkd3d_create_vk_null_uav;
+ return S_OK;
+ }
+
+ device->create_null_srv = vkd3d_create_null_srv;
+ device->create_null_uav = vkd3d_create_null_uav;
+
memset(&heap_properties, 0, sizeof(heap_properties));
heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index c28eb234..ef454fa1 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -131,6 +131,7 @@ struct vkd3d_vulkan_info
bool EXT_debug_marker;
bool EXT_depth_clip_enable;
bool EXT_descriptor_indexing;
+ bool EXT_robustness2;
bool EXT_shader_demote_to_helper_invocation;
bool EXT_shader_stencil_export;
bool EXT_texel_buffer_alignment;
@@ -1450,6 +1451,10 @@ struct d3d12_device
unsigned int format_compatibility_list_count;
const struct vkd3d_format_compatibility_list *format_compatibility_lists;
struct vkd3d_null_resources null_resources;
+ void (*create_null_srv)(struct d3d12_desc *descriptor, struct d3d12_device *device,
+ const D3D12_SHADER_RESOURCE_VIEW_DESC *desc);
+ void (*create_null_uav)(struct d3d12_desc *descriptor, struct d3d12_device *device,
+ const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc);
struct vkd3d_uav_clear_state uav_clear_state;
VkDescriptorPoolSize vk_pool_sizes[VKD3D_DESCRIPTOR_POOL_COUNT];
--
2.34.1
2
4
[PATCH 1/5] jscript: Return JS_E_INVALID_PROPERTY in jsdisp_call_name if property is not found.
by Gabriel Ivăncescu 21 Mar '22
by Gabriel Ivăncescu 21 Mar '22
21 Mar '22
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
dlls/jscript/dispex.c | 3 +++
dlls/jscript/tests/run.c | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index e140010..1cacd49 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -2007,6 +2007,9 @@ HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, unsigned
if(FAILED(hres))
return hres;
+ if(!prop || prop->type == PROP_DELETED)
+ return JS_E_INVALID_PROPERTY;
+
return invoke_prop_func(disp, to_disp(disp), prop, flags, argc, argv, r, NULL);
}
diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c
index 63d8115..86d6fa4 100644
--- a/dlls/jscript/tests/run.c
+++ b/dlls/jscript/tests/run.c
@@ -2946,6 +2946,28 @@ static void test_script_exprs(void)
CHECK_CALLED(global_success_d);
CHECK_CALLED(global_success_i);
+ hres = parse_script_expr(L"var o=new Object(); Object.prototype.toLocaleString.call(o)", &v, NULL);
+ ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
+ ok(!lstrcmpW(V_BSTR(&v), L"[object Object]"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+ VariantClear(&v);
+
+ hres = parse_script_expr(L"var o=new Object(); Object.prototype.toString = function() {return \"wine\";}; Object.prototype.toLocaleString.call(o)", &v, NULL);
+ ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
+ todo_wine
+ ok(!lstrcmpW(V_BSTR(&v), L"wine"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+ VariantClear(&v);
+
+ hres = parse_script_expr(L"var o=new Object(); delete Object.prototype.toString; Object.prototype.toLocaleString.call(o)", &v, NULL);
+ ok(hres == 0x800a01b6, "parse_script_expr failed: %08lx\n", hres);
+
+ hres = parse_script_expr(L"var o=new Object(); o.toString = function() {return \"wine\";}; Object.prototype.toLocaleString.call(o)", &v, NULL);
+ ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
+ ok(!lstrcmpW(V_BSTR(&v), L"wine"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+ VariantClear(&v);
+
test_default_value();
test_retval();
--
2.34.1
3
11
[PATCH vkd3d 1/5] tests: Rename struct shader_context to struct shader_runner.
by Zebediah Figura 21 Mar '22
by Zebediah Figura 21 Mar '22
21 Mar '22
This is a bit clearer, and avoids colliding with other things named "context",
e.g. struct test_context, or d3d11 device contexts.
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
tests/shader_runner.c | 90 ++++++++++++++++++-------------------
tests/shader_runner.h | 12 ++---
tests/shader_runner_d3d11.c | 20 ++++-----
tests/shader_runner_d3d12.c | 20 ++++-----
4 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/tests/shader_runner.c b/tests/shader_runner.c
index 8cfdf052c..d68d7f186 100644
--- a/tests/shader_runner.c
+++ b/tests/shader_runner.c
@@ -99,7 +99,7 @@ static bool match_string(const char *line, const char *token, const char **const
return true;
}
-static void parse_require_directive(struct shader_context *context, const char *line)
+static void parse_require_directive(struct shader_runner *runner, const char *line)
{
if (match_string(line, "shader model >=", &line))
{
@@ -117,7 +117,7 @@ static void parse_require_directive(struct shader_context *context, const char *
{
if (match_string(line, model_strings[i], &line))
{
- context->minimum_shader_model = i;
+ runner->minimum_shader_model = i;
return;
}
}
@@ -277,19 +277,19 @@ static void parse_texture_directive(struct texture_params *texture, const char *
}
}
-static void set_uniforms(struct shader_context *context, size_t offset, size_t count, const void *uniforms)
+static void set_uniforms(struct shader_runner *runner, size_t offset, size_t count, const void *uniforms)
{
- context->uniform_count = align(max(context->uniform_count, offset + count), 4);
- vkd3d_array_reserve((void **)&context->uniforms, &context->uniform_capacity,
- context->uniform_count, sizeof(*context->uniforms));
- memcpy(context->uniforms + offset, uniforms, count * sizeof(*context->uniforms));
+ runner->uniform_count = align(max(runner->uniform_count, offset + count), 4);
+ vkd3d_array_reserve((void **)&runner->uniforms, &runner->uniform_capacity,
+ runner->uniform_count, sizeof(*runner->uniforms));
+ memcpy(runner->uniforms + offset, uniforms, count * sizeof(*runner->uniforms));
}
-static void parse_test_directive(struct shader_context *context, const char *line)
+static void parse_test_directive(struct shader_runner *runner, const char *line)
{
if (match_string(line, "draw quad", &line))
{
- context->ops->draw_quad(context);
+ runner->ops->draw_quad(runner);
}
else if (match_string(line, "probe all rgba", &line))
{
@@ -304,7 +304,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin
if (ret < 5)
ulps = 0;
- context->ops->probe_vec4(context, &rect, &v, ulps);
+ runner->ops->probe_vec4(runner, &rect, &v, ulps);
}
else if (match_string(line, "probe rect rgba", &line))
{
@@ -324,7 +324,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin
rect.right = x + w;
rect.top = y;
rect.bottom = y + h;
- context->ops->probe_vec4(context, &rect, &v, ulps);
+ runner->ops->probe_vec4(runner, &rect, &v, ulps);
}
else if (match_string(line, "probe rgba", &line))
{
@@ -343,7 +343,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin
rect.right = x + 1;
rect.top = y;
rect.bottom = y + 1;
- context->ops->probe_vec4(context, &rect, &v, ulps);
+ runner->ops->probe_vec4(runner, &rect, &v, ulps);
}
else if (match_string(line, "uniform", &line))
{
@@ -359,7 +359,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin
if (sscanf(line, "%f %f %f %f", &v.x, &v.y, &v.z, &v.w) < 4)
fatal_error("Malformed float4 constant '%s'.\n", line);
- set_uniforms(context, offset, 4, &v);
+ set_uniforms(runner, offset, 4, &v);
}
else if (match_string(line, "float", &line))
{
@@ -367,7 +367,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin
if (sscanf(line, "%f", &f) < 1)
fatal_error("Malformed float constant '%s'.\n", line);
- set_uniforms(context, offset, 1, &f);
+ set_uniforms(runner, offset, 1, &f);
}
else if (match_string(line, "int4", &line))
{
@@ -375,7 +375,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin
if (sscanf(line, "%d %d %d %d", &v[0], &v[1], &v[2], &v[3]) < 4)
fatal_error("Malformed int4 constant '%s'.\n", line);
- set_uniforms(context, offset, 4, v);
+ set_uniforms(runner, offset, 4, v);
}
else if (match_string(line, "int", &line))
{
@@ -383,7 +383,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin
if (sscanf(line, "%i", &i) < 1)
fatal_error("Malformed int constant '%s'.\n", line);
- set_uniforms(context, offset, 1, &i);
+ set_uniforms(runner, offset, 1, &i);
}
else if (match_string(line, "uint", &line))
{
@@ -391,7 +391,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin
if (sscanf(line, "%u", &u) < 1)
fatal_error("Malformed uint constant '%s'.\n", line);
- set_uniforms(context, offset, 1, &u);
+ set_uniforms(runner, offset, 1, &u);
}
}
else
@@ -400,14 +400,14 @@ static void parse_test_directive(struct shader_context *context, const char *lin
}
}
-static struct sampler *get_sampler(struct shader_context *context, unsigned int slot)
+static struct sampler *get_sampler(struct shader_runner *runner, unsigned int slot)
{
struct sampler *sampler;
size_t i;
- for (i = 0; i < context->sampler_count; ++i)
+ for (i = 0; i < runner->sampler_count; ++i)
{
- sampler = &context->samplers[i];
+ sampler = &runner->samplers[i];
if (sampler->slot == slot)
return sampler;
@@ -416,25 +416,25 @@ static struct sampler *get_sampler(struct shader_context *context, unsigned int
return NULL;
}
-static void set_texture(struct shader_context *context, struct texture *texture)
+static void set_texture(struct shader_runner *runner, struct texture *texture)
{
size_t i;
- for (i = 0; i < context->texture_count; ++i)
+ for (i = 0; i < runner->texture_count; ++i)
{
- if (context->textures[i]->slot == texture->slot)
+ if (runner->textures[i]->slot == texture->slot)
{
- context->ops->destroy_texture(context, context->textures[i]);
- context->textures[i] = texture;
+ runner->ops->destroy_texture(runner, runner->textures[i]);
+ runner->textures[i] = texture;
return;
}
}
- context->textures = realloc(context->textures, (context->texture_count + 1) * sizeof(*context->textures));
- context->textures[context->texture_count++] = texture;
+ runner->textures = realloc(runner->textures, (runner->texture_count + 1) * sizeof(*runner->textures));
+ runner->textures[runner->texture_count++] = texture;
}
-void run_shader_tests(struct shader_context *context, int argc, char **argv, const struct shader_runner_ops *ops)
+void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const struct shader_runner_ops *ops)
{
size_t shader_source_size = 0, shader_source_len = 0;
struct sampler *current_sampler = NULL;
@@ -446,7 +446,7 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con
char line[256];
FILE *f;
- context->minimum_shader_model = SHADER_MODEL_2_0;
+ runner->minimum_shader_model = SHADER_MODEL_2_0;
for (i = 1; i < argc; ++i)
{
@@ -469,8 +469,8 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con
return;
}
- memset(context, 0, sizeof(*context));
- context->ops = ops;
+ memset(runner, 0, sizeof(*runner));
+ runner->ops = ops;
for (;;)
{
@@ -489,13 +489,13 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con
break;
case STATE_TEXTURE:
- set_texture(context, context->ops->create_texture(context, ¤t_texture));
+ set_texture(runner, runner->ops->create_texture(runner, ¤t_texture));
free(current_texture.data);
break;
case STATE_SHADER_PIXEL:
- free(context->ps_source);
- context->ps_source = shader_source;
+ free(runner->ps_source);
+ runner->ps_source = shader_source;
shader_source = NULL;
shader_source_len = 0;
shader_source_size = 0;
@@ -599,15 +599,15 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con
{
state = STATE_SAMPLER;
- if ((current_sampler = get_sampler(context, index)))
+ if ((current_sampler = get_sampler(runner, index)))
{
memset(current_sampler, 0, sizeof(*current_sampler));
}
else
{
- context->samplers = realloc(context->samplers,
- ++context->sampler_count * sizeof(*context->samplers));
- current_sampler = &context->samplers[context->sampler_count - 1];
+ runner->samplers = realloc(runner->samplers,
+ ++runner->sampler_count * sizeof(*runner->samplers));
+ current_sampler = &runner->samplers[runner->sampler_count - 1];
memset(current_sampler, 0, sizeof(*current_sampler));
}
current_sampler->slot = index;
@@ -664,7 +664,7 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con
}
case STATE_REQUIRE:
- parse_require_directive(context, line);
+ parse_require_directive(runner, line);
break;
case STATE_SAMPLER:
@@ -676,19 +676,19 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con
break;
case STATE_TEST:
- parse_test_directive(context, line);
+ parse_test_directive(runner, line);
break;
}
}
}
- free(context->ps_source);
- for (i = 0; i < context->texture_count; ++i)
+ free(runner->ps_source);
+ for (i = 0; i < runner->texture_count; ++i)
{
- if (context->textures[i])
- context->ops->destroy_texture(context, context->textures[i]);
+ if (runner->textures[i])
+ runner->ops->destroy_texture(runner, runner->textures[i]);
}
- free(context->textures);
+ free(runner->textures);
fclose(f);
diff --git a/tests/shader_runner.h b/tests/shader_runner.h
index 6958191d9..84c170164 100644
--- a/tests/shader_runner.h
+++ b/tests/shader_runner.h
@@ -65,7 +65,7 @@ struct texture
unsigned int slot;
};
-struct shader_context
+struct shader_runner
{
const struct shader_runner_ops *ops;
@@ -84,15 +84,15 @@ struct shader_context
struct shader_runner_ops
{
- struct texture *(*create_texture)(struct shader_context *context, const struct texture_params *params);
- void (*destroy_texture)(struct shader_context *context, struct texture *texture);
- void (*draw_quad)(struct shader_context *context);
- void (*probe_vec4)(struct shader_context *context, const RECT *rect, const struct vec4 *v, unsigned int ulps);
+ struct texture *(*create_texture)(struct shader_runner *runner, const struct texture_params *params);
+ void (*destroy_texture)(struct shader_runner *runner, struct texture *texture);
+ void (*draw_quad)(struct shader_runner *runner);
+ void (*probe_vec4)(struct shader_runner *runner, const RECT *rect, const struct vec4 *v, unsigned int ulps);
};
void fatal_error(const char *format, ...) VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2);
-void run_shader_tests(struct shader_context *context, int argc, char **argv, const struct shader_runner_ops *ops);
+void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const struct shader_runner_ops *ops);
#ifdef _WIN32
void run_shader_tests_d3d11(int argc, char **argv);
diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c
index 6290ac290..f84a3be83 100644
--- a/tests/shader_runner_d3d11.c
+++ b/tests/shader_runner_d3d11.c
@@ -53,7 +53,7 @@ static struct d3d11_texture *d3d11_texture(struct texture *t)
struct d3d11_shader_context
{
- struct shader_context c;
+ struct shader_runner c;
ID3D11Device *device;
HWND window;
@@ -65,9 +65,9 @@ struct d3d11_shader_context
ID3D11VertexShader *vs;
};
-static struct d3d11_shader_context *d3d11_shader_context(struct shader_context *c)
+static struct d3d11_shader_context *d3d11_shader_context(struct shader_runner *r)
{
- return CONTAINING_RECORD(c, struct d3d11_shader_context, c);
+ return CONTAINING_RECORD(r, struct d3d11_shader_context, c);
}
static bool enable_debug_layer;
@@ -359,9 +359,9 @@ static ID3D11Buffer *create_buffer(ID3D11Device *device, unsigned int bind_flags
return buffer;
}
-static struct texture *d3d11_runner_create_texture(struct shader_context *c, const struct texture_params *params)
+static struct texture *d3d11_runner_create_texture(struct shader_runner *r, const struct texture_params *params)
{
- struct d3d11_shader_context *context = d3d11_shader_context(c);
+ struct d3d11_shader_context *context = d3d11_shader_context(r);
ID3D11Device *device = context->device;
D3D11_SUBRESOURCE_DATA resource_data;
D3D11_TEXTURE2D_DESC desc = {0};
@@ -394,7 +394,7 @@ static struct texture *d3d11_runner_create_texture(struct shader_context *c, con
return &texture->t;
}
-static void d3d11_runner_destroy_texture(struct shader_context *c, struct texture *t)
+static void d3d11_runner_destroy_texture(struct shader_runner *r, struct texture *t)
{
struct d3d11_texture *texture = d3d11_texture(t);
@@ -403,7 +403,7 @@ static void d3d11_runner_destroy_texture(struct shader_context *c, struct textur
free(texture);
}
-static void d3d11_runner_draw_quad(struct shader_context *c)
+static void d3d11_runner_draw_quad(struct shader_runner *r)
{
static const char vs_source[] =
"void main(uint id : SV_VertexID, out float4 position : SV_Position)\n"
@@ -412,7 +412,7 @@ static void d3d11_runner_draw_quad(struct shader_context *c)
" position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n"
"}";
- struct d3d11_shader_context *context = d3d11_shader_context(c);
+ struct d3d11_shader_context *context = d3d11_shader_context(r);
ID3D11Device *device = context->device;
ID3D11Buffer *cb = NULL;
ID3D11PixelShader *ps;
@@ -561,9 +561,9 @@ static void check_readback_data_vec4(struct resource_readback *rb,
got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y);
}
-static void d3d11_runner_probe_vec4(struct shader_context *c, const RECT *rect, const struct vec4 *v, unsigned int ulps)
+static void d3d11_runner_probe_vec4(struct shader_runner *r, const RECT *rect, const struct vec4 *v, unsigned int ulps)
{
- struct d3d11_shader_context *context = d3d11_shader_context(c);
+ struct d3d11_shader_context *context = d3d11_shader_context(r);
struct resource_readback rb;
init_readback(context, &rb);
diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c
index 571efeacd..eec9582c7 100644
--- a/tests/shader_runner_d3d12.c
+++ b/tests/shader_runner_d3d12.c
@@ -40,16 +40,16 @@ static struct d3d12_texture *d3d12_texture(struct texture *t)
struct d3d12_shader_context
{
- struct shader_context c;
+ struct shader_runner c;
struct test_context test_context;
ID3D12DescriptorHeap *heap;
};
-static struct d3d12_shader_context *d3d12_shader_context(struct shader_context *c)
+static struct d3d12_shader_context *d3d12_shader_context(struct shader_runner *r)
{
- return CONTAINING_RECORD(c, struct d3d12_shader_context, c);
+ return CONTAINING_RECORD(r, struct d3d12_shader_context, c);
}
static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_model)
@@ -80,9 +80,9 @@ static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_m
#define MAX_RESOURCE_DESCRIPTORS 256
-static struct texture *d3d12_runner_create_texture(struct shader_context *c, const struct texture_params *params)
+static struct texture *d3d12_runner_create_texture(struct shader_runner *r, const struct texture_params *params)
{
- struct d3d12_shader_context *context = d3d12_shader_context(c);
+ struct d3d12_shader_context *context = d3d12_shader_context(r);
struct test_context *test_context = &context->test_context;
ID3D12Device *device = test_context->device;
D3D12_SUBRESOURCE_DATA resource_data;
@@ -113,7 +113,7 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con
return &texture->t;
}
-static void d3d12_runner_destroy_texture(struct shader_context *c, struct texture *t)
+static void d3d12_runner_destroy_texture(struct shader_runner *r, struct texture *t)
{
struct d3d12_texture *texture = d3d12_texture(t);
@@ -121,9 +121,9 @@ static void d3d12_runner_destroy_texture(struct shader_context *c, struct textur
free(texture);
}
-static void d3d12_runner_draw_quad(struct shader_context *c)
+static void d3d12_runner_draw_quad(struct shader_runner *r)
{
- struct d3d12_shader_context *context = d3d12_shader_context(c);
+ struct d3d12_shader_context *context = d3d12_shader_context(r);
struct test_context *test_context = &context->test_context;
ID3D12GraphicsCommandList *command_list = test_context->list;
@@ -243,10 +243,10 @@ static void d3d12_runner_draw_quad(struct shader_context *c)
reset_command_list(command_list, test_context->allocator);
}
-static void d3d12_runner_probe_vec4(struct shader_context *c,
+static void d3d12_runner_probe_vec4(struct shader_runner *r,
const RECT *rect, const struct vec4 *v, unsigned int ulps)
{
- struct d3d12_shader_context *context = d3d12_shader_context(c);
+ struct d3d12_shader_context *context = d3d12_shader_context(r);
struct test_context *test_context = &context->test_context;
struct resource_readback rb;
--
2.35.1
2
9
Output is modelled on behaviour observed under the Windows 10.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
programs/sc/sc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/programs/sc/sc.c b/programs/sc/sc.c
index 4e642874237..4407ab5bcab 100644
--- a/programs/sc/sc.c
+++ b/programs/sc/sc.c
@@ -175,6 +175,26 @@ 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"";
+}
+
int __cdecl wmain( int argc, const WCHAR *argv[] )
{
SC_HANDLE manager, service;
@@ -285,6 +305,33 @@ 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" ))
+ {
+ service = OpenServiceW( manager, argv[2], SERVICE_QUERY_STATUS );
+ if (service)
+ {
+ SERVICE_STATUS status;
+
+ 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",
+ argv[2], status.dwServiceType, service_type_string( status.dwServiceType ),
+ status.dwCurrentState, service_state_string( status.dwCurrentState ),
+ status.dwControlsAccepted, status.dwWin32ExitCode,
+ status.dwServiceSpecificExitCode, status.dwCheckPoint,
+ status.dwWaitHint );
+ CloseServiceHandle( service );
+ }
+ else WINE_ERR("failed to open service %lu\n", GetLastError());
+ }
else if (!wcsicmp( argv[1], L"sdset" ))
{
WINE_FIXME("SdSet command not supported, faking success\n");
--
2.35.1
1
0
21 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
v2: Fixed wrong ntdll_wcstoumbs call spotted by Huw. Thanks!
dlls/user32/Makefile.in | 1 -
dlls/user32/user_main.c | 21 +++++++
dlls/user32/user_private.h | 7 ---
dlls/win32u/Makefile.in | 1 +
dlls/win32u/gdiobj.c | 1 +
dlls/win32u/message.c | 6 ++
dlls/win32u/ntuser_private.h | 15 +++++
dlls/{user32 => win32u}/spy.c | 109 ++++++++++++++++++----------------
dlls/win32u/sysparams.c | 2 +
dlls/win32u/win32u.spec | 2 +-
dlls/win32u/win32u_private.h | 3 +
dlls/win32u/window.c | 4 +-
dlls/win32u/wrappers.c | 7 +++
include/ntuser.h | 5 ++
14 files changed, 124 insertions(+), 60 deletions(-)
rename dlls/{user32 => win32u}/spy.c (96%)
2
1
[PATCH] winhttp: Avoid freeing potentially uninitialized context in netconn_secure_connect().
by Paul Gofman 21 Mar '22
by Paul Gofman 21 Mar '22
21 Mar '22
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
---
Certain failures in InitializeSecurityContextW may leave output context unitialized. Freeing that on error path
below may cause access violation. It seems to me that just zeroing the context is easier and less fragile
rather than accurately guessing which possible InitializeSecurityContextW() status requires freeing the handle
or not.
On a separate note, I tested that Windows DeleteSecurityContext may also have an exception given invalid context
but it catches that (probably like other secur32 functions in similar cases) and returns SEC_E_INVALID_HANDLE:
https://gist.github.com/gofman/7960b67a0fadaae843157b5556a1c003.
I am not immediately sure if we want to fix that now in secur32 (I am not aware of any specific app depending on that),
in case we will we can factor out structure getter and either use __TRY / __CATCH or add a magic number to
the structure. In any case I suppose avoiding hitting this case in winhttp worth it regardless.
dlls/winhttp/net.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
index 2fc48476513..07a65c5465f 100644
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -293,6 +293,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur
if (!(read_buf = malloc( read_buf_size ))) return ERROR_OUTOFMEMORY;
+ memset( &ctx, 0, sizeof(ctx) );
status = InitializeSecurityContextW(cred_handle, NULL, hostname, isc_req_flags, 0, 0, NULL, 0,
&ctx, &out_desc, &attrs, NULL);
--
2.35.1
2
1
21 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/spy.c | 13 ++-----------
dlls/win32u/ntuser_private.h | 1 +
2 files changed, 3 insertions(+), 11 deletions(-)
3
2
21 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user.exe16/message.c | 11 +++++------
dlls/user.exe16/user.c | 7 ++++---
dlls/user.exe16/user_private.h | 3 ---
dlls/user32/controls.h | 6 ------
dlls/user32/cursoricon.c | 10 ----------
dlls/user32/user_main.c | 6 ------
dlls/user32/winproc.c | 3 ---
7 files changed, 9 insertions(+), 37 deletions(-)
3
2
21 Mar '22
They are no longer used from PE code.
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/win32u/dce.c | 42 +++++++++++++++++------------------
dlls/wineandroid.drv/window.c | 14 ++++++------
dlls/winemac.drv/surface.c | 14 ++++++------
dlls/winex11.drv/bitblt.c | 14 ++++++------
include/wine/gdi_driver.h | 20 ++++++++++-------
5 files changed, 54 insertions(+), 50 deletions(-)
2
1
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/gdi.exe16/gdi.c | 141 +----------------------------------
dlls/win32u/clipping.c | 6 +-
dlls/win32u/dc.c | 7 ++
dlls/win32u/dce.c | 132 +++++++++++++++++++++++++++++++-
dlls/win32u/gdiobj.c | 1 -
dlls/win32u/ntgdi_private.h | 2 +
dlls/win32u/win32u.spec | 3 -
dlls/win32u/win32u_private.h | 3 +-
dlls/win32u/wrappers.c | 7 --
include/ntgdi.h | 3 +
include/wine/gdi_driver.h | 2 -
11 files changed, 149 insertions(+), 158 deletions(-)
2
1
21 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/Makefile.in | 1 -
dlls/user32/user_main.c | 21 +++++++
dlls/user32/user_private.h | 7 ---
dlls/win32u/Makefile.in | 1 +
dlls/win32u/gdiobj.c | 1 +
dlls/win32u/message.c | 6 ++
dlls/win32u/ntuser_private.h | 15 +++++
dlls/{user32 => win32u}/spy.c | 109 ++++++++++++++++++----------------
dlls/win32u/sysparams.c | 2 +
dlls/win32u/win32u.spec | 2 +-
dlls/win32u/win32u_private.h | 3 +
dlls/win32u/window.c | 4 +-
dlls/win32u/wrappers.c | 7 +++
include/ntuser.h | 5 ++
14 files changed, 124 insertions(+), 60 deletions(-)
rename dlls/{user32 => win32u}/spy.c (96%)
3
2
In order for a debugger to properly resolve loaded modules and detect
loading of them, it's necessary that the correct DT_DEBUG entry is visible
to the debugger. We had two problems with this before:
1. Since the preloader is the main executable, its ELF metadata is used
instead of the executable that we are trying to load.
2. The ELF header was actually getting overwritten by the reserved region,
since we only adjusted the placement for the .text section.
While 1. cannot be solved unless we run the preloader in another way, e.g.
as an interpreter, we can use some dirty hacks to solve 2.
This patch simply creates a stub PT_DYNAMIC section in the preloader,
then during execution patch that to point to the main executable's
respective section.
This allows GDB to have full shared library support when attaching.
There are numerous limitation due to the nature of the hack: It relies on the
BFD linker to create a PT_DYNAMIC entry, it doesn't work when the executable
was launched within the debugger, and it doesn't work with LLDB.
GDB doesn't seem to resolve the symbols of the main executable,
but that should not be much of an issue since the loader itself is very
short.
Some alternative ways to fix this are also possible:
1. Run the preloader as an ELF interpreter. This would get rid of the need
of messing with the auxiliary vector and various ELF metadata, but the
interpreter can be only specified by absolute path, which is a packaging
nuisance.
2. Get rid of the preloader entirely, make the loader static and let it perform
the reservation. This should work on glibc, but it's in general not a
very well supported use case and feels like a compatibility disaster.
---
configure | 17 ++++++----
configure.ac | 17 ++++++----
loader/Makefile.in | 5 +--
loader/preloader.c | 68 ++++++++++++++++++++++++++++++++------
loader/preloader_dynamic.s | 11 ++++++
5 files changed, 93 insertions(+), 25 deletions(-)
create mode 100644 loader/preloader_dynamic.s
diff --git a/configure b/configure
index 6a3a43a9e97..098c67f250a 100755
--- a/configure
+++ b/configure
@@ -10372,7 +10372,7 @@ if test "x$ac_cv_cflags__Wl___export_dynamic" = xyes
then :
WINELOADER_LDFLAGS="-Wl,--export-dynamic"
fi
- WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000"
+ WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs"
case $host_cpu in
*i[3456789]86* | x86_64 | *aarch64* | arm*)
@@ -10402,10 +10402,13 @@ fi
printf "%s\n" "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; }
if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes
then :
- case $host_os in
- freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;;
- *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;;
- esac
+
+ case $host_os in
+ freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;;
+ *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;;
+ esac
+ WINEPRELOADER_LDFLAGS="$WINEPRELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d400000"
+
else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400" >&5
printf %s "checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400... " >&6; }
@@ -10433,11 +10436,13 @@ fi
printf "%s\n" "$ac_cv_cflags__Wl___section_start__interp_0x7d000400" >&6; }
if test "x$ac_cv_cflags__Wl___section_start__interp_0x7d000400" = xyes
then :
- case $host_os in
+
+ case $host_os in
freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;;
*) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;;
esac
fi
+ WINEPRELOADER_LDFLAGS="$WINEPRELOADER_LDFLAGS -Wl,-Ttext=0x7d400000"
# Extract the first word of "prelink", so it can be a program name with args.
set dummy prelink; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff --git a/configure.ac b/configure.ac
index 5a85fce12a4..9b0e167448f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -826,20 +826,25 @@ case $host_os in
WINE_TRY_CFLAGS([-Wl,-z,defs],[UNIXLDFLAGS="$UNIXLDFLAGS -Wl,-z,defs"])
WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"])
- WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000"
+ WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs"
case $host_cpu in
*i[[3456789]]86* | x86_64 | *aarch64* | arm*)
WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],
- [case $host_os in
- freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;;
- *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;;
- esac],
+ [
+ case $host_os in
+ freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;;
+ *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;;
+ esac
+ WINEPRELOADER_LDFLAGS="$WINEPRELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d400000"
+ ],
[WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7d000400],
- [case $host_os in
+ [
+ case $host_os in
freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;;
*) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;;
esac])
+ WINEPRELOADER_LDFLAGS="$WINEPRELOADER_LDFLAGS -Wl,-Ttext=0x7d400000"
AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
if test "x$PRELINK" = xfalse
then
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 7302c231915..b5bdf6e1439 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -2,6 +2,7 @@ SOURCES = \
main.c \
preloader.c \
preloader_mac.c \
+ preloader_dynamic.s \
wine.de.UTF-8.man.in \
wine.desktop \
wine.fr.UTF-8.man.in \
@@ -25,10 +26,10 @@ wine64_OBJS = main.o
wine64_DEPS = $(WINELOADER_DEPENDS)
wine64_LDFLAGS = $(WINELOADER_LDFLAGS) $(LDEXECFLAGS) $(PTHREAD_LIBS)
-wine_preloader_OBJS = preloader.o preloader_mac.o
+wine_preloader_OBJS = preloader.o preloader_mac.o preloader_dynamic.o
wine_preloader_DEPS = $(WINELOADER_DEPENDS)
wine_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS)
-wine64_preloader_OBJS = preloader.o preloader_mac.o
+wine64_preloader_OBJS = preloader.o preloader_mac.o preloader_dynamic.o
wine64_preloader_DEPS = $(WINELOADER_DEPENDS)
wine64_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS)
diff --git a/loader/preloader.c b/loader/preloader.c
index 585be50624f..6af37cfca12 100644
--- a/loader/preloader.c
+++ b/loader/preloader.c
@@ -868,7 +868,7 @@ static void set_auxiliary_values( struct wld_auxv *av, const struct wld_auxv *ne
*
* Get a field of the auxiliary structure
*/
-static int get_auxiliary( struct wld_auxv *av, int type, int def_val )
+static unsigned long get_auxiliary(struct wld_auxv *av, unsigned long type, unsigned long def_val)
{
for ( ; av->a_type != AT_NULL; av++)
if( av->a_type == type ) return av->a_un.a_val;
@@ -1148,13 +1148,30 @@ static unsigned int gnu_hash( const char *name )
return h;
}
+static void *find_segment(const struct wld_link_map *map, int type, ElfW(Half) * size)
+{
+ void *ret = NULL;
+ const ElfW(Phdr) *ph;
+ /* parse the (already loaded) ELF executable's header */
+ for (ph = map->l_phdr; ph < &map->l_phdr[map->l_phnum]; ++ph)
+ {
+ if (type == ph->p_type)
+ {
+ ret = (void *)(ph->p_vaddr + map->l_addr);
+ if (size)
+ *size = ph->p_memsz;
+ break;
+ }
+ }
+ return ret;
+}
+
/*
* Find a symbol in the symbol table of the executable loaded
*/
static void *find_symbol( const struct wld_link_map *map, const char *var, int type )
{
const ElfW(Dyn) *dyn = NULL;
- const ElfW(Phdr) *ph;
const ElfW(Sym) *symtab = NULL;
const Elf32_Word *hashtab = NULL;
const Elf32_Word *gnu_hashtab = NULL;
@@ -1165,15 +1182,7 @@ static void *find_symbol( const struct wld_link_map *map, const char *var, int t
#ifdef DUMP_SYMS
wld_printf("%p %x\n", map->l_phdr, map->l_phnum );
#endif
- /* parse the (already loaded) ELF executable's header */
- for (ph = map->l_phdr; ph < &map->l_phdr[map->l_phnum]; ++ph)
- {
- if( PT_DYNAMIC == ph->p_type )
- {
- dyn = (void *)(ph->p_vaddr + map->l_addr);
- break;
- }
- }
+ dyn = find_segment( map, PT_DYNAMIC, NULL );
if( !dyn ) return NULL;
while( dyn->d_tag )
@@ -1375,6 +1384,12 @@ void* wld_start( void **stack )
struct wld_auxv new_av[8], delete_av[3], *av;
struct wld_link_map main_binary_map, ld_so_map;
struct wine_preload_info **wine_main_preload_info;
+ void *main_binary_dynamic = NULL;
+ ElfW(Half) main_binary_dynamic_size = 0;
+ ElfW(Phdr) *self_phdr;
+ unsigned long phdr_offset = 0;
+ ElfW(Half) self_phnum;
+ ElfW(Phdr) *ph;
pargc = *stack;
argv = (char **)pargc + 1;
@@ -1394,6 +1409,8 @@ void* wld_start( void **stack )
av = (struct wld_auxv *)(p+1);
page_size = get_auxiliary( av, AT_PAGESZ, 4096 );
page_mask = page_size - 1;
+ self_phdr = (void *)get_auxiliary(av, AT_PHDR, (unsigned long)NULL);
+ self_phnum = get_auxiliary(av, AT_PHNUM, 0);
preloader_start = (char *)_start - ((unsigned long)_start & page_mask);
preloader_end = (char *)((unsigned long)(_end + page_mask) & ~page_mask);
@@ -1442,6 +1459,35 @@ void* wld_start( void **stack )
interp = (char *)main_binary_map.l_addr + main_binary_map.l_interp;
map_so_lib( interp, &ld_so_map );
+ main_binary_dynamic = find_segment(&main_binary_map, PT_DYNAMIC, &main_binary_dynamic_size);
+ for (ph = self_phdr; ph < &self_phdr[self_phnum]; ++ph)
+ {
+ if (is_addr_reserved(ph))
+ {
+ wld_printf("preloader: Warning: preloader PHDR is in reserved range, symbols in gdb "
+ "will be broken! (Make sure the linker used to build Wine supports "
+ "-Ttext-segment)\n");
+ break;
+ }
+
+ if (PT_PHDR == ph->p_type)
+ {
+ /* Best effort PIE support */
+ phdr_offset = (unsigned long)self_phdr - (unsigned long)ph->p_vaddr;
+ }
+ else if (PT_DYNAMIC == ph->p_type)
+ {
+ /*
+ * Monkey patch our PT_DYNAMIC entry to point it to the real executable's PT_DYNAMIC section.
+ * This is required by debuggers to resolve loaded shared libraries and more.
+ */
+ wld_mprotect((void *)((unsigned long)ph & ~page_mask), page_size, PROT_READ | PROT_WRITE);
+ ph->p_vaddr = (unsigned long)main_binary_dynamic - phdr_offset;
+ ph->p_memsz = main_binary_dynamic_size;
+ break;
+ }
+ }
+
/* store pointer to the preload info into the appropriate main binary variable */
wine_main_preload_info = find_symbol( &main_binary_map, "wine_main_preload_info", STT_OBJECT );
if (wine_main_preload_info) *wine_main_preload_info = preload_info;
diff --git a/loader/preloader_dynamic.s b/loader/preloader_dynamic.s
new file mode 100644
index 00000000000..cd658c758d8
--- /dev/null
+++ b/loader/preloader_dynamic.s
@@ -0,0 +1,11 @@
+DT_NULL=0
+# This section is a stub PT_DYNAMIC entry that will be patched over to the real exectuable's
+# respective section.
+# This only works with ld.bfd. gold and lld (with --image-base) will create their own
+# PT_DYNAMIC entry unless instructed otherwise with a linker script.
+.section ".dynamic"
+ _DYNAMIC: .globl _DYNAMIC
+ # Don't put any "real" entries here: GDB will look at the on-disk image first, and we
+ # need to make sure that the stub entries doesn't get preferred over the real entries
+ # that we forward to.
+ .long DT_NULL,0
--
2.35.1
1
0
[PATCH 1/2] riched20: Add back-reference to outer ME_Run from struct re_object.
by Jinoh Kang 21 Mar '22
by Jinoh Kang 21 Mar '22
21 Mar '22
Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com>
---
dlls/riched20/caret.c | 5 +++--
dlls/riched20/editstr.h | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c
index 6d32776e3d2..c8658098e18 100644
--- a/dlls/riched20/caret.c
+++ b/dlls/riched20/caret.c
@@ -442,7 +442,7 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars)
nChars, FALSE);
}
-static struct re_object* create_re_object(const REOBJECT *reo)
+static struct re_object* create_re_object(const REOBJECT *reo, ME_Run *run)
{
struct re_object *reobj = heap_alloc(sizeof(*reobj));
@@ -452,6 +452,7 @@ static struct re_object* create_re_object(const REOBJECT *reo)
return NULL;
}
ME_CopyReObject(&reobj->obj, reo, REO_GETOBJ_ALL_INTERFACES);
+ reobj->run = run;
return reobj;
}
@@ -477,7 +478,7 @@ void editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo)
run = run_insert( editor, cursor, style, &space, 1, MERF_GRAPHICS );
- run->reobj = create_re_object( reo );
+ run->reobj = create_re_object( reo, run );
prev = run;
while ((prev = run_prev_all_paras( prev )))
diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h
index 889795de189..3b166234f23 100644
--- a/dlls/riched20/editstr.h
+++ b/dlls/riched20/editstr.h
@@ -147,11 +147,13 @@ typedef enum {
/******************************** structures *************************/
struct tagME_DisplayItem;
+struct tagME_Run;
struct re_object
{
struct list entry;
REOBJECT obj;
+ struct tagME_Run *run; /* ptr to the reobj's run */
};
typedef struct tagME_Run
--
2.34.1
2
3
21 Mar '22
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/dinput/tests/driver_hid.c | 27 ++++++++----
dlls/dinput/tests/driver_hid.h | 75 ++++++++++++++++++++++++++++++++++
2 files changed, 95 insertions(+), 7 deletions(-)
diff --git a/dlls/dinput/tests/driver_hid.c b/dlls/dinput/tests/driver_hid.c
index 99aa9bd688c..e4101853833 100644
--- a/dlls/dinput/tests/driver_hid.c
+++ b/dlls/dinput/tests/driver_hid.c
@@ -411,11 +411,12 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp )
IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp );
HID_DEVICE_EXTENSION *ext = device->DeviceExtension;
struct hid_device *impl = ext->MiniDeviceExtension;
+ ULONG code = stack->MinorFunction;
KIRQL irql;
- if (winetest_debug > 1) trace( "pnp %#x\n", stack->MinorFunction );
+ if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_pnp(code) );
- switch (stack->MinorFunction)
+ switch (code)
{
case IRP_MN_START_DEVICE:
++got_start_device;
@@ -502,7 +503,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp )
KIRQL irql;
LONG index;
- if (winetest_debug > 1) trace( "ioctl %#lx\n", code );
+ if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) );
ok( got_start_device, "expected IRP_MN_START_DEVICE before any ioctls\n" );
@@ -725,6 +726,8 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp )
ULONG code = stack->Parameters.DeviceIoControl.IoControlCode;
KIRQL irql;
+ if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) );
+
switch (code)
{
case IOCTL_WINETEST_HID_SET_EXPECT:
@@ -752,27 +755,32 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp )
return hidclass_driver_ioctl( device, irp );
}
-static NTSTATUS WINAPI driver_add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT *fdo )
+static NTSTATUS WINAPI driver_add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT *device )
{
- HID_DEVICE_EXTENSION *ext = fdo->DeviceExtension;
+ HID_DEVICE_EXTENSION *ext = device->DeviceExtension;
NTSTATUS ret;
+ if (winetest_debug > 1) trace( "%s: driver %p, device %p\n", __func__, driver, device );
+
/* We should be given the FDO, not the PDO. */
ok( !!ext->PhysicalDeviceObject, "expected non-NULL pdo\n" );
ok( ext->NextDeviceObject == ext->PhysicalDeviceObject, "got pdo %p, next %p\n",
ext->PhysicalDeviceObject, ext->NextDeviceObject );
todo_wine
- ok( ext->NextDeviceObject->AttachedDevice == fdo, "wrong attached device\n" );
+ ok( ext->NextDeviceObject->AttachedDevice == device, "wrong attached device\n" );
ret = IoRegisterDeviceInterface( ext->PhysicalDeviceObject, &control_class, NULL, &control_symlink );
ok( !ret, "got %#lx\n", ret );
- fdo->Flags &= ~DO_DEVICE_INITIALIZING;
+ if (winetest_debug > 1) trace( "Created HID FDO %p for Bus PDO %p\n", device, ext->PhysicalDeviceObject );
+
+ device->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\n", __func__, device );
ok( 0, "unexpected call\n" );
irp->IoStatus.Status = STATUS_SUCCESS;
IoCompleteRequest( irp, IO_NO_INCREMENT );
@@ -781,6 +789,7 @@ static NTSTATUS WINAPI driver_create( DEVICE_OBJECT *device, IRP *irp )
static NTSTATUS WINAPI driver_close( DEVICE_OBJECT *device, IRP *irp )
{
+ if (winetest_debug > 1) trace( "%s: device %p\n", __func__, device );
ok( 0, "unexpected call\n" );
irp->IoStatus.Status = STATUS_SUCCESS;
IoCompleteRequest( irp, IO_NO_INCREMENT );
@@ -789,6 +798,7 @@ static NTSTATUS WINAPI driver_close( DEVICE_OBJECT *device, IRP *irp )
static void WINAPI driver_unload( DRIVER_OBJECT *driver )
{
+ if (winetest_debug > 1) trace( "%s: driver %p\n", __func__, driver );
input_queue_cleanup( &input_queue );
expect_queue_cleanup( &expect_queue );
winetest_cleanup();
@@ -812,6 +822,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry )
DWORD size;
if ((ret = winetest_init())) return ret;
+ if (winetest_debug > 1) trace( "%s: driver %p\n", __func__, driver );
InitializeObjectAttributes( &attr, registry, 0, NULL, NULL );
ret = ZwOpenKey( &hkey, KEY_ALL_ACCESS, &attr );
@@ -833,6 +844,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry )
ok( !ret, "ZwQueryValueKey returned %#lx\n", ret );
memcpy( &polled, buffer + info_size, size - info_size );
params.DevicesArePolled = polled;
+ /* polled mode calls this in a state where printing anything locks the system up */
+ if (polled) winetest_debug = 0;
RtlInitUnicodeString( &name_str, L"Descriptor" );
size = info_size + sizeof(report_descriptor_buf);
diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h
index 089d12b70fc..80073a6ae3f 100644
--- a/dlls/dinput/tests/driver_hid.h
+++ b/dlls/dinput/tests/driver_hid.h
@@ -31,9 +31,11 @@
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
+#include "winioctl.h"
#include "winternl.h"
#include "ddk/wdm.h"
+#include "ddk/hidclass.h"
DEFINE_GUID(control_class,0xdeadbeef,0x29ef,0x4538,0xa5,0xfd,0xb6,0x95,0x73,0xa3,0x62,0xc0);
@@ -65,6 +67,79 @@ struct winetest_shared_data
LONG todo_failures;
};
+static inline const char *debugstr_pnp( ULONG code )
+{
+ switch (code)
+ {
+ case IRP_MN_START_DEVICE: return "IRP_MN_START_DEVICE";
+ case IRP_MN_QUERY_REMOVE_DEVICE: return "IRP_MN_QUERY_REMOVE_DEVICE";
+ case IRP_MN_REMOVE_DEVICE: return "IRP_MN_REMOVE_DEVICE";
+ case IRP_MN_CANCEL_REMOVE_DEVICE: return "IRP_MN_CANCEL_REMOVE_DEVICE";
+ case IRP_MN_STOP_DEVICE: return "IRP_MN_STOP_DEVICE";
+ case IRP_MN_QUERY_STOP_DEVICE: return "IRP_MN_QUERY_STOP_DEVICE";
+ case IRP_MN_CANCEL_STOP_DEVICE: return "IRP_MN_CANCEL_STOP_DEVICE";
+ case IRP_MN_QUERY_DEVICE_RELATIONS: return "IRP_MN_QUERY_DEVICE_RELATIONS";
+ case IRP_MN_QUERY_INTERFACE: return "IRP_MN_QUERY_INTERFACE";
+ case IRP_MN_QUERY_CAPABILITIES: return "IRP_MN_QUERY_CAPABILITIES";
+ case IRP_MN_QUERY_RESOURCES: return "IRP_MN_QUERY_RESOURCES";
+ case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: return "IRP_MN_QUERY_RESOURCE_REQUIREMENTS";
+ case IRP_MN_QUERY_DEVICE_TEXT: return "IRP_MN_QUERY_DEVICE_TEXT";
+ case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: return "IRP_MN_FILTER_RESOURCE_REQUIREMENTS";
+ case IRP_MN_READ_CONFIG: return "IRP_MN_READ_CONFIG";
+ case IRP_MN_WRITE_CONFIG: return "IRP_MN_WRITE_CONFIG";
+ case IRP_MN_EJECT: return "IRP_MN_EJECT";
+ case IRP_MN_SET_LOCK: return "IRP_MN_SET_LOCK";
+ case IRP_MN_QUERY_ID: return "IRP_MN_QUERY_ID";
+ case IRP_MN_QUERY_PNP_DEVICE_STATE: return "IRP_MN_QUERY_PNP_DEVICE_STATE";
+ case IRP_MN_QUERY_BUS_INFORMATION: return "IRP_MN_QUERY_BUS_INFORMATION";
+ case IRP_MN_DEVICE_USAGE_NOTIFICATION: return "IRP_MN_DEVICE_USAGE_NOTIFICATION";
+ case IRP_MN_SURPRISE_REMOVAL: return "IRP_MN_SURPRISE_REMOVAL";
+ case IRP_MN_QUERY_LEGACY_BUS_INFORMATION: return "IRP_MN_QUERY_LEGACY_BUS_INFORMATION";
+ default: return "unknown";
+ }
+}
+
+static inline const char *debugstr_ioctl( ULONG code )
+{
+ switch (code)
+ {
+ case HID_CTL_CODE(0): return "IOCTL_HID_GET_DEVICE_DESCRIPTOR";
+ case HID_CTL_CODE(1): return "IOCTL_HID_GET_REPORT_DESCRIPTOR";
+ case HID_CTL_CODE(2): return "IOCTL_HID_READ_REPORT";
+ case HID_CTL_CODE(3): return "IOCTL_HID_WRITE_REPORT";
+ case HID_CTL_CODE(4): return "IOCTL_HID_GET_STRING";
+ case HID_CTL_CODE(7): return "IOCTL_HID_ACTIVATE_DEVICE";
+ case HID_CTL_CODE(8): return "IOCTL_HID_DEACTIVATE_DEVICE";
+ case HID_CTL_CODE(9): return "IOCTL_HID_GET_DEVICE_ATTRIBUTES";
+ case HID_CTL_CODE(10): return "IOCTL_HID_SEND_IDLE_NOTIFICATION_REQUEST";
+ case HID_OUT_CTL_CODE(102): return "IOCTL_GET_PHYSICAL_DESCRIPTOR";
+ case HID_CTL_CODE(101): return "IOCTL_HID_FLUSH_QUEUE";
+ case HID_CTL_CODE(100): return "IOCTL_HID_GET_COLLECTION_DESCRIPTOR";
+ case HID_BUFFER_CTL_CODE(106): return "IOCTL_HID_GET_COLLECTION_INFORMATION";
+ case HID_OUT_CTL_CODE(100): return "IOCTL_HID_GET_FEATURE";
+ case HID_OUT_CTL_CODE(103): return "IOCTL_HID_GET_HARDWARE_ID";
+ case HID_OUT_CTL_CODE(120): return "IOCTL_HID_GET_INDEXED_STRING";
+ case HID_OUT_CTL_CODE(104): return "IOCTL_HID_GET_INPUT_REPORT";
+ case HID_OUT_CTL_CODE(110): return "IOCTL_HID_GET_MANUFACTURER_STRING";
+ case HID_BUFFER_CTL_CODE(104): return "IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS";
+ case HID_BUFFER_CTL_CODE(102): return "IOCTL_HID_GET_POLL_FREQUENCY_MSEC";
+ case HID_OUT_CTL_CODE(111): return "IOCTL_HID_GET_PRODUCT_STRING";
+ case HID_OUT_CTL_CODE(112): return "IOCTL_HID_GET_SERIALNUMBER_STRING";
+ case HID_IN_CTL_CODE(100): return "IOCTL_HID_SET_FEATURE";
+ case HID_BUFFER_CTL_CODE(105): return "IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS";
+ case HID_IN_CTL_CODE(101): return "IOCTL_HID_SET_OUTPUT_REPORT";
+ case HID_BUFFER_CTL_CODE(103): return "IOCTL_HID_SET_POLL_FREQUENCY_MSEC";
+ case HID_BUFFER_CTL_CODE(100): return "IOCTL_HID_GET_DRIVER_CONFIG";
+ case HID_BUFFER_CTL_CODE(101): return "IOCTL_HID_SET_DRIVER_CONFIG";
+ case HID_OUT_CTL_CODE(121): return "IOCTL_HID_GET_MS_GENRE_DESCRIPTOR";
+ case IOCTL_WINETEST_HID_SET_EXPECT: return "IOCTL_WINETEST_HID_SET_EXPECT";
+ case IOCTL_WINETEST_HID_WAIT_EXPECT: return "IOCTL_WINETEST_HID_WAIT_EXPECT";
+ case IOCTL_WINETEST_HID_SEND_INPUT: return "IOCTL_WINETEST_HID_SEND_INPUT";
+ case IOCTL_WINETEST_HID_SET_CONTEXT: return "IOCTL_WINETEST_HID_SET_CONTEXT";
+ default: return "unknown";
+ }
+}
+
#ifndef __WINE_WINE_TEST_H
#if !defined( __WINE_USE_MSVCRT ) || defined( __MINGW32__ )
--
2.35.1
2
8
Currently, apartment OXIDs are generated using the process ID
(and the thread ID for a single threaded-apartment). This means
that if an apartment is destroyed and re-created (using
`CoUninitialize` followed by `CoInitializeEx`), the newly created
apartment will end up with the same OXID as the old apartment.
However, testing shows that Windows will generate a *new* OXID
when an apartment is created in the above manner. Using
RtlGenRandom makes our behavior more consistent with Windows -
however, the actual OXIDs we generate will still differ
from those of Windows.
Additionally, this fixes an issue that caused the .NET 4.8
installer to become stuck during the downloading stage under Wine.
The installer appears to perform the following actions:
1. Call `IBackgroundCopyJob_SetNotify` interface on a BITS
job. This causes us to create a proxy (in the other process
hosting 'qmgr') for the `IBackgroundCopyCallback` pointer
passed as a parameter.
2. Trigger MTA apartment re-creation (in the process running the setup,
*not* the process with the `IBackgroundCopyCallback` proxy)
through `CoUninitialize` followed by `CoInitializeEx`.
3. Call `IBackgroundCopyJob_SetNotify` on a newly created job,
but with the same `IBackgroundCopyCallback` pointer parameter.
When we deserialize the pointer passed to
`IBackgroundCopyJob_SetNotify`, we will end up re-using the same
`proxy_manager` that we created for the previous `IBackgroundCopyCallback`.
This is due to the fact that the OIDs happen to match (due to the fact that
the .NET 4.8 setup appears to perform actions in the same order between
the old and new apartments), and the apartment OXIDs match as explained above.
above. As a result, we will use the old IPID when we send RPC packets
using this `proxy_manager`. However, the new and old IPIDs will *never* match,
since their generation process includes `RtlGenRandom`. This will cause a fault
packet to be generated on the listening side of the RPC connection.
By using RtlGenRandom when we generate the apartment OXID, we ensure that
the proxy side will never incorrectly re-use a stale `proxy_manager`
Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com>
---
dlls/combase/apartment.c | 18 ++++++--------
dlls/ole32/tests/marshal.c | 49 ++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c
index c1b381879d3..d4d78264dea 100644
--- a/dlls/combase/apartment.c
+++ b/dlls/combase/apartment.c
@@ -32,6 +32,7 @@
#include "windef.h"
#include "winbase.h"
#include "servprov.h"
+#include "ntsecapi.h"
#include "combase_private.h"
@@ -382,17 +383,12 @@ static struct apartment *apartment_construct(DWORD model)
apt->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": apartment");
apt->multi_threaded = !(model & COINIT_APARTMENTTHREADED);
-
- if (apt->multi_threaded)
- {
- /* FIXME: should be randomly generated by in an RPC call to rpcss */
- apt->oxid = ((OXID)GetCurrentProcessId() << 32) | 0xcafe;
- }
- else
- {
- /* FIXME: should be randomly generated by in an RPC call to rpcss */
- apt->oxid = ((OXID)GetCurrentProcessId() << 32) | GetCurrentThreadId();
- }
+ /* FIXME: should be generated by in an RPC call to rpcss
+ * Re-creating an apartment (via `CoUninitialize` followed by `CoInitializeEx`)
+ * will result in a *different* oxid. This is consistent with the behavior of
+ * Windows, and ensures that proxies in a different process will create
+ * a new RPC connection, instead of attempting to re-use an old one. */
+ RtlGenRandom(&apt->oxid, sizeof(apt->oxid));
TRACE("Created apartment on OXID %s\n", wine_dbgstr_longlong(apt->oxid));
diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c
index 6e21ed1889b..0f8a7a643de 100644
--- a/dlls/ole32/tests/marshal.c
+++ b/dlls/ole32/tests/marshal.c
@@ -1239,6 +1239,54 @@ static void test_marshal_proxy_apartment_shutdown(void)
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
}
+static OXID get_apartment_oxid(void)
+{
+ HRESULT hr;
+ OBJREF objref;
+ DWORD size, read;
+ IStream *pStream = NULL;
+
+ hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream);
+ ok_ole_success(hr, CreateStreamOnHGlobal);
+
+ hr = CoMarshalInterface(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);
+ ok_ole_success(hr, CoMarshalInterface);
+
+ hr = IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL);
+ ok_ole_success(hr, IStream_Seek);
+
+ size = FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr);
+ hr = IStream_Read(pStream, &objref, size, &read);
+ ok_ole_success(hr, IStream_Read);
+
+ IStream_Release(pStream);
+
+ return objref.u_objref.u_standard.std.oxid;
+}
+
+/* tests that re-creating an apartment (via `CoUninitialize` followed by `CoInitializeEx`)
+ * results in an apartment with a different OXID than the previous apartment
+ */
+static void test_apartment_oxid(void)
+{
+
+ OXID first_oxid;
+ OXID second_oxid;
+
+ cLocks = 0;
+ external_connections = 0;
+
+ CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+ first_oxid = get_apartment_oxid();
+ CoUninitialize();
+
+ CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+ second_oxid = get_apartment_oxid();
+ CoUninitialize();
+
+ ok(first_oxid != second_oxid, "Re-created apartment has old OXID: %s\n", wine_dbgstr_longlong(first_oxid));
+}
+
/* tests that proxies are released when the containing mta apartment is destroyed */
static void test_marshal_proxy_mta_apartment_shutdown(void)
{
@@ -4511,6 +4559,7 @@ START_TEST(marshal)
test_cocreateinstance_proxy();
test_implicit_mta();
+ test_apartment_oxid();
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
--
2.35.1
2
1
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52623
Signed-off-by: Austin English <austinenglish(a)gmail.com>
---
dlls/winspool.drv/info.c | 9 +++++++++
dlls/winspool.drv/winspool.drv.spec | 1 +
2 files changed, 10 insertions(+)
diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 52edd362622..7e3b0476735 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -8076,3 +8076,12 @@ DWORD WINAPI PerfCollect(LPWSTR query, LPVOID *data, LPDWORD size, LPDWORD obj_c
*obj_count = 0;
return ERROR_SUCCESS;
}
+
+/*****************************************************************************
+ * GetSpoolFileHandle [WINSPOOL.@]
+ */
+HANDLE WINAPI GetSpoolFileHandle(HANDLE printer)
+{
+ FIXME("%p: stub\n", printer);
+ return INVALID_HANDLE_VALUE;
+}
diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec
index 5d8a62d4695..d7bb49bd34b 100644
--- a/dlls/winspool.drv/winspool.drv.spec
+++ b/dlls/winspool.drv/winspool.drv.spec
@@ -144,6 +144,7 @@
@ stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr)
@ stdcall GetPrinterDriverW(long wstr long ptr long ptr)
@ stdcall GetPrinterW(long long ptr long ptr)
+@ stdcall GetSpoolFileHandle(ptr)
@ stdcall IsValidDevmodeA(ptr long)
@ stdcall IsValidDevmodeW(ptr long)
@ stdcall OpenPrinterA(str ptr ptr)
--
2.35.1
2
1
From: Austin English <austinenglish(a)gmail.com>
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52623
Signed-off-by: Austin English <austinenglish(a)gmail.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winspool.drv/info.c | 9 +++++++++
dlls/winspool.drv/winspool.drv.spec | 1 +
include/winspool.h | 2 ++
3 files changed, 12 insertions(+)
diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 52edd362622..a89abd0ced9 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -8076,3 +8076,12 @@ DWORD WINAPI PerfCollect(LPWSTR query, LPVOID *data, LPDWORD size, LPDWORD obj_c
*obj_count = 0;
return ERROR_SUCCESS;
}
+
+/*****************************************************************************
+ * GetSpoolFileHandle [WINSPOOL.@]
+ */
+HANDLE WINAPI GetSpoolFileHandle( HANDLE printer )
+{
+ FIXME( "%p: stub\n", printer );
+ return INVALID_HANDLE_VALUE;
+}
diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec
index 5d8a62d4695..d7bb49bd34b 100644
--- a/dlls/winspool.drv/winspool.drv.spec
+++ b/dlls/winspool.drv/winspool.drv.spec
@@ -144,6 +144,7 @@
@ stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr)
@ stdcall GetPrinterDriverW(long wstr long ptr long ptr)
@ stdcall GetPrinterW(long long ptr long ptr)
+@ stdcall GetSpoolFileHandle(ptr)
@ stdcall IsValidDevmodeA(ptr long)
@ stdcall IsValidDevmodeW(ptr long)
@ stdcall OpenPrinterA(str ptr ptr)
diff --git a/include/winspool.h b/include/winspool.h
index 68619741f38..db8773ec418 100644
--- a/include/winspool.h
+++ b/include/winspool.h
@@ -1768,6 +1768,8 @@ BOOL WINAPI XcvDataW(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData,
BOOL WINAPI IsValidDevmodeA(PDEVMODEA pDevMode, SIZE_T size);
BOOL WINAPI IsValidDevmodeW(PDEVMODEW pDevMode, SIZE_T size);
+HANDLE WINAPI GetSpoolFileHandle(HANDLE printer);
+
#ifdef __cplusplus
} /* extern "C" */
#endif
--
2.23.0
1
0
[PATCH 6/6] bcrypt: Stop passing a dummy public key to gnutls_privkey_import_dsa_raw().
by Hans Leidekker 21 Mar '22
by Hans Leidekker 21 Mar '22
21 Mar '22
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/bcrypt/gnutls.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index 6a55c84efef..884f4b1d37e 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -1145,8 +1145,7 @@ static NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len )
BLOBHEADER *hdr = (BLOBHEADER *)buf;
DSSPUBKEY *pubkey;
gnutls_privkey_t handle;
- gnutls_datum_t p, q, g, y, x;
- unsigned char dummy[128];
+ gnutls_datum_t p, q, g, x;
unsigned char *data, p_data[128], q_data[20], g_data[128], x_data[20];
int i, ret, size;
@@ -1185,12 +1184,7 @@ static NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len )
for (i = 0; i < x.size; i++) x.data[i] = data[x.size - i - 1];
data += x.size;
- WARN( "using dummy public key\n" );
- memset( dummy, 1, sizeof(dummy) );
- y.data = dummy;
- y.size = min( p.size, sizeof(dummy) );
-
- if ((ret = pgnutls_privkey_import_dsa_raw( handle, &p, &q, &g, &y, &x )))
+ if ((ret = pgnutls_privkey_import_dsa_raw( handle, &p, &q, &g, NULL, &x )))
{
pgnutls_perror( ret );
pgnutls_privkey_deinit( handle );
--
2.30.2
1
0
21 Mar '22
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/bcrypt/bcrypt_internal.h | 2 -
dlls/bcrypt/bcrypt_main.c | 68 +----
dlls/bcrypt/gnutls.c | 481 ++++++++--------------------------
3 files changed, 125 insertions(+), 426 deletions(-)
diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
index 7342b66479a..d57819f2ec6 100644
--- a/dlls/bcrypt/bcrypt_internal.h
+++ b/dlls/bcrypt/bcrypt_internal.h
@@ -175,8 +175,6 @@ struct key_asymmetric
{
ULONG bitlen; /* ignored for ECC keys */
unsigned flags;
- UCHAR *pubkey;
- unsigned pubkey_len;
DSSSEED dss_seed;
};
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
index 23f30833235..2ffeff66d7b 100644
--- a/dlls/bcrypt/bcrypt_main.c
+++ b/dlls/bcrypt/bcrypt_main.c
@@ -968,8 +968,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se
return status;
}
-static NTSTATUS key_asymmetric_create( struct key **ret_key, enum alg_id alg_id, ULONG bitlen,
- const UCHAR *pubkey, ULONG pubkey_len )
+static NTSTATUS key_asymmetric_create( enum alg_id alg_id, ULONG bitlen, struct key **ret_key )
{
struct key *key;
@@ -983,14 +982,6 @@ static NTSTATUS key_asymmetric_create( struct key **ret_key, enum alg_id alg_id,
key->hdr.magic = MAGIC_KEY;
key->alg_id = alg_id;
key->u.a.bitlen = bitlen;
- key->u.a.pubkey_len = pubkey_len;
-
- if (!(key->u.a.pubkey = malloc( pubkey_len )))
- {
- free( key );
- return STATUS_NO_MEMORY;
- }
- if (pubkey) memcpy( key->u.a.pubkey, pubkey, pubkey_len );
*ret_key = key;
return STATUS_SUCCESS;
@@ -1377,8 +1368,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2)
return STATUS_INVALID_PARAMETER;
- size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2;
- if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, (BYTE *)ecc_blob, size ))) return status;
+ if ((status = key_asymmetric_create( alg->id, key_size * 8, &key ))) return status;
params.key = key;
params.flags = KEY_IMPORT_FLAG_PUBLIC;
params.buf = input;
@@ -1419,8 +1409,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 3)
return STATUS_INVALID_PARAMETER;
- size = sizeof(*ecc_blob) + key_size * 2;
- if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, NULL, size ))) return status;
+ if ((status = key_asymmetric_create( alg->id, key_size * 8, &key ))) return status;
params.key = key;
params.flags = 0;
params.buf = input;
@@ -1445,7 +1434,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus;
if (size != input_len) return NTE_BAD_DATA;
- if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) return status;
+ if ((status = key_asymmetric_create( alg->id, rsa_blob->BitLength, &key ))) return status;
params.key = key;
params.flags = KEY_IMPORT_FLAG_PUBLIC;
params.buf = input;
@@ -1467,8 +1456,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
if (alg->id != ALG_ID_RSA || (rsa_blob->Magic != BCRYPT_RSAPRIVATE_MAGIC &&
rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED;
- size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus;
- if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) return status;
+ if ((status = key_asymmetric_create( alg->id, rsa_blob->BitLength, &key ))) return status;
params.key = key;
params.flags = 0;
params.buf = input;
@@ -1490,8 +1478,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
if ((alg->id != ALG_ID_DSA) || dsa_blob->dwMagic != BCRYPT_DSA_PUBLIC_MAGIC)
return STATUS_NOT_SUPPORTED;
- size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3;
- if ((status = key_asymmetric_create( &key, alg->id, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ))) return status;
+ if ((status = key_asymmetric_create( alg->id, dsa_blob->cbKey * 8, &key ))) return status;
params.key = key;
params.flags = KEY_IMPORT_FLAG_PUBLIC;
params.buf = input;
@@ -1530,8 +1517,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
if (input_len < sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 2 + 40 + sizeof(DSSSEED))
return STATUS_INVALID_PARAMETER;
- size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED);
- if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, NULL, size ))) return status;
+ if ((status = key_asymmetric_create( alg->id, pubkey->bitlen, &key ))) return status;
key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2;
params.key = key;
params.flags = 0;
@@ -1567,7 +1553,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED);
if (input_len < size) return STATUS_INVALID_PARAMETER;
- if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, (BYTE *)hdr, size ))) return status;
+ if ((status = key_asymmetric_create( alg->id, pubkey->bitlen, &key ))) return status;
key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2;
params.key = key;
params.flags = KEY_IMPORT_FLAG_PUBLIC;
@@ -1660,36 +1646,15 @@ NTSTATUS WINAPI BCryptGenerateKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_H
struct algorithm *alg = algorithm;
struct key *key;
NTSTATUS status;
- ULONG size;
TRACE( "%p, %p, %lu, %#lx\n", algorithm, handle, key_len, flags );
if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE;
if (!handle) return STATUS_INVALID_PARAMETER;
- switch (alg->id)
- {
- case ALG_ID_ECDH_P256:
- case ALG_ID_ECDSA_P256:
- size = sizeof(BCRYPT_ECCKEY_BLOB) + 2 * 256 / 8;
- break;
- case ALG_ID_ECDSA_P384:
- size = sizeof(BCRYPT_ECCKEY_BLOB) + 2 * 384 / 8;
- break;
- case ALG_ID_RSA:
- case ALG_ID_RSA_SIGN:
- size = sizeof(BCRYPT_RSAKEY_BLOB) + 2 * key_len / 8;
- break;
- case ALG_ID_DSA:
- size = sizeof(BCRYPT_DSA_KEY_BLOB) + 3 * key_len / 8;
- break;
- default:
- FIXME( "algorithm %u not supported\n", alg->id );
- return STATUS_NOT_SUPPORTED;
- }
-
- if (!(status = key_asymmetric_create( &key, alg->id, key_len, NULL, size ))) *handle = key;
- return status;
+ if ((status = key_asymmetric_create( alg->id, key_len, &key ))) return status;
+ *handle = key;
+ return STATUS_SUCCESS;
}
NTSTATUS WINAPI BCryptFinalizeKeyPair( BCRYPT_KEY_HANDLE handle, ULONG flags )
@@ -1766,14 +1731,9 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
{
struct key_asymmetric_duplicate_params params;
- if (!(buffer = malloc( key_orig->u.a.pubkey_len ))) return STATUS_NO_MEMORY;
- memcpy( buffer, key_orig->u.a.pubkey, key_orig->u.a.pubkey_len );
-
- key_copy->u.a.bitlen = key_orig->u.a.bitlen;
- key_copy->u.a.flags = key_orig->u.a.flags;
- key_copy->u.a.pubkey = buffer;
- key_copy->u.a.pubkey_len = key_orig->u.a.pubkey_len;
- key_copy->u.a.dss_seed = key_orig->u.a.dss_seed;
+ key_copy->u.a.bitlen = key_orig->u.a.bitlen;
+ key_copy->u.a.flags = key_orig->u.a.flags;
+ key_copy->u.a.dss_seed = key_orig->u.a.dss_seed;
params.key_orig = key_orig;
params.key_copy = key_copy;
diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index 28119fc9e78..6a55c84efef 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -72,7 +72,11 @@ typedef enum
union key_data
{
gnutls_cipher_hd_t cipher;
- gnutls_privkey_t privkey;
+ struct
+ {
+ gnutls_privkey_t privkey;
+ gnutls_pubkey_t pubkey;
+ } a;
};
C_ASSERT( sizeof(union key_data) <= sizeof(((struct key *)0)->private) );
@@ -98,6 +102,7 @@ static int (*pgnutls_pubkey_import_rsa_raw)(gnutls_pubkey_t, const gnutls_datum_
/* Not present in gnutls version < 2.12.0 */
static int (*pgnutls_pubkey_import_dsa_raw)(gnutls_pubkey_t, const gnutls_datum_t *, const gnutls_datum_t *,
const gnutls_datum_t *, const gnutls_datum_t *);
+static int (*pgnutls_pubkey_import_privkey)(gnutls_pubkey_t, gnutls_privkey_t, unsigned int, unsigned int);
/* Not present in gnutls version < 3.3.0 */
static int (*pgnutls_privkey_export_ecc_raw)(gnutls_privkey_t, gnutls_ecc_curve_t *,
@@ -133,6 +138,7 @@ MAKE_FUNCPTR(gnutls_privkey_import_dsa_raw);
MAKE_FUNCPTR(gnutls_privkey_init);
MAKE_FUNCPTR(gnutls_privkey_sign_hash);
MAKE_FUNCPTR(gnutls_pubkey_deinit);
+MAKE_FUNCPTR(gnutls_pubkey_import_privkey);
MAKE_FUNCPTR(gnutls_pubkey_init);
#undef MAKE_FUNCPTR
@@ -272,6 +278,7 @@ static NTSTATUS gnutls_process_attach( void *args )
LOAD_FUNCPTR(gnutls_privkey_init);
LOAD_FUNCPTR(gnutls_privkey_sign_hash);
LOAD_FUNCPTR(gnutls_pubkey_deinit);
+ LOAD_FUNCPTR(gnutls_pubkey_import_privkey);
LOAD_FUNCPTR(gnutls_pubkey_init);
#undef LOAD_FUNCPTR
@@ -609,234 +616,6 @@ static ULONG export_gnutls_datum( UCHAR *buffer, ULONG buflen, gnutls_datum_t *d
return size;
}
-#define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, bitlen / f, &d, p )
-static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, unsigned *pubkey_len )
-{
- BCRYPT_RSAKEY_BLOB *rsa_blob = pubkey;
- gnutls_datum_t m, e;
- UCHAR *dst;
- int ret;
-
- if ((ret = pgnutls_privkey_export_rsa_raw( gnutls_key, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL )))
- {
- pgnutls_perror( ret );
- return STATUS_INTERNAL_ERROR;
- }
-
- if (*pubkey_len < sizeof(*rsa_blob) + EXPORT_SIZE(e,8,0) + EXPORT_SIZE(m,8,1))
- {
- FIXME( "wrong pubkey len %u\n", *pubkey_len );
- pgnutls_perror( ret );
- free( e.data ); free( m.data );
- return STATUS_BUFFER_TOO_SMALL;
- }
-
- dst = (UCHAR *)(rsa_blob + 1);
- rsa_blob->cbPublicExp = export_gnutls_datum( dst, bitlen / 8, &e, 0 );
-
- dst += rsa_blob->cbPublicExp;
- rsa_blob->cbModulus = export_gnutls_datum( dst, bitlen / 8, &m, 1 );
-
- rsa_blob->Magic = BCRYPT_RSAPUBLIC_MAGIC;
- rsa_blob->BitLength = bitlen;
- rsa_blob->cbPrime1 = 0;
- rsa_blob->cbPrime2 = 0;
-
- *pubkey_len = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus;
-
- free( e.data ); free( m.data );
- return STATUS_SUCCESS;
-}
-#undef EXPORT_SIZE
-
-static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_id alg_id, void *pubkey,
- unsigned *pubkey_len )
-{
- BCRYPT_ECCKEY_BLOB *ecc_blob = pubkey;
- gnutls_ecc_curve_t curve;
- gnutls_datum_t x, y;
- DWORD magic, size;
- UCHAR *dst;
- int ret;
-
- switch (alg_id)
- {
- case ALG_ID_ECDH_P256:
- magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC;
- size = 32;
- break;
- case ALG_ID_ECDSA_P256:
- magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC;
- size = 32;
- break;
- default:
- FIXME( "algorithm %u not supported\n", alg_id );
- return STATUS_NOT_IMPLEMENTED;
- }
-
- if ((ret = pgnutls_privkey_export_ecc_raw( gnutls_key, &curve, &x, &y, NULL )))
- {
- pgnutls_perror( ret );
- return STATUS_INTERNAL_ERROR;
- }
-
- if (curve != GNUTLS_ECC_CURVE_SECP256R1)
- {
- FIXME( "curve %u not supported\n", curve );
- free( x.data ); free( y.data );
- return STATUS_NOT_IMPLEMENTED;
- }
-
- if (*pubkey_len < sizeof(*ecc_blob) + size * 2)
- {
- FIXME( "wrong pubkey len %u / %lu\n", *pubkey_len, sizeof(*ecc_blob) + size * 2 );
- pgnutls_perror( ret );
- free( x.data ); free( y.data );
- return STATUS_BUFFER_TOO_SMALL;
- }
-
- ecc_blob->dwMagic = magic;
- ecc_blob->cbKey = size;
-
- dst = (UCHAR *)(ecc_blob + 1);
- export_gnutls_datum( dst, size, &x, 1 );
-
- dst += size;
- export_gnutls_datum( dst, size, &y, 1 );
-
- *pubkey_len = sizeof(*ecc_blob) + ecc_blob->cbKey * 2;
-
- free( x.data ); free( y.data );
- return STATUS_SUCCESS;
-}
-
-static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, unsigned *pubkey_len )
-{
- BCRYPT_DSA_KEY_BLOB *dsa_blob = pubkey;
- gnutls_datum_t p, q, g, y;
- UCHAR *dst;
- int ret;
-
- if ((ret = pgnutls_privkey_export_dsa_raw( gnutls_key, &p, &q, &g, &y, NULL )))
- {
- pgnutls_perror( ret );
- return STATUS_INTERNAL_ERROR;
- }
-
- if (bitlen > 1024)
- {
- FIXME( "bitlen > 1024 not supported\n" );
- return STATUS_NOT_IMPLEMENTED;
- }
-
- if (*pubkey_len < sizeof(*dsa_blob) + bitlen / 8 * 3)
- {
- FIXME( "wrong pubkey len %u / %lu\n", *pubkey_len, sizeof(*dsa_blob) + bitlen / 8 * 3 );
- pgnutls_perror( ret );
- free( p.data ); free( q.data ); free( g.data ); free( y.data );
- return STATUS_NO_MEMORY;
- }
-
- dst = (UCHAR *)(dsa_blob + 1);
- export_gnutls_datum( dst, bitlen / 8, &p, 1 );
-
- dst += bitlen / 8;
- export_gnutls_datum( dst, bitlen / 8, &g, 1 );
-
- dst += bitlen / 8;
- export_gnutls_datum( dst, bitlen / 8, &y, 1 );
-
- dst = dsa_blob->q;
- export_gnutls_datum( dst, sizeof(dsa_blob->q), &q, 1 );
-
- dsa_blob->dwMagic = BCRYPT_DSA_PUBLIC_MAGIC;
- dsa_blob->cbKey = bitlen / 8;
- memset( dsa_blob->Count, 0, sizeof(dsa_blob->Count) ); /* FIXME */
- memset( dsa_blob->Seed, 0, sizeof(dsa_blob->Seed) ); /* FIXME */
-
- *pubkey_len = sizeof(*dsa_blob) + dsa_blob->cbKey * 3;
-
- free( p.data ); free( q.data ); free( g.data ); free( y.data );
- return STATUS_SUCCESS;
-}
-
-static void reverse_bytes( UCHAR *buf, ULONG len )
-{
- unsigned int i;
- UCHAR tmp;
-
- for (i = 0; i < len / 2; ++i)
- {
- tmp = buf[i];
- buf[i] = buf[len - i - 1];
- buf[len - i - 1] = tmp;
- }
-}
-
-#define Q_SIZE 20
-static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, unsigned bitlen,
- void *pubkey, unsigned *pubkey_len )
-{
- BLOBHEADER *hdr = pubkey;
- DSSPUBKEY *dsskey;
- gnutls_datum_t p, q, g, y;
- UCHAR *dst;
- int ret, size = sizeof(*hdr) + sizeof(*dsskey) + sizeof(*seed);
-
- if (bitlen > 1024)
- {
- FIXME( "bitlen > 1024 not supported\n" );
- return STATUS_NOT_IMPLEMENTED;
- }
-
- if ((ret = pgnutls_privkey_export_dsa_raw( gnutls_key, &p, &q, &g, &y, NULL )))
- {
- pgnutls_perror( ret );
- return STATUS_INTERNAL_ERROR;
- }
-
- if (*pubkey_len < size + bitlen / 8 * 3 + Q_SIZE)
- {
- FIXME( "wrong pubkey len %u / %u\n", *pubkey_len, size + bitlen / 8 * 3 + Q_SIZE );
- pgnutls_perror( ret );
- free( p.data ); free( q.data ); free( g.data ); free( y.data );
- return STATUS_NO_MEMORY;
- }
-
- hdr->bType = PUBLICKEYBLOB;
- hdr->bVersion = 2;
- hdr->reserved = 0;
- hdr->aiKeyAlg = CALG_DSS_SIGN;
-
- dsskey = (DSSPUBKEY *)(hdr + 1);
- dsskey->magic = MAGIC_DSS1;
- dsskey->bitlen = bitlen;
-
- dst = (UCHAR *)(dsskey + 1);
- export_gnutls_datum( dst, bitlen / 8, &p, 1 );
- reverse_bytes( dst, bitlen / 8 );
- dst += bitlen / 8;
-
- export_gnutls_datum( dst, Q_SIZE, &q, 1 );
- reverse_bytes( dst, Q_SIZE );
- dst += Q_SIZE;
-
- export_gnutls_datum( dst, bitlen / 8, &g, 1 );
- reverse_bytes( dst, bitlen / 8 );
- dst += bitlen / 8;
-
- export_gnutls_datum( dst, bitlen / 8, &y, 1 );
- reverse_bytes( dst, bitlen / 8 );
- dst += bitlen / 8;
-
- memcpy( dst, seed, sizeof(*seed) );
-
- *pubkey_len = size + bitlen / 8 * 3 + Q_SIZE;
-
- free( p.data ); free( q.data ); free( g.data ); free( y.data );
- return STATUS_SUCCESS;
-}
-
#define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, key->u.a.bitlen / f, &d, p )
static NTSTATUS key_export_rsa_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len )
{
@@ -845,7 +624,7 @@ static NTSTATUS key_export_rsa_public( struct key *key, UCHAR *buf, ULONG len, U
UCHAR *dst;
int ret;
- if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->privkey, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL )))
+ if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->a.privkey, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
@@ -894,7 +673,7 @@ 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)->privkey, &curve, &x, &y, NULL )))
+ if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
@@ -931,7 +710,7 @@ static NTSTATUS key_export_dsa_public( struct key *key, UCHAR *buf, ULONG len, U
UCHAR *dst;
int ret;
- if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, NULL )))
+ if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, NULL )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
@@ -968,6 +747,19 @@ static NTSTATUS key_export_dsa_public( struct key *key, UCHAR *buf, ULONG len, U
return STATUS_SUCCESS;
}
+static void reverse_bytes( UCHAR *buf, ULONG len )
+{
+ unsigned int i;
+ UCHAR tmp;
+
+ for (i = 0; i < len / 2; ++i)
+ {
+ tmp = buf[i];
+ buf[i] = buf[len - i - 1];
+ buf[len - i - 1] = tmp;
+ }
+}
+
#define Q_SIZE 20
static NTSTATUS key_export_dsa_capi_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len )
{
@@ -983,7 +775,7 @@ static NTSTATUS key_export_dsa_capi_public( struct key *key, UCHAR *buf, ULONG l
return STATUS_NOT_IMPLEMENTED;
}
- if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, NULL )))
+ if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, NULL )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
@@ -1029,13 +821,13 @@ static NTSTATUS key_asymmetric_generate( void *args )
{
struct key *key = args;
gnutls_pk_algorithm_t pk_alg;
- gnutls_privkey_t handle;
+ gnutls_privkey_t privkey;
+ gnutls_pubkey_t pubkey;
unsigned int bitlen;
- NTSTATUS status;
int ret;
if (!libgnutls_handle) return STATUS_INTERNAL_ERROR;
- if (key_data(key)->privkey) return STATUS_INVALID_HANDLE;
+ if (key_data(key)->a.privkey) return STATUS_INVALID_HANDLE;
switch (key->alg_id)
{
@@ -1061,45 +853,35 @@ static NTSTATUS key_asymmetric_generate( void *args )
return STATUS_NOT_SUPPORTED;
}
- if ((ret = pgnutls_privkey_init( &handle )))
+ if ((ret = pgnutls_privkey_init( &privkey )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
}
-
- if ((ret = pgnutls_privkey_generate( handle, pk_alg, bitlen, 0 )))
+ if ((ret = pgnutls_pubkey_init( &pubkey )))
{
pgnutls_perror( ret );
- pgnutls_privkey_deinit( handle );
+ pgnutls_privkey_deinit( privkey );
return STATUS_INTERNAL_ERROR;
}
- switch (pk_alg)
+ if ((ret = pgnutls_privkey_generate( privkey, pk_alg, bitlen, 0 )))
{
- case GNUTLS_PK_RSA:
- status = export_gnutls_pubkey_rsa( handle, key->u.a.bitlen, key->u.a.pubkey, &key->u.a.pubkey_len );
- break;
-
- case GNUTLS_PK_ECC:
- status = export_gnutls_pubkey_ecc( handle, key->alg_id, key->u.a.pubkey, &key->u.a.pubkey_len );
- break;
-
- case GNUTLS_PK_DSA:
- status = export_gnutls_pubkey_dsa( handle, key->u.a.bitlen, key->u.a.pubkey, &key->u.a.pubkey_len );
- break;
-
- default:
- ERR( "unhandled algorithm %u\n", pk_alg );
+ pgnutls_perror( ret );
+ pgnutls_privkey_deinit( privkey );
+ pgnutls_pubkey_deinit( pubkey );
return STATUS_INTERNAL_ERROR;
}
-
- if (status)
+ if ((ret = pgnutls_pubkey_import_privkey( pubkey, privkey, 0, 0 )))
{
- pgnutls_privkey_deinit( handle );
- return status;
+ pgnutls_perror( ret );
+ pgnutls_privkey_deinit( privkey );
+ pgnutls_pubkey_deinit( pubkey );
+ return STATUS_INTERNAL_ERROR;
}
- key_data(key)->privkey = handle;
+ key_data(key)->a.privkey = privkey;
+ key_data(key)->a.pubkey = pubkey;
return STATUS_SUCCESS;
}
@@ -1128,7 +910,7 @@ static NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *r
return STATUS_NOT_IMPLEMENTED;
}
- if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->privkey, &curve, &x, &y, &d )))
+ if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, &d )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
@@ -1168,7 +950,6 @@ static NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len )
gnutls_ecc_curve_t curve;
gnutls_privkey_t handle;
gnutls_datum_t x, y, k;
- NTSTATUS status;
int ret;
switch (key->alg_id)
@@ -1204,14 +985,8 @@ static NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len )
return STATUS_INTERNAL_ERROR;
}
- if ((status = export_gnutls_pubkey_ecc( handle, key->alg_id, key->u.a.pubkey, &key->u.a.pubkey_len )))
- {
- pgnutls_privkey_deinit( handle );
- return status;
- }
-
- if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey );
- key_data(key)->privkey = handle;
+ if (key_data(key)->a.privkey) pgnutls_privkey_deinit( key_data(key)->a.privkey );
+ key_data(key)->a.privkey = handle;
return STATUS_SUCCESS;
}
@@ -1224,7 +999,7 @@ static NTSTATUS key_export_rsa( struct key *key, ULONG flags, UCHAR *buf, ULONG
UCHAR *dst;
int ret;
- if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 )))
+ if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->a.privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
@@ -1301,8 +1076,8 @@ static NTSTATUS key_import_rsa( struct key *key, UCHAR *buf, ULONG len )
return STATUS_INTERNAL_ERROR;
}
- if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey );
- key_data(key)->privkey = handle;
+ if (key_data(key)->a.privkey) pgnutls_privkey_deinit( key_data(key)->a.privkey );
+ key_data(key)->a.privkey = handle;
return STATUS_SUCCESS;
}
@@ -1314,7 +1089,7 @@ static NTSTATUS key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULO
UCHAR *dst;
int ret, size;
- if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, &x )))
+ if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, &x )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
@@ -1374,7 +1149,6 @@ static NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len )
unsigned char dummy[128];
unsigned char *data, p_data[128], q_data[20], g_data[128], x_data[20];
int i, ret, size;
- NTSTATUS status;
if ((ret = pgnutls_privkey_init( &handle )))
{
@@ -1423,29 +1197,24 @@ static NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len )
return STATUS_INTERNAL_ERROR;
}
- if ((status = export_gnutls_pubkey_dsa_capi( handle, &key->u.a.dss_seed, key->u.a.bitlen,
- key->u.a.pubkey, &key->u.a.pubkey_len )))
- {
- pgnutls_privkey_deinit( handle );
- return status;
- }
-
memcpy( &key->u.a.dss_seed, data, sizeof(key->u.a.dss_seed) );
- if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey );
- key_data(key)->privkey = handle;
+ if (key_data(key)->a.privkey) pgnutls_privkey_deinit( key_data(key)->a.privkey );
+ key_data(key)->a.privkey = handle;
return STATUS_SUCCESS;
}
-static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnutls_key )
+static NTSTATUS key_import_ecc_public( struct key *key, UCHAR *buf, ULONG len )
{
BCRYPT_ECCKEY_BLOB *ecc_blob;
gnutls_ecc_curve_t curve;
gnutls_datum_t x, y;
+ gnutls_pubkey_t handle;
int ret;
switch (key->alg_id)
{
+ case ALG_ID_ECDH_P256:
case ALG_ID_ECDSA_P256: curve = GNUTLS_ECC_CURVE_SECP256R1; break;
case ALG_ID_ECDSA_P384: curve = GNUTLS_ECC_CURVE_SECP384R1; break;
@@ -1454,103 +1223,112 @@ static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnut
return STATUS_NOT_IMPLEMENTED;
}
- if ((ret = pgnutls_pubkey_init( gnutls_key )))
+ if ((ret = pgnutls_pubkey_init( &handle )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
}
- ecc_blob = (BCRYPT_ECCKEY_BLOB *)key->u.a.pubkey;
- x.data = key->u.a.pubkey + sizeof(*ecc_blob);
+ ecc_blob = (BCRYPT_ECCKEY_BLOB *)buf;
+ x.data = buf + sizeof(*ecc_blob);
x.size = ecc_blob->cbKey;
- y.data = key->u.a.pubkey + sizeof(*ecc_blob) + ecc_blob->cbKey;
+ y.data = buf + sizeof(*ecc_blob) + ecc_blob->cbKey;
y.size = ecc_blob->cbKey;
- if ((ret = pgnutls_pubkey_import_ecc_raw( *gnutls_key, curve, &x, &y )))
+ if ((ret = pgnutls_pubkey_import_ecc_raw( handle, curve, &x, &y )))
{
pgnutls_perror( ret );
- pgnutls_pubkey_deinit( *gnutls_key );
+ pgnutls_pubkey_deinit( handle );
return STATUS_INTERNAL_ERROR;
}
+ if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey );
+ key_data(key)->a.pubkey = handle;
return STATUS_SUCCESS;
}
-static NTSTATUS import_gnutls_pubkey_rsa( struct key *key, gnutls_pubkey_t *gnutls_key )
+static NTSTATUS key_import_rsa_public( struct key *key, UCHAR *buf, ULONG len )
{
BCRYPT_RSAKEY_BLOB *rsa_blob;
+ gnutls_pubkey_t handle;
gnutls_datum_t m, e;
int ret;
- if ((ret = pgnutls_pubkey_init( gnutls_key )))
+ if ((ret = pgnutls_pubkey_init( &handle )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
}
- rsa_blob = (BCRYPT_RSAKEY_BLOB *)key->u.a.pubkey;
- e.data = key->u.a.pubkey + sizeof(*rsa_blob);
+ rsa_blob = (BCRYPT_RSAKEY_BLOB *)buf;
+ e.data = buf + sizeof(*rsa_blob);
e.size = rsa_blob->cbPublicExp;
- m.data = key->u.a.pubkey + sizeof(*rsa_blob) + rsa_blob->cbPublicExp;
+ m.data = buf + sizeof(*rsa_blob) + rsa_blob->cbPublicExp;
m.size = rsa_blob->cbModulus;
- if ((ret = pgnutls_pubkey_import_rsa_raw( *gnutls_key, &m, &e )))
+ if ((ret = pgnutls_pubkey_import_rsa_raw( handle, &m, &e )))
{
pgnutls_perror( ret );
- pgnutls_pubkey_deinit( *gnutls_key );
+ pgnutls_pubkey_deinit( handle );
return STATUS_INTERNAL_ERROR;
}
+ if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey );
+ key_data(key)->a.pubkey = handle;
return STATUS_SUCCESS;
}
-static NTSTATUS import_gnutls_pubkey_dsa( struct key *key, gnutls_pubkey_t *gnutls_key )
+static NTSTATUS key_import_dsa_public( struct key *key, UCHAR *buf, ULONG len )
{
BCRYPT_DSA_KEY_BLOB *dsa_blob;
gnutls_datum_t p, q, g, y;
+ gnutls_pubkey_t handle;
int ret;
- if ((ret = pgnutls_pubkey_init( gnutls_key )))
+ if ((ret = pgnutls_pubkey_init( &handle )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
}
- dsa_blob = (BCRYPT_DSA_KEY_BLOB *)key->u.a.pubkey;
- p.data = key->u.a.pubkey + sizeof(*dsa_blob);
+ dsa_blob = (BCRYPT_DSA_KEY_BLOB *)buf;
+ p.data = buf + sizeof(*dsa_blob);
p.size = dsa_blob->cbKey;
q.data = dsa_blob->q;
q.size = sizeof(dsa_blob->q);
- g.data = key->u.a.pubkey + sizeof(*dsa_blob) + dsa_blob->cbKey;
+ g.data = buf + sizeof(*dsa_blob) + dsa_blob->cbKey;
g.size = dsa_blob->cbKey;
- y.data = key->u.a.pubkey + sizeof(*dsa_blob) + dsa_blob->cbKey * 2;
+ y.data = buf + sizeof(*dsa_blob) + dsa_blob->cbKey * 2;
y.size = dsa_blob->cbKey;
- if ((ret = pgnutls_pubkey_import_dsa_raw( *gnutls_key, &p, &q, &g, &y )))
+ if ((ret = pgnutls_pubkey_import_dsa_raw( handle, &p, &q, &g, &y )))
{
pgnutls_perror( ret );
- pgnutls_pubkey_deinit( *gnutls_key );
+ pgnutls_pubkey_deinit( handle );
return STATUS_INTERNAL_ERROR;
}
+ if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey );
+ key_data(key)->a.pubkey = handle;
return STATUS_SUCCESS;
}
-static NTSTATUS import_gnutls_pubkey_dsa_capi( struct key *key, gnutls_pubkey_t *gnutls_key )
+static NTSTATUS key_import_dsa_capi_public( struct key *key, UCHAR *buf, ULONG len )
{
BLOBHEADER *hdr;
DSSPUBKEY *pubkey;
gnutls_datum_t p, q, g, y;
+ gnutls_pubkey_t handle;
unsigned char *data, p_data[128], q_data[20], g_data[128], y_data[128];
int i, ret, size;
- if ((ret = pgnutls_pubkey_init( gnutls_key )))
+ if ((ret = pgnutls_pubkey_init( &handle )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
}
- hdr = (BLOBHEADER *)key->u.a.pubkey;
+ hdr = (BLOBHEADER *)buf;
pubkey = (DSSPUBKEY *)(hdr + 1);
size = pubkey->bitlen / 8;
data = (unsigned char *)(pubkey + 1);
@@ -1574,40 +1352,18 @@ static NTSTATUS import_gnutls_pubkey_dsa_capi( struct key *key, gnutls_pubkey_t
y.size = sizeof(y_data);
for (i = 0; i < y.size; i++) y.data[i] = data[y.size - i - 1];
- if ((ret = pgnutls_pubkey_import_dsa_raw( *gnutls_key, &p, &q, &g, &y )))
+ if ((ret = pgnutls_pubkey_import_dsa_raw( handle, &p, &q, &g, &y )))
{
pgnutls_perror( ret );
- pgnutls_pubkey_deinit( *gnutls_key );
+ pgnutls_pubkey_deinit( handle );
return STATUS_INTERNAL_ERROR;
}
+ if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey );
+ key_data(key)->a.pubkey = handle;
return STATUS_SUCCESS;
}
-static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_key )
-{
- switch (key->alg_id)
- {
- case ALG_ID_ECDSA_P256:
- case ALG_ID_ECDSA_P384:
- return import_gnutls_pubkey_ecc( key, gnutls_key );
-
- case ALG_ID_RSA:
- case ALG_ID_RSA_SIGN:
- return import_gnutls_pubkey_rsa( key, gnutls_key );
-
- case ALG_ID_DSA:
- if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2)
- return import_gnutls_pubkey_dsa_capi( key, gnutls_key );
- else
- return import_gnutls_pubkey_dsa( key, gnutls_key );
-
- default:
- FIXME("algorithm %u not yet supported\n", key->alg_id );
- return STATUS_NOT_IMPLEMENTED;
- }
-}
-
static NTSTATUS key_asymmetric_export( void *args )
{
const struct key_asymmetric_export_params *params = args;
@@ -1658,26 +1414,21 @@ static NTSTATUS key_asymmetric_import( void *args )
case ALG_ID_ECDSA_P256:
case ALG_ID_ECDSA_P384:
if (flags & KEY_IMPORT_FLAG_PUBLIC)
- {
- FIXME("\n");
- return STATUS_SUCCESS;
- }
+ return key_import_ecc_public( key, params->buf, params->len );
return key_import_ecc( key, params->buf, params->len );
case ALG_ID_RSA:
case ALG_ID_RSA_SIGN:
if (flags & KEY_IMPORT_FLAG_PUBLIC)
- {
- FIXME("\n");
- return STATUS_SUCCESS;
- }
+ return key_import_rsa_public( key, params->buf, params->len );
return key_import_rsa( key, params->buf, params->len );
case ALG_ID_DSA:
if (flags & KEY_IMPORT_FLAG_PUBLIC)
{
- FIXME("\n");
- return STATUS_SUCCESS;
+ if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2)
+ return key_import_dsa_capi_public( key, params->buf, params->len );
+ return key_import_dsa_public( key, params->buf, params->len );
}
if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2)
return key_import_dsa_capi( key, params->buf, params->len );
@@ -1760,7 +1511,6 @@ static NTSTATUS key_asymmetric_verify( void *args )
gnutls_sign_algorithm_t sign_alg;
gnutls_datum_t gnutls_hash, gnutls_signature;
gnutls_pk_algorithm_t pk_alg;
- gnutls_pubkey_t gnutls_key;
NTSTATUS status;
int ret;
@@ -1824,19 +1574,14 @@ static NTSTATUS key_asymmetric_verify( void *args )
return STATUS_NOT_IMPLEMENTED;
}
- if ((status = import_gnutls_pubkey( key, &gnutls_key ))) return status;
if ((status = prepare_gnutls_signature( key, params->signature, params->signature_len, &gnutls_signature )))
- {
- pgnutls_pubkey_deinit( gnutls_key );
return status;
- }
gnutls_hash.data = params->hash;
gnutls_hash.size = params->hash_len;
- ret = pgnutls_pubkey_verify_hash2( gnutls_key, sign_alg, 0, &gnutls_hash, &gnutls_signature );
+ ret = pgnutls_pubkey_verify_hash2( key_data(key)->a.pubkey, sign_alg, 0, &gnutls_hash, &gnutls_signature );
if (gnutls_signature.data != params->signature) free( gnutls_signature.data );
- pgnutls_pubkey_deinit( gnutls_key );
return (ret < 0) ? STATUS_INVALID_SIGNATURE : STATUS_SUCCESS;
}
@@ -1975,7 +1720,7 @@ static NTSTATUS key_asymmetric_sign( void *args )
*params->ret_len = key->u.a.bitlen / 8;
return STATUS_SUCCESS;
}
- if (!key_data(key)->privkey) return STATUS_INVALID_PARAMETER;
+ if (!key_data(key)->a.privkey) return STATUS_INVALID_PARAMETER;
hash.data = params->input;
hash.size = params->input_len;
@@ -1983,15 +1728,13 @@ static NTSTATUS key_asymmetric_sign( void *args )
signature.data = NULL;
signature.size = 0;
- if ((ret = pgnutls_privkey_sign_hash( key_data(key)->privkey, hash_alg, 0, &hash, &signature )))
+ if ((ret = pgnutls_privkey_sign_hash( key_data(key)->a.privkey, hash_alg, 0, &hash, &signature )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
}
- status = format_gnutls_signature( key->alg_id, signature, params->output,
- params->output_len, params->ret_len );
-
+ status = format_gnutls_signature( key->alg_id, signature, params->output, params->output_len, params->ret_len );
free( signature.data );
return status;
}
@@ -2000,7 +1743,8 @@ static NTSTATUS key_asymmetric_destroy( void *args )
{
struct key *key = args;
- if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey );
+ if (key_data(key)->a.privkey) pgnutls_privkey_deinit( key_data(key)->a.privkey );
+ if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey );
return STATUS_SUCCESS;
}
@@ -2011,9 +1755,9 @@ static NTSTATUS key_asymmetric_duplicate( void *args )
struct key *key_copy = params->key_copy;
int ret;
- if (!key_data(key_orig)->privkey) return STATUS_SUCCESS;
+ if (!key_data(key_orig)->a.privkey) return STATUS_SUCCESS;
- if ((ret = pgnutls_privkey_init( &key_data(key_copy)->privkey )))
+ if ((ret = pgnutls_privkey_init( &key_data(key_copy)->a.privkey )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
@@ -2025,12 +1769,12 @@ static NTSTATUS key_asymmetric_duplicate( void *args )
case ALG_ID_RSA_SIGN:
{
gnutls_datum_t m, e, d, p, q, u, e1, e2;
- if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key_orig)->privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 )))
+ if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key_orig)->a.privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
}
- ret = pgnutls_privkey_import_rsa_raw( key_data(key_copy)->privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 );
+ ret = pgnutls_privkey_import_rsa_raw( key_data(key_copy)->a.privkey, &m, &e, &d, &p, &q, &u, &e1, &e2 );
free( m.data ); free( e.data ); free( d.data ); free( p.data ); free( q.data ); free( u.data );
free( e1.data ); free( e2.data );
if (ret)
@@ -2043,12 +1787,12 @@ static NTSTATUS key_asymmetric_duplicate( void *args )
case ALG_ID_DSA:
{
gnutls_datum_t p, q, g, y, x;
- if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key_orig)->privkey, &p, &q, &g, &y, &x )))
+ if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key_orig)->a.privkey, &p, &q, &g, &y, &x )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
}
- ret = pgnutls_privkey_import_dsa_raw( key_data(key_copy)->privkey, &p, &q, &g, &y, &x );
+ ret = pgnutls_privkey_import_dsa_raw( key_data(key_copy)->a.privkey, &p, &q, &g, &y, &x );
free( p.data ); free( q.data ); free( g.data ); free( y.data ); free( x.data );
if (ret)
{
@@ -2063,12 +1807,12 @@ static NTSTATUS key_asymmetric_duplicate( void *args )
{
gnutls_ecc_curve_t curve;
gnutls_datum_t x, y, k;
- if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key_orig)->privkey, &curve, &x, &y, &k )))
+ if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key_orig)->a.privkey, &curve, &x, &y, &k )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
}
- ret = pgnutls_privkey_import_ecc_raw( key_data(key_copy)->privkey, curve, &x, &y, &k );
+ ret = pgnutls_privkey_import_ecc_raw( key_data(key_copy)->a.privkey, curve, &x, &y, &k );
free( x.data ); free( y.data ); free( k.data );
if (ret)
{
@@ -2094,7 +1838,7 @@ static NTSTATUS key_asymmetric_decrypt( void *args )
e.data = params->input;
e.size = params->input_len;
- if ((ret = pgnutls_privkey_decrypt_data( key_data(params->key)->privkey, 0, &e, &d )))
+ if ((ret = pgnutls_privkey_decrypt_data( key_data(params->key)->a.privkey, 0, &e, &d )))
{
pgnutls_perror( ret );
return STATUS_INTERNAL_ERROR;
@@ -2187,8 +1931,6 @@ static struct key *get_asymmetric_key( struct key32 *key32, struct key *key )
key->private[1] = key32->private[1];
key->u.a.bitlen = key32->u.a.bitlen;
key->u.a.flags = key32->u.a.flags;
- key->u.a.pubkey = ULongToPtr(key32->u.a.pubkey);
- key->u.a.pubkey_len = key32->u.a.pubkey_len;
key->u.a.dss_seed = key32->u.a.dss_seed;
return key;
}
@@ -2204,7 +1946,6 @@ static void put_asymmetric_key32( struct key *key, struct key32 *key32 )
key32->private[0] = key->private[0];
key32->private[1] = key->private[1];
key32->u.a.flags = key->u.a.flags;
- key32->u.a.pubkey_len = key->u.a.pubkey_len;
key32->u.a.dss_seed = key->u.a.dss_seed;
}
--
2.30.2
1
0
21 Mar '22
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/bcrypt/bcrypt_internal.h | 8 +--
dlls/bcrypt/bcrypt_main.c | 87 ++++++++++++++++------
dlls/bcrypt/gnutls.c | 132 ++++++++++++++++------------------
3 files changed, 132 insertions(+), 95 deletions(-)
diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
index d299def6e11..7342b66479a 100644
--- a/dlls/bcrypt/bcrypt_internal.h
+++ b/dlls/bcrypt/bcrypt_internal.h
@@ -279,9 +279,11 @@ struct key_asymmetric_export_params
ULONG *ret_len;
};
-struct key_import_params
+#define KEY_IMPORT_FLAG_PUBLIC 0x00000001
+struct key_asymmetric_import_params
{
struct key *key;
+ ULONG flags;
UCHAR *buf;
ULONG len;
};
@@ -303,9 +305,7 @@ enum key_funcs
unix_key_asymmetric_verify,
unix_key_asymmetric_destroy,
unix_key_asymmetric_export,
- unix_key_import_dsa_capi,
- unix_key_import_ecc,
- unix_key_import_rsa,
+ unix_key_asymmetric_import,
};
#endif /* __BCRYPT_INTERNAL_H */
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
index 408c477b92f..23f30833235 100644
--- a/dlls/bcrypt/bcrypt_main.c
+++ b/dlls/bcrypt/bcrypt_main.c
@@ -1339,7 +1339,7 @@ static void key_destroy( struct key *key )
static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input,
ULONG input_len )
{
- struct key_import_params params;
+ struct key_asymmetric_import_params params;
struct key *key;
NTSTATUS status;
ULONG size;
@@ -1378,7 +1378,19 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
return STATUS_INVALID_PARAMETER;
size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2;
- return key_asymmetric_create( (struct key **)ret_key, alg->id, key_size * 8, (BYTE *)ecc_blob, size );
+ if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, (BYTE *)ecc_blob, size ))) return status;
+ params.key = key;
+ params.flags = KEY_IMPORT_FLAG_PUBLIC;
+ params.buf = input;
+ params.len = input_len;
+ if ((status = UNIX_CALL( key_asymmetric_import, ¶ms )))
+ {
+ key_destroy( key );
+ return status;
+ }
+
+ *ret_key = key;
+ return STATUS_SUCCESS;
}
else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB ))
{
@@ -1409,11 +1421,11 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
size = sizeof(*ecc_blob) + key_size * 2;
if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, NULL, size ))) return status;
-
- params.key = key;
- params.buf = input;
- params.len = input_len;
- if ((status = UNIX_CALL( key_import_ecc, ¶ms )))
+ params.key = key;
+ params.flags = 0;
+ params.buf = input;
+ params.len = input_len;
+ if ((status = UNIX_CALL( key_asymmetric_import, ¶ms )))
{
key_destroy( key );
return status;
@@ -1432,7 +1444,20 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus;
if (size != input_len) return NTE_BAD_DATA;
- return key_asymmetric_create( (struct key **)ret_key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size );
+
+ if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) return status;
+ params.key = key;
+ params.flags = KEY_IMPORT_FLAG_PUBLIC;
+ params.buf = input;
+ params.len = input_len;
+ if ((status = UNIX_CALL( key_asymmetric_import, ¶ms )))
+ {
+ key_destroy( key );
+ return status;
+ }
+
+ *ret_key = key;
+ return STATUS_SUCCESS;
}
else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB ))
{
@@ -1443,12 +1468,12 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED;
size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus;
- if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size )))
- return status;
- params.key = key;
- params.buf = input;
- params.len = input_len;
- if ((status = UNIX_CALL( key_import_rsa, ¶ms )))
+ if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) return status;
+ params.key = key;
+ params.flags = 0;
+ params.buf = input;
+ params.len = input_len;
+ if ((status = UNIX_CALL( key_asymmetric_import, ¶ms )))
{
key_destroy( key );
return status;
@@ -1466,7 +1491,19 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
return STATUS_NOT_SUPPORTED;
size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3;
- return key_asymmetric_create( (struct key **)ret_key, alg->id, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size );
+ if ((status = key_asymmetric_create( &key, alg->id, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ))) return status;
+ params.key = key;
+ params.flags = KEY_IMPORT_FLAG_PUBLIC;
+ params.buf = input;
+ params.len = input_len;
+ if ((status = UNIX_CALL( key_asymmetric_import, ¶ms )))
+ {
+ key_destroy( key );
+ return status;
+ }
+
+ *ret_key = key;
+ return STATUS_SUCCESS;
}
else if (!wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB ))
{
@@ -1495,11 +1532,12 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED);
if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, NULL, size ))) return status;
-
- params.key = key;
- params.buf = input;
- params.len = input_len;
- if ((status = UNIX_CALL( key_import_dsa_capi, ¶ms )))
+ key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2;
+ params.key = key;
+ params.flags = 0;
+ params.buf = input;
+ params.len = input_len;
+ if ((status = UNIX_CALL( key_asymmetric_import, ¶ms )))
{
key_destroy( key );
return status;
@@ -1531,6 +1569,15 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, (BYTE *)hdr, size ))) return status;
key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2;
+ params.key = key;
+ params.flags = KEY_IMPORT_FLAG_PUBLIC;
+ params.buf = input;
+ params.len = input_len;
+ if ((status = UNIX_CALL( key_asymmetric_import, ¶ms )))
+ {
+ key_destroy( key );
+ return status;
+ }
*ret_key = key;
return STATUS_SUCCESS;
diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index 01e1fe72092..28119fc9e78 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -1162,10 +1162,8 @@ static NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *r
return STATUS_SUCCESS;
}
-static NTSTATUS key_import_ecc( void *args )
+static NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len )
{
- const struct key_import_params *params = args;
- struct key *key = params->key;
BCRYPT_ECCKEY_BLOB *ecc_blob;
gnutls_ecc_curve_t curve;
gnutls_privkey_t handle;
@@ -1191,7 +1189,7 @@ static NTSTATUS key_import_ecc( void *args )
return STATUS_INTERNAL_ERROR;
}
- ecc_blob = (BCRYPT_ECCKEY_BLOB *)params->buf;
+ ecc_blob = (BCRYPT_ECCKEY_BLOB *)buf;
x.data = (unsigned char *)(ecc_blob + 1);
x.size = ecc_blob->cbKey;
y.data = x.data + ecc_blob->cbKey;
@@ -1212,6 +1210,7 @@ static NTSTATUS key_import_ecc( void *args )
return status;
}
+ if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey );
key_data(key)->privkey = handle;
return STATUS_SUCCESS;
}
@@ -1273,10 +1272,9 @@ static NTSTATUS key_export_rsa( struct key *key, ULONG flags, UCHAR *buf, ULONG
return STATUS_SUCCESS;
}
-static NTSTATUS key_import_rsa( void *args )
+static NTSTATUS key_import_rsa( struct key *key, UCHAR *buf, ULONG len )
{
- const struct key_import_params *params = args;
- BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)params->buf;
+ BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)buf;
gnutls_datum_t m, e, p, q;
gnutls_privkey_t handle;
int ret;
@@ -1303,7 +1301,8 @@ static NTSTATUS key_import_rsa( void *args )
return STATUS_INTERNAL_ERROR;
}
- key_data(params->key)->privkey = handle;
+ if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey );
+ key_data(key)->privkey = handle;
return STATUS_SUCCESS;
}
@@ -1366,11 +1365,9 @@ static NTSTATUS key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULO
return STATUS_SUCCESS;
}
-static NTSTATUS key_import_dsa_capi( void *args )
+static NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len )
{
- const struct key_import_params *params = args;
- struct key *key = params->key;
- BLOBHEADER *hdr = (BLOBHEADER *)params->buf;
+ BLOBHEADER *hdr = (BLOBHEADER *)buf;
DSSPUBKEY *pubkey;
gnutls_privkey_t handle;
gnutls_datum_t p, q, g, y, x;
@@ -1435,9 +1432,8 @@ static NTSTATUS key_import_dsa_capi( void *args )
memcpy( &key->u.a.dss_seed, data, sizeof(key->u.a.dss_seed) );
- key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2;
+ if (key_data(key)->privkey) pgnutls_privkey_deinit( key_data(key)->privkey );
key_data(key)->privkey = handle;
-
return STATUS_SUCCESS;
}
@@ -1650,6 +1646,50 @@ static NTSTATUS key_asymmetric_export( void *args )
}
}
+static NTSTATUS key_asymmetric_import( void *args )
+{
+ const struct key_asymmetric_import_params *params = args;
+ struct key *key = params->key;
+ unsigned flags = params->flags;
+
+ switch (key->alg_id)
+ {
+ case ALG_ID_ECDH_P256:
+ case ALG_ID_ECDSA_P256:
+ case ALG_ID_ECDSA_P384:
+ if (flags & KEY_IMPORT_FLAG_PUBLIC)
+ {
+ FIXME("\n");
+ return STATUS_SUCCESS;
+ }
+ return key_import_ecc( key, params->buf, params->len );
+
+ case ALG_ID_RSA:
+ case ALG_ID_RSA_SIGN:
+ if (flags & KEY_IMPORT_FLAG_PUBLIC)
+ {
+ FIXME("\n");
+ return STATUS_SUCCESS;
+ }
+ return key_import_rsa( key, params->buf, params->len );
+
+ case ALG_ID_DSA:
+ if (flags & KEY_IMPORT_FLAG_PUBLIC)
+ {
+ FIXME("\n");
+ return STATUS_SUCCESS;
+ }
+ if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2)
+ return key_import_dsa_capi( key, params->buf, params->len );
+ FIXME( "DSA private key not supported\n" );
+ return STATUS_NOT_IMPLEMENTED;
+
+ default:
+ FIXME( "algorithm %u not yet supported\n", key->alg_id );
+ return STATUS_NOT_IMPLEMENTED;
+ }
+}
+
static NTSTATUS prepare_gnutls_signature_dsa( struct key *key, UCHAR *signature, ULONG signature_len,
gnutls_datum_t *gnutls_signature )
{
@@ -2085,9 +2125,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
key_asymmetric_verify,
key_asymmetric_destroy,
key_asymmetric_export,
- key_import_dsa_capi,
- key_import_ecc,
- key_import_rsa
+ key_asymmetric_import
};
#ifdef _WIN64
@@ -2477,59 +2515,12 @@ static NTSTATUS wow64_key_asymmetric_export( void *args )
return ret;
}
-static NTSTATUS wow64_key_import_dsa_capi( void *args )
-{
- struct
- {
- PTR32 key;
- PTR32 buf;
- ULONG len;
- } const *params32 = args;
-
- NTSTATUS ret;
- struct key key;
- struct key32 *key32 = ULongToPtr( params32->key );
- struct key_import_params params =
- {
- get_asymmetric_key( key32, &key ),
- ULongToPtr(params32->buf),
- params32->len
- };
-
- ret = key_import_dsa_capi( ¶ms );
- put_asymmetric_key32( &key, key32 );
- return ret;
-}
-
-static NTSTATUS wow64_key_import_ecc( void *args )
-{
- struct
- {
- PTR32 key;
- PTR32 buf;
- ULONG len;
- } const *params32 = args;
-
- NTSTATUS ret;
- struct key key;
- struct key32 *key32 = ULongToPtr( params32->key );
- struct key_import_params params =
- {
- get_asymmetric_key( key32, &key ),
- ULongToPtr(params32->buf),
- params32->len
- };
-
- ret = key_import_ecc( ¶ms );
- put_asymmetric_key32( &key, key32 );
- return ret;
-}
-
-static NTSTATUS wow64_key_import_rsa( void *args )
+static NTSTATUS wow64_key_asymmetric_import( void *args )
{
struct
{
PTR32 key;
+ ULONG flags;
PTR32 buf;
ULONG len;
} const *params32 = args;
@@ -2537,14 +2528,15 @@ static NTSTATUS wow64_key_import_rsa( void *args )
NTSTATUS ret;
struct key key;
struct key32 *key32 = ULongToPtr( params32->key );
- struct key_import_params params =
+ struct key_asymmetric_import_params params =
{
get_asymmetric_key( key32, &key ),
+ params32->flags,
ULongToPtr(params32->buf),
params32->len
};
- ret = key_import_rsa( ¶ms );
+ ret = key_asymmetric_import( ¶ms );
put_asymmetric_key32( &key, key32 );
return ret;
}
@@ -2566,9 +2558,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
wow64_key_asymmetric_verify,
wow64_key_asymmetric_destroy,
wow64_key_asymmetric_export,
- wow64_key_import_dsa_capi,
- wow64_key_import_ecc,
- wow64_key_import_rsa
+ wow64_key_asymmetric_import
};
#endif /* _WIN64 */
--
2.30.2
1
0
21 Mar '22
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/bcrypt/bcrypt_internal.h | 10 +-
dlls/bcrypt/bcrypt_main.c | 46 +++--
dlls/bcrypt/gnutls.c | 336 +++++++++++++++++++++++++---------
3 files changed, 277 insertions(+), 115 deletions(-)
diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
index 6d115e10e54..d299def6e11 100644
--- a/dlls/bcrypt/bcrypt_internal.h
+++ b/dlls/bcrypt/bcrypt_internal.h
@@ -268,13 +268,15 @@ struct key_asymmetric_verify_params
unsigned flags;
};
-struct key_export_params
+#define KEY_EXPORT_FLAG_PUBLIC 0x00000001
+#define KEY_EXPORT_FLAG_RSA_FULL 0x00000002
+struct key_asymmetric_export_params
{
struct key *key;
+ ULONG flags;
UCHAR *buf;
ULONG len;
ULONG *ret_len;
- BOOL full;
};
struct key_import_params
@@ -300,9 +302,7 @@ enum key_funcs
unix_key_asymmetric_sign,
unix_key_asymmetric_verify,
unix_key_asymmetric_destroy,
- unix_key_export_dsa_capi,
- unix_key_export_ecc,
- unix_key_export_rsa,
+ unix_key_asymmetric_export,
unix_key_import_dsa_capi,
unix_key_import_ecc,
unix_key_import_rsa,
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
index ab9cf67923d..408c477b92f 100644
--- a/dlls/bcrypt/bcrypt_main.c
+++ b/dlls/bcrypt/bcrypt_main.c
@@ -1070,7 +1070,7 @@ static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRY
static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size )
{
- struct key_export_params params;
+ struct key_asymmetric_export_params params;
if (!wcscmp( type, BCRYPT_KEY_DATA_BLOB ))
{
@@ -1101,38 +1101,34 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U
}
return STATUS_SUCCESS;
}
- else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) ||
- !wcscmp( type, BCRYPT_ECCPUBLIC_BLOB ) || !wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB ))
+ else if (!wcscmp( type, BCRYPT_DSA_PRIVATE_BLOB ) || !wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB ) ||
+ !wcscmp( type, BCRYPT_ECCPRIVATE_BLOB ))
{
- *size = key->u.a.pubkey_len;
- if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS;
- if (output) memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len );
- return STATUS_SUCCESS;
- }
- else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB ))
- {
- params.key = key;
- params.buf = output;
- params.len = output_len;
+ params.key = key;
+ params.flags = 0;
+ params.buf = output;
+ params.len = output_len;
params.ret_len = size;
- params.full = wcscmp( type, BCRYPT_RSAPRIVATE_BLOB );
- return UNIX_CALL( key_export_rsa, ¶ms );
+ return UNIX_CALL( key_asymmetric_export, ¶ms );
}
- else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB ))
+ else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB ))
{
- params.key = key;
- params.buf = output;
- params.len = output_len;
+ params.key = key;
+ params.flags = (wcscmp( type, BCRYPT_RSAPRIVATE_BLOB )) ? KEY_EXPORT_FLAG_RSA_FULL : 0;
+ params.buf = output;
+ params.len = output_len;
params.ret_len = size;
- return UNIX_CALL( key_export_ecc, ¶ms );
+ return UNIX_CALL( key_asymmetric_export, ¶ms );
}
- else if (!wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB ))
+ else if (!wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) || !wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB ) ||
+ !wcscmp( type, BCRYPT_ECCPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ))
{
- params.key = key;
- params.buf = output;
- params.len = output_len;
+ params.key = key;
+ params.flags = KEY_EXPORT_FLAG_PUBLIC;
+ params.buf = output;
+ params.len = output_len;
params.ret_len = size;
- return UNIX_CALL( key_export_dsa_capi, ¶ms );
+ return UNIX_CALL( key_asymmetric_export, ¶ms );
}
FIXME( "unsupported key type %s\n", debugstr_w(type) );
diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index 6862c5cdcf2..01e1fe72092 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -647,6 +647,7 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit
free( e.data ); free( m.data );
return STATUS_SUCCESS;
}
+#undef EXPORT_SIZE
static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_id alg_id, void *pubkey,
unsigned *pubkey_len )
@@ -836,6 +837,194 @@ static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, cons
return STATUS_SUCCESS;
}
+#define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, key->u.a.bitlen / f, &d, p )
+static NTSTATUS key_export_rsa_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len )
+{
+ BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)buf;
+ gnutls_datum_t m, e;
+ UCHAR *dst;
+ int ret;
+
+ if ((ret = pgnutls_privkey_export_rsa_raw( key_data(key)->privkey, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL )))
+ {
+ pgnutls_perror( ret );
+ return STATUS_INTERNAL_ERROR;
+ }
+
+ *ret_len = sizeof(*rsa_blob) + EXPORT_SIZE(e,8,0) + EXPORT_SIZE(m,8,1);
+ if (len >= *ret_len && buf)
+ {
+ dst = (UCHAR *)(rsa_blob + 1);
+ rsa_blob->cbPublicExp = export_gnutls_datum( dst, key->u.a.bitlen / 8, &e, 0 );
+
+ dst += rsa_blob->cbPublicExp;
+ rsa_blob->cbModulus = export_gnutls_datum( dst, key->u.a.bitlen / 8, &m, 1 );
+
+ rsa_blob->Magic = BCRYPT_RSAPUBLIC_MAGIC;
+ rsa_blob->BitLength = key->u.a.bitlen;
+ rsa_blob->cbPrime1 = 0;
+ rsa_blob->cbPrime2 = 0;
+ }
+
+ free( e.data ); free( m.data );
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS key_export_ecc_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len )
+{
+ BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)buf;
+ gnutls_ecc_curve_t curve;
+ gnutls_datum_t x, y;
+ DWORD magic, size;
+ UCHAR *dst;
+ int ret;
+
+ switch (key->alg_id)
+ {
+ case ALG_ID_ECDH_P256:
+ magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC;
+ size = 32;
+ break;
+ case ALG_ID_ECDSA_P256:
+ magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC;
+ size = 32;
+ break;
+ default:
+ FIXME( "algorithm %u not supported\n", key->alg_id );
+ return STATUS_NOT_IMPLEMENTED;
+ }
+
+ if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->privkey, &curve, &x, &y, NULL )))
+ {
+ pgnutls_perror( ret );
+ return STATUS_INTERNAL_ERROR;
+ }
+
+ if (curve != GNUTLS_ECC_CURVE_SECP256R1)
+ {
+ FIXME( "curve %u not supported\n", curve );
+ free( x.data ); free( y.data );
+ return STATUS_NOT_IMPLEMENTED;
+ }
+
+ *ret_len = sizeof(*ecc_blob) + size * 2;
+ if (len >= *ret_len && buf)
+ {
+ ecc_blob->dwMagic = magic;
+ ecc_blob->cbKey = size;
+
+ dst = (UCHAR *)(ecc_blob + 1);
+ export_gnutls_datum( dst, size, &x, 1 );
+
+ dst += size;
+ export_gnutls_datum( dst, size, &y, 1 );
+ }
+
+ free( x.data ); free( y.data );
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS key_export_dsa_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len )
+{
+ BCRYPT_DSA_KEY_BLOB *dsa_blob = (BCRYPT_DSA_KEY_BLOB *)buf;
+ gnutls_datum_t p, q, g, y;
+ UCHAR *dst;
+ int ret;
+
+ if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, NULL )))
+ {
+ pgnutls_perror( ret );
+ return STATUS_INTERNAL_ERROR;
+ }
+
+ if (key->u.a.bitlen > 1024)
+ {
+ FIXME( "bitlen > 1024 not supported\n" );
+ return STATUS_NOT_IMPLEMENTED;
+ }
+
+ *ret_len = sizeof(*dsa_blob) + key->u.a.bitlen / 8 * 3;
+ if (len >= *ret_len && buf)
+ {
+ dst = (UCHAR *)(dsa_blob + 1);
+ export_gnutls_datum( dst, key->u.a.bitlen / 8, &p, 1 );
+
+ dst += key->u.a.bitlen / 8;
+ export_gnutls_datum( dst, key->u.a.bitlen / 8, &g, 1 );
+
+ dst += key->u.a.bitlen / 8;
+ export_gnutls_datum( dst, key->u.a.bitlen / 8, &y, 1 );
+
+ dst = dsa_blob->q;
+ export_gnutls_datum( dst, sizeof(dsa_blob->q), &q, 1 );
+
+ dsa_blob->dwMagic = BCRYPT_DSA_PUBLIC_MAGIC;
+ dsa_blob->cbKey = key->u.a.bitlen / 8;
+ memset( dsa_blob->Count, 0, sizeof(dsa_blob->Count) ); /* FIXME */
+ memset( dsa_blob->Seed, 0, sizeof(dsa_blob->Seed) ); /* FIXME */
+ }
+
+ free( p.data ); free( q.data ); free( g.data ); free( y.data );
+ return STATUS_SUCCESS;
+}
+
+#define Q_SIZE 20
+static NTSTATUS key_export_dsa_capi_public( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len )
+{
+ BLOBHEADER *hdr = (BLOBHEADER *)buf;
+ DSSPUBKEY *dsskey;
+ gnutls_datum_t p, q, g, y;
+ UCHAR *dst;
+ int ret, size = sizeof(*hdr) + sizeof(*dsskey) + sizeof(key->u.a.dss_seed);
+
+ if (key->u.a.bitlen > 1024)
+ {
+ FIXME( "bitlen > 1024 not supported\n" );
+ return STATUS_NOT_IMPLEMENTED;
+ }
+
+ if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, NULL )))
+ {
+ pgnutls_perror( ret );
+ return STATUS_INTERNAL_ERROR;
+ }
+
+ *ret_len = size + key->u.a.bitlen / 8 * 3 + Q_SIZE;
+ if (len >= *ret_len && buf)
+ {
+ hdr->bType = PUBLICKEYBLOB;
+ hdr->bVersion = 2;
+ hdr->reserved = 0;
+ hdr->aiKeyAlg = CALG_DSS_SIGN;
+
+ dsskey = (DSSPUBKEY *)(hdr + 1);
+ dsskey->magic = MAGIC_DSS1;
+ dsskey->bitlen = key->u.a.bitlen;
+
+ dst = (UCHAR *)(dsskey + 1);
+ export_gnutls_datum( dst, key->u.a.bitlen / 8, &p, 1 );
+ reverse_bytes( dst, key->u.a.bitlen / 8 );
+ dst += key->u.a.bitlen / 8;
+
+ export_gnutls_datum( dst, Q_SIZE, &q, 1 );
+ reverse_bytes( dst, Q_SIZE );
+ dst += Q_SIZE;
+
+ export_gnutls_datum( dst, key->u.a.bitlen / 8, &g, 1 );
+ reverse_bytes( dst, key->u.a.bitlen / 8 );
+ dst += key->u.a.bitlen / 8;
+
+ export_gnutls_datum( dst, key->u.a.bitlen / 8, &y, 1 );
+ reverse_bytes( dst, key->u.a.bitlen / 8 );
+ dst += key->u.a.bitlen / 8;
+
+ memcpy( dst, &key->u.a.dss_seed, sizeof(key->u.a.dss_seed) );
+ }
+
+ free( p.data ); free( q.data ); free( g.data ); free( y.data );
+ return STATUS_SUCCESS;
+}
+
static NTSTATUS key_asymmetric_generate( void *args )
{
struct key *key = args;
@@ -914,10 +1103,8 @@ static NTSTATUS key_asymmetric_generate( void *args )
return STATUS_SUCCESS;
}
-static NTSTATUS key_export_ecc( void *args )
+static NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len )
{
- const struct key_export_params *params = args;
- struct key *key = params->key;
BCRYPT_ECCKEY_BLOB *ecc_blob;
gnutls_ecc_curve_t curve;
gnutls_datum_t x, y, d;
@@ -954,10 +1141,10 @@ static NTSTATUS key_export_ecc( void *args )
return STATUS_NOT_IMPLEMENTED;
}
- *params->ret_len = sizeof(*ecc_blob) + size * 3;
- if (params->len >= *params->ret_len && params->buf)
+ *ret_len = sizeof(*ecc_blob) + size * 3;
+ if (len >= *ret_len && buf)
{
- ecc_blob = (BCRYPT_ECCKEY_BLOB *)params->buf;
+ ecc_blob = (BCRYPT_ECCKEY_BLOB *)buf;
ecc_blob->dwMagic = magic;
ecc_blob->cbKey = size;
@@ -1029,13 +1216,12 @@ static NTSTATUS key_import_ecc( void *args )
return STATUS_SUCCESS;
}
-static NTSTATUS key_export_rsa( void *args )
+static NTSTATUS key_export_rsa( struct key *key, ULONG flags, UCHAR *buf, ULONG len, ULONG *ret_len )
{
- const struct key_export_params *params = args;
- struct key *key = params->key;
BCRYPT_RSAKEY_BLOB *rsa_blob;
gnutls_datum_t m, e, d, p, q, u, e1, e2;
ULONG bitlen = key->u.a.bitlen;
+ BOOL full = (flags & KEY_EXPORT_FLAG_RSA_FULL);
UCHAR *dst;
int ret;
@@ -1045,13 +1231,13 @@ static NTSTATUS key_export_rsa( void *args )
return STATUS_INTERNAL_ERROR;
}
- *params->ret_len = sizeof(*rsa_blob) + EXPORT_SIZE(e,8,0) + EXPORT_SIZE(m,8,1) + EXPORT_SIZE(p,16,1) + EXPORT_SIZE(q,16,1);
- if (params->full) *params->ret_len += EXPORT_SIZE(e1,16,1) + EXPORT_SIZE(e2,16,1) + EXPORT_SIZE(u,16,1) + EXPORT_SIZE(d,8,1);
+ *ret_len = sizeof(*rsa_blob) + EXPORT_SIZE(e,8,0) + EXPORT_SIZE(m,8,1) + EXPORT_SIZE(p,16,1) + EXPORT_SIZE(q,16,1);
+ if (full) *ret_len += EXPORT_SIZE(e1,16,1) + EXPORT_SIZE(e2,16,1) + EXPORT_SIZE(u,16,1) + EXPORT_SIZE(d,8,1);
- if (params->len >= *params->ret_len && params->buf)
+ if (len >= *ret_len && buf)
{
- rsa_blob = (BCRYPT_RSAKEY_BLOB *)params->buf;
- rsa_blob->Magic = params->full ? BCRYPT_RSAFULLPRIVATE_MAGIC : BCRYPT_RSAPRIVATE_MAGIC;
+ rsa_blob = (BCRYPT_RSAKEY_BLOB *)buf;
+ rsa_blob->Magic = full ? BCRYPT_RSAFULLPRIVATE_MAGIC : BCRYPT_RSAPRIVATE_MAGIC;
rsa_blob->BitLength = bitlen;
dst = (UCHAR *)(rsa_blob + 1);
@@ -1066,7 +1252,7 @@ static NTSTATUS key_export_rsa( void *args )
dst += rsa_blob->cbPrime1;
rsa_blob->cbPrime2 = export_gnutls_datum( dst, bitlen / 16, &q, 1 );
- if (params->full)
+ if (full)
{
dst += rsa_blob->cbPrime2;
export_gnutls_datum( dst, bitlen / 16, &e1, 1 );
@@ -1121,10 +1307,8 @@ static NTSTATUS key_import_rsa( void *args )
return STATUS_SUCCESS;
}
-static NTSTATUS key_export_dsa_capi( void *args )
+static NTSTATUS key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len )
{
- const struct key_export_params *params = args;
- struct key *key = params->key;
BLOBHEADER *hdr;
DSSPUBKEY *pubkey;
gnutls_datum_t p, q, g, y, x;
@@ -1145,10 +1329,10 @@ static NTSTATUS key_export_dsa_capi( void *args )
}
size = key->u.a.bitlen / 8;
- *params->ret_len = sizeof(*hdr) + sizeof(*pubkey) + size * 2 + 40 + sizeof(key->u.a.dss_seed);
- if (params->len >= *params->ret_len && params->buf)
+ *ret_len = sizeof(*hdr) + sizeof(*pubkey) + size * 2 + 40 + sizeof(key->u.a.dss_seed);
+ if (len >= *ret_len && buf)
{
- hdr = (BLOBHEADER *)params->buf;
+ hdr = (BLOBHEADER *)buf;
hdr->bType = PRIVATEKEYBLOB;
hdr->bVersion = 2;
hdr->reserved = 0;
@@ -1428,6 +1612,44 @@ static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_k
}
}
+static NTSTATUS key_asymmetric_export( void *args )
+{
+ const struct key_asymmetric_export_params *params = args;
+ struct key *key = params->key;
+ unsigned flags = params->flags;
+
+ switch (key->alg_id)
+ {
+ case ALG_ID_ECDH_P256:
+ case ALG_ID_ECDSA_P256:
+ case ALG_ID_ECDSA_P384:
+ if (flags & KEY_EXPORT_FLAG_PUBLIC)
+ return key_export_ecc_public( key, params->buf, params->len, params->ret_len );
+ return key_export_ecc( key, params->buf, params->len, params->ret_len );
+
+ case ALG_ID_RSA:
+ case ALG_ID_RSA_SIGN:
+ if (flags & KEY_EXPORT_FLAG_PUBLIC)
+ return key_export_rsa_public( key, params->buf, params->len, params->ret_len );
+ return key_export_rsa( key, flags, params->buf, params->len, params->ret_len );
+
+ case ALG_ID_DSA:
+ if (flags & KEY_EXPORT_FLAG_PUBLIC)
+ {
+ if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2)
+ return key_export_dsa_capi_public( key, params->buf, params->len, params->ret_len );
+ return key_export_dsa_public( key, params->buf, params->len, params->ret_len );
+ }
+ if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2)
+ return key_export_dsa_capi( key, params->buf, params->len, params->ret_len );
+ return STATUS_NOT_IMPLEMENTED;
+
+ default:
+ FIXME( "algorithm %u not yet supported\n", key->alg_id );
+ return STATUS_NOT_IMPLEMENTED;
+ }
+}
+
static NTSTATUS prepare_gnutls_signature_dsa( struct key *key, UCHAR *signature, ULONG signature_len,
gnutls_datum_t *gnutls_signature )
{
@@ -1862,9 +2084,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
key_asymmetric_sign,
key_asymmetric_verify,
key_asymmetric_destroy,
- key_export_dsa_capi,
- key_export_ecc,
- key_export_rsa,
+ key_asymmetric_export,
key_import_dsa_capi,
key_import_ecc,
key_import_rsa
@@ -2229,37 +2449,12 @@ static NTSTATUS wow64_key_asymmetric_destroy( void *args )
return key_asymmetric_destroy( get_asymmetric_key( key32, &key ));
}
-static NTSTATUS wow64_key_export_dsa_capi( void *args )
-{
- struct
- {
- PTR32 key;
- PTR32 buf;
- ULONG len;
- PTR32 ret_len;
- } const *params32 = args;
-
- NTSTATUS ret;
- struct key key;
- struct key32 *key32 = ULongToPtr( params32->key );
- struct key_export_params params =
- {
- get_asymmetric_key( key32, &key ),
- ULongToPtr(params32->buf),
- params32->len,
- ULongToPtr(params32->ret_len)
- };
-
- ret = key_export_dsa_capi( ¶ms );
- put_asymmetric_key32( &key, key32 );
- return ret;
-}
-
-static NTSTATUS wow64_key_export_ecc( void *args )
+static NTSTATUS wow64_key_asymmetric_export( void *args )
{
struct
{
PTR32 key;
+ ULONG flags;
PTR32 buf;
ULONG len;
PTR32 ret_len;
@@ -2268,15 +2463,16 @@ static NTSTATUS wow64_key_export_ecc( void *args )
NTSTATUS ret;
struct key key;
struct key32 *key32 = ULongToPtr( params32->key );
- struct key_export_params params =
+ struct key_asymmetric_export_params params =
{
get_asymmetric_key( key32, &key ),
+ params32->flags,
ULongToPtr(params32->buf),
params32->len,
- ULongToPtr(params32->ret_len)
+ ULongToPtr(params32->ret_len),
};
- ret = key_export_ecc( ¶ms );
+ ret = key_asymmetric_export( ¶ms );
put_asymmetric_key32( &key, key32 );
return ret;
}
@@ -2329,34 +2525,6 @@ static NTSTATUS wow64_key_import_ecc( void *args )
return ret;
}
-static NTSTATUS wow64_key_export_rsa( void *args )
-{
- struct
- {
- PTR32 key;
- PTR32 buf;
- ULONG len;
- PTR32 ret_len;
- BOOL full;
- } const *params32 = args;
-
- NTSTATUS ret;
- struct key key;
- struct key32 *key32 = ULongToPtr( params32->key );
- struct key_export_params params =
- {
- get_asymmetric_key( key32, &key ),
- ULongToPtr(params32->buf),
- params32->len,
- ULongToPtr(params32->ret_len),
- params32->full
- };
-
- ret = key_export_rsa( ¶ms );
- put_asymmetric_key32( &key, key32 );
- return ret;
-}
-
static NTSTATUS wow64_key_import_rsa( void *args )
{
struct
@@ -2397,9 +2565,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
wow64_key_asymmetric_sign,
wow64_key_asymmetric_verify,
wow64_key_asymmetric_destroy,
- wow64_key_export_dsa_capi,
- wow64_key_export_ecc,
- wow64_key_export_rsa,
+ wow64_key_asymmetric_export,
wow64_key_import_dsa_capi,
wow64_key_import_ecc,
wow64_key_import_rsa
--
2.30.2
1
0
21 Mar '22
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/bcrypt/bcrypt_main.c | 40 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 21 deletions(-)
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
index fe16f9269c9..ab9cf67923d 100644
--- a/dlls/bcrypt/bcrypt_main.c
+++ b/dlls/bcrypt/bcrypt_main.c
@@ -1324,6 +1324,22 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu
return status;
}
+static void key_destroy( struct key *key )
+{
+ if (key_is_symmetric( key ))
+ {
+ UNIX_CALL( key_symmetric_destroy, key );
+ free( key->u.s.vector );
+ free( key->u.s.secret );
+ DeleteCriticalSection( &key->u.s.cs );
+ }
+ else
+ UNIX_CALL( key_asymmetric_destroy, key );
+
+ key->hdr.magic = 0;
+ free( key );
+}
+
static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input,
ULONG input_len )
{
@@ -1403,7 +1419,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
params.len = input_len;
if ((status = UNIX_CALL( key_import_ecc, ¶ms )))
{
- BCryptDestroyKey( key );
+ key_destroy( key );
return status;
}
@@ -1438,7 +1454,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
params.len = input_len;
if ((status = UNIX_CALL( key_import_rsa, ¶ms )))
{
- BCryptDestroyKey( key );
+ key_destroy( key );
return status;
}
@@ -1489,7 +1505,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
params.len = input_len;
if ((status = UNIX_CALL( key_import_dsa_capi, ¶ms )))
{
- BCryptDestroyKey( key );
+ key_destroy( key );
return status;
}
@@ -1724,24 +1740,6 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy )
return STATUS_SUCCESS;
}
-static void key_destroy( struct key *key )
-{
- if (key_is_symmetric( key ))
- {
- UNIX_CALL( key_symmetric_destroy, key );
- free( key->u.s.vector );
- free( key->u.s.secret );
- DeleteCriticalSection( &key->u.s.cs );
- }
- else
- {
- UNIX_CALL( key_asymmetric_destroy, key );
- free( key->u.a.pubkey );
- }
- key->hdr.magic = 0;
- free( key );
-}
-
NTSTATUS WINAPI BCryptDuplicateKey( BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE *handle_copy,
UCHAR *object, ULONG object_len, ULONG flags )
{
--
2.30.2
1
0
21 Mar '22
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/bcrypt/bcrypt_main.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
index 5df4da009a4..fe16f9269c9 100644
--- a/dlls/bcrypt/bcrypt_main.c
+++ b/dlls/bcrypt/bcrypt_main.c
@@ -968,7 +968,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se
return status;
}
-static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *alg, ULONG bitlen,
+static NTSTATUS key_asymmetric_create( struct key **ret_key, enum alg_id alg_id, ULONG bitlen,
const UCHAR *pubkey, ULONG pubkey_len )
{
struct key *key;
@@ -981,7 +981,7 @@ static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *a
if (!(key = calloc( 1, sizeof(*key) ))) return STATUS_NO_MEMORY;
key->hdr.magic = MAGIC_KEY;
- key->alg_id = alg->id;
+ key->alg_id = alg_id;
key->u.a.bitlen = bitlen;
key->u.a.pubkey_len = pubkey_len;
@@ -1366,7 +1366,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
return STATUS_INVALID_PARAMETER;
size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2;
- return key_asymmetric_create( (struct key **)ret_key, alg, key_size * 8, (BYTE *)ecc_blob, size );
+ return key_asymmetric_create( (struct key **)ret_key, alg->id, key_size * 8, (BYTE *)ecc_blob, size );
}
else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB ))
{
@@ -1396,7 +1396,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
return STATUS_INVALID_PARAMETER;
size = sizeof(*ecc_blob) + key_size * 2;
- if ((status = key_asymmetric_create( &key, alg, key_size * 8, NULL, size ))) return status;
+ if ((status = key_asymmetric_create( &key, alg->id, key_size * 8, NULL, size ))) return status;
params.key = key;
params.buf = input;
@@ -1420,7 +1420,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus;
if (size != input_len) return NTE_BAD_DATA;
- return key_asymmetric_create( (struct key **)ret_key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size );
+ return key_asymmetric_create( (struct key **)ret_key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size );
}
else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB ))
{
@@ -1431,7 +1431,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED;
size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus;
- if ((status = key_asymmetric_create( &key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size )))
+ if ((status = key_asymmetric_create( &key, alg->id, rsa_blob->BitLength, (BYTE *)rsa_blob, size )))
return status;
params.key = key;
params.buf = input;
@@ -1454,7 +1454,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
return STATUS_NOT_SUPPORTED;
size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3;
- return key_asymmetric_create( (struct key **)ret_key, alg, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size );
+ return key_asymmetric_create( (struct key **)ret_key, alg->id, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size );
}
else if (!wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB ))
{
@@ -1482,7 +1482,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
return STATUS_INVALID_PARAMETER;
size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED);
- if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, NULL, size ))) return status;
+ if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, NULL, size ))) return status;
params.key = key;
params.buf = input;
@@ -1517,7 +1517,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP
size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED);
if (input_len < size) return STATUS_INVALID_PARAMETER;
- if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, (BYTE *)hdr, size ))) return status;
+ if ((status = key_asymmetric_create( &key, alg->id, pubkey->bitlen, (BYTE *)hdr, size ))) return status;
key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2;
*ret_key = key;
@@ -1629,7 +1629,7 @@ NTSTATUS WINAPI BCryptGenerateKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_H
return STATUS_NOT_SUPPORTED;
}
- if (!(status = key_asymmetric_create( &key, alg, key_len, NULL, size ))) *handle = key;
+ if (!(status = key_asymmetric_create( &key, alg->id, key_len, NULL, size ))) *handle = key;
return status;
}
--
2.30.2
1
0
20 Mar '22
There is no flushing after X11DRV_XIMLookupChars on wine11xdrv. for
this reason, the characters of the GUI are not updated.
In addition, in IME_SetResultString on wine11xdrv, the bInComposition
flag is not deactivated after generating WM_IME_ENDCOMPOSITION, so that
the WM_IME_STARTCOMPOSITION message is not generated in the next
composition.
Also, when WM_IME_COMPOSITION is processed in editor_handle_message on
riched20, the existing selection is removed and the characters being
entered disappear.
WM_IME_STARTCOMPOSITION occurs when attempting to input after full
selection, and ME_DeleteSelection is called, which causes the exact
location of the cursor to be lost.
Signed-off-by: Alex Kwak <take-me-home(a)kakao.com>
---
v2: Fix comment style
---
dlls/riched20/editor.c | 3 +--
dlls/winex11.drv/ime.c | 5 ++---
dlls/winex11.drv/xim.c | 10 ++++++++++
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index a8cf3175591..33437a6d6e3 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -4097,8 +4097,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
return 0;
case WM_IME_STARTCOMPOSITION:
{
- editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]);
ME_DeleteSelection(editor);
+ editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]);
ME_CommitUndo(editor);
ME_UpdateRepaint(editor, FALSE);
return 0;
@@ -4109,7 +4109,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
ME_Style *style = style_get_insert_style( editor, editor->pCursors );
hIMC = ITextHost_TxImmGetContext(editor->texthost);
- ME_DeleteSelection(editor);
ME_SaveTempStyle(editor, style);
if (lParam & (GCS_RESULTSTR|GCS_COMPSTR))
{
diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c
index c1584930861..db2ff5d85cc 100644
--- a/dlls/winex11.drv/ime.c
+++ b/dlls/winex11.drv/ime.c
@@ -1049,10 +1049,9 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen)
GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR);
GenerateIMEMessage(imc, WM_IME_COMPOSITION, lpResult[0], GCS_RESULTSTR|GCS_RESULTCLAUSE);
GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0);
+ myPrivate->bInComposition = FALSE;
- if (!inComp)
- ImmSetOpenStatus(imc, FALSE);
-
+ ImmSetOpenStatus(imc, FALSE);
ImmUnlockIMC(imc);
}
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 3994c2106cc..66c56c177ac 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -117,6 +117,16 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count )
IME_SetResultString(wcOutput, dwOutput);
HeapFree(GetProcessHeap(), 0, wcOutput);
+
+ /*
+ * After then if `CompositionString` is remaining, flushing it.
+ * i.e., Korean
+ */
+ if (CompositionString)
+ {
+ IME_SetCompositionString(SCS_SETSTR, CompositionString,
+ dwCompStringLength, NULL, 0);
+ }
}
static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data)
--
2.32.0
3
4
19 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/info.c | 1289 ++++++++++++++++++++++++-----------------------
1 file changed, 645 insertions(+), 644 deletions(-)
diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index d6b323dd9d7..d3e70842b00 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include "ntdll_test.h"
#include <winnls.h>
@@ -124,30 +125,30 @@ static void test_query_basic(void)
/* Use a nonexistent info class */
status = pNtQuerySystemInformation(-1, NULL, 0, NULL);
ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* vista */,
- "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08x\n", status);
+ "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08lx\n", status);
/* Use an existing class but with a zero-length buffer */
status = pNtQuerySystemInformation(SystemBasicInformation, NULL, 0, NULL);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
/* Use an existing class, correct length but no SystemInformation buffer */
status = pNtQuerySystemInformation(SystemBasicInformation, NULL, sizeof(sbi), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* vista */,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got %08lx\n", status);
/* Use an existing class, correct length, a pointer to a buffer but no ReturnLength pointer */
status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
/* Check a too large buffer size */
status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi) * 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
/* Finally some correct calls */
memset(&sbi, 0xcc, sizeof(sbi));
status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(sbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(sbi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
/* Check if we have some return values */
if (winetest_debug > 1) trace("Number of Processors : %d\n", sbi.NumberOfProcessors);
@@ -155,28 +156,28 @@ static void test_query_basic(void)
memset(&sbi2, 0xcc, sizeof(sbi2));
status = pRtlGetNativeSystemInformation(SystemBasicInformation, &sbi2, sizeof(sbi2), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status);
- ok( sizeof(sbi2) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status);
+ ok( sizeof(sbi2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
- ok( sbi.unknown == sbi2.unknown, "Expected unknown %#x, got %#x.\n", sbi.unknown, sbi2.unknown);
- ok( sbi.KeMaximumIncrement == sbi2.KeMaximumIncrement, "Expected KeMaximumIncrement %u, got %u.\n",
+ ok( sbi.unknown == sbi2.unknown, "Expected unknown %#lx, got %#lx.\n", sbi.unknown, sbi2.unknown);
+ ok( sbi.KeMaximumIncrement == sbi2.KeMaximumIncrement, "Expected KeMaximumIncrement %lu, got %lu.\n",
sbi.KeMaximumIncrement, sbi2.KeMaximumIncrement);
- ok( sbi.PageSize == sbi2.PageSize, "Expected PageSize field %u, %u.\n", sbi.PageSize, sbi2.PageSize);
+ ok( sbi.PageSize == sbi2.PageSize, "Expected PageSize field %lu, %lu.\n", sbi.PageSize, sbi2.PageSize);
ok( sbi.MmNumberOfPhysicalPages == sbi2.MmNumberOfPhysicalPages,
- "Expected MmNumberOfPhysicalPages %u, got %u.\n",
+ "Expected MmNumberOfPhysicalPages %lu, got %lu.\n",
sbi.MmNumberOfPhysicalPages, sbi2.MmNumberOfPhysicalPages);
- ok( sbi.MmLowestPhysicalPage == sbi2.MmLowestPhysicalPage, "Expected MmLowestPhysicalPage %u, got %u.\n",
+ ok( sbi.MmLowestPhysicalPage == sbi2.MmLowestPhysicalPage, "Expected MmLowestPhysicalPage %lu, got %lu.\n",
sbi.MmLowestPhysicalPage, sbi2.MmLowestPhysicalPage);
- ok( sbi.MmHighestPhysicalPage == sbi2.MmHighestPhysicalPage, "Expected MmHighestPhysicalPage %u, got %u.\n",
+ ok( sbi.MmHighestPhysicalPage == sbi2.MmHighestPhysicalPage, "Expected MmHighestPhysicalPage %lu, got %lu.\n",
sbi.MmHighestPhysicalPage, sbi2.MmHighestPhysicalPage);
/* Higher 32 bits of AllocationGranularity is sometimes garbage on Windows. */
ok( (ULONG)sbi.AllocationGranularity == (ULONG)sbi2.AllocationGranularity,
- "Expected AllocationGranularity %#lx, got %#lx.\n",
+ "Expected AllocationGranularity %#Ix, got %#Ix.\n",
sbi.AllocationGranularity, sbi2.AllocationGranularity);
ok( sbi.LowestUserAddress == sbi2.LowestUserAddress, "Expected LowestUserAddress %p, got %p.\n",
sbi.LowestUserAddress, sbi2.LowestUserAddress);
ok( sbi.ActiveProcessorsAffinityMask == sbi2.ActiveProcessorsAffinityMask,
- "Expected ActiveProcessorsAffinityMask %#lx, got %#lx.\n",
+ "Expected ActiveProcessorsAffinityMask %#Ix, got %#Ix.\n",
sbi.ActiveProcessorsAffinityMask, sbi2.ActiveProcessorsAffinityMask);
ok( sbi.NumberOfProcessors == sbi2.NumberOfProcessors, "Expected NumberOfProcessors %u, got %u.\n",
sbi.NumberOfProcessors, sbi2.NumberOfProcessors);
@@ -193,26 +194,26 @@ static void test_query_basic(void)
memset(&sbi3, 0xcc, sizeof(sbi3));
status = pNtQuerySystemInformation(SystemNativeBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength);
#ifdef _WIN64
- ok( status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS), "got %08x\n", status);
+ ok( status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS), "got %08lx\n", status);
if (!status)
{
- ok( sizeof(sbi3) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( sizeof(sbi3) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
ok( !memcmp( &sbi2, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ),
"info is different\n" );
}
#else
ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), /* vista */
- "got %08x\n", status);
+ "got %08lx\n", status);
status = pRtlGetNativeSystemInformation( SystemNativeBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength );
ok( !status || status == STATUS_INFO_LENGTH_MISMATCH ||
broken(status == STATUS_INVALID_INFO_CLASS) || broken(status == STATUS_NOT_IMPLEMENTED),
- "failed %x\n", status );
+ "failed %lx\n", status );
if (!status || status == STATUS_INFO_LENGTH_MISMATCH)
todo_wine_if( is_wow64 )
- ok( !status == !is_wow64, "got wrong status %x wow64 %u\n", status, is_wow64 );
+ ok( !status == !is_wow64, "got wrong status %lx wow64 %u\n", status, is_wow64 );
if (!status)
{
- ok( sizeof(sbi3) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( sizeof(sbi3) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
ok( !memcmp( &sbi2, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ),
"info is different\n" );
}
@@ -234,23 +235,23 @@ static void test_query_basic(void)
BYTE NumberOfProcessors;
} sbi64;
- ok( ReturnLength == sizeof(sbi64), "len %x\n", ReturnLength );
+ ok( ReturnLength == sizeof(sbi64), "len %lx\n", ReturnLength );
memset( &sbi64, 0xcc, sizeof(sbi64) );
ReturnLength = 0;
status = pRtlGetNativeSystemInformation( SystemNativeBasicInformation, &sbi64, sizeof(sbi64), &ReturnLength );
- ok( !status, "failed %x\n", status );
- ok( ReturnLength == sizeof(sbi64), "len %x\n", ReturnLength );
+ ok( !status, "failed %lx\n", status );
+ ok( ReturnLength == sizeof(sbi64), "len %lx\n", ReturnLength );
- ok( sbi.unknown == sbi64.unknown, "unknown %#x / %#x\n", sbi.unknown, sbi64.unknown);
- ok( sbi.KeMaximumIncrement == sbi64.KeMaximumIncrement, "KeMaximumIncrement %u / %u\n",
+ ok( sbi.unknown == sbi64.unknown, "unknown %#lx / %#lx\n", sbi.unknown, sbi64.unknown);
+ ok( sbi.KeMaximumIncrement == sbi64.KeMaximumIncrement, "KeMaximumIncrement %lu / %lu\n",
sbi.KeMaximumIncrement, sbi64.KeMaximumIncrement);
- ok( sbi.PageSize == sbi64.PageSize, "PageSize %u / %u\n", sbi.PageSize, sbi64.PageSize);
+ ok( sbi.PageSize == sbi64.PageSize, "PageSize %lu / %lu\n", sbi.PageSize, sbi64.PageSize);
ok( sbi.MmNumberOfPhysicalPages == sbi64.MmNumberOfPhysicalPages,
- "MmNumberOfPhysicalPages %u / %u\n",
+ "MmNumberOfPhysicalPages %lu / %lu\n",
sbi.MmNumberOfPhysicalPages, sbi64.MmNumberOfPhysicalPages);
- ok( sbi.MmLowestPhysicalPage == sbi64.MmLowestPhysicalPage, "MmLowestPhysicalPage %u / %u\n",
+ ok( sbi.MmLowestPhysicalPage == sbi64.MmLowestPhysicalPage, "MmLowestPhysicalPage %lu / %lu\n",
sbi.MmLowestPhysicalPage, sbi64.MmLowestPhysicalPage);
- ok( sbi.MmHighestPhysicalPage == sbi64.MmHighestPhysicalPage, "MmHighestPhysicalPage %u / %u\n",
+ ok( sbi.MmHighestPhysicalPage == sbi64.MmHighestPhysicalPage, "MmHighestPhysicalPage %lu / %lu\n",
sbi.MmHighestPhysicalPage, sbi64.MmHighestPhysicalPage);
ok( sbi.AllocationGranularity == (ULONG_PTR)sbi64.AllocationGranularity,
"AllocationGranularity %#lx / %#lx\n", sbi.AllocationGranularity,
@@ -269,8 +270,8 @@ static void test_query_basic(void)
memset(&sbi3, 0xcc, sizeof(sbi3));
status = pNtQuerySystemInformation(SystemEmulationBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status);
- ok( sizeof(sbi3) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status);
+ ok( sizeof(sbi3) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
ok( !memcmp( &sbi, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ),
"info is different\n" );
@@ -282,22 +283,22 @@ static void test_query_basic(void)
{
case SystemNativeBasicInformation:
ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_INFO_LENGTH_MISMATCH ||
- broken(status == STATUS_NOT_IMPLEMENTED) /* vista */, "%u: %x / %x\n", i, status, expect );
+ broken(status == STATUS_NOT_IMPLEMENTED) /* vista */, "%lu: %lx / %lx\n", i, status, expect );
break;
case SystemBasicInformation:
case SystemCpuInformation:
case SystemEmulationBasicInformation:
case SystemEmulationProcessorInformation:
- ok( status == expect, "%u: %x / %x\n", i, status, expect );
+ ok( status == expect, "%lu: %lx / %lx\n", i, status, expect );
break;
default:
if (is_wow64) /* only a few info classes are supported on Wow64 */
todo_wine_if (is_wow64 && status != STATUS_INVALID_INFO_CLASS)
ok( status == STATUS_INVALID_INFO_CLASS ||
broken(status == STATUS_NOT_IMPLEMENTED), /* vista */
- "%u: %x\n", i, status );
+ "%lu: %lx\n", i, status );
else
- ok( status == expect, "%u: %x / %x\n", i, status, expect );
+ ok( status == expect, "%lu: %lx / %lx\n", i, status, expect );
break;
}
}
@@ -311,18 +312,18 @@ static void test_query_cpu(void)
memset(&sci, 0xcc, sizeof(sci));
status = pNtQuerySystemInformation(SystemCpuInformation, &sci, sizeof(sci), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(sci) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(sci) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
/* Check if we have some return values */
- if (winetest_debug > 1) trace("Processor FeatureSet : %08x\n", sci.ProcessorFeatureBits);
- ok( sci.ProcessorFeatureBits != 0, "Expected some features for this processor, got %08x\n",
+ if (winetest_debug > 1) trace("Processor FeatureSet : %08lx\n", sci.ProcessorFeatureBits);
+ ok( sci.ProcessorFeatureBits != 0, "Expected some features for this processor, got %08lx\n",
sci.ProcessorFeatureBits);
memset(&sci2, 0xcc, sizeof(sci2));
status = pRtlGetNativeSystemInformation(SystemCpuInformation, &sci2, sizeof(sci2), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status);
- ok( sizeof(sci2) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status);
+ ok( sizeof(sci2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
if (is_wow64)
{
@@ -343,13 +344,13 @@ static void test_query_cpu(void)
sci.ProcessorRevision, sci2.ProcessorRevision );
ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n",
sci.MaximumProcessors, sci2.MaximumProcessors );
- ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %x / %x\n",
+ ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n",
sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits );
memset(&sci2, 0xcc, sizeof(sci2));
status = pNtQuerySystemInformation(SystemEmulationProcessorInformation, &sci2, sizeof(sci2), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status);
- ok( sizeof(sci2) == ReturnLength, "Unexpected length %u.\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status);
+ ok( sizeof(sci2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength);
#ifdef _WIN64
ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n",
@@ -365,7 +366,7 @@ static void test_query_cpu(void)
sci.ProcessorRevision, sci2.ProcessorRevision );
ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n",
sci.MaximumProcessors, sci2.MaximumProcessors );
- ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %x / %x\n",
+ ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n",
sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits );
}
@@ -377,7 +378,7 @@ static void test_query_performance(void)
DWORD size = sizeof(SYSTEM_PERFORMANCE_INFORMATION);
status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, 0, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size, &ReturnLength);
if (status == STATUS_INFO_LENGTH_MISMATCH && is_wow64)
@@ -386,13 +387,13 @@ static void test_query_performance(void)
size += 16;
status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size, &ReturnLength);
}
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( ReturnLength == size, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( ReturnLength == size, "Inconsistent length %ld\n", ReturnLength);
status = pNtQuerySystemInformation(SystemPerformanceInformation, buffer, size + 2, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( ReturnLength == size || ReturnLength == size + 2 /* win8+ */,
- "Inconsistent length %d\n", ReturnLength);
+ "Inconsistent length %ld\n", ReturnLength);
/* Not return values yet, as struct members are unknown */
}
@@ -414,32 +415,32 @@ static void test_query_timeofday(void)
SYSTEM_TIMEOFDAY_INFORMATION_PRIVATE sti;
status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 0, &ReturnLength );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( 0 == ReturnLength, "ReturnLength should be 0, it is (%d)\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( 0 == ReturnLength, "ReturnLength should be 0, it is (%ld)\n", ReturnLength);
sti.uCurrentTimeZoneId = 0xdeadbeef;
status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 24, &ReturnLength );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( 24 == ReturnLength, "ReturnLength should be 24, it is (%d)\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( 24 == ReturnLength, "ReturnLength should be 24, it is (%ld)\n", ReturnLength);
ok( 0xdeadbeef == sti.uCurrentTimeZoneId, "This part of the buffer should not have been filled\n");
sti.uCurrentTimeZoneId = 0xdeadbeef;
status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 32, &ReturnLength );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( 32 == ReturnLength, "ReturnLength should be 32, it is (%d)\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( 32 == ReturnLength, "ReturnLength should be 32, it is (%ld)\n", ReturnLength);
ok( 0xdeadbeef != sti.uCurrentTimeZoneId, "Buffer should have been partially filled\n");
status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, 49, &ReturnLength );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
ok( ReturnLength == 0 || ReturnLength == sizeof(sti) /* vista */,
- "ReturnLength should be 0, it is (%d)\n", ReturnLength);
+ "ReturnLength should be 0, it is (%ld)\n", ReturnLength);
status = pNtQuerySystemInformation( SystemTimeOfDayInformation, &sti, sizeof(sti), &ReturnLength );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(sti) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(sti) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
/* Check if we have some return values */
- if (winetest_debug > 1) trace("uCurrentTimeZoneId : (%d)\n", sti.uCurrentTimeZoneId);
+ if (winetest_debug > 1) trace("uCurrentTimeZoneId : (%ld)\n", sti.uCurrentTimeZoneId);
}
static void test_query_process( BOOL extended )
@@ -498,7 +499,7 @@ static void test_query_process( BOOL extended )
/* test ReturnLength */
ReturnLength = 0;
status = pNtQuerySystemInformation( info_class, NULL, 0, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08lx\n", status);
ok( ReturnLength > 0, "got 0 length\n" );
/* W2K3 and later returns the needed length, the rest returns 0. */
@@ -516,7 +517,7 @@ static void test_query_process( BOOL extended )
/* Sometimes new process or threads appear between the call and increase the size,
* otherwise the previously returned buffer size should be sufficient. */
ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH,
- "Expected STATUS_SUCCESS, got %08x\n", status );
+ "Expected STATUS_SUCCESS, got %08lx\n", status );
spi = spi_buf;
@@ -542,14 +543,14 @@ static void test_query_process( BOOL extended )
cid.UniqueThread = 0;
status = NtOpenProcess( &handle, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid );
ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED,
- "Got unexpected status %#x, pid %p.\n", status, spi->UniqueProcessId );
+ "Got unexpected status %#lx, pid %p.\n", status, spi->UniqueProcessId );
if (!status)
{
ULONG_PTR info;
status = NtQueryInformationProcess( handle, ProcessWow64Information, &info, sizeof(info), NULL );
- ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status );
+ ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status );
is_process_wow64 = !!info;
NtClose( handle );
}
@@ -583,12 +584,12 @@ static void test_query_process( BOOL extended )
THREAD_BASIC_INFORMATION tbi;
status = pNtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status );
+ ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status );
expected_address = tbi.TebBaseAddress;
if (is_wow64 && is_process_wow64)
expected_address = (BYTE *)expected_address - 0x2000;
if (!is_wow64 && !is_process_wow64 && !tbi.TebBaseAddress)
- win_skip( "Could not get TebBaseAddress, thread %u.\n", j );
+ win_skip( "Could not get TebBaseAddress, thread %lu.\n", j );
else
ok( ti->TebBase == expected_address || (is_wow64 && !expected_address && !!ti->TebBase),
"Got unexpected TebBase %p, expected %p.\n", ti->TebBase, expected_address );
@@ -623,11 +624,11 @@ static void test_query_process( BOOL extended )
status = NtOpenProcess( &handle, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid );
ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */,
- "NtOpenProcess returned:%x\n", status );
+ "NtOpenProcess returned:%lx\n", status );
if (status != STATUS_SUCCESS) continue;
status = pNtQueryInformationProcess( handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL );
- ok( status == STATUS_SUCCESS, "NtQueryInformationProcess returned:%x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryInformationProcess returned:%lx\n", status );
ok( pbi.UniqueProcessId == GetCurrentProcessId(),
"Expected pid %p, got %p\n", ULongToHandle(GetCurrentProcessId()), ULongToHandle(pbi.UniqueProcessId) );
@@ -642,11 +643,11 @@ static void test_query_process( BOOL extended )
status = NtOpenThread( &handle, THREAD_QUERY_LIMITED_INFORMATION, &attr, &cid );
ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */,
- "NtOpenThread returned:%x\n", status );
+ "NtOpenThread returned:%lx\n", status );
if (status != STATUS_SUCCESS) continue;
status = pNtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "NtQueryInformationThread returned:%x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryInformationThread returned:%lx\n", status );
ok( tbi.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()),
"Expected tid %p, got %p\n", ULongToHandle(GetCurrentThreadId()), tbi.ClientId.UniqueThread );
@@ -665,13 +666,13 @@ static void test_query_procperf(void)
/* Find out the number of processors */
status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
NeededLength = sbi.NumberOfProcessors * sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION);
sppi = HeapAlloc(GetProcessHeap(), 0, NeededLength);
status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, 0, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
/* Try it for 1 processor */
sppi->KernelTime.QuadPart = 0xdeaddead;
@@ -679,9 +680,9 @@ static void test_query_procperf(void)
sppi->IdleTime.QuadPart = 0xdeaddead;
status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi,
sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) == ReturnLength,
- "Inconsistent length %d\n", ReturnLength);
+ "Inconsistent length %ld\n", ReturnLength);
ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n");
ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n");
ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n");
@@ -691,8 +692,8 @@ static void test_query_procperf(void)
sppi->UserTime.QuadPart = 0xdeaddead;
sppi->IdleTime.QuadPart = 0xdeaddead;
status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, NeededLength, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( NeededLength == ReturnLength, "Inconsistent length (%d) <-> (%d)\n", NeededLength, ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( NeededLength == ReturnLength, "Inconsistent length (%ld) <-> (%ld)\n", NeededLength, ReturnLength);
ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n");
ok (sppi->UserTime.QuadPart != 0xdeaddead, "UserTime unchanged\n");
ok (sppi->IdleTime.QuadPart != 0xdeaddead, "IdleTime unchanged\n");
@@ -704,8 +705,8 @@ static void test_query_procperf(void)
sppi->IdleTime.QuadPart = 0xdeaddead;
status = pNtQuerySystemInformation(SystemProcessorPerformanceInformation, sppi, NeededLength + 2, &ReturnLength);
ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH /* vista */,
- "Expected STATUS_SUCCESS or STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( NeededLength == ReturnLength, "Inconsistent length (%d) <-> (%d)\n", NeededLength, ReturnLength);
+ "Expected STATUS_SUCCESS or STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( NeededLength == ReturnLength, "Inconsistent length (%ld) <-> (%ld)\n", NeededLength, ReturnLength);
if (status == STATUS_SUCCESS)
{
ok (sppi->KernelTime.QuadPart != 0xdeaddead, "KernelTime unchanged\n");
@@ -731,12 +732,12 @@ static void test_query_module(void)
char *buffer;
status = pNtQuerySystemInformation(SystemModuleInformation, NULL, 0, &size);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status);
ok(size > 0, "expected nonzero size\n");
info = malloc(size);
status = pNtQuerySystemInformation(SystemModuleInformation, info, size, &size);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
ok(info->ModulesCount > 0, "Expected some modules to be loaded\n");
@@ -744,10 +745,10 @@ static void test_query_module(void)
{
RTL_PROCESS_MODULE_INFORMATION *module = &info->Modules[i];
- ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex);
- ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name);
- ok(module->ImageSize, "%u: got 0 size\n", i);
- ok(module->LoadCount, "%u: got 0 load count\n", i);
+ ok(module->LoadOrderIndex == i, "%lu: got index %u\n", i, module->LoadOrderIndex);
+ ok(module->ImageBaseAddress || is_wow64, "%lu: got NULL address for %s\n", i, module->Name);
+ ok(module->ImageSize, "%lu: got 0 size\n", i);
+ ok(module->LoadCount, "%lu: got 0 load count\n", i);
}
free(info);
@@ -758,27 +759,27 @@ static void test_query_module(void)
win_skip("SystemModuleInformationEx is not supported.\n");
return;
}
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status);
ok(size > 0, "expected nonzero size\n");
buffer = malloc(size);
status = pNtQuerySystemInformation(SystemModuleInformationEx, buffer, size, &size);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
infoex = (const void *)buffer;
for (i = 0; infoex->NextOffset; i++)
{
const RTL_PROCESS_MODULE_INFORMATION *module = &infoex->BaseInfo;
- ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex);
- ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name);
- ok(module->ImageSize, "%u: got 0 size\n", i);
- ok(module->LoadCount, "%u: got 0 load count\n", i);
+ ok(module->LoadOrderIndex == i, "%lu: got index %u\n", i, module->LoadOrderIndex);
+ ok(module->ImageBaseAddress || is_wow64, "%lu: got NULL address for %s\n", i, module->Name);
+ ok(module->ImageSize, "%lu: got 0 size\n", i);
+ ok(module->LoadCount, "%lu: got 0 load count\n", i);
infoex = (const void *)((const char *)infoex + infoex->NextOffset);
}
ok(((char *)infoex - buffer) + sizeof(infoex->NextOffset) == size,
- "got size %u, null terminator %u\n", size, (char *)infoex - buffer);
+ "got size %lu, null terminator %Iu\n", size, (char *)infoex - buffer);
free(buffer);
@@ -795,15 +796,15 @@ static void test_query_handle(void)
INT i;
EventHandle = CreateEventA(NULL, FALSE, FALSE, NULL);
- ok( EventHandle != NULL, "CreateEventA failed %u\n", GetLastError() );
+ ok( EventHandle != NULL, "CreateEventA failed %lu\n", GetLastError() );
ret = SetHandleInformation(EventHandle, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE,
HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE);
- ok(ret, "got error %u\n", GetLastError());
+ ok(ret, "got error %lu\n", GetLastError());
/* Request the needed length : a SystemInformationLength greater than one struct sets ReturnLength */
ReturnLength = 0xdeadbeef;
status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
ok( ReturnLength != 0xdeadbeef, "Expected valid ReturnLength\n" );
SystemInformationLength = ReturnLength;
@@ -819,11 +820,11 @@ static void test_query_handle(void)
memset(shi, 0x55, SystemInformationLength);
status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength);
}
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
ExpectedLength = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION, Handle[shi->Count]);
ok( ReturnLength == ExpectedLength || broken(ReturnLength == ExpectedLength - sizeof(DWORD)), /* Vista / 2008 */
- "Expected length %u, got %u\n", ExpectedLength, ReturnLength );
- ok( shi->Count > 1, "Expected more than 1 handle, got %u\n", shi->Count );
+ "Expected length %lu, got %lu\n", ExpectedLength, ReturnLength );
+ ok( shi->Count > 1, "Expected more than 1 handle, got %lu\n", shi->Count );
ok( shi->Handle[1].HandleValue != 0x5555 || broken( shi->Handle[1].HandleValue == 0x5555 ), /* Vista / 2008 */
"Uninitialized second handle\n" );
if (shi->Handle[1].HandleValue == 0x5555)
@@ -845,10 +846,10 @@ static void test_query_handle(void)
break;
}
}
- ok( found, "Expected to find event handle %p (pid %x) in handle list\n", EventHandle, GetCurrentProcessId() );
+ ok( found, "Expected to find event handle %p (pid %lx) in handle list\n", EventHandle, GetCurrentProcessId() );
ret = SetHandleInformation(EventHandle, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0);
- ok(ret, "got error %u\n", GetLastError());
+ ok(ret, "got error %lu\n", GetLastError());
CloseHandle(EventHandle);
ReturnLength = 0xdeadbeef;
@@ -859,14 +860,14 @@ static void test_query_handle(void)
shi = HeapReAlloc(GetProcessHeap(), 0, shi, SystemInformationLength);
status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength);
}
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
for (i = 0, found = FALSE; i < shi->Count && !found; i++)
found = (shi->Handle[i].OwnerPid == GetCurrentProcessId()) &&
((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle);
ok( !found, "Unexpectedly found event handle in handle list\n" );
status = pNtQuerySystemInformation(SystemHandleInformation, NULL, SystemInformationLength, &ReturnLength);
- ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status );
done:
HeapFree( GetProcessHeap(), 0, shi);
@@ -882,24 +883,24 @@ static void test_query_handle_ex(void)
BOOL found, ret;
event = CreateEventA(NULL, FALSE, FALSE, NULL);
- ok(event != NULL, "failed to create event, error %u\n", GetLastError());
+ ok(event != NULL, "failed to create event, error %lu\n", GetLastError());
ret = SetHandleInformation(event, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE,
HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE);
- ok(ret, "got error %u\n", GetLastError());
+ ok(ret, "got error %lu\n", GetLastError());
size = 0;
status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status);
- ok(size > sizeof(SYSTEM_HANDLE_INFORMATION_EX), "got size %u\n", size);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status);
+ ok(size > sizeof(SYSTEM_HANDLE_INFORMATION_EX), "got size %lu\n", size);
while (status == STATUS_INFO_LENGTH_MISMATCH)
{
info = realloc(info, size);
status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size);
}
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]);
- ok(size == expect_size, "expected size %u, got %u\n", expect_size, size);
+ ok(size == expect_size, "expected size %lu, got %lu\n", expect_size, size);
ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles);
found = FALSE;
@@ -909,8 +910,8 @@ static void test_query_handle_ex(void)
&& (HANDLE)info->Handles[i].HandleValue == event)
{
ok(info->Handles[i].HandleAttributes == (OBJ_INHERIT | OBJ_PROTECT_CLOSE),
- "got flags %#x\n", info->Handles[i].HandleAttributes);
- ok(info->Handles[i].GrantedAccess == EVENT_ALL_ACCESS, "got access %#x\n", info->Handles[i].GrantedAccess);
+ "got flags %#lx\n", info->Handles[i].HandleAttributes);
+ ok(info->Handles[i].GrantedAccess == EVENT_ALL_ACCESS, "got access %#lx\n", info->Handles[i].GrantedAccess);
found = TRUE;
}
ok(!info->Handles[i].CreatorBackTraceIndex, "got backtrace index %u\n", info->Handles[i].CreatorBackTraceIndex);
@@ -918,7 +919,7 @@ static void test_query_handle_ex(void)
ok(found, "event handle not found\n");
ret = SetHandleInformation(event, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0);
- ok(ret, "got error %u\n", GetLastError());
+ ok(ret, "got error %lu\n", GetLastError());
CloseHandle(event);
status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size);
@@ -927,9 +928,9 @@ static void test_query_handle_ex(void)
info = realloc(info, size);
status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size);
}
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]);
- ok(size == expect_size, "expected size %u, got %u\n", expect_size, size);
+ ok(size == expect_size, "expected size %lu, got %lu\n", expect_size, size);
ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles);
found = FALSE;
@@ -945,7 +946,7 @@ static void test_query_handle_ex(void)
ok(!found, "event handle found\n");
status = pNtQuerySystemInformation(SystemExtendedHandleInformation, NULL, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size);
- ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status );
free(info);
}
@@ -965,7 +966,7 @@ static void test_query_cache(void)
ReturnLength = 0xdeadbeef;
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength);
ok(!status && (ReturnLength == expected),
- "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected);
+ "%d: got 0x%lx and %lu (expected STATUS_SUCCESS and %lu)\n", i, status, ReturnLength, expected);
}
/* buffer too small for the full result.
@@ -979,7 +980,7 @@ static void test_query_cache(void)
ReturnLength = 0xdeadbeef;
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength);
ok(!status && (ReturnLength == expected),
- "%d: got 0x%x and %u (expected STATUS_SUCCESS and %u)\n", i, status, ReturnLength, expected);
+ "%d: got 0x%lx and %lu (expected STATUS_SUCCESS and %lu)\n", i, status, ReturnLength, expected);
}
}
@@ -988,7 +989,7 @@ static void test_query_cache(void)
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength);
ok( status == STATUS_INFO_LENGTH_MISMATCH &&
((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)),
- "%d: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", i, status, ReturnLength, expected);
+ "%d: got 0x%lx and %lu (expected STATUS_INFO_LENGTH_MISMATCH and %lu)\n", i, status, ReturnLength, expected);
if (0) {
/* this crashes on some vista / win7 machines */
@@ -996,7 +997,7 @@ static void test_query_cache(void)
status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, 0, &ReturnLength);
ok( status == STATUS_INFO_LENGTH_MISMATCH &&
((ReturnLength == expected) || broken(!ReturnLength) || broken(ReturnLength == 0xfffffff0)),
- "0: got 0x%x and %u (expected STATUS_INFO_LENGTH_MISMATCH and %u)\n", status, ReturnLength, expected);
+ "0: got 0x%lx and %lu (expected STATUS_INFO_LENGTH_MISMATCH and %lu)\n", status, ReturnLength, expected);
}
}
@@ -1010,18 +1011,18 @@ static void test_query_interrupt(void)
/* Find out the number of processors */
status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
NeededLength = sbi.NumberOfProcessors * sizeof(SYSTEM_INTERRUPT_INFORMATION);
sii = HeapAlloc(GetProcessHeap(), 0, NeededLength);
status = pNtQuerySystemInformation(SystemInterruptInformation, sii, 0, &ReturnLength);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok(ReturnLength == NeededLength, "got %u\n", ReturnLength);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok(ReturnLength == NeededLength, "got %lu\n", ReturnLength);
/* Try it for all processors */
status = pNtQuerySystemInformation(SystemInterruptInformation, sii, NeededLength, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
/* Windows XP and W2K3 (and others?) always return 0 for the ReturnLength
* No test added for this as it's highly unlikely that an app depends on this
@@ -1039,29 +1040,29 @@ static void test_time_adjustment(void)
memset( &query, 0xcc, sizeof(query) );
status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query), &len );
- ok( status == STATUS_SUCCESS, "got %08x\n", status );
- ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len );
+ ok( status == STATUS_SUCCESS, "got %08lx\n", status );
+ ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %lu\n", len );
ok( query.TimeAdjustmentDisabled == TRUE || query.TimeAdjustmentDisabled == FALSE,
"wrong value %x\n", query.TimeAdjustmentDisabled );
status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query)-1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status );
- ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status );
+ ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %lu\n", len );
status = pNtQuerySystemInformation( SystemTimeAdjustmentInformation, &query, sizeof(query)+1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status );
- ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status );
+ ok( len == sizeof(query) || broken(!len) /* winxp */, "wrong len %lu\n", len );
adjust.TimeAdjustment = query.TimeAdjustment;
adjust.TimeAdjustmentDisabled = query.TimeAdjustmentDisabled;
status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust) );
- ok( status == STATUS_SUCCESS || status == STATUS_PRIVILEGE_NOT_HELD, "got %08x\n", status );
+ ok( status == STATUS_SUCCESS || status == STATUS_PRIVILEGE_NOT_HELD, "got %08lx\n", status );
status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust)-1 );
todo_wine
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status );
status = pNtSetSystemInformation( SystemTimeAdjustmentInformation, &adjust, sizeof(adjust)+1 );
todo_wine
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status );
}
static void test_query_kerndebug(void)
@@ -1072,21 +1073,21 @@ static void test_query_kerndebug(void)
SYSTEM_KERNEL_DEBUGGER_INFORMATION skdi;
status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, 0, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, sizeof(skdi), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(skdi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(skdi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, sizeof(skdi) + 2, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(skdi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(skdi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex, 0, &ReturnLength);
ok( status == STATUS_INFO_LENGTH_MISMATCH
|| status == STATUS_NOT_IMPLEMENTED /* before win7 */
|| status == STATUS_INVALID_INFO_CLASS /* wow64 on Win10 */,
- "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
if (status != STATUS_INFO_LENGTH_MISMATCH)
{
@@ -1096,13 +1097,13 @@ static void test_query_kerndebug(void)
{
status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex,
sizeof(skdi_ex), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex,
sizeof(skdi_ex) + 2, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
}
}
@@ -1113,15 +1114,15 @@ static void test_query_regquota(void)
SYSTEM_REGISTRY_QUOTA_INFORMATION srqi;
status = pNtQuerySystemInformation(SystemRegistryQuotaInformation, &srqi, 0, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQuerySystemInformation(SystemRegistryQuotaInformation, &srqi, sizeof(srqi), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(srqi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(srqi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQuerySystemInformation(SystemRegistryQuotaInformation, &srqi, sizeof(srqi) + 2, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(srqi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(srqi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
}
static void test_query_logicalproc(void)
@@ -1139,12 +1140,12 @@ static void test_query_logicalproc(void)
win_skip("SystemLogicalProcessorInformation is not supported\n");
return;
}
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok(len%sizeof(*slpi) == 0, "Incorrect length %d\n", len);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok(len%sizeof(*slpi) == 0, "Incorrect length %ld\n", len);
slpi = HeapAlloc(GetProcessHeap(), 0, len);
status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, slpi, len, &len);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
proc_no = 0;
for(i=0; i<len/sizeof(*slpi); i++) {
@@ -1160,7 +1161,7 @@ static void test_query_logicalproc(void)
}
ok(proc_no > 0, "No processors were found\n");
if(si.dwNumberOfProcessors <= 32)
- ok(proc_no == si.dwNumberOfProcessors, "Incorrect number of logical processors: %d, expected %d\n",
+ ok(proc_no == si.dwNumberOfProcessors, "Incorrect number of logical processors: %ld, expected %ld\n",
proc_no, si.dwNumberOfProcessors);
HeapFree(GetProcessHeap(), 0, slpi);
@@ -1181,43 +1182,43 @@ static void test_query_logicalprocex(void)
len = 0;
relationship = RelationAll;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len > 0, "got %u\n", len);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len > 0, "got %lu\n", len);
len_core = 0;
relationship = RelationProcessorCore;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_core);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len_core > 0, "got %u\n", len_core);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len_core > 0, "got %lu\n", len_core);
len_numa = 0;
relationship = RelationNumaNode;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_numa);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len_numa > 0, "got %u\n", len_numa);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len_numa > 0, "got %lu\n", len_numa);
len_cache = 0;
relationship = RelationCache;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_cache);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len_cache > 0, "got %u\n", len_cache);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len_cache > 0, "got %lu\n", len_cache);
len_package = 0;
relationship = RelationProcessorPackage;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_package);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len_package > 0, "got %u\n", len_package);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len_package > 0, "got %lu\n", len_package);
len_group = 0;
relationship = RelationGroup;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len_group);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status);
- ok(len_group > 0, "got %u\n", len_group);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08lx\n", status);
+ ok(len_group > 0, "got %lu\n", len_group);
len_public = 0;
ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, &len_public);
- ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError());
- ok(len == len_public, "got %u, expected %u\n", len_public, len);
+ ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %ld\n", ret, GetLastError());
+ ok(len == len_public, "got %lu, expected %lu\n", len_public, len);
infoex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
infoex_public = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_public);
@@ -1229,10 +1230,10 @@ static void test_query_logicalprocex(void)
relationship = RelationAll;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &len);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
ret = pGetLogicalProcessorInformationEx(RelationAll, infoex_public, &len_public);
- ok(ret, "got %d, error %d\n", ret, GetLastError());
+ ok(ret, "got %d, error %ld\n", ret, GetLastError());
ok(!memcmp(infoex, infoex_public, len), "returned info data mismatch\n");
/* Test for RelationAll. */
@@ -1247,7 +1248,7 @@ static void test_query_logicalprocex(void)
continue;
}
- trace("infoex[%u].Size: %u\n", i, ex->Size);
+ trace("infoex[%u].Size: %lu\n", i, ex->Size);
switch (ex->Relationship)
{
case RelationProcessorCore:
@@ -1258,14 +1259,14 @@ static void test_query_logicalprocex(void)
trace("infoex[%u].Processor.GroupCount: 0x%x\n", i, ex->Processor.GroupCount);
for (j = 0; j < ex->Processor.GroupCount; ++j)
{
- trace("infoex[%u].Processor.GroupMask[%u].Mask: 0x%lx\n", i, j, ex->Processor.GroupMask[j].Mask);
+ trace("infoex[%u].Processor.GroupMask[%u].Mask: 0x%Ix\n", i, j, ex->Processor.GroupMask[j].Mask);
trace("infoex[%u].Processor.GroupMask[%u].Group: 0x%x\n", i, j, ex->Processor.GroupMask[j].Group);
}
break;
case RelationNumaNode:
trace("infoex[%u].Relationship: 0x%x (NumaNode)\n", i, ex->Relationship);
- trace("infoex[%u].NumaNode.NodeNumber: 0x%x\n", i, ex->NumaNode.NodeNumber);
- trace("infoex[%u].NumaNode.GroupMask.Mask: 0x%lx\n", i, ex->NumaNode.GroupMask.Mask);
+ trace("infoex[%u].NumaNode.NodeNumber: 0x%lx\n", i, ex->NumaNode.NodeNumber);
+ trace("infoex[%u].NumaNode.GroupMask.Mask: 0x%Ix\n", i, ex->NumaNode.GroupMask.Mask);
trace("infoex[%u].NumaNode.GroupMask.Group: 0x%x\n", i, ex->NumaNode.GroupMask.Group);
break;
case RelationCache:
@@ -1273,9 +1274,9 @@ static void test_query_logicalprocex(void)
trace("infoex[%u].Cache.Level: 0x%x\n", i, ex->Cache.Level);
trace("infoex[%u].Cache.Associativity: 0x%x\n", i, ex->Cache.Associativity);
trace("infoex[%u].Cache.LineSize: 0x%x\n", i, ex->Cache.LineSize);
- trace("infoex[%u].Cache.CacheSize: 0x%x\n", i, ex->Cache.CacheSize);
+ trace("infoex[%u].Cache.CacheSize: 0x%lx\n", i, ex->Cache.CacheSize);
trace("infoex[%u].Cache.Type: 0x%x\n", i, ex->Cache.Type);
- trace("infoex[%u].Cache.GroupMask.Mask: 0x%lx\n", i, ex->Cache.GroupMask.Mask);
+ trace("infoex[%u].Cache.GroupMask.Mask: 0x%Ix\n", i, ex->Cache.GroupMask.Mask);
trace("infoex[%u].Cache.GroupMask.Group: 0x%x\n", i, ex->Cache.GroupMask.Group);
break;
case RelationGroup:
@@ -1286,7 +1287,7 @@ static void test_query_logicalprocex(void)
{
trace("infoex[%u].Group.GroupInfo[%u].MaximumProcessorCount: 0x%x\n", i, j, ex->Group.GroupInfo[j].MaximumProcessorCount);
trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorCount: 0x%x\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorCount);
- trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorMask: 0x%lx\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorMask);
+ trace("infoex[%u].Group.GroupInfo[%u].ActiveProcessorMask: 0x%Ix\n", i, j, ex->Group.GroupInfo[j].ActiveProcessorMask);
}
break;
default:
@@ -1301,7 +1302,7 @@ static void test_query_logicalprocex(void)
relationship = RelationProcessorCore;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_core, len_core, &len_core);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
for (i = 0; status == STATUS_SUCCESS && i < len_core;)
{
@@ -1313,7 +1314,7 @@ static void test_query_logicalprocex(void)
relationship = RelationNumaNode;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_numa, len_numa, &len_numa);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
for (i = 0; status == STATUS_SUCCESS && i < len_numa;)
{
@@ -1325,7 +1326,7 @@ static void test_query_logicalprocex(void)
relationship = RelationCache;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_cache, len_cache, &len_cache);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
for (i = 0; status == STATUS_SUCCESS && i < len_cache;)
{
@@ -1337,7 +1338,7 @@ static void test_query_logicalprocex(void)
relationship = RelationProcessorPackage;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_package, len_package, &len_package);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
for (i = 0; status == STATUS_SUCCESS && i < len_package;)
{
@@ -1349,7 +1350,7 @@ static void test_query_logicalprocex(void)
relationship = RelationGroup;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex_group, len_group, &len_group);
- ok(status == STATUS_SUCCESS, "got 0x%08x\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
for (i = 0; status == STATUS_SUCCESS && i < len_group;)
{
@@ -1360,7 +1361,7 @@ static void test_query_logicalprocex(void)
}
len_union = len_core + len_numa + len_cache + len_package + len_group;
- ok(len == len_union, "Expected 0x%x, got 0x%0x\n", len, len_union);
+ ok(len == len_union, "Expected 0x%lx, got 0x%0lx\n", len, len_union);
HeapFree(GetProcessHeap(), 0, infoex);
HeapFree(GetProcessHeap(), 0, infoex_public);
@@ -1396,56 +1397,56 @@ static void test_query_cpusetinfo(void)
return;
}
- ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status);
- ok(len == expected_len, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#lx.\n", status);
+ ok(len == expected_len, "Got unexpected length %lu.\n", len);
len = 0xdeadbeef;
status = pNtQuerySystemInformation(SystemCpuSetInformation, NULL, 0, &len);
ok(status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_INFO_CLASS,
- "Got unexpected status %#x.\n", status);
- ok(len == 0xdeadbeef, "Got unexpected len %u.\n", len);
+ "Got unexpected status %#lx.\n", status);
+ ok(len == 0xdeadbeef, "Got unexpected len %lu.\n", len);
len = 0xdeadbeef;
process = (HANDLE)0xdeadbeef;
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len);
- ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status);
- ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#lx.\n", status);
+ ok(len == 0xdeadbeef, "Got unexpected length %lu.\n", len);
len = 0xdeadbeef;
process = NULL;
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, 4 * sizeof(process), NULL, 0, &len);
ok((status == STATUS_INVALID_PARAMETER && len == 0xdeadbeef)
|| (status == STATUS_BUFFER_TOO_SMALL && len == expected_len),
- "Got unexpected status %#x, length %u.\n", status, len);
+ "Got unexpected status %#lx, length %lu.\n", status, len);
len = 0xdeadbeef;
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, NULL, sizeof(process), NULL, 0, &len);
- ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status);
- ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#lx.\n", status);
+ ok(len == 0xdeadbeef, "Got unexpected length %lu.\n", len);
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len);
- ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status);
- ok(len == expected_len, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#lx.\n", status);
+ ok(len == expected_len, "Got unexpected length %lu.\n", len);
len = 0xdeadbeef;
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL,
expected_len, &len);
- ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status);
- ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#lx.\n", status);
+ ok(len == 0xdeadbeef, "Got unexpected length %lu.\n", len);
info = malloc(expected_len);
len = 0;
status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), info, expected_len, &len);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
- ok(len == expected_len, "Got unexpected length %u.\n", len);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
+ ok(len == expected_len, "Got unexpected length %lu.\n", len);
for (i = 0; i < cpu_count; ++i)
{
SYSTEM_CPU_SET_INFORMATION *d = &info[i];
- ok(d->Size == sizeof(*d), "Got unexpected size %u, i %u.\n", d->Size, i);
+ ok(d->Size == sizeof(*d), "Got unexpected size %lu, i %u.\n", d->Size, i);
ok(d->Type == CpuSetInformation, "Got unexpected type %u, i %u.\n", d->Type, i);
- ok(d->CpuSet.Id == 0x100 + i, "Got unexpected Id %#x, i %u.\n", d->CpuSet.Id, i);
+ ok(d->CpuSet.Id == 0x100 + i, "Got unexpected Id %#lx, i %u.\n", d->CpuSet.Id, i);
ok(!d->CpuSet.Group, "Got unexpected Group %u, i %u.\n", d->CpuSet.Group, i);
ok(d->CpuSet.LogicalProcessorIndex == i, "Got unexpected LogicalProcessorIndex %u, i %u.\n",
d->CpuSet.LogicalProcessorIndex, i);
@@ -1470,36 +1471,36 @@ static void test_query_firmware(void)
status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len - 1, &len1);
ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* xp */,
- "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
if (len1 == 0) /* xp, 2003 */
{
win_skip("SystemFirmwareTableInformation is not available\n");
HeapFree(GetProcessHeap(), 0, sfti);
return;
}
- ok(len1 == min_sfti_len, "Expected length %u, got %u\n", min_sfti_len, len1);
+ ok(len1 == min_sfti_len, "Expected length %lu, got %lu\n", min_sfti_len, len1);
status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &len1);
- ok(status == STATUS_NOT_IMPLEMENTED, "Expected STATUS_NOT_IMPLEMENTED, got %08x\n", status);
- ok(len1 == 0, "Expected length 0, got %u\n", len1);
+ ok(status == STATUS_NOT_IMPLEMENTED, "Expected STATUS_NOT_IMPLEMENTED, got %08lx\n", status);
+ ok(len1 == 0, "Expected length 0, got %lu\n", len1);
sfti->ProviderSignature = RSMB;
sfti->Action = SystemFirmwareTable_Get;
status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &len1);
- ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status);
- ok(len1 >= min_sfti_len, "Expected length >= %u, got %u\n", min_sfti_len, len1);
+ ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08lx\n", status);
+ ok(len1 >= min_sfti_len, "Expected length >= %lu, got %lu\n", min_sfti_len, len1);
ok(sfti->TableBufferLength == len1 - min_sfti_len,
- "Expected length %u, got %u\n", len1 - min_sfti_len, sfti->TableBufferLength);
+ "Expected length %lu, got %lu\n", len1 - min_sfti_len, sfti->TableBufferLength);
sfti = HeapReAlloc(GetProcessHeap(), 0, sfti, len1);
ok(!!sfti, "Failed to allocate memory\n");
status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, len1, &len2);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok(len2 == len1, "Expected length %u, got %u\n", len1, len2);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(len2 == len1, "Expected length %lu, got %lu\n", len1, len2);
ok(sfti->TableBufferLength == len1 - min_sfti_len,
- "Expected length %u, got %u\n", len1 - min_sfti_len, sfti->TableBufferLength);
+ "Expected length %lu, got %lu\n", len1 - min_sfti_len, sfti->TableBufferLength);
HeapFree(GetProcessHeap(), 0, sfti);
}
@@ -1527,16 +1528,16 @@ static void test_query_battery(void)
trace("Charging : %u\n", bs.Charging);
trace("Discharging : %u\n", bs.Discharging);
trace("Tag : %u\n", bs.Tag);
- trace("MaxCapacity : %u\n", bs.MaxCapacity);
- trace("RemainingCapacity : %u\n", bs.RemainingCapacity);
- trace("Rate : %d\n", (LONG)bs.Rate);
- trace("EstimatedTime : %u\n", bs.EstimatedTime);
- trace("DefaultAlert1 : %u\n", bs.DefaultAlert1);
- trace("DefaultAlert2 : %u\n", bs.DefaultAlert2);
+ trace("MaxCapacity : %lu\n", bs.MaxCapacity);
+ trace("RemainingCapacity : %lu\n", bs.RemainingCapacity);
+ trace("Rate : %ld\n", (LONG)bs.Rate);
+ trace("EstimatedTime : %lu\n", bs.EstimatedTime);
+ trace("DefaultAlert1 : %lu\n", bs.DefaultAlert1);
+ trace("DefaultAlert2 : %lu\n", bs.DefaultAlert2);
}
ok(bs.MaxCapacity >= bs.RemainingCapacity,
- "expected MaxCapacity %u to be greater than or equal to RemainingCapacity %u\n",
+ "expected MaxCapacity %lu to be greater than or equal to RemainingCapacity %lu\n",
bs.MaxCapacity, bs.RemainingCapacity);
if (!bs.BatteryPresent)
@@ -1546,7 +1547,7 @@ static void test_query_battery(void)
else
time_left = ~0u;
ok(bs.EstimatedTime == time_left,
- "expected %u minutes remaining got %u minutes\n", time_left, bs.EstimatedTime);
+ "expected %lu minutes remaining got %lu minutes\n", time_left, bs.EstimatedTime);
}
static void test_query_processor_power_info(void)
@@ -1588,12 +1589,12 @@ static void test_query_processor_power_info(void)
"Expected all but the last record to be overwritten.\n");
status = pNtPowerInformation(ProcessorInformation, 0, 0, 0, size);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
for(i = 0; i < si.dwNumberOfProcessors; i++)
ppi[i].Number = 0xDEADBEEF;
status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, sizeof(PROCESSOR_POWER_INFORMATION) - 1);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
for(i = 0; i < si.dwNumberOfProcessors; i++)
if (ppi[i].Number != 0xDEADBEEF) break;
ok( i == si.dwNumberOfProcessors, "Expected untouched buffer\n");
@@ -1602,13 +1603,13 @@ static void test_query_processor_power_info(void)
{
/* picky version found on newer Windows like Win7 */
ok( ppi[1].Number == 0xDEADBEEF, "Expected untouched buffer.\n");
- ok( status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status);
+ ok( status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08lx\n", status);
status = pNtPowerInformation(ProcessorInformation, 0, 0, 0, size);
- ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "Got %08x\n", status);
+ ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "Got %08lx\n", status);
status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, 0);
- ok( status == STATUS_BUFFER_TOO_SMALL || status == STATUS_INVALID_PARAMETER, "Got %08x\n", status);
+ ok( status == STATUS_BUFFER_TOO_SMALL || status == STATUS_INVALID_PARAMETER, "Got %08lx\n", status);
}
}
else
@@ -1617,7 +1618,7 @@ static void test_query_processor_power_info(void)
}
status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, size);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
HeapFree(GetProcessHeap(), 0, ppi);
}
@@ -1632,38 +1633,38 @@ static void test_query_process_wow64(void)
/* Do not give a handle and buffer */
status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, 0, NULL);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
/* Use a correct info class and buffer size, but still no handle and buffer */
status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE, got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE, got %08lx\n", status);
/* Use a correct info class, buffer size and handle, but no buffer */
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL);
- ok( status == STATUS_ACCESS_VIOLATION , "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status);
+ ok( status == STATUS_ACCESS_VIOLATION , "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status);
/* Use a correct info class, buffer and buffer size, but no handle */
pbi[0] = pbi[1] = dummy;
status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
- ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
+ ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
/* Use a greater buffer size */
pbi[0] = pbi[1] = dummy;
status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, NULL);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
/* Use no ReturnLength */
pbi[0] = pbi[1] = dummy;
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]);
- ok( pbi[0] != dummy, "pbi[0] %lx\n", pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %Ix\n", is_wow64, pbi[0]);
+ ok( pbi[0] != dummy, "pbi[0] %Ix\n", pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
/* Test written size on 64 bit by checking high 32 bit buffer */
if (sizeof(ULONG_PTR) > sizeof(DWORD))
{
@@ -1675,28 +1676,28 @@ static void test_query_process_wow64(void)
pbi[0] = pbi[1] = dummy;
ReturnLength = 0xdeadbeef;
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
- ok( ReturnLength == sizeof(ULONG_PTR), "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %Ix\n", is_wow64, pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
+ ok( ReturnLength == sizeof(ULONG_PTR), "Inconsistent length %ld\n", ReturnLength);
/* Everything is correct except a too small buffer size */
pbi[0] = pbi[1] = dummy;
ReturnLength = 0xdeadbeef;
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) - 1, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
- todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
+ todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", ReturnLength);
/* Everything is correct except a too large buffer size */
pbi[0] = pbi[1] = dummy;
ReturnLength = 0xdeadbeef;
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]);
- ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]);
- todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( pbi[0] == dummy, "pbi[0] changed to %Ix\n", pbi[0]);
+ ok( pbi[1] == dummy, "pbi[1] changed to %Ix\n", pbi[1]);
+ todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", ReturnLength);
}
static void test_query_process_basic(void)
@@ -1721,50 +1722,50 @@ static void test_query_process_basic(void)
status = pNtQueryInformationProcess(NULL, -1, NULL, 0, NULL);
ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* vista */,
- "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08x\n", status);
+ "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, NULL, 0, NULL);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, NULL, sizeof(pbi), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, &pbi, sizeof(pbi), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessBasicInformation, &pbi, sizeof(pbi) * 2, NULL);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(pbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(pbi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi) * 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( sizeof(pbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( sizeof(pbi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
- if (winetest_debug > 1) trace("ProcessID : %lx\n", pbi.UniqueProcessId);
+ if (winetest_debug > 1) trace("ProcessID : %Ix\n", pbi.UniqueProcessId);
ok( pbi.UniqueProcessId > 0, "Expected a ProcessID > 0, got 0\n");
}
static void dump_vm_counters(const char *header, const VM_COUNTERS_EX *pvi)
{
trace("%s:\n", header);
- trace("PeakVirtualSize : %lu\n", pvi->PeakVirtualSize);
- trace("VirtualSize : %lu\n", pvi->VirtualSize);
- trace("PageFaultCount : %u\n", pvi->PageFaultCount);
- trace("PeakWorkingSetSize : %lu\n", pvi->PeakWorkingSetSize);
- trace("WorkingSetSize : %lu\n", pvi->WorkingSetSize);
- trace("QuotaPeakPagedPoolUsage : %lu\n", pvi->QuotaPeakPagedPoolUsage);
- trace("QuotaPagedPoolUsage : %lu\n", pvi->QuotaPagedPoolUsage);
- trace("QuotaPeakNonPagePoolUsage : %lu\n", pvi->QuotaPeakNonPagedPoolUsage);
- trace("QuotaNonPagePoolUsage : %lu\n", pvi->QuotaNonPagedPoolUsage);
- trace("PagefileUsage : %lu\n", pvi->PagefileUsage);
- trace("PeakPagefileUsage : %lu\n", pvi->PeakPagefileUsage);
+ trace("PeakVirtualSize : %Iu\n", pvi->PeakVirtualSize);
+ trace("VirtualSize : %Iu\n", pvi->VirtualSize);
+ trace("PageFaultCount : %lu\n", pvi->PageFaultCount);
+ trace("PeakWorkingSetSize : %Iu\n", pvi->PeakWorkingSetSize);
+ trace("WorkingSetSize : %Iu\n", pvi->WorkingSetSize);
+ trace("QuotaPeakPagedPoolUsage : %Iu\n", pvi->QuotaPeakPagedPoolUsage);
+ trace("QuotaPagedPoolUsage : %Iu\n", pvi->QuotaPagedPoolUsage);
+ trace("QuotaPeakNonPagePoolUsage : %Iu\n", pvi->QuotaPeakNonPagedPoolUsage);
+ trace("QuotaNonPagePoolUsage : %Iu\n", pvi->QuotaNonPagedPoolUsage);
+ trace("PagefileUsage : %Iu\n", pvi->PagefileUsage);
+ trace("PeakPagefileUsage : %Iu\n", pvi->PeakPagefileUsage);
}
static void test_query_process_vm(void)
@@ -1779,21 +1780,21 @@ static void test_query_process_vm(void)
status = pNtQueryInformationProcess(NULL, ProcessVmCounters, NULL, sizeof(pvi), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 24, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( ReturnLength == sizeof(VM_COUNTERS), "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( ReturnLength == sizeof(VM_COUNTERS), "Inconsistent length %ld\n", ReturnLength);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 46, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- todo_wine ok( ReturnLength == sizeof(VM_COUNTERS), "wrong size %d\n", ReturnLength);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ todo_wine ok( ReturnLength == sizeof(VM_COUNTERS), "wrong size %ld\n", ReturnLength);
/* Check if we have some return values */
if (winetest_debug > 1)
@@ -1803,19 +1804,19 @@ static void test_query_process_vm(void)
process = OpenProcess(PROCESS_VM_READ, FALSE, GetCurrentProcessId());
status = pNtQueryInformationProcess(process, ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got %08x\n", status);
+ ok( status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got %08lx\n", status);
CloseHandle(process);
process = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentProcessId());
status = pNtQueryInformationProcess(process, ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS || broken(!process) /* XP */, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS || broken(!process) /* XP */, "Expected STATUS_SUCCESS, got %08lx\n", status);
CloseHandle(process);
memset(&pvi, 0, sizeof(pvi));
process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId());
status = pNtQueryInformationProcess(process, ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage );
/* Check if we have some return values */
if (winetest_debug > 1)
@@ -1827,48 +1828,48 @@ static void test_query_process_vm(void)
/* Check if we have real counters */
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage );
prev_size = pvi.VirtualSize;
if (winetest_debug > 1)
dump_vm_counters("VM counters before VirtualAlloc", &pvi);
ptr = VirtualAlloc(NULL, alloc_size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
- ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError());
+ ok( ptr != NULL, "VirtualAlloc failed, err %lu\n", GetLastError());
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ 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 %lu, got %lu\n", prev_size + alloc_size, pvi.VirtualSize);
+ "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize);
VirtualFree( ptr, 0, MEM_RELEASE);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage );
prev_size = pvi.VirtualSize;
if (winetest_debug > 1)
dump_vm_counters("VM counters before VirtualAlloc", &pvi);
ptr = VirtualAlloc(NULL, alloc_size, MEM_RESERVE, PAGE_READWRITE);
- ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError());
+ ok( ptr != NULL, "VirtualAlloc failed, err %lu\n", GetLastError());
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ 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 %lu, got %lu\n", prev_size + alloc_size, pvi.VirtualSize);
+ "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize);
prev_size = pvi.VirtualSize;
ptr = VirtualAlloc(ptr, alloc_size, MEM_COMMIT, PAGE_READWRITE);
- ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError());
+ ok( ptr != NULL, "VirtualAlloc failed, err %lu\n", GetLastError());
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ 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_COMMIT)", &pvi);
ok( pvi.VirtualSize == prev_size,
- "Expected to equal to %lu, got %lu\n", prev_size, pvi.VirtualSize);
+ "Expected to equal to %Iu, got %Iu\n", prev_size, pvi.VirtualSize);
VirtualFree( ptr, 0, MEM_RELEASE);
}
@@ -1880,21 +1881,21 @@ static void test_query_process_io(void)
status = pNtQueryInformationProcess(NULL, ProcessIoCounters, NULL, sizeof(pii), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessIoCounters, &pii, sizeof(pii), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessIoCounters, &pii, 24, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessIoCounters, &pii, sizeof(pii), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(pii) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(pii) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessIoCounters, &pii, sizeof(pii) * 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
- ok( sizeof(pii) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
+ ok( sizeof(pii) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
/* Check if we have some return values */
if (winetest_debug > 1) trace("OtherOperationCount : 0x%s\n", wine_dbgstr_longlong(pii.OtherOperationCount));
@@ -1914,26 +1915,26 @@ static void test_query_process_times(void)
status = pNtQueryInformationProcess(NULL, ProcessTimes, NULL, sizeof(spti), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessTimes, &spti, sizeof(spti), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessTimes, &spti, 24, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, one_before_last_pid);
if (!process)
{
- if (winetest_debug > 1) trace("Could not open process with ID : %d, error : %u. Going to use current one.\n", one_before_last_pid, GetLastError());
+ if (winetest_debug > 1) trace("Could not open process with ID : %ld, error : %lu. Going to use current one.\n", one_before_last_pid, GetLastError());
process = GetCurrentProcess();
}
else
- trace("ProcessTimes for process with ID : %d\n", one_before_last_pid);
+ trace("ProcessTimes for process with ID : %ld\n", one_before_last_pid);
status = pNtQueryInformationProcess( process, ProcessTimes, &spti, sizeof(spti), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(spti) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(spti) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
CloseHandle(process);
FileTimeToSystemTime((const FILETIME *)&spti.CreateTime, &UTC);
@@ -1953,11 +1954,11 @@ static void test_query_process_times(void)
if (winetest_debug > 1) trace("UserTime : %02d:%02d:%02d.%03d\n", Local.wHour, Local.wMinute, Local.wSecond, Local.wMilliseconds);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessTimes, &spti, sizeof(spti) * 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
ok( sizeof(spti) == ReturnLength ||
ReturnLength == 0 /* vista */ ||
broken(is_wow64), /* returns garbage on wow64 */
- "Inconsistent length %d\n", ReturnLength);
+ "Inconsistent length %ld\n", ReturnLength);
}
static void test_query_process_debug_port(int argc, char **argv)
@@ -1973,62 +1974,62 @@ static void test_query_process_debug_port(int argc, char **argv)
si.cb = sizeof(si);
ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi);
- ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError());
+ ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError());
if (!ret) return;
status = pNtQueryInformationProcess(NULL, ProcessDebugPort,
NULL, 0, NULL);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
status = pNtQueryInformationProcess(NULL, ProcessDebugPort,
NULL, sizeof(debug_port), NULL);
- ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION /* XP */, "got %#x\n", status);
+ ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION /* XP */, "got %#lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort,
NULL, sizeof(debug_port), NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#lx.\n", status);
status = pNtQueryInformationProcess(NULL, ProcessDebugPort,
&debug_port, sizeof(debug_port), NULL);
- ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#x.\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort,
&debug_port, sizeof(debug_port) - 1, NULL);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort,
&debug_port, sizeof(debug_port) + 1, NULL);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort,
&debug_port, sizeof(debug_port), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_port == 0, "Expected port 0, got %#lx.\n", debug_port);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_port == 0, "Expected port 0, got %#Ix.\n", debug_port);
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugPort,
&debug_port, sizeof(debug_port), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_port == ~(DWORD_PTR)0, "Expected port %#lx, got %#lx.\n", ~(DWORD_PTR)0, debug_port);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_port == ~(DWORD_PTR)0, "Expected port %#Ix, got %#Ix.\n", ~(DWORD_PTR)0, debug_port);
for (;;)
{
DEBUG_EVENT ev;
ret = WaitForDebugEvent(&ev, INFINITE);
- ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "WaitForDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break;
ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE);
- ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
}
ret = CloseHandle(pi.hThread);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
ret = CloseHandle(pi.hProcess);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
}
static void subtest_query_process_debug_port_custom_dacl(int argc, char **argv, ACCESS_MASK access, PSID sid)
@@ -2056,37 +2057,37 @@ static void subtest_query_process_debug_port_custom_dacl(int argc, char **argv,
InitializeObjectAttributes(&attr, NULL, 0, NULL, &sd);
status = NtCreateDebugObject(&debug_obj, MAXIMUM_ALLOWED, &attr, DEBUG_KILL_ON_CLOSE);
- ok(SUCCEEDED(status), "Failed to create debug object: %#010x\n", status);
+ ok(SUCCEEDED(status), "Failed to create debug object: %#010lx\n", status);
if (!SUCCEEDED(status)) return;
old_debug_obj = pDbgUiGetThreadDebugObject();
pDbgUiSetThreadDebugObject(debug_obj);
- sprintf(cmdline, "%s %s %s %u", argv[0], argv[1], "debuggee:dbgport", access);
+ sprintf(cmdline, "%s %s %s %lu", argv[0], argv[1], "debuggee:dbgport", access);
memset(&si, 0, sizeof(si));
si.cb = sizeof(si);
ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE,
DEBUG_PROCESS, NULL, NULL, &si, &pi);
- ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError());
+ ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError());
if (!ret) goto close_debug_obj;
do
{
ret = WaitForDebugEvent(&ev, INFINITE);
- ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "WaitForDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE);
- ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
} while (ev.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT);
wait_child_process(pi.hProcess);
ret = CloseHandle(pi.hThread);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
ret = CloseHandle(pi.hProcess);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
close_debug_obj:
pDbgUiSetThreadDebugObject(old_debug_obj);
@@ -2101,16 +2102,16 @@ static TOKEN_OWNER *get_current_owner(void)
BOOL ret;
ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &token);
- ok(ret, "Failed to get process token: %u\n", GetLastError());
+ ok(ret, "Failed to get process token: %lu\n", GetLastError());
ret = GetTokenInformation(token, TokenOwner, NULL, 0, &length);
ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER,
- "GetTokenInformation failed: %u\n", GetLastError());
- ok(length != 0, "Failed to get token owner information length: %u\n", GetLastError());
+ "GetTokenInformation failed: %lu\n", GetLastError());
+ ok(length != 0, "Failed to get token owner information length: %lu\n", GetLastError());
owner = HeapAlloc(GetProcessHeap(), 0, length);
ret = GetTokenInformation(token, TokenOwner, owner, length, &length);
- ok(ret, "Failed to get token owner information: %u)\n", GetLastError());
+ ok(ret, "Failed to get token owner information: %lu)\n", GetLastError());
CloseHandle(token);
return owner;
@@ -2144,7 +2145,7 @@ static void test_query_process_debug_port_custom_dacl(int argc, char **argv)
{
ACCESS_MASK access = all_access_masks[i];
- winetest_push_context("debug object access %08x", access);
+ winetest_push_context("debug object access %08lx", access);
subtest_query_process_debug_port_custom_dacl(argc, argv, access, owner->Owner);
winetest_pop_context();
}
@@ -2162,28 +2163,28 @@ static void test_query_process_priority(void)
status = pNtQueryInformationProcess(NULL, ProcessPriorityClass, NULL, sizeof(priority[0]), NULL);
ok(status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_INVALID_HANDLE) /* w2k3 */,
- "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessPriorityClass, &priority, sizeof(priority[0]), NULL);
- ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, 1, &ReturnLength);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, sizeof(priority), &ReturnLength);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
orig_priority = GetPriorityClass(GetCurrentProcess());
ret = SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS);
- ok(ret, "Failed to set priority class: %u\n", GetLastError());
+ ok(ret, "Failed to set priority class: %lu\n", GetLastError());
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, sizeof(priority[0]), &ReturnLength);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok(priority[0].PriorityClass == PROCESS_PRIOCLASS_BELOW_NORMAL,
"Expected PROCESS_PRIOCLASS_BELOW_NORMAL, got %u\n", priority[0].PriorityClass);
ret = SetPriorityClass(GetCurrentProcess(), orig_priority);
- ok(ret, "Failed to reset priority class: %u\n", GetLastError());
+ ok(ret, "Failed to reset priority class: %lu\n", GetLastError());
}
static void test_query_process_handlecount(void)
@@ -2196,35 +2197,35 @@ static void test_query_process_handlecount(void)
status = pNtQueryInformationProcess(NULL, ProcessHandleCount, NULL, sizeof(handlecount), NULL);
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE,
- "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessHandleCount, &handlecount, sizeof(handlecount), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessHandleCount, &handlecount, 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, one_before_last_pid);
if (!process)
{
- trace("Could not open process with ID : %d, error : %u. Going to use current one.\n", one_before_last_pid, GetLastError());
+ trace("Could not open process with ID : %ld, error : %lu. Going to use current one.\n", one_before_last_pid, GetLastError());
process = GetCurrentProcess();
}
else
- if (winetest_debug > 1) trace("ProcessHandleCount for process with ID : %d\n", one_before_last_pid);
+ if (winetest_debug > 1) trace("ProcessHandleCount for process with ID : %ld\n", one_before_last_pid);
status = pNtQueryInformationProcess( process, ProcessHandleCount, &handlecount, sizeof(handlecount), &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
CloseHandle(process);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessHandleCount, buffer, sizeof(buffer), &ReturnLength);
ok( status == STATUS_INFO_LENGTH_MISMATCH || status == STATUS_SUCCESS,
- "Expected STATUS_INFO_LENGTH_MISMATCH or STATUS_SUCCESS, got %08x\n", status);
- ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %d\n", ReturnLength);
+ "Expected STATUS_INFO_LENGTH_MISMATCH or STATUS_SUCCESS, got %08lx\n", status);
+ ok( sizeof(handlecount) == ReturnLength, "Inconsistent length %ld\n", ReturnLength);
/* Check if we have some return values */
- if (winetest_debug > 1) trace("HandleCount : %d\n", handlecount);
+ if (winetest_debug > 1) trace("HandleCount : %ld\n", handlecount);
todo_wine
{
ok( handlecount > 0, "Expected some handles, got 0\n");
@@ -2240,17 +2241,17 @@ static void test_query_process_image_file_name(void)
UNICODE_STRING *buffer = NULL;
status = pNtQueryInformationProcess(NULL, ProcessImageFileName, &image_file_name, sizeof(image_file_name), NULL);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, sizeof(image_file_name), &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
buffer = heap_alloc(ReturnLength);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, buffer, ReturnLength, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
todo_wine
ok(!memcmp(buffer->Buffer, deviceW, sizeof(deviceW)),
"Expected image name to begin with \\Device\\, got %s\n",
@@ -2263,17 +2264,17 @@ static void test_query_process_image_file_name(void)
win_skip("ProcessImageFileNameWin32 is not supported\n");
return;
}
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileNameWin32, &image_file_name, 2, &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileNameWin32, &image_file_name, sizeof(image_file_name), &ReturnLength);
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
buffer = heap_alloc(ReturnLength);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileNameWin32, buffer, ReturnLength, &ReturnLength);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok(memcmp(buffer->Buffer, deviceW, sizeof(deviceW)),
"Expected image name not to begin with \\Device\\, got %s\n",
wine_dbgstr_wn(buffer->Buffer, buffer->Length / sizeof(WCHAR)));
@@ -2289,18 +2290,18 @@ static void test_query_process_image_info(void)
status = pNtQueryInformationProcess( NULL, ProcessImageInformation, &info, sizeof(info), &len );
ok( status == STATUS_INVALID_HANDLE || broken(status == STATUS_INVALID_PARAMETER), /* winxp */
- "got %08x\n", status);
+ "got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info)-1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info)+1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status);
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status);
memset( &info, 0xcc, sizeof(info) );
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info), &len );
- ok( status == STATUS_SUCCESS, "got %08x\n", status);
- ok( len == sizeof(info), "wrong len %u\n", len );
+ ok( status == STATUS_SUCCESS, "got %08lx\n", status);
+ ok( len == sizeof(info), "wrong len %lu\n", len );
ok( info.MajorSubsystemVersion == nt->OptionalHeader.MajorSubsystemVersion,
"wrong major version %x/%x\n",
@@ -2331,49 +2332,49 @@ static void test_query_process_debug_object_handle(int argc, char **argv)
si.cb = sizeof(si);
ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL,
NULL, &si, &pi);
- ok(ret, "CreateProcess failed with last error %u\n", GetLastError());
+ ok(ret, "CreateProcess failed with last error %lu\n", GetLastError());
if (!ret) return;
status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL,
0, NULL);
ok(status == STATUS_INFO_LENGTH_MISMATCH,
- "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n",
+ "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n",
status);
status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle, NULL,
sizeof(debug_object), NULL);
ok(status == STATUS_INVALID_HANDLE ||
status == STATUS_ACCESS_VIOLATION, /* XP */
- "Expected NtQueryInformationProcess to return STATUS_INVALID_HANDLE, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_INVALID_HANDLE, got 0x%08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, NULL, sizeof(debug_object), NULL);
ok(status == STATUS_ACCESS_VIOLATION,
- "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08lx\n", status);
status = pNtQueryInformationProcess(NULL, ProcessDebugObjectHandle,
&debug_object, sizeof(debug_object), NULL);
ok(status == STATUS_INVALID_HANDLE,
- "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_ACCESS_VIOLATION, got 0x%08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, &debug_object,
sizeof(debug_object) - 1, NULL);
ok(status == STATUS_INFO_LENGTH_MISMATCH,
- "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, &debug_object,
sizeof(debug_object) + 1, NULL);
ok(status == STATUS_INFO_LENGTH_MISMATCH,
- "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_INFO_LENGTH_MISMATCH, got 0x%08lx\n", status);
debug_object = (HANDLE)0xdeadbeef;
status = pNtQueryInformationProcess(GetCurrentProcess(),
ProcessDebugObjectHandle, &debug_object,
sizeof(debug_object), NULL);
ok(status == STATUS_PORT_NOT_SET,
- "Expected NtQueryInformationProcess to return STATUS_PORT_NOT_SET, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_PORT_NOT_SET, got 0x%08lx\n", status);
ok(debug_object == NULL ||
broken(debug_object == (HANDLE)0xdeadbeef), /* Wow64 */
"Expected debug object handle to be NULL, got %p\n", debug_object);
@@ -2382,31 +2383,31 @@ static void test_query_process_debug_object_handle(int argc, char **argv)
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugObjectHandle,
&debug_object, sizeof(debug_object), NULL);
ok(status == STATUS_SUCCESS,
- "Expected NtQueryInformationProcess to return STATUS_SUCCESS, got 0x%08x\n", status);
+ "Expected NtQueryInformationProcess to return STATUS_SUCCESS, got 0x%08lx\n", status);
ok(debug_object != NULL,
"Expected debug object handle to be non-NULL, got %p\n", debug_object);
status = NtClose( debug_object );
- ok( !status, "NtClose failed %x\n", status );
+ ok( !status, "NtClose failed %lx\n", status );
for (;;)
{
DEBUG_EVENT ev;
ret = WaitForDebugEvent(&ev, INFINITE);
- ok(ret, "WaitForDebugEvent failed with last error %u\n", GetLastError());
+ ok(ret, "WaitForDebugEvent failed with last error %lu\n", GetLastError());
if (!ret) break;
if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break;
ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE);
- ok(ret, "ContinueDebugEvent failed with last error %u\n", GetLastError());
+ ok(ret, "ContinueDebugEvent failed with last error %lu\n", GetLastError());
if (!ret) break;
}
ret = CloseHandle(pi.hThread);
- ok(ret, "CloseHandle failed with last error %u\n", GetLastError());
+ ok(ret, "CloseHandle failed with last error %lu\n", GetLastError());
ret = CloseHandle(pi.hProcess);
- ok(ret, "CloseHandle failed with last error %u\n", GetLastError());
+ ok(ret, "CloseHandle failed with last error %lu\n", GetLastError());
}
static void test_query_process_debug_flags(int argc, char **argv)
@@ -2428,34 +2429,34 @@ static void test_query_process_debug_flags(int argc, char **argv)
/* test invalid arguments */
status = pNtQueryInformationProcess(NULL, ProcessDebugFlags, NULL, 0, NULL);
ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* WOW64 */,
- "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
status = pNtQueryInformationProcess(NULL, ProcessDebugFlags, NULL, sizeof(debug_flags), NULL);
ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_INVALID_INFO_CLASS) /* WOW64 */,
- "Expected STATUS_INVALID_HANDLE, got %#x.\n", status);
+ "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags,
NULL, sizeof(debug_flags), NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#lx.\n", status);
status = pNtQueryInformationProcess(NULL, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
ok(status == STATUS_INVALID_HANDLE || broken(status == STATUS_INVALID_INFO_CLASS) /* WOW64 */,
- "Expected STATUS_INVALID_HANDLE, got %#x.\n", status);
+ "Expected STATUS_INVALID_HANDLE, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags,
&debug_flags, sizeof(debug_flags) - 1, NULL);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags,
&debug_flags, sizeof(debug_flags) + 1, NULL);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#lx.\n", status);
/* test ProcessDebugFlags of current process */
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == TRUE, "Expected flag TRUE, got %x.\n", debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == TRUE, "Expected flag TRUE, got %lx.\n", debug_flags);
for (i = 0; i < ARRAY_SIZE(test_flags); i++)
{
@@ -2464,26 +2465,26 @@ static void test_query_process_debug_flags(int argc, char **argv)
si.cb = sizeof(si);
ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, test_flags[i], NULL, NULL, &si, &pi);
- ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError());
+ ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError());
if (!(test_flags[i] & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS)))
{
/* test ProcessDebugFlags before attaching with debugger */
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == TRUE, "Expected flag TRUE, got %x.\n", debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == TRUE, "Expected flag TRUE, got %lx.\n", debug_flags);
ret = DebugActiveProcess(pi.dwProcessId);
- ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError());
+ ok(ret, "DebugActiveProcess failed, last error %#lx.\n", GetLastError());
expected_flags = FALSE;
}
/* test ProcessDebugFlags after attaching with debugger */
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == expected_flags, "Expected flag %lx, got %lx.\n", expected_flags, debug_flags);
if (!(test_flags[i] & CREATE_SUSPENDED))
{
@@ -2492,40 +2493,40 @@ static void test_query_process_debug_flags(int argc, char **argv)
for (;;)
{
ret = WaitForDebugEvent(&ev, 1000);
- ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "WaitForDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
if (ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) break;
ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE);
- ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
}
result = SuspendThread(pi.hThread);
- ok(result == 0, "Expected 0, got %u.\n", result);
+ ok(result == 0, "Expected 0, got %lu.\n", result);
}
ret = DebugActiveProcessStop(pi.dwProcessId);
- ok(ret, "DebugActiveProcessStop failed, last error %#x.\n", GetLastError());
+ ok(ret, "DebugActiveProcessStop failed, last error %#lx.\n", GetLastError());
/* test ProcessDebugFlags after detaching debugger */
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == expected_flags, "Expected flag %lx, got %lx.\n", expected_flags, debug_flags);
ret = DebugActiveProcess(pi.dwProcessId);
- ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError());
+ ok(ret, "DebugActiveProcess failed, last error %#lx.\n", GetLastError());
/* test ProcessDebugFlags after re-attaching debugger */
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == FALSE, "Expected flag FALSE, got %x.\n", debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == FALSE, "Expected flag FALSE, got %lx.\n", debug_flags);
result = ResumeThread(pi.hThread);
- todo_wine ok(result == 2, "Expected 2, got %u.\n", result);
+ todo_wine ok(result == 2, "Expected 2, got %lu.\n", result);
/* Wait until the process is terminated. On Windows XP the process randomly
* gets stuck in a non-continuable exception, so stop after 100 iterations.
@@ -2535,13 +2536,13 @@ static void test_query_process_debug_flags(int argc, char **argv)
{
ret = WaitForDebugEvent(&ev, 1000);
ok(ret || broken(GetLastError() == ERROR_SEM_TIMEOUT),
- "WaitForDebugEvent failed, last error %#x.\n", GetLastError());
+ "WaitForDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break;
ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE);
- ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError());
if (!ret) break;
}
ok(j < 100 || broken(j >= 100) /* Win XP */, "Expected less than 100 debug events.\n");
@@ -2549,13 +2550,13 @@ static void test_query_process_debug_flags(int argc, char **argv)
/* test ProcessDebugFlags after process has terminated */
status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL);
- ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status);
- ok(debug_flags == FALSE, "Expected flag FALSE, got %x.\n", debug_flags);
+ ok(!status, "NtQueryInformationProcess failed, status %#lx.\n", status);
+ ok(debug_flags == FALSE, "Expected flag FALSE, got %lx.\n", debug_flags);
ret = CloseHandle(pi.hThread);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
ret = CloseHandle(pi.hProcess);
- ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
+ ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError());
}
}
@@ -2572,42 +2573,42 @@ static void test_readvirtualmemory(void)
/* normal operation */
status = pNtReadVirtualMemory(process, teststring, buffer, 12, &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == 12, "Expected to read 12 bytes, got %Id\n",readcount);
ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n");
/* no number of bytes */
memset(buffer, 0, 12);
status = pNtReadVirtualMemory(process, teststring, buffer, 12, NULL);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n");
/* illegal remote address */
todo_wine{
status = pNtReadVirtualMemory(process, (void *) 0x1234, buffer, 12, &readcount);
- ok( status == STATUS_PARTIAL_COPY, "Expected STATUS_PARTIAL_COPY, got %08x\n", status);
+ ok( status == STATUS_PARTIAL_COPY, "Expected STATUS_PARTIAL_COPY, got %08lx\n", status);
if (status == STATUS_PARTIAL_COPY)
- ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount);
+ ok( readcount == 0, "Expected to read 0 bytes, got %Id\n",readcount);
}
/* 0 handle */
status = pNtReadVirtualMemory(0, teststring, buffer, 12, &readcount);
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status);
- ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount);
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status);
+ ok( readcount == 0, "Expected to read 0 bytes, got %Id\n",readcount);
/* pseudo handle for current process*/
memset(buffer, 0, 12);
status = pNtReadVirtualMemory((HANDLE)-1, teststring, buffer, 12, &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == 12, "Expected to read 12 bytes, got %ld\n",readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == 12, "Expected to read 12 bytes, got %Id\n",readcount);
ok( strcmp(teststring, buffer) == 0, "Expected read memory to be the same as original memory\n");
/* illegal local address */
status = pNtReadVirtualMemory(process, teststring, (void *)0x1234, 12, &readcount);
ok( status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_PARTIAL_COPY) /* Win10 */,
- "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status);
+ "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status);
if (status == STATUS_ACCESS_VIOLATION)
- ok( readcount == 0, "Expected to read 0 bytes, got %ld\n",readcount);
+ ok( readcount == 0, "Expected to read 0 bytes, got %Id\n",readcount);
CloseHandle(process);
}
@@ -2631,8 +2632,8 @@ static void test_mapprotection(void)
skip("Unable to query process execute flags on this platform\n");
return;
}
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
- if (winetest_debug > 1) trace("Process execute flags %08x\n", oldflags);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
+ if (winetest_debug > 1) trace("Process execute flags %08lx\n", oldflags);
if (!(oldflags & MEM_EXECUTE_OPTION_ENABLE))
{
@@ -2649,7 +2650,7 @@ static void test_mapprotection(void)
}
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
reset_flags = TRUE;
}
@@ -2663,14 +2664,14 @@ static void test_mapprotection(void)
SEC_COMMIT | SEC_NOCACHE,
0
);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
offset.u.LowPart = 0;
offset.u.HighPart = 0;
count = 0x2000;
addr = NULL;
status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
#if defined(__x86_64__) || defined(__i386__)
*(unsigned char*)addr = 0xc3; /* lret ... in both i386 and x86_64 */
@@ -2686,12 +2687,12 @@ static void test_mapprotection(void)
if (winetest_debug > 1) trace("...done.\n");
status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08x\n", status);
- ok((info.Protect & ~PAGE_NOCACHE) == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok((info.Protect & ~PAGE_NOCACHE) == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%lx\n", info.Protect);
status = pNtUnmapViewOfSection( GetCurrentProcess(), (char *)addr + 0x1050 );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
pNtClose (h);
if (reset_flags)
@@ -2709,52 +2710,52 @@ static void test_threadstack(void)
info.ReserveSize = 0x100000;
info.StackBase = (void *)0xdeadbeef;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation, &info, sizeof(info) );
- ok( !status, "NtSetInformationProcess failed %08x\n", status );
+ ok( !status, "NtSetInformationProcess failed %08lx\n", status );
ok( info.StackBase != (void *)0xdeadbeef, "stackbase not set\n" );
status = pNtQueryVirtualMemory( GetCurrentProcess(), info.StackBase, MemoryBasicInformation,
&meminfo, sizeof(meminfo), &retlen );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( meminfo.AllocationBase == info.StackBase, "wrong base %p/%p\n",
meminfo.AllocationBase, info.StackBase );
- ok( meminfo.RegionSize == info.ReserveSize, "wrong size %lx/%lx\n",
+ ok( meminfo.RegionSize == info.ReserveSize, "wrong size %Ix/%Ix\n",
meminfo.RegionSize, info.ReserveSize );
- ok( meminfo.State == MEM_RESERVE, "wrong state %x\n", meminfo.State );
- ok( meminfo.Protect == 0, "wrong protect %x\n", meminfo.Protect );
- ok( meminfo.Type == MEM_PRIVATE, "wrong type %x\n", meminfo.Type );
+ ok( meminfo.State == MEM_RESERVE, "wrong state %lx\n", meminfo.State );
+ ok( meminfo.Protect == 0, "wrong protect %lx\n", meminfo.Protect );
+ ok( meminfo.Type == MEM_PRIVATE, "wrong type %lx\n", meminfo.Type );
info_ex.AllocInfo = info;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation,
&info_ex, sizeof(info_ex) );
if (status != STATUS_INVALID_PARAMETER)
{
- ok( !status, "NtSetInformationProcess failed %08x\n", status );
+ ok( !status, "NtSetInformationProcess failed %08lx\n", status );
ok( info_ex.AllocInfo.StackBase != info.StackBase, "stackbase not set\n" );
status = pNtQueryVirtualMemory( GetCurrentProcess(), info_ex.AllocInfo.StackBase,
MemoryBasicInformation, &meminfo, sizeof(meminfo), &retlen );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( retlen == sizeof(meminfo), "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( meminfo.AllocationBase == info_ex.AllocInfo.StackBase, "wrong base %p/%p\n",
meminfo.AllocationBase, info_ex.AllocInfo.StackBase );
- ok( meminfo.RegionSize == info_ex.AllocInfo.ReserveSize, "wrong size %lx/%lx\n",
+ ok( meminfo.RegionSize == info_ex.AllocInfo.ReserveSize, "wrong size %Ix/%Ix\n",
meminfo.RegionSize, info_ex.AllocInfo.ReserveSize );
- ok( meminfo.State == MEM_RESERVE, "wrong state %x\n", meminfo.State );
- ok( meminfo.Protect == 0, "wrong protect %x\n", meminfo.Protect );
- ok( meminfo.Type == MEM_PRIVATE, "wrong type %x\n", meminfo.Type );
+ ok( meminfo.State == MEM_RESERVE, "wrong state %lx\n", meminfo.State );
+ ok( meminfo.Protect == 0, "wrong protect %lx\n", meminfo.Protect );
+ ok( meminfo.Type == MEM_PRIVATE, "wrong type %lx\n", meminfo.Type );
VirtualFree( info_ex.AllocInfo.StackBase, 0, MEM_FREE );
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation,
&info, sizeof(info) - 1 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status );
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation,
&info, sizeof(info) + 1 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status );
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation,
&info_ex, sizeof(info_ex) - 1 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status );
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessThreadStackAllocation,
&info_ex, sizeof(info_ex) + 1 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationProcess failed %08lx\n", status );
}
else win_skip( "ProcessThreadStackAllocation ex not supported\n" );
@@ -2777,161 +2778,161 @@ static void test_queryvirtualmemory(void)
module = GetModuleHandleA( "ntdll.dll" );
status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module);
- ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT);
- ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READONLY);
- ok (mbi.Type == MEM_IMAGE, "mbi.Type is 0x%x, expected 0x%x\n", mbi.Type, MEM_IMAGE);
+ ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT);
+ ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%lx, expected 0x%x\n", mbi.Protect, PAGE_READONLY);
+ ok (mbi.Type == MEM_IMAGE, "mbi.Type is 0x%lx, expected 0x%x\n", mbi.Type, MEM_IMAGE);
module = GetModuleHandleA( "ntdll.dll" );
status = pNtQueryVirtualMemory(NtCurrentProcess(), pNtQueryVirtualMemory, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module);
- ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT);
- ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ);
+ ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT);
+ ok (mbi.Protect == PAGE_EXECUTE_READ, "mbi.Protect is 0x%lx, expected 0x%x\n", mbi.Protect, PAGE_EXECUTE_READ);
status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok (mbi.AllocationProtect == PAGE_READWRITE || mbi.AllocationProtect == PAGE_EXECUTE_READWRITE,
- "mbi.AllocationProtect is 0x%x\n", mbi.AllocationProtect);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT);
+ "mbi.AllocationProtect is 0x%lx\n", mbi.AllocationProtect);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT);
ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_EXECUTE_READWRITE,
- "mbi.Protect is 0x%x\n", mbi.Protect);
+ "mbi.Protect is 0x%lx\n", mbi.Protect);
status = pNtQueryVirtualMemory(NtCurrentProcess(), stackbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
- ok (mbi.AllocationProtect == PAGE_READWRITE, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_READWRITE);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%x\n", mbi.State, MEM_COMMIT);
- ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%x\n", mbi.Protect, PAGE_READWRITE);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok (mbi.AllocationProtect == PAGE_READWRITE, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_READWRITE);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%x\n", mbi.State, MEM_COMMIT);
+ ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%lx, expected 0x%x\n", mbi.Protect, PAGE_READWRITE);
module = GetModuleHandleA( NULL );
status = pNtQueryVirtualMemory(NtCurrentProcess(), teststring, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module);
- ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT);
- ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READONLY);
+ ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT);
+ ok (mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%lx, expected 0x%X\n", mbi.Protect, PAGE_READONLY);
status = pNtQueryVirtualMemory(NtCurrentProcess(), datatestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok (mbi.AllocationBase == module, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, module);
- ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT);
+ ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT);
ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_WRITECOPY,
- "mbi.Protect is 0x%x\n", mbi.Protect);
+ "mbi.Protect is 0x%lx\n", mbi.Protect);
status = pNtQueryVirtualMemory(NtCurrentProcess(), rwtestbuf, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
if (mbi.AllocationBase == module)
{
- ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
- ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT);
+ ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY);
+ ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT);
ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_WRITECOPY,
- "mbi.Protect is 0x%x\n", mbi.Protect);
+ "mbi.Protect is 0x%lx\n", mbi.Protect);
}
else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */
status = pNtQueryVirtualMemory(NtCurrentProcess(), user_shared_data, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok(readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %ld\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(readcount == sizeof(MEMORY_BASIC_INFORMATION), "Expected to read %d bytes, got %Id\n",(int)sizeof(MEMORY_BASIC_INFORMATION),readcount);
ok(mbi.AllocationBase == user_shared_data, "mbi.AllocationBase is 0x%p, expected 0x%p\n", mbi.AllocationBase, user_shared_data);
- ok(mbi.AllocationProtect == PAGE_READONLY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_READONLY);
- ok(mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT);
- ok(mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%x\n", mbi.Protect);
- ok(mbi.Type == MEM_PRIVATE, "mbi.Type is 0x%x, expected 0x%x\n", mbi.Type, MEM_PRIVATE);
- ok(mbi.RegionSize == 0x1000, "mbi.RegionSize is 0x%lx, expected 0x%x\n", mbi.RegionSize, 0x1000);
+ ok(mbi.AllocationProtect == PAGE_READONLY, "mbi.AllocationProtect is 0x%lx, expected 0x%x\n", mbi.AllocationProtect, PAGE_READONLY);
+ ok(mbi.State == MEM_COMMIT, "mbi.State is 0x%lx, expected 0x%X\n", mbi.State, MEM_COMMIT);
+ ok(mbi.Protect == PAGE_READONLY, "mbi.Protect is 0x%lx\n", mbi.Protect);
+ ok(mbi.Type == MEM_PRIVATE, "mbi.Type is 0x%lx, expected 0x%x\n", mbi.Type, MEM_PRIVATE);
+ ok(mbi.RegionSize == 0x1000, "mbi.RegionSize is 0x%Ix, expected 0x%x\n", mbi.RegionSize, 0x1000);
/* check error code when addr is higher than working set limit */
status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount);
- ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
/* check error code when len is less than MEMORY_BASIC_INFORMATION size */
status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION) - 1, &readcount);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
module = GetModuleHandleA( "ntdll.dll" );
memset(buffer, 0xcc, sizeof(buffer));
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemoryMappedFilenameInformation,
name, sizeof(*name) + 16, &readcount);
- ok(status == STATUS_BUFFER_OVERFLOW, "got %08x\n", status);
+ ok(status == STATUS_BUFFER_OVERFLOW, "got %08lx\n", status);
ok(name->SectionFileName.Length == 0xcccc || broken(!name->SectionFileName.Length), /* vista64 */
"Wrong len %u\n", name->SectionFileName.Length);
- ok(readcount > sizeof(*name), "Wrong count %lu\n", readcount);
+ ok(readcount > sizeof(*name), "Wrong count %Iu\n", readcount);
memset(buffer, 0xcc, sizeof(buffer));
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemoryMappedFilenameInformation,
name, sizeof(buffer), &readcount);
- ok(status == STATUS_SUCCESS, "got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "got %08lx\n", status);
ok(name->SectionFileName.Buffer == (WCHAR *)(name + 1), "Wrong ptr %p/%p\n",
name->SectionFileName.Buffer, name + 1 );
ok(name->SectionFileName.Length != 0xcccc, "Wrong len %u\n", name->SectionFileName.Length);
ok(name->SectionFileName.MaximumLength == name->SectionFileName.Length + sizeof(WCHAR),
"Wrong maxlen %u/%u\n", name->SectionFileName.MaximumLength, name->SectionFileName.Length);
ok(readcount == sizeof(name->SectionFileName) + name->SectionFileName.MaximumLength,
- "Wrong count %lu/%u\n", readcount, name->SectionFileName.MaximumLength);
+ "Wrong count %Iu/%u\n", readcount, name->SectionFileName.MaximumLength);
ok( !name->SectionFileName.Buffer[name->SectionFileName.Length / sizeof(WCHAR)],
"buffer not null-terminated\n" );
memset(buffer, 0xcc, sizeof(buffer));
status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemoryMappedFilenameInformation,
name, sizeof(buffer), NULL);
- ok(status == STATUS_SUCCESS, "got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "got %08lx\n", status);
status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemoryMappedFilenameInformation,
NULL, sizeof(buffer), NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "got %08x\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "got %08lx\n", status);
memset(buffer, 0xcc, sizeof(buffer));
prev = readcount;
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 321, MemoryMappedFilenameInformation,
name, sizeof(*name) - 1, &readcount);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %08lx\n", status);
ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length);
- ok(readcount == prev, "Wrong count %lu\n", readcount);
+ ok(readcount == prev, "Wrong count %Iu\n", readcount);
memset(buffer, 0xcc, sizeof(buffer));
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory((HANDLE)0xdead, (char *)module + 1234, MemoryMappedFilenameInformation,
name, sizeof(buffer), &readcount);
- ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "got %08lx\n", status);
ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */
- "Wrong count %lu\n", readcount);
+ "Wrong count %Iu\n", readcount);
memset(buffer, 0xcc, sizeof(buffer));
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), buffer, MemoryMappedFilenameInformation,
name, sizeof(buffer), &readcount);
- ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status);
+ ok(status == STATUS_INVALID_ADDRESS, "got %08lx\n", status);
ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length);
ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */
- "Wrong count %lu\n", readcount);
+ "Wrong count %Iu\n", readcount);
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)0x1234, MemoryMappedFilenameInformation,
name, sizeof(buffer), &readcount);
- ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status);
+ ok(status == STATUS_INVALID_ADDRESS, "got %08lx\n", status);
ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length);
ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */
- "Wrong count %lu\n", readcount);
+ "Wrong count %Iu\n", readcount);
readcount = 0xdeadbeef;
status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)0x1234, MemoryMappedFilenameInformation,
name, sizeof(*name) - 1, &readcount);
- ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status);
+ ok(status == STATUS_INVALID_ADDRESS, "got %08lx\n", status);
ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length);
ok(readcount == 0xdeadbeef || broken(readcount == 15), /* wow64 */
- "Wrong count %lu\n", readcount);
+ "Wrong count %Iu\n", readcount);
}
static void test_affinity(void)
@@ -2944,64 +2945,64 @@ static void test_affinity(void)
GetSystemInfo(&si);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
proc_affinity = pbi.AffinityMask;
ok( proc_affinity == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected process affinity\n" );
proc_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) );
ok( status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
proc_affinity = 0;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) );
ok( status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected thread affinity\n" );
thread_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
ok( status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
thread_affinity = 0;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
ok( status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
thread_affinity = 1;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" );
/* NOTE: Pre-Vista does not allow bits to be set that are higher than the highest set bit in process affinity mask */
thread_affinity = (pbi.AffinityMask << 1) | pbi.AffinityMask;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
- ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08lx\n", status );
if (status == STATUS_SUCCESS)
{
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
- ok( tbi.AffinityMask == pbi.AffinityMask, "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask, tbi.AffinityMask );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
+ ok( tbi.AffinityMask == pbi.AffinityMask, "Unexpected thread affinity. Expected %Ix, got %Ix\n", pbi.AffinityMask, tbi.AffinityMask );
}
thread_affinity = ~(DWORD_PTR)0 - 1;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
- ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( broken(status == STATUS_INVALID_PARAMETER) || (status == STATUS_SUCCESS), "Expected STATUS_SUCCESS, got %08lx\n", status );
if (status == STATUS_SUCCESS)
{
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
- ok( tbi.AffinityMask == (pbi.AffinityMask & (~(DWORD_PTR)0 - 1)), "Unexpected thread affinity. Expected %lx, got %lx\n", pbi.AffinityMask & (~(DWORD_PTR)0 - 1), tbi.AffinityMask );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
+ ok( tbi.AffinityMask == (pbi.AffinityMask & (~(DWORD_PTR)0 - 1)), "Unexpected thread affinity. Expected %Ix, got %Ix\n", pbi.AffinityMask & (~(DWORD_PTR)0 - 1), tbi.AffinityMask );
}
/* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */
thread_affinity = ~(DWORD_PTR)0;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
ok( broken(status == STATUS_INVALID_PARAMETER) || status == STATUS_SUCCESS,
- "Expected STATUS_SUCCESS, got %08x\n", status);
+ "Expected STATUS_SUCCESS, got %08lx\n", status);
if (si.dwNumberOfProcessors <= 1)
{
@@ -3013,35 +3014,35 @@ static void test_affinity(void)
if (status == STATUS_SUCCESS)
{
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "unexpected affinity %#lx\n", tbi.AffinityMask );
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "unexpected affinity %#Ix\n", tbi.AffinityMask );
}
else
skip("Cannot test thread affinity mask for 'all processors' flag\n");
proc_affinity = 2;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
proc_affinity = pbi.AffinityMask;
ok( proc_affinity == 2, "Unexpected process affinity\n" );
/* Setting the process affinity changes the thread affinity to match */
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( tbi.AffinityMask == 2, "Unexpected thread affinity\n" );
/* The thread affinity is restricted to the process affinity */
thread_affinity = 1;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
ok( status == STATUS_INVALID_PARAMETER,
- "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
proc_affinity = get_affinity_mask( si.dwNumberOfProcessors );
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
/* Resetting the process affinity also resets the thread affinity */
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ),
"Unexpected thread affinity\n" );
}
@@ -3061,14 +3062,14 @@ static void test_HideFromDebugger(void)
dummy = 0;
status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG) );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
dummy = 0;
status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, NULL, 0 );
- ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status );
+ ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status );
status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, NULL, 0 );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
dummy = 0;
status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL );
if (status == STATUS_INVALID_INFO_CLASS)
@@ -3077,32 +3078,32 @@ static void test_HideFromDebugger(void)
return;
}
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
dummy = 0;
status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
dummy = 0;
status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
- ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
+ ok( dummy == 1, "Expected dummy == 1, got %08lx\n", dummy );
stop_event = CreateEventA( NULL, FALSE, FALSE, NULL );
ok( stop_event != NULL, "CreateEvent failed\n" );
thread = CreateThread( NULL, 0, hide_from_debugger_thread, stop_event, 0, NULL );
- ok( thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError() );
+ ok( thread != INVALID_HANDLE_VALUE, "CreateThread failed with %ld\n", GetLastError() );
dummy = 0;
status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL );
- ok( status == STATUS_SUCCESS, "got %#x\n", status );
- ok( dummy == 0, "Expected dummy == 0, got %08x\n", dummy );
+ ok( status == STATUS_SUCCESS, "got %#lx\n", status );
+ ok( dummy == 0, "Expected dummy == 0, got %08lx\n", dummy );
status = pNtSetInformationThread( thread, ThreadHideFromDebugger, NULL, 0 );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
dummy = 0;
status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL );
- ok( status == STATUS_SUCCESS, "got %#x\n", status );
- ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy );
+ ok( status == STATUS_SUCCESS, "got %#lx\n", status );
+ ok( dummy == 1, "Expected dummy == 1, got %08lx\n", dummy );
SetEvent( stop_event );
WaitForSingleObject( thread, INFINITE );
@@ -3129,41 +3130,41 @@ static void test_NtGetCurrentProcessorNumber(void)
GetSystemInfo(&si);
current_cpu = pNtGetCurrentProcessorNumber();
- if (winetest_debug > 1) trace("dwNumberOfProcessors: %d, current processor: %d\n", si.dwNumberOfProcessors, current_cpu);
+ if (winetest_debug > 1) trace("dwNumberOfProcessors: %ld, current processor: %ld\n", si.dwNumberOfProcessors, current_cpu);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL);
old_process_mask = pbi.AffinityMask;
- ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status);
status = pNtQueryInformationThread(GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL);
old_thread_mask = tbi.AffinityMask;
- ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status);
/* allow the test to run on all processors */
new_mask = get_affinity_mask( si.dwNumberOfProcessors );
status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &new_mask, sizeof(new_mask));
- ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status);
for (i = 0; i < si.dwNumberOfProcessors; i++)
{
new_mask = (DWORD_PTR)1 << i;
status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &new_mask, sizeof(new_mask));
- ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status);
+ ok(status == STATUS_SUCCESS, "%ld: got 0x%lx (expected STATUS_SUCCESS)\n", i, status);
status = pNtQueryInformationThread(GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL);
- ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status);
+ ok(status == STATUS_SUCCESS, "%ld: got 0x%lx (expected STATUS_SUCCESS)\n", i, status);
current_cpu = pNtGetCurrentProcessorNumber();
- ok((current_cpu == i), "%d (new_mask 0x%lx): running on processor %d (AffinityMask: 0x%lx)\n",
+ ok((current_cpu == i), "%ld (new_mask 0x%Ix): running on processor %ld (AffinityMask: 0x%Ix)\n",
i, new_mask, current_cpu, tbi.AffinityMask);
}
/* restore old values */
status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &old_process_mask, sizeof(old_process_mask));
- ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status);
status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &old_thread_mask, sizeof(old_thread_mask));
- ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status);
+ ok(status == STATUS_SUCCESS, "got 0x%lx (expected STATUS_SUCCESS)\n", status);
}
static void test_ThreadEnableAlignmentFaultFixup(void)
@@ -3173,28 +3174,28 @@ static void test_ThreadEnableAlignmentFaultFixup(void)
dummy = 0;
status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG), NULL );
- ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status );
+ ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status );
status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1, NULL );
- ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status );
+ ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status );
dummy = 1;
status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG) );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 0 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 1 );
- ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", status );
status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, &dummy, 1 );
- todo_wine ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status );
+ todo_wine ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08lx\n", status );
status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 1 );
- todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status );
+ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Expected STATUS_OBJECT_TYPE_MISMATCH, got %08lx\n", status );
dummy = 1;
status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1 );
- ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status );
dummy = 0;
status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 8 );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
}
static DWORD WINAPI start_address_thread(void *arg)
@@ -3207,8 +3208,8 @@ static DWORD WINAPI start_address_thread(void *arg)
ret = 0xdeadbeef;
status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress,
&entry, sizeof(entry), &ret);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
- ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(ret == sizeof(entry), "NtQueryInformationThread returned %lu bytes\n", ret);
ok(entry == (void *)start_address_thread, "expected %p, got %p\n", start_address_thread, entry);
return 0;
}
@@ -3231,8 +3232,8 @@ static void test_thread_start_address(void)
ret = 0xdeadbeef;
status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress,
&entry, sizeof(entry), &ret);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
- ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(ret == sizeof(entry), "NtQueryInformationThread returned %lu bytes\n", ret);
expected_entry = (void *)((char *)module + nt->OptionalHeader.AddressOfEntryPoint);
ok(entry == expected_entry, "expected %p, got %p\n", expected_entry, entry);
@@ -3240,7 +3241,7 @@ static void test_thread_start_address(void)
status = pNtSetInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress,
&entry, sizeof(entry));
ok(status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, /* >= Vista */
- "expected STATUS_SUCCESS or STATUS_INVALID_PARAMETER, got %08x\n", status);
+ "expected STATUS_SUCCESS or STATUS_INVALID_PARAMETER, got %08lx\n", status);
if (status == STATUS_SUCCESS)
{
@@ -3248,15 +3249,15 @@ static void test_thread_start_address(void)
ret = 0xdeadbeef;
status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress,
&entry, sizeof(entry), &ret);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
- ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(ret == sizeof(entry), "NtQueryInformationThread returned %lu bytes\n", ret);
ok(entry == (void *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", entry);
}
thread = CreateThread(NULL, 0, start_address_thread, NULL, 0, NULL);
- ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError());
+ ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %ld\n", GetLastError());
ret = WaitForSingleObject(thread, 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);
CloseHandle(thread);
}
@@ -3268,12 +3269,12 @@ static void test_query_data_alignment(void)
value = 0xdeadbeef;
status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &ReturnLength);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
- ok(sizeof(value) == ReturnLength, "Inconsistent length %u\n", ReturnLength);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
+ ok(sizeof(value) == ReturnLength, "Inconsistent length %lu\n", ReturnLength);
#ifdef __arm__
ok(value == 32, "Expected 32, got %u\n", value);
#else
- ok(value == 64, "Expected 64, got %u\n", value);
+ ok(value == 64, "Expected 64, got %lu\n", value);
#endif
}
@@ -3290,34 +3291,34 @@ static void test_thread_lookup(void)
cid.UniqueProcess = ULongToHandle(GetCurrentProcessId());
cid.UniqueThread = ULongToHandle(GetCurrentThreadId());
status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid);
- ok(!status, "NtOpenThread returned %#x\n", status);
+ ok(!status, "NtOpenThread returned %#lx\n", status);
status = pNtOpenThread((HANDLE *)0xdeadbee0, THREAD_QUERY_INFORMATION, &attr, &cid);
- ok( status == STATUS_ACCESS_VIOLATION, "NtOpenThread returned %#x\n", status);
+ ok( status == STATUS_ACCESS_VIOLATION, "NtOpenThread returned %#lx\n", status);
status = pNtQueryObject(handle, ObjectBasicInformation, &obj_info, sizeof(obj_info), NULL);
- ok(!status, "NtQueryObject returned: %#x\n", status);
+ ok(!status, "NtQueryObject returned: %#lx\n", status);
ok(obj_info.GrantedAccess == (THREAD_QUERY_LIMITED_INFORMATION | THREAD_QUERY_INFORMATION)
|| broken(obj_info.GrantedAccess == THREAD_QUERY_INFORMATION), /* winxp */
- "GrantedAccess = %x\n", obj_info.GrantedAccess);
+ "GrantedAccess = %lx\n", obj_info.GrantedAccess);
status = pNtQueryInformationThread(handle, ThreadBasicInformation, &info, sizeof(info), NULL);
- ok(!status, "NtQueryInformationThread returned %#x\n", status);
+ ok(!status, "NtQueryInformationThread returned %#lx\n", status);
ok(info.ClientId.UniqueProcess == ULongToHandle(GetCurrentProcessId()),
- "UniqueProcess = %p expected %x\n", info.ClientId.UniqueProcess, GetCurrentProcessId());
+ "UniqueProcess = %p expected %lx\n", info.ClientId.UniqueProcess, GetCurrentProcessId());
ok(info.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()),
- "UniqueThread = %p expected %x\n", info.ClientId.UniqueThread, GetCurrentThreadId());
+ "UniqueThread = %p expected %lx\n", info.ClientId.UniqueThread, GetCurrentThreadId());
pNtClose(handle);
cid.UniqueProcess = 0;
cid.UniqueThread = ULongToHandle(GetCurrentThreadId());
status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid);
- ok(!status, "NtOpenThread returned %#x\n", status);
+ ok(!status, "NtOpenThread returned %#lx\n", status);
status = pNtQueryInformationThread(handle, ThreadBasicInformation, &info, sizeof(info), NULL);
- ok(!status, "NtQueryInformationThread returned %#x\n", status);
+ ok(!status, "NtQueryInformationThread returned %#lx\n", status);
ok(info.ClientId.UniqueProcess == ULongToHandle(GetCurrentProcessId()),
- "UniqueProcess = %p expected %x\n", info.ClientId.UniqueProcess, GetCurrentProcessId());
+ "UniqueProcess = %p expected %lx\n", info.ClientId.UniqueProcess, GetCurrentProcessId());
ok(info.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()),
- "UniqueThread = %p expected %x\n", info.ClientId.UniqueThread, GetCurrentThreadId());
+ "UniqueThread = %p expected %lx\n", info.ClientId.UniqueThread, GetCurrentThreadId());
pNtClose(handle);
cid.UniqueProcess = ULongToHandle(0xdeadbeef);
@@ -3325,7 +3326,7 @@ static void test_thread_lookup(void)
handle = (HANDLE)0xdeadbeef;
status = NtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid);
todo_wine
- ok(status == STATUS_INVALID_CID, "NtOpenThread returned %#x\n", status);
+ ok(status == STATUS_INVALID_CID, "NtOpenThread returned %#lx\n", status);
todo_wine
ok( !handle || broken(handle == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle );
if (!status) pNtClose(handle);
@@ -3335,7 +3336,7 @@ static void test_thread_lookup(void)
handle = (HANDLE)0xdeadbeef;
status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid);
ok(status == STATUS_INVALID_CID || broken(status == STATUS_INVALID_PARAMETER) /* winxp */,
- "NtOpenThread returned %#x\n", status);
+ "NtOpenThread returned %#lx\n", status);
ok( !handle || broken(handle == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle );
}
@@ -3348,25 +3349,25 @@ static void test_thread_info(void)
data = 0xcccccccc;
status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread,
&data, sizeof(data), &len );
- ok( !status, "failed %x\n", status );
- ok( data == 0 || data == 1, "wrong data %x\n", data );
- ok( len == sizeof(data), "wrong len %u\n", len );
+ ok( !status, "failed %lx\n", status );
+ ok( data == 0 || data == 1, "wrong data %lx\n", data );
+ ok( len == sizeof(data), "wrong len %lu\n", len );
len = 0xdeadbeef;
data = 0xcccccccc;
status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread,
&data, sizeof(data) - 1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %x\n", status );
- ok( data == 0xcccccccc, "wrong data %x\n", data );
- ok( len == 0xdeadbeef, "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %lx\n", status );
+ ok( data == 0xcccccccc, "wrong data %lx\n", data );
+ ok( len == 0xdeadbeef, "wrong len %lu\n", len );
len = 0xdeadbeef;
data = 0xcccccccc;
status = pNtQueryInformationThread( GetCurrentThread(), ThreadAmILastThread,
&data, sizeof(data) + 1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %x\n", status );
- ok( data == 0xcccccccc, "wrong data %x\n", data );
- ok( len == 0xdeadbeef, "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "failed %lx\n", status );
+ ok( data == 0xcccccccc, "wrong data %lx\n", data );
+ ok( len == 0xdeadbeef, "wrong len %lu\n", len );
}
static void test_debug_object(void)
@@ -3379,44 +3380,44 @@ static void test_debug_object(void)
DEBUG_EVENT event;
status = pNtCreateDebugObject( &handle, DEBUG_ALL_ACCESS, &attr, 0 );
- ok( !status, "NtCreateDebugObject failed %x\n", status );
+ ok( !status, "NtCreateDebugObject failed %lx\n", status );
status = pNtSetInformationDebugObject( handle, 0, &flag, sizeof(ULONG), &len );
- ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %lx\n", status );
status = pNtSetInformationDebugObject( handle, 2, &flag, sizeof(ULONG), &len );
- ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %lx\n", status );
status = pNtSetInformationDebugObject( (HANDLE)0xdead, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG), &len );
- ok( status == STATUS_INVALID_HANDLE, "NtSetInformationDebugObject failed %x\n", status );
+ ok( status == STATUS_INVALID_HANDLE, "NtSetInformationDebugObject failed %lx\n", status );
len = 0xdead;
status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG) + 1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %x\n", status );
- ok( len == sizeof(ULONG), "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %lx\n", status );
+ ok( len == sizeof(ULONG), "wrong len %lu\n", len );
len = 0xdead;
status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG) - 1, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %x\n", status );
- ok( len == sizeof(ULONG), "wrong len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtSetInformationDebugObject failed %lx\n", status );
+ ok( len == sizeof(ULONG), "wrong len %lu\n", len );
len = 0xdead;
status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG), &len );
- ok( !status, "NtSetInformationDebugObject failed %x\n", status );
- ok( !len, "wrong len %u\n", len );
+ ok( !status, "NtSetInformationDebugObject failed %lx\n", status );
+ ok( !len, "wrong len %lu\n", len );
flag = DEBUG_KILL_ON_CLOSE;
status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG), &len );
- ok( !status, "NtSetInformationDebugObject failed %x\n", status );
- ok( !len, "wrong len %u\n", len );
+ ok( !status, "NtSetInformationDebugObject failed %lx\n", status );
+ ok( !len, "wrong len %lu\n", len );
for (flag = 2; flag; flag <<= 1)
{
status = pNtSetInformationDebugObject( handle, DebugObjectKillProcessOnExitInformation,
&flag, sizeof(ULONG), &len );
- ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NtSetInformationDebugObject failed %lx\n", status );
}
pNtClose( handle );
@@ -3425,39 +3426,39 @@ static void test_debug_object(void)
state.NewState = DbgIdle;
memset( &event, 0xcc, sizeof(event) );
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
+ ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
state.NewState = DbgReplyPending;
memset( &event, 0xcc, sizeof(event) );
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
+ ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
state.NewState = 11;
memset( &event, 0xcc, sizeof(event) );
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
+ ok( status == STATUS_UNSUCCESSFUL, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
state.NewState = DbgExitProcessStateChange;
state.StateInfo.ExitProcess.ExitStatus = 0x123456;
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( !status, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
- ok( event.u.ExitProcess.dwExitCode == 0x123456, "event not updated %x\n", event.u.ExitProcess.dwExitCode );
+ ok( !status, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
+ ok( event.u.ExitProcess.dwExitCode == 0x123456, "event not updated %lx\n", event.u.ExitProcess.dwExitCode );
memset( &state, 0xdd, sizeof(state) );
state.NewState = DbgCreateProcessStateChange;
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( !status, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
- ok( event.u.CreateProcessInfo.nDebugInfoSize == 0xdddddddd, "event not updated %x\n", event.u.CreateProcessInfo.nDebugInfoSize );
+ ok( !status, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
+ ok( event.u.CreateProcessInfo.nDebugInfoSize == 0xdddddddd, "event not updated %lx\n", event.u.CreateProcessInfo.nDebugInfoSize );
ok( event.u.CreateProcessInfo.lpThreadLocalBase == NULL, "event not updated %p\n", event.u.CreateProcessInfo.lpThreadLocalBase );
ok( event.u.CreateProcessInfo.lpImageName == NULL, "event not updated %p\n", event.u.CreateProcessInfo.lpImageName );
ok( event.u.CreateProcessInfo.fUnicode == TRUE, "event not updated %x\n", event.u.CreateProcessInfo.fUnicode );
@@ -3465,10 +3466,10 @@ static void test_debug_object(void)
memset( &state, 0xdd, sizeof(state) );
state.NewState = DbgLoadDllStateChange;
status = pDbgUiConvertStateChangeStructure( &state, &event );
- ok( !status, "DbgUiConvertStateChangeStructure failed %x\n", status );
- ok( event.dwProcessId == 0xdddddddd, "event not updated %x\n", event.dwProcessId );
- ok( event.dwThreadId == 0xdddddddd, "event not updated %x\n", event.dwThreadId );
- ok( event.u.LoadDll.nDebugInfoSize == 0xdddddddd, "event not updated %x\n", event.u.LoadDll.nDebugInfoSize );
+ ok( !status, "DbgUiConvertStateChangeStructure failed %lx\n", status );
+ ok( event.dwProcessId == 0xdddddddd, "event not updated %lx\n", event.dwProcessId );
+ ok( event.dwThreadId == 0xdddddddd, "event not updated %lx\n", event.dwThreadId );
+ ok( event.u.LoadDll.nDebugInfoSize == 0xdddddddd, "event not updated %lx\n", event.u.LoadDll.nDebugInfoSize );
ok( PtrToUlong(event.u.LoadDll.lpImageName) == 0xdddddddd, "event not updated %p\n", event.u.LoadDll.lpImageName );
ok( event.u.LoadDll.fUnicode == TRUE, "event not updated %x\n", event.u.LoadDll.fUnicode );
}
@@ -3480,7 +3481,7 @@ static void test_process_instrumentation_callback(void)
status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, NULL, 0 );
ok( status == STATUS_INFO_LENGTH_MISMATCH /* Win10 */ || status == STATUS_INVALID_INFO_CLASS
- || status == STATUS_NOT_SUPPORTED, "Got unexpected status %#x.\n", status );
+ || status == STATUS_NOT_SUPPORTED, "Got unexpected status %#lx.\n", status );
if (status != STATUS_INFO_LENGTH_MISMATCH)
{
win_skip( "ProcessInstrumentationCallback is not supported.\n" );
@@ -3490,13 +3491,13 @@ static void test_process_instrumentation_callback(void)
memset(&info, 0, sizeof(info));
status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, sizeof(info) );
ok( status == STATUS_SUCCESS /* Win 10 */ || broken( status == STATUS_PRIVILEGE_NOT_HELD )
- || broken( status == STATUS_INFO_LENGTH_MISMATCH ), "Got unexpected status %#x.\n", status );
+ || broken( status == STATUS_INFO_LENGTH_MISMATCH ), "Got unexpected status %#lx.\n", status );
memset(&info, 0, sizeof(info));
status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, 2 * sizeof(info) );
ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH
|| broken( status == STATUS_PRIVILEGE_NOT_HELD ) /* some versions and machines before Win10 */,
- "Got unexpected status %#x.\n", status );
+ "Got unexpected status %#lx.\n", status );
}
static void test_debuggee_dbgport(int argc, char **argv)
@@ -3514,21 +3515,21 @@ static void test_debuggee_dbgport(int argc, char **argv)
}
access = strtoul(argv[1], NULL, 0);
- winetest_push_context("debug object access %08x", access);
+ winetest_push_context("debug object access %08lx", access);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugPort,
&debug_port, sizeof(debug_port), NULL );
- ok( !status, "NtQueryInformationProcess ProcessDebugPort failed, status %#x.\n", status );
- ok( debug_port == ~(DWORD_PTR)0, "Expected port %#lx, got %#lx.\n", ~(DWORD_PTR)0, debug_port );
+ ok( !status, "NtQueryInformationProcess ProcessDebugPort failed, status %#lx.\n", status );
+ ok( debug_port == ~(DWORD_PTR)0, "Expected port %#Ix, got %#Ix.\n", ~(DWORD_PTR)0, debug_port );
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugFlags,
&debug_flags, sizeof(debug_flags), NULL );
- ok( !status, "NtQueryInformationProcess ProcessDebugFlags failed, status %#x.\n", status );
+ ok( !status, "NtQueryInformationProcess ProcessDebugFlags failed, status %#lx.\n", status );
expect_status = access ? STATUS_SUCCESS : STATUS_ACCESS_DENIED;
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugObjectHandle,
&handle, sizeof(handle), NULL );
- ok( status == expect_status, "NtQueryInformationProcess ProcessDebugObjectHandle expected status %#x, actual %#x.\n", expect_status, status );
+ ok( status == expect_status, "NtQueryInformationProcess ProcessDebugObjectHandle expected status %#lx, actual %#lx.\n", expect_status, status );
if (SUCCEEDED( status )) NtClose( handle );
winetest_pop_context();
2
1
19 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/om.c | 789 +++++++++++++++++++++++++------------------------
1 file changed, 395 insertions(+), 394 deletions(-)
diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index f872d6709a1..946f54523b3 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -18,6 +18,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include "ntdll_test.h"
#include "winternl.h"
@@ -88,37 +89,37 @@ static void test_case_sensitive (void)
pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test");
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE);
- ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08lx)\n", status);
status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, FALSE);
- ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status);
+ ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#lx\n", status);
pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\Test");
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, FALSE);
- ok(status == STATUS_SUCCESS, "Failed to create Event(%08x)\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to create Event(%08lx)\n", status);
pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\TEst");
InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL);
status = pNtOpenMutant(&h, GENERIC_ALL, &attr);
ok(status == STATUS_OBJECT_TYPE_MISMATCH,
- "NtOpenMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08x)\n", status);
+ "NtOpenMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status);
pNtClose(Mutant);
pRtlInitUnicodeString(&str, L"\\BASENamedObjects\\test");
InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL);
status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE);
- ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status);
+ ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#lx\n", status);
status = pNtCreateEvent(&h, GENERIC_ALL, &attr, NotificationEvent, FALSE);
ok(status == STATUS_OBJECT_NAME_COLLISION,
- "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION got(%08x)\n", status);
+ "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION got(%08lx)\n", status);
attr.Attributes = 0;
status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE);
ok(status == STATUS_OBJECT_PATH_NOT_FOUND,
- "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status);
+ "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status);
pNtClose(Event);
}
@@ -138,17 +139,17 @@ static void test_namespace_pipe(void)
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
status = pNtCreateNamedPipeFile((HANDLE *)0xdeadbee0, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout);
- ok(status == STATUS_ACCESS_VIOLATION, "Failed to create NamedPipe(%08x)\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "Failed to create NamedPipe(%08lx)\n", status);
status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout);
- ok(status == STATUS_SUCCESS, "Failed to create NamedPipe(%08x)\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to create NamedPipe(%08lx)\n", status);
h = (HANDLE)0xdeadbeef;
status = pNtCreateNamedPipeFile(&h, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout);
ok(status == STATUS_INSTANCE_NOT_AVAILABLE,
- "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08x)\n", status);
+ "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08lx)\n", status);
ok( !h || broken(h == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", h );
pRtlInitUnicodeString(&str, L"\\??\\PIPE\\TEST\\PIPE");
@@ -157,12 +158,12 @@ static void test_namespace_pipe(void)
status = pNtCreateNamedPipeFile(&h, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout);
ok(status == STATUS_INSTANCE_NOT_AVAILABLE,
- "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08x)\n", status);
+ "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08lx)\n", status);
ok( !h || broken(h == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", h );
h = CreateFileA("\\\\.\\pipe\\test\\pipe", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
OPEN_EXISTING, 0, 0 );
- ok(h != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%u)\n", GetLastError());
+ ok(h != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%lu)\n", GetLastError());
pNtClose(h);
pRtlInitUnicodeString(&str, L"\\??\\pipe\\test\\pipe");
@@ -173,7 +174,7 @@ static void test_namespace_pipe(void)
status == STATUS_PIPE_NOT_AVAILABLE ||
status == STATUS_OBJECT_NAME_INVALID || /* vista */
status == STATUS_OBJECT_NAME_NOT_FOUND, /* win8 */
- "NtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status);
+ "NtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status);
ok( !h || broken(h == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", h );
pRtlInitUnicodeString(&str, L"\\??\\pipe\\test");
@@ -182,17 +183,17 @@ static void test_namespace_pipe(void)
status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0);
ok(status == STATUS_OBJECT_NAME_NOT_FOUND ||
status == STATUS_OBJECT_NAME_INVALID, /* vista */
- "NtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08x)\n", status);
+ "NtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08lx)\n", status);
ok( !h || broken(h == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", h );
str.Length -= 4 * sizeof(WCHAR);
status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0);
- ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded got %08lx\n", status);
pNtClose( h );
str.Length -= sizeof(WCHAR);
status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0);
- ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenFile should have succeeded got %08lx\n", status);
pNtClose( h );
pNtClose(pipe);
@@ -209,11 +210,11 @@ static void check_create_open_dir_( int line, HANDLE parent, const WCHAR *name,
RtlInitUnicodeString( &str, name );
InitializeObjectAttributes( &attr, &str, 0, parent, NULL );
status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok_(__FILE__, line)( status == expect, "NtCreateDirectoryObject(%s) got %08x\n", debugstr_w(name), status );
+ ok_(__FILE__, line)( status == expect, "NtCreateDirectoryObject(%s) got %08lx\n", debugstr_w(name), status );
if (!status) pNtClose( h );
status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok_(__FILE__, line)( status == expect, "NtOpenDirectoryObject(%s) got %08x\n", debugstr_w(name), status );
+ ok_(__FILE__, line)( status == expect, "NtOpenDirectoryObject(%s) got %08lx\n", debugstr_w(name), status );
if (!status) pNtClose( h );
}
@@ -242,13 +243,13 @@ static HANDLE get_base_dir(void)
WCHAR name[40];
h = CreateMutexW( NULL, FALSE, objname );
- ok(h != 0, "CreateMutexA failed got ret=%p (%d)\n", h, GetLastError());
+ ok(h != 0, "CreateMutexA failed got ret=%p (%ld)\n", h, GetLastError());
InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, 0, NULL);
swprintf( name, ARRAY_SIZE(name), L"\\BaseNamedObjects\\Session\\%u", NtCurrentTeb()->Peb->SessionId );
RtlInitUnicodeString( &str, name );
status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
ok(is_correct_dir( dir, objname ), "wrong dir\n");
pNtClose( h );
@@ -267,86 +268,86 @@ static void test_name_collisions(void)
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
RtlInitUnicodeString(&str, L"\\");
status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_OBJECT_NAME_COLLISION, "NtCreateDirectoryObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_COLLISION, "NtCreateDirectoryObject got %08lx\n", status );
InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, 0, NULL);
status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_OBJECT_NAME_EXISTS, "NtCreateDirectoryObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_EXISTS, "NtCreateDirectoryObject got %08lx\n", status );
pNtClose(h);
status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE);
ok(status == STATUS_OBJECT_TYPE_MISMATCH,
- "NtCreateMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08x)\n", status);
+ "NtCreateMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status);
RtlInitUnicodeString(&str, L"\\??\\PIPE\\om.c-mutant");
status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE);
- todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status);
+ todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#lx\n", status);
dir = get_base_dir();
RtlInitUnicodeString(&str, L"om.c-test");
InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, dir, NULL);
h = CreateMutexA(NULL, FALSE, "om.c-test");
- ok(h != 0, "CreateMutexA failed got ret=%p (%d)\n", h, GetLastError());
+ ok(h != 0, "CreateMutexA failed got ret=%p (%ld)\n", h, GetLastError());
status = pNtCreateMutant(&h1, GENERIC_ALL, &attr, FALSE);
ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL,
- "NtCreateMutant should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status);
+ "NtCreateMutant should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status);
h2 = CreateMutexA(NULL, FALSE, "om.c-test");
winerr = GetLastError();
ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS,
- "CreateMutexA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr);
+ "CreateMutexA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr);
pNtClose(h);
pNtClose(h1);
pNtClose(h2);
h = CreateEventA(NULL, FALSE, FALSE, "om.c-test");
- ok(h != 0, "CreateEventA failed got ret=%p (%d)\n", h, GetLastError());
+ ok(h != 0, "CreateEventA failed got ret=%p (%ld)\n", h, GetLastError());
status = pNtCreateEvent(&h1, GENERIC_ALL, &attr, NotificationEvent, FALSE);
ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL,
- "NtCreateEvent should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status);
+ "NtCreateEvent should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status);
h2 = CreateEventA(NULL, FALSE, FALSE, "om.c-test");
winerr = GetLastError();
ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS,
- "CreateEventA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr);
+ "CreateEventA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr);
pNtClose(h);
pNtClose(h1);
pNtClose(h2);
h = CreateSemaphoreA(NULL, 1, 2, "om.c-test");
- ok(h != 0, "CreateSemaphoreA failed got ret=%p (%d)\n", h, GetLastError());
+ ok(h != 0, "CreateSemaphoreA failed got ret=%p (%ld)\n", h, GetLastError());
status = pNtCreateSemaphore(&h1, GENERIC_ALL, &attr, 1, 2);
ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL,
- "NtCreateSemaphore should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status);
+ "NtCreateSemaphore should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status);
h2 = CreateSemaphoreA(NULL, 1, 2, "om.c-test");
winerr = GetLastError();
ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS,
- "CreateSemaphoreA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr);
+ "CreateSemaphoreA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr);
pNtClose(h);
pNtClose(h1);
pNtClose(h2);
h = CreateWaitableTimerA(NULL, TRUE, "om.c-test");
- ok(h != 0, "CreateWaitableTimerA failed got ret=%p (%d)\n", h, GetLastError());
+ ok(h != 0, "CreateWaitableTimerA failed got ret=%p (%ld)\n", h, GetLastError());
status = pNtCreateTimer(&h1, GENERIC_ALL, &attr, NotificationTimer);
ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL,
- "NtCreateTimer should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status);
+ "NtCreateTimer should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status);
h2 = CreateWaitableTimerA(NULL, TRUE, "om.c-test");
winerr = GetLastError();
ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS,
- "CreateWaitableTimerA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr);
+ "CreateWaitableTimerA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr);
pNtClose(h);
pNtClose(h1);
pNtClose(h2);
h = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 256, "om.c-test");
- ok(h != 0, "CreateFileMappingA failed got ret=%p (%d)\n", h, GetLastError());
+ ok(h != 0, "CreateFileMappingA failed got ret=%p (%ld)\n", h, GetLastError());
size.u.LowPart = 256;
size.u.HighPart = 0;
status = pNtCreateSection(&h1, SECTION_MAP_WRITE, &attr, &size, PAGE_READWRITE, SEC_COMMIT, 0);
ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL,
- "NtCreateSection should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status);
+ "NtCreateSection should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status);
h2 = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 256, "om.c-test");
winerr = GetLastError();
ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS,
- "CreateFileMappingA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr);
+ "CreateFileMappingA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr);
pNtClose(h);
pNtClose(h1);
pNtClose(h2);
@@ -367,9 +368,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr,
ret = ret2 = (HANDLE)0xdeadbeef;
status = pNtCreateMutant( &ret, GENERIC_ALL, attr, FALSE );
- ok( status == create_expect, "%u: NtCreateMutant failed %x\n", line, status );
+ ok( status == create_expect, "%u: NtCreateMutant failed %lx\n", line, status );
status2 = pNtOpenMutant( &ret2, GENERIC_ALL, attr );
- ok( status2 == open_expect, "%u: NtOpenMutant failed %x\n", line, status2 );
+ ok( status2 == open_expect, "%u: NtOpenMutant failed %lx\n", line, status2 );
if (!status) pNtClose( ret );
else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateMutant handle %p\n", line, ret );
@@ -379,9 +380,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr,
ret = ret2 = (HANDLE)0xdeadbeef;
status = pNtCreateSemaphore( &ret, GENERIC_ALL, attr, 1, 2 );
- ok( status == create_expect, "%u: NtCreateSemaphore failed %x\n", line, status );
+ ok( status == create_expect, "%u: NtCreateSemaphore failed %lx\n", line, status );
status2 = pNtOpenSemaphore( &ret2, GENERIC_ALL, attr );
- ok( status2 == open_expect, "%u: NtOpenSemaphore failed %x\n", line, status2 );
+ ok( status2 == open_expect, "%u: NtOpenSemaphore failed %lx\n", line, status2 );
if (!status) pNtClose( ret );
else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateSemaphore handle %p\n", line, ret );
@@ -392,15 +393,15 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr,
status = pNtCreateSemaphore( &ret, GENERIC_ALL, attr, 2, 1 );
ok( status == STATUS_INVALID_PARAMETER ||
(status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION),
- "%u: NtCreateSemaphore failed %x\n", line, status );
+ "%u: NtCreateSemaphore failed %lx\n", line, status );
ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateSemaphore handle %p\n", line, ret );
ret = ret2 = (HANDLE)0xdeadbeef;
status = pNtCreateEvent( &ret, GENERIC_ALL, attr, SynchronizationEvent, 0 );
- ok( status == create_expect, "%u: NtCreateEvent failed %x\n", line, status );
+ ok( status == create_expect, "%u: NtCreateEvent failed %lx\n", line, status );
status2 = pNtOpenEvent( &ret2, GENERIC_ALL, attr );
- ok( status2 == open_expect, "%u: NtOpenEvent failed %x\n", line, status2 );
+ ok( status2 == open_expect, "%u: NtOpenEvent failed %lx\n", line, status2 );
if (!status) pNtClose( ret );
else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateEvent handle %p\n", line, ret );
@@ -411,15 +412,15 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr,
status = pNtCreateEvent( &ret, GENERIC_ALL, attr, 2, 0 );
ok( status == STATUS_INVALID_PARAMETER ||
(status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION),
- "%u: NtCreateEvent failed %x\n", line, status );
+ "%u: NtCreateEvent failed %lx\n", line, status );
ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateEvent handle %p\n", line, ret );
ret = ret2 = (HANDLE)0xdeadbeef;
status = pNtCreateKeyedEvent( &ret, GENERIC_ALL, attr, 0 );
- ok( status == create_expect, "%u: NtCreateKeyedEvent failed %x\n", line, status );
+ ok( status == create_expect, "%u: NtCreateKeyedEvent failed %lx\n", line, status );
status2 = pNtOpenKeyedEvent( &ret2, GENERIC_ALL, attr );
- ok( status2 == open_expect, "%u: NtOpenKeyedEvent failed %x\n", line, status2 );
+ ok( status2 == open_expect, "%u: NtOpenKeyedEvent failed %lx\n", line, status2 );
if (!status) pNtClose( ret );
else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateKeyedEvent handle %p\n", line, ret );
@@ -429,9 +430,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr,
ret = ret2 = (HANDLE)0xdeadbeef;
status = pNtCreateTimer( &ret, GENERIC_ALL, attr, NotificationTimer );
- ok( status == create_expect, "%u: NtCreateTimer failed %x\n", line, status );
+ ok( status == create_expect, "%u: NtCreateTimer failed %lx\n", line, status );
status2 = pNtOpenTimer( &ret2, GENERIC_ALL, attr );
- ok( status2 == open_expect, "%u: NtOpenTimer failed %x\n", line, status2 );
+ ok( status2 == open_expect, "%u: NtOpenTimer failed %lx\n", line, status2 );
if (!status) pNtClose( ret );
else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateTimer handle %p\n", line, ret );
@@ -442,15 +443,15 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr,
status = pNtCreateTimer( &ret, GENERIC_ALL, attr, 2 );
ok( status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_PARAMETER_4 ||
(status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION),
- "%u: NtCreateTimer failed %x\n", line, status );
+ "%u: NtCreateTimer failed %lx\n", line, status );
ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateTimer handle %p\n", line, ret );
ret = ret2 = (HANDLE)0xdeadbeef;
status = pNtCreateIoCompletion( &ret, GENERIC_ALL, attr, 0 );
- ok( status == create_expect, "%u: NtCreateIoCompletion failed %x\n", line, status );
+ ok( status == create_expect, "%u: NtCreateIoCompletion failed %lx\n", line, status );
status2 = pNtOpenIoCompletion( &ret2, GENERIC_ALL, attr );
- ok( status2 == open_expect, "%u: NtOpenIoCompletion failed %x\n", line, status2 );
+ ok( status2 == open_expect, "%u: NtOpenIoCompletion failed %lx\n", line, status2 );
if (!status) pNtClose( ret );
else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateIoCompletion handle %p\n", line, ret );
@@ -460,9 +461,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr,
ret = ret2 = (HANDLE)0xdeadbeef;
status = pNtCreateJobObject( &ret, GENERIC_ALL, attr );
- ok( status == create_expect, "%u: NtCreateJobObject failed %x\n", line, status );
+ ok( status == create_expect, "%u: NtCreateJobObject failed %lx\n", line, status );
status2 = pNtOpenJobObject( &ret2, GENERIC_ALL, attr );
- ok( status2 == open_expect, "%u: NtOpenJobObject failed %x\n", line, status2 );
+ ok( status2 == open_expect, "%u: NtOpenJobObject failed %lx\n", line, status2 );
if (!status) pNtClose( ret );
else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateJobObject handle %p\n", line, ret );
@@ -472,9 +473,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr,
ret = ret2 = (HANDLE)0xdeadbeef;
status = pNtCreateDirectoryObject( &ret, GENERIC_ALL, attr );
- ok( status == create_expect, "%u: NtCreateDirectoryObject failed %x\n", line, status );
+ ok( status == create_expect, "%u: NtCreateDirectoryObject failed %lx\n", line, status );
status2 = pNtOpenDirectoryObject( &ret2, GENERIC_ALL, attr );
- ok( status2 == open_expect, "%u: NtOpenDirectoryObject failed %x\n", line, status2 );
+ ok( status2 == open_expect, "%u: NtOpenDirectoryObject failed %lx\n", line, status2 );
if (!status) pNtClose( ret );
else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateDirectoryObject handle %p\n", line, ret );
@@ -484,9 +485,9 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr,
ret = ret2 = (HANDLE)0xdeadbeef;
status = pNtCreateSymbolicLinkObject( &ret, GENERIC_ALL, attr, &target );
- ok( status == create_expect, "%u: NtCreateSymbolicLinkObject failed %x\n", line, status );
+ ok( status == create_expect, "%u: NtCreateSymbolicLinkObject failed %lx\n", line, status );
status2 = pNtOpenSymbolicLinkObject( &ret2, GENERIC_ALL, attr );
- ok( status2 == open_expect, "%u: NtOpenSymbolicLinkObject failed %x\n", line, status2 );
+ ok( status2 == open_expect, "%u: NtOpenSymbolicLinkObject failed %lx\n", line, status2 );
if (!status) pNtClose( ret );
else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateSymbolicLinkObject handle %p\n", line, ret );
@@ -498,15 +499,15 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr,
status = pNtCreateSymbolicLinkObject( &ret, GENERIC_ALL, attr, &target );
ok( status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_PARAMETER_4 ||
(status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION),
- "%u: NtCreateSymbolicLinkObject failed %x\n", line, status );
+ "%u: NtCreateSymbolicLinkObject failed %lx\n", line, status );
ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateSymbolicLinkObject handle %p\n", line, ret );
ret = ret2 = (HANDLE)0xdeadbeef;
status = pNtCreateSection( &ret, SECTION_MAP_WRITE, attr, &size, PAGE_READWRITE, SEC_COMMIT, 0 );
- ok( status == create_expect, "%u: NtCreateSection failed %x\n", line, status );
+ ok( status == create_expect, "%u: NtCreateSection failed %lx\n", line, status );
status2 = pNtOpenSection( &ret2, SECTION_MAP_WRITE, attr );
- ok( status2 == open_expect, "%u: NtOpenSection failed %x\n", line, status2 );
+ ok( status2 == open_expect, "%u: NtOpenSection failed %lx\n", line, status2 );
if (!status) pNtClose( ret );
else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateSection handle %p\n", line, ret );
@@ -517,20 +518,20 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr,
status = pNtCreateSection( &ret, SECTION_MAP_WRITE, attr, &size, 0x1234, SEC_COMMIT, 0 );
ok( status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_PAGE_PROTECTION ||
(status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION),
- "%u: NtCreateSection failed %x\n", line, status );
+ "%u: NtCreateSection failed %lx\n", line, status );
ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateSection handle %p\n", line, ret );
ret = ret2 = (HANDLE)0xdeadbeef;
status = pNtCreateDebugObject( &ret, DEBUG_ALL_ACCESS, attr, 0 );
- ok( status == create_expect, "%u: NtCreateDebugObject failed %x\n", line, status );
+ ok( status == create_expect, "%u: NtCreateDebugObject failed %lx\n", line, status );
if (!status) pNtClose( ret );
else ok( !ret || broken( ret == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateDebugObject handle %p\n", line, ret );
status = pNtCreateDebugObject( &ret2, DEBUG_ALL_ACCESS, attr, 0xdead );
ok( status == STATUS_INVALID_PARAMETER ||
(status == STATUS_ACCESS_VIOLATION && create_expect == STATUS_ACCESS_VIOLATION),
- "%u: NtCreateDebugObject failed %x\n", line, status );
+ "%u: NtCreateDebugObject failed %lx\n", line, status );
ok( !ret2 || broken( ret2 == (HANDLE)0xdeadbeef ) /* vista */,
"%u: NtCreateDebugObject handle %p\n", line, ret );
}
@@ -560,96 +561,96 @@ static void test_name_limits(void)
attr.RootDirectory = get_base_dir();
str.Length = 0;
status = pNtCreateMutant( &ret, GENERIC_ALL, &attr2, FALSE );
- ok( status == STATUS_SUCCESS, "%u: NtCreateMutant failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateMutant failed %lx\n", str.Length, status );
attr3.RootDirectory = ret;
status = pNtOpenMutant( &ret2, GENERIC_ALL, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenMutant failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenMutant failed %lx\n", str.Length, status );
status = pNtOpenMutant( &ret2, GENERIC_ALL, &attr3 );
ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */,
- "%u: NtOpenMutant failed %x\n", str.Length, status );
+ "%u: NtOpenMutant failed %lx\n", str.Length, status );
pNtClose( ret );
status = pNtCreateSemaphore( &ret, GENERIC_ALL, &attr2, 1, 2 );
- ok( status == STATUS_SUCCESS, "%u: NtCreateSemaphore failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateSemaphore failed %lx\n", str.Length, status );
attr3.RootDirectory = ret;
status = pNtOpenSemaphore( &ret2, GENERIC_ALL, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSemaphore failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSemaphore failed %lx\n", str.Length, status );
status = pNtOpenSemaphore( &ret2, GENERIC_ALL, &attr3 );
ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */,
- "%u: NtOpenSemaphore failed %x\n", str.Length, status );
+ "%u: NtOpenSemaphore failed %lx\n", str.Length, status );
pNtClose( ret );
status = pNtCreateEvent( &ret, GENERIC_ALL, &attr2, SynchronizationEvent, 0 );
- ok( status == STATUS_SUCCESS, "%u: NtCreateEvent failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateEvent failed %lx\n", str.Length, status );
attr3.RootDirectory = ret;
status = pNtOpenEvent( &ret2, GENERIC_ALL, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenEvent failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenEvent failed %lx\n", str.Length, status );
status = pNtOpenEvent( &ret2, GENERIC_ALL, &attr3 );
ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */,
- "%u: NtOpenEvent failed %x\n", str.Length, status );
+ "%u: NtOpenEvent failed %lx\n", str.Length, status );
pNtClose( ret );
status = pNtCreateKeyedEvent( &ret, GENERIC_ALL, &attr2, 0 );
- ok( status == STATUS_SUCCESS, "%u: NtCreateKeyedEvent failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateKeyedEvent failed %lx\n", str.Length, status );
attr3.RootDirectory = ret;
status = pNtOpenKeyedEvent( &ret2, GENERIC_ALL, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenKeyedEvent failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenKeyedEvent failed %lx\n", str.Length, status );
status = pNtOpenKeyedEvent( &ret2, GENERIC_ALL, &attr3 );
ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */,
- "%u: NtOpenKeyedEvent failed %x\n", str.Length, status );
+ "%u: NtOpenKeyedEvent failed %lx\n", str.Length, status );
pNtClose( ret );
status = pNtCreateTimer( &ret, GENERIC_ALL, &attr2, NotificationTimer );
- ok( status == STATUS_SUCCESS, "%u: NtCreateTimer failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateTimer failed %lx\n", str.Length, status );
attr3.RootDirectory = ret;
status = pNtOpenTimer( &ret2, GENERIC_ALL, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenTimer failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenTimer failed %lx\n", str.Length, status );
status = pNtOpenTimer( &ret2, GENERIC_ALL, &attr3 );
ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */,
- "%u: NtOpenTimer failed %x\n", str.Length, status );
+ "%u: NtOpenTimer failed %lx\n", str.Length, status );
pNtClose( ret );
status = pNtCreateIoCompletion( &ret, GENERIC_ALL, &attr2, 0 );
- ok( status == STATUS_SUCCESS, "%u: NtCreateCompletion failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateCompletion failed %lx\n", str.Length, status );
attr3.RootDirectory = ret;
status = pNtOpenIoCompletion( &ret2, GENERIC_ALL, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenCompletion failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenCompletion failed %lx\n", str.Length, status );
status = pNtOpenIoCompletion( &ret2, GENERIC_ALL, &attr3 );
ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */,
- "%u: NtOpenCompletion failed %x\n", str.Length, status );
+ "%u: NtOpenCompletion failed %lx\n", str.Length, status );
pNtClose( ret );
status = pNtCreateJobObject( &ret, GENERIC_ALL, &attr2 );
- ok( status == STATUS_SUCCESS, "%u: NtCreateJobObject failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateJobObject failed %lx\n", str.Length, status );
attr3.RootDirectory = ret;
status = pNtOpenJobObject( &ret2, GENERIC_ALL, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenJobObject failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenJobObject failed %lx\n", str.Length, status );
status = pNtOpenJobObject( &ret2, GENERIC_ALL, &attr3 );
ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */,
- "%u: NtOpenJobObject failed %x\n", str.Length, status );
+ "%u: NtOpenJobObject failed %lx\n", str.Length, status );
pNtClose( ret );
status = pNtCreateDirectoryObject( &ret, GENERIC_ALL, &attr2 );
- ok( status == STATUS_SUCCESS, "%u: NtCreateDirectoryObject failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateDirectoryObject failed %lx\n", str.Length, status );
attr3.RootDirectory = ret;
status = pNtOpenDirectoryObject( &ret2, GENERIC_ALL, &attr );
ok( status == STATUS_SUCCESS || broken(status == STATUS_ACCESS_DENIED), /* winxp */
- "%u: NtOpenDirectoryObject failed %x\n", str.Length, status );
+ "%u: NtOpenDirectoryObject failed %lx\n", str.Length, status );
if (!status) pNtClose( ret2 );
status = pNtOpenDirectoryObject( &ret2, GENERIC_ALL, &attr3 );
- ok( status == STATUS_SUCCESS, "%u: NtOpenDirectoryObject failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtOpenDirectoryObject failed %lx\n", str.Length, status );
pNtClose( ret2 );
pNtClose( ret );
status = pNtCreateSymbolicLinkObject( &ret, GENERIC_ALL, &attr2, &target );
- ok( status == STATUS_SUCCESS, "%u: NtCreateSymbolicLinkObject failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateSymbolicLinkObject failed %lx\n", str.Length, status );
attr3.RootDirectory = ret;
status = pNtOpenSymbolicLinkObject( &ret2, GENERIC_ALL, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSymbolicLinkObject failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSymbolicLinkObject failed %lx\n", str.Length, status );
status = pNtOpenSymbolicLinkObject( &ret2, GENERIC_ALL, &attr3 );
- ok( status == STATUS_SUCCESS, "%u: NtOpenSymbolicLinkObject failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtOpenSymbolicLinkObject failed %lx\n", str.Length, status );
pNtClose( ret2 );
pNtClose( ret );
status = pNtCreateSection( &ret, SECTION_MAP_WRITE, &attr2, &size, PAGE_READWRITE, SEC_COMMIT, 0 );
- ok( status == STATUS_SUCCESS, "%u: NtCreateSection failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateSection failed %lx\n", str.Length, status );
attr3.RootDirectory = ret;
status = pNtOpenSection( &ret2, SECTION_MAP_WRITE, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSection failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSection failed %lx\n", str.Length, status );
status = pNtOpenSection( &ret2, SECTION_MAP_WRITE, &attr3 );
ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */,
- "%u: NtOpenSection failed %x\n", str.Length, status );
+ "%u: NtOpenSection failed %lx\n", str.Length, status );
pNtClose( ret );
str.Length = 67;
@@ -692,132 +693,132 @@ static void test_name_limits(void)
attr3.ObjectName = &str2;
pRtlInitUnicodeString( &str2, L"\\BaseNamedObjects\\Local" );
status = pNtOpenSymbolicLinkObject( &ret, SYMBOLIC_LINK_QUERY, &attr3 );
- ok( status == STATUS_SUCCESS, "can't open BaseNamedObjects\\Local %x\n", status );
+ ok( status == STATUS_SUCCESS, "can't open BaseNamedObjects\\Local %lx\n", status );
attr3.ObjectName = &str;
attr3.RootDirectory = ret;
test_all_kernel_objects( __LINE__, &attr3, STATUS_OBJECT_TYPE_MISMATCH, STATUS_OBJECT_TYPE_MISMATCH );
pNtClose( attr3.RootDirectory );
status = pNtCreateMutant( &ret, GENERIC_ALL, NULL, FALSE );
- ok( status == STATUS_SUCCESS, "NULL: NtCreateMutant failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NULL: NtCreateMutant failed %lx\n", status );
pNtClose( ret );
status = pNtCreateMutant( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, FALSE );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateMutant failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateMutant failed %lx\n", status );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenMutant( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenMutant failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenMutant failed %lx\n", status );
ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret );
status = pNtOpenMutant( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenMutant failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenMutant failed %lx\n", status );
status = pNtCreateSemaphore( &ret, GENERIC_ALL, NULL, 1, 2 );
- ok( status == STATUS_SUCCESS, "NULL: NtCreateSemaphore failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NULL: NtCreateSemaphore failed %lx\n", status );
pNtClose( ret );
status = pNtCreateSemaphore( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, 1, 2 );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSemaphore failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSemaphore failed %lx\n", status );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenSemaphore( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSemaphore failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSemaphore failed %lx\n", status );
ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret );
status = pNtOpenSemaphore( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSemaphore failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSemaphore failed %lx\n", status );
status = pNtCreateEvent( &ret, GENERIC_ALL, NULL, SynchronizationEvent, 0 );
- ok( status == STATUS_SUCCESS, "NULL: NtCreateEvent failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NULL: NtCreateEvent failed %lx\n", status );
pNtClose( ret );
status = pNtCreateEvent( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, SynchronizationEvent, 0 );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateEvent failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateEvent failed %lx\n", status );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenEvent( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenEvent failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenEvent failed %lx\n", status );
ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret );
status = pNtOpenEvent( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenEvent failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenEvent failed %lx\n", status );
status = pNtCreateKeyedEvent( &ret, GENERIC_ALL, NULL, 0 );
- ok( status == STATUS_SUCCESS, "NULL: NtCreateKeyedEvent failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NULL: NtCreateKeyedEvent failed %lx\n", status );
pNtClose( ret );
status = pNtCreateKeyedEvent( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, 0 );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKeyedEvent failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKeyedEvent failed %lx\n", status );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenKeyedEvent( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenKeyedEvent failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenKeyedEvent failed %lx\n", status );
ok( !ret, "handle set %p\n", ret );
status = pNtOpenKeyedEvent( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKeyedEvent failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKeyedEvent failed %lx\n", status );
status = pNtCreateTimer( &ret, GENERIC_ALL, NULL, NotificationTimer );
- ok( status == STATUS_SUCCESS, "NULL: NtCreateTimer failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NULL: NtCreateTimer failed %lx\n", status );
pNtClose( ret );
status = pNtCreateTimer( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, NotificationTimer );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateTimer failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateTimer failed %lx\n", status );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenTimer( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenTimer failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenTimer failed %lx\n", status );
ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret );
status = pNtOpenTimer( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenTimer failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenTimer failed %lx\n", status );
status = pNtCreateIoCompletion( &ret, GENERIC_ALL, NULL, 0 );
- ok( status == STATUS_SUCCESS, "NULL: NtCreateCompletion failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NULL: NtCreateCompletion failed %lx\n", status );
pNtClose( ret );
status = pNtCreateIoCompletion( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, 0 );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateCompletion failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateCompletion failed %lx\n", status );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenIoCompletion( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenCompletion failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenCompletion failed %lx\n", status );
ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret );
status = pNtOpenIoCompletion( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenCompletion failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenCompletion failed %lx\n", status );
status = pNtCreateJobObject( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_SUCCESS, "NULL: NtCreateJobObject failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NULL: NtCreateJobObject failed %lx\n", status );
pNtClose( ret );
status = pNtCreateJobObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateJobObject failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateJobObject failed %lx\n", status );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenJobObject( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenJobObject failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenJobObject failed %lx\n", status );
ok( !ret || broken(ret == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", ret );
status = pNtOpenJobObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenJobObject failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenJobObject failed %lx\n", status );
status = pNtCreateDirectoryObject( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_SUCCESS, "NULL: NtCreateDirectoryObject failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NULL: NtCreateDirectoryObject failed %lx\n", status );
pNtClose( ret );
status = pNtCreateDirectoryObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateDirectoryObject failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateDirectoryObject failed %lx\n", status );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenDirectoryObject( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenDirectoryObject failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenDirectoryObject failed %lx\n", status );
ok( !ret, "handle set %p\n", ret );
status = pNtOpenDirectoryObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenDirectoryObject failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenDirectoryObject failed %lx\n", status );
status = pNtCreateSymbolicLinkObject( &ret, GENERIC_ALL, NULL, &target );
ok( status == STATUS_ACCESS_VIOLATION || broken( status == STATUS_SUCCESS), /* winxp */
- "NULL: NtCreateSymbolicLinkObject failed %x\n", status );
+ "NULL: NtCreateSymbolicLinkObject failed %lx\n", status );
if (!status) pNtClose( ret );
status = pNtCreateSymbolicLinkObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL, &target );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSymbolicLinkObject failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSymbolicLinkObject failed %lx\n", status );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenSymbolicLinkObject( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSymbolicLinkObject failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSymbolicLinkObject failed %lx\n", status );
ok( !ret, "handle set %p\n", ret );
status = pNtOpenSymbolicLinkObject( (HANDLE *)0xdeadbee0, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSymbolicLinkObject failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSymbolicLinkObject failed %lx\n", status );
status = pNtCreateSection( &ret, SECTION_MAP_WRITE, NULL, &size, PAGE_READWRITE, SEC_COMMIT, 0 );
- ok( status == STATUS_SUCCESS, "NULL: NtCreateSection failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NULL: NtCreateSection failed %lx\n", status );
pNtClose( ret );
status = pNtCreateSection( (HANDLE *)0xdeadbee0, SECTION_MAP_WRITE, NULL, &size, PAGE_READWRITE, SEC_COMMIT, 0 );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSection failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateSection failed %lx\n", status );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenSection( &ret, SECTION_MAP_WRITE, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSection failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSection failed %lx\n", status );
ok( !ret, "handle set %p\n", ret );
status = pNtOpenSection( (HANDLE *)0xdeadbee0, SECTION_MAP_WRITE, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSection failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenSection failed %lx\n", status );
attr2.ObjectName = attr3.ObjectName = &str;
/* named pipes */
@@ -829,14 +830,14 @@ static void test_name_limits(void)
timeout.QuadPart = -10000;
status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout );
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status );
status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr2, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout );
- ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status );
+ ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status );
str.Length = 67;
status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr2, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout );
- ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status );
str.Length = 128;
for (attr.Length = 0; attr.Length <= 2 * sizeof(attr); attr.Length++)
{
@@ -844,33 +845,33 @@ static void test_name_limits(void)
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout );
if (attr.Length == sizeof(attr))
{
- ok( status == STATUS_SUCCESS, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status );
pNtClose( ret );
}
else ok( status == STATUS_INVALID_PARAMETER,
- "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status );
+ "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status );
}
attr.Length = sizeof(attr);
str.Length = 65532;
status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout );
- ok( status == STATUS_SUCCESS, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status );
pNtClose( ret );
str.Length = 65534;
status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout );
- ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateNamedPipeFile failed %lx\n", str.Length, status );
attr3.RootDirectory = 0;
attr2.ObjectName = attr3.ObjectName = NULL;
status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr2, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout );
- ok( status == STATUS_OBJECT_NAME_INVALID, "NULL: NtCreateNamedPipeFile failed %x\n", status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "NULL: NtCreateNamedPipeFile failed %lx\n", status );
status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr3, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout );
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NULL: NtCreateNamedPipeFile failed %x\n", status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NULL: NtCreateNamedPipeFile failed %lx\n", status );
status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, NULL, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtCreateNamedPipeFile failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtCreateNamedPipeFile failed %lx\n", status );
attr2.ObjectName = attr3.ObjectName = &str;
/* mailslots */
@@ -878,40 +879,40 @@ static void test_name_limits(void)
for (i = 0; i < 65536 / sizeof(WCHAR); i++) str.Buffer[i + wcslen( mailslotW )] = 'a';
str.Length = 0;
status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr, &iosb, 0, 0, 0, NULL );
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateMailslotFile failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status );
status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr2, &iosb, 0, 0, 0, NULL );
- ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateMailslotFile failed %x\n", str.Length, status );
+ ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status );
str.Length = 67;
status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr2, &iosb, 0, 0, 0, NULL );
- ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateMailslotFile failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status );
str.Length = 128;
for (attr.Length = 0; attr.Length <= 2 * sizeof(attr); attr.Length++)
{
status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr, &iosb, 0, 0, 0, NULL );
if (attr.Length == sizeof(attr))
{
- ok( status == STATUS_SUCCESS, "%u: NtCreateMailslotFile failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status );
pNtClose( ret );
}
else ok( status == STATUS_INVALID_PARAMETER,
- "%u: NtCreateMailslotFile failed %x\n", str.Length, status );
+ "%u: NtCreateMailslotFile failed %lx\n", str.Length, status );
}
attr.Length = sizeof(attr);
str.Length = 65532;
status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr, &iosb, 0, 0, 0, NULL );
- ok( status == STATUS_SUCCESS, "%u: NtCreateMailslotFile failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status );
pNtClose( ret );
str.Length = 65534;
status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr, &iosb, 0, 0, 0, NULL );
- ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateMailslotFile failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateMailslotFile failed %lx\n", str.Length, status );
attr3.RootDirectory = 0;
attr2.ObjectName = attr3.ObjectName = NULL;
status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr2, &iosb, 0, 0, 0, NULL );
- ok( status == STATUS_OBJECT_NAME_INVALID, "NULL: NtCreateMailslotFile failed %x\n", status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "NULL: NtCreateMailslotFile failed %lx\n", status );
status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr3, &iosb, 0, 0, 0, NULL );
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NULL: NtCreateMailslotFile failed %x\n", status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NULL: NtCreateMailslotFile failed %lx\n", status );
status = pNtCreateMailslotFile( &ret, GENERIC_ALL, NULL, &iosb, 0, 0, 0, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "NULL: NtCreateMailslotFile failed %x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "NULL: NtCreateMailslotFile failed %lx\n", status );
attr2.ObjectName = attr3.ObjectName = &str;
/* registry keys */
@@ -920,17 +921,17 @@ static void test_name_limits(void)
str.Length = 0;
status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL );
todo_wine
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateKey failed %x\n", str.Length, status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateKey failed %lx\n", str.Length, status );
status = pNtCreateKey( &ret, GENERIC_ALL, &attr2, 0, NULL, 0, NULL );
- ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateKey failed %x\n", str.Length, status );
+ ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateKey failed %lx\n", str.Length, status );
status = pNtOpenKey( &ret, GENERIC_ALL, &attr2 );
- ok( status == STATUS_INVALID_HANDLE, "%u: NtOpenKey failed %x\n", str.Length, status );
+ ok( status == STATUS_INVALID_HANDLE, "%u: NtOpenKey failed %lx\n", str.Length, status );
str.Length = (wcslen( registryW ) + 250) * sizeof(WCHAR) + 1;
status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL );
ok( status == STATUS_OBJECT_NAME_INVALID ||
status == STATUS_INVALID_PARAMETER ||
broken( status == STATUS_SUCCESS ), /* wow64 */
- "%u: NtCreateKey failed %x\n", str.Length, status );
+ "%u: NtCreateKey failed %lx\n", str.Length, status );
if (!status)
{
pNtDeleteKey( ret );
@@ -939,20 +940,20 @@ static void test_name_limits(void)
str.Length = (wcslen( registryW ) + 256) * sizeof(WCHAR);
status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL );
ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED,
- "%u: NtCreateKey failed %x\n", str.Length, status );
+ "%u: NtCreateKey failed %lx\n", str.Length, status );
status = pNtCreateKey( (HANDLE *)0xdeadbee0, GENERIC_ALL, &attr, 0, NULL, 0, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "%u: NtCreateKey failed %x\n", str.Length, status );
+ ok( status == STATUS_ACCESS_VIOLATION, "%u: NtCreateKey failed %lx\n", str.Length, status );
if (!status)
{
status = pNtOpenKey( &ret2, KEY_READ, &attr );
- ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %lx\n", str.Length, status );
pNtClose( ret2 );
status = pNtOpenKey( (HANDLE *)0xdeadbee0, KEY_READ, &attr );
- ok( status == STATUS_ACCESS_VIOLATION, "%u: NtOpenKey failed %x\n", str.Length, status );
+ ok( status == STATUS_ACCESS_VIOLATION, "%u: NtOpenKey failed %lx\n", str.Length, status );
attr3.RootDirectory = ret;
str.Length = 0;
status = pNtOpenKey( &ret2, KEY_READ, &attr3 );
- ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %lx\n", str.Length, status );
pNtClose( ret2 );
pNtDeleteKey( ret );
pNtClose( ret );
@@ -963,9 +964,9 @@ static void test_name_limits(void)
if (attr.Length == sizeof(attr))
{
status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL );
- ok( status == STATUS_SUCCESS, "%u: NtCreateKey failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtCreateKey failed %lx\n", str.Length, status );
status = pNtOpenKey( &ret2, KEY_READ, &attr );
- ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %x\n", str.Length, status );
+ ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %lx\n", str.Length, status );
pNtClose( ret2 );
pNtDeleteKey( ret );
pNtClose( ret );
@@ -973,9 +974,9 @@ static void test_name_limits(void)
else
{
status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %x\n", str.Length, status );
+ ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %lx\n", str.Length, status );
status = pNtOpenKey( &ret2, KEY_READ, &attr );
- ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %x\n", str.Length, status );
+ ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %lx\n", str.Length, status );
}
}
attr.Length = sizeof(attr);
@@ -985,7 +986,7 @@ static void test_name_limits(void)
ok( status == STATUS_OBJECT_NAME_INVALID ||
status == STATUS_INVALID_PARAMETER ||
broken( status == STATUS_SUCCESS ), /* win7 */
- "%u: NtCreateKey failed %x\n", str.Length, status );
+ "%u: NtCreateKey failed %lx\n", str.Length, status );
if (!status)
{
pNtDeleteKey( ret );
@@ -995,33 +996,33 @@ static void test_name_limits(void)
ok( status == STATUS_OBJECT_NAME_INVALID ||
status == STATUS_INVALID_PARAMETER ||
broken( status == STATUS_OBJECT_NAME_NOT_FOUND ), /* wow64 */
- "%u: NtOpenKey failed %x\n", str.Length, status );
+ "%u: NtOpenKey failed %lx\n", str.Length, status );
str.Length++;
status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %x\n", str.Length, status );
+ ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %lx\n", str.Length, status );
status = pNtOpenKey( &ret, GENERIC_ALL, &attr );
todo_wine
- ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %x\n", str.Length, status );
+ ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %lx\n", str.Length, status );
str.Length = 2000;
status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL );
- ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %x\n", str.Length, status );
+ ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %lx\n", str.Length, status );
status = pNtOpenKey( &ret, GENERIC_ALL, &attr );
todo_wine
- ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %x\n", str.Length, status );
+ ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %lx\n", str.Length, status );
/* some Windows versions change the error past 2050 chars, others past 4066 chars, some don't */
str.Length = 5000;
status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL );
ok( status == STATUS_BUFFER_OVERFLOW ||
status == STATUS_BUFFER_TOO_SMALL ||
status == STATUS_INVALID_PARAMETER,
- "%u: NtCreateKey failed %x\n", str.Length, status );
+ "%u: NtCreateKey failed %lx\n", str.Length, status );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenKey( &ret, GENERIC_ALL, &attr );
todo_wine
ok( status == STATUS_BUFFER_OVERFLOW ||
status == STATUS_BUFFER_TOO_SMALL ||
status == STATUS_INVALID_PARAMETER,
- "%u: NtOpenKey failed %x\n", str.Length, status );
+ "%u: NtOpenKey failed %lx\n", str.Length, status );
ok( !ret, "handle set %p\n", ret );
str.Length = 65534;
ret = (HANDLE)0xdeadbeef;
@@ -1029,7 +1030,7 @@ static void test_name_limits(void)
ok( status == STATUS_OBJECT_NAME_INVALID ||
status == STATUS_BUFFER_OVERFLOW ||
status == STATUS_BUFFER_TOO_SMALL,
- "%u: NtCreateKey failed %x\n", str.Length, status );
+ "%u: NtCreateKey failed %lx\n", str.Length, status );
ok( !ret, "handle set %p\n", ret );
ret = (HANDLE)0xdeadbeef;
status = pNtOpenKey( &ret, GENERIC_ALL, &attr );
@@ -1037,26 +1038,26 @@ static void test_name_limits(void)
ok( status == STATUS_OBJECT_NAME_INVALID ||
status == STATUS_BUFFER_OVERFLOW ||
status == STATUS_BUFFER_TOO_SMALL,
- "%u: NtOpenKey failed %x\n", str.Length, status );
+ "%u: NtOpenKey failed %lx\n", str.Length, status );
ok( !ret, "handle set %p\n", ret );
attr3.RootDirectory = 0;
attr2.ObjectName = attr3.ObjectName = NULL;
status = pNtCreateKey( &ret, GENERIC_ALL, &attr2, 0, NULL, 0, NULL );
todo_wine
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE /* vista wow64 */,
- "NULL: NtCreateKey failed %x\n", status );
+ "NULL: NtCreateKey failed %lx\n", status );
status = pNtCreateKey( &ret, GENERIC_ALL, &attr3, 0, NULL, 0, NULL );
todo_wine
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %lx\n", status );
status = pNtCreateKey( &ret, GENERIC_ALL, NULL, 0, NULL, 0, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %lx\n", status );
status = pNtOpenKey( &ret, GENERIC_ALL, &attr2 );
ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE /* vista wow64 */,
- "NULL: NtOpenKey failed %x\n", status );
+ "NULL: NtOpenKey failed %lx\n", status );
status = pNtOpenKey( &ret, GENERIC_ALL, &attr3 );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKey failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKey failed %lx\n", status );
status = pNtOpenKey( &ret, GENERIC_ALL, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKey failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKey failed %lx\n", status );
attr2.ObjectName = attr3.ObjectName = &str;
HeapFree( GetProcessHeap(), 0, str.Buffer );
@@ -1073,32 +1074,32 @@ static void test_directory(void)
/* No name and/or no attributes */
status = pNtCreateDirectoryObject(NULL, DIRECTORY_QUERY, &attr);
- ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#x\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#lx\n", status);
status = pNtOpenDirectoryObject(NULL, DIRECTORY_QUERY, &attr);
- ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#x\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#lx\n", status);
status = pNtCreateDirectoryObject(&h, DIRECTORY_QUERY, NULL);
- ok(status == STATUS_SUCCESS, "Failed to create Directory without attributes(%08x)\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to create Directory without attributes(%08lx)\n", status);
pNtClose(h);
status = pNtOpenDirectoryObject(&h, DIRECTORY_QUERY, NULL);
ok(status == STATUS_INVALID_PARAMETER,
- "NtOpenDirectoryObject should have failed with STATUS_INVALID_PARAMETER got(%08x)\n", status);
+ "NtOpenDirectoryObject should have failed with STATUS_INVALID_PARAMETER got(%08lx)\n", status);
InitializeObjectAttributes(&attr, NULL, 0, 0, NULL);
status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status );
status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08lx\n", status );
/* Bad name */
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
RtlInitUnicodeString(&str, L"");
status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status );
pNtClose(h);
status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08lx\n", status );
pNtClose(dir);
check_create_open_dir( NULL, L"BaseNamedObjects", STATUS_OBJECT_PATH_SYNTAX_BAD );
@@ -1109,9 +1110,9 @@ static void test_directory(void)
RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\om.c-test");
status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status );
status = pNtOpenDirectoryObject( &dir1, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to open directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to open directory %08lx\n", status );
pNtClose(h);
pNtClose(dir1);
@@ -1123,36 +1124,36 @@ static void test_directory(void)
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
status = pNtOpenSymbolicLinkObject(&dir, SYMBOLIC_LINK_QUERY, &attr);
- ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08lx)\n", status);
InitializeObjectAttributes(&attr, &str, 0, dir, NULL);
RtlInitUnicodeString(&str, L"one more level");
status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateDirectoryObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateDirectoryObject got %08lx\n", status );
RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\Local\\om.c-test" );
InitializeObjectAttributes( &attr, &str, 0, 0, NULL );
status = pNtCreateDirectoryObject( &dir1, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status );
RtlInitUnicodeString( &str, L"om.c-test" );
InitializeObjectAttributes( &attr, &str, 0, dir, NULL );
status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Failed to open directory %08x\n", status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Failed to open directory %08lx\n", status );
RtlInitUnicodeString( &str, L"om.c-event" );
InitializeObjectAttributes( &attr, &str, 0, dir1, NULL );
status = pNtCreateEvent( &h, GENERIC_ALL, &attr, SynchronizationEvent, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateEvent failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateEvent failed %lx\n", status );
status = pNtOpenEvent( &h2, GENERIC_ALL, &attr );
- ok( status == STATUS_SUCCESS, "NtOpenEvent failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NtOpenEvent failed %lx\n", status );
pNtClose( h2 );
RtlInitUnicodeString( &str, L"om.c-test\\om.c-event" );
InitializeObjectAttributes( &attr, &str, 0, dir, NULL );
status = pNtOpenEvent( &h2, GENERIC_ALL, &attr );
- ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenEvent failed %x\n", status );
+ ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenEvent failed %lx\n", status );
RtlInitUnicodeString( &str, L"\\BasedNamedObjects\\Local\\om.c-test\\om.c-event" );
InitializeObjectAttributes( &attr, &str, 0, 0, NULL );
status = pNtOpenEvent( &h2, GENERIC_ALL, &attr );
- ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenEvent failed %x\n", status );
+ ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenEvent failed %lx\n", status );
pNtClose( h );
pNtClose( dir1 );
@@ -1161,33 +1162,33 @@ static void test_directory(void)
len = 0xdeadbeef;
memset( buffer, 0xaa, sizeof(buffer) );
status = pNtQuerySymbolicLinkObject( dir, &str, &len );
- ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08lx\n", status );
full_len = str.Length + sizeof(WCHAR);
- ok( len == full_len, "bad length %u/%u\n", len, full_len );
+ ok( len == full_len, "bad length %lu/%lu\n", len, full_len );
ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" );
str.MaximumLength = str.Length;
str.Length = 0x4444;
len = 0xdeadbeef;
status = pNtQuerySymbolicLinkObject( dir, &str, &len );
- ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status );
- ok( len == full_len, "bad length %u/%u\n", len, full_len );
+ ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08lx\n", status );
+ ok( len == full_len, "bad length %lu/%lu\n", len, full_len );
ok( str.Length == 0x4444, "len set to %x\n", str.Length );
str.MaximumLength = 0;
str.Length = 0x4444;
len = 0xdeadbeef;
status = pNtQuerySymbolicLinkObject( dir, &str, &len );
- ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status );
- ok( len == full_len, "bad length %u/%u\n", len, full_len );
+ ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08lx\n", status );
+ ok( len == full_len, "bad length %lu/%lu\n", len, full_len );
ok( str.Length == 0x4444, "len set to %x\n", str.Length );
str.MaximumLength = full_len;
str.Length = 0x4444;
len = 0xdeadbeef;
status = pNtQuerySymbolicLinkObject( dir, &str, &len );
- ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status );
- ok( len == full_len, "bad length %u/%u\n", len, full_len );
+ ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08lx\n", status );
+ ok( len == full_len, "bad length %lu/%lu\n", len, full_len );
ok( str.Length == full_len - sizeof(WCHAR), "len set to %x\n", str.Length );
pNtClose(dir);
@@ -1195,11 +1196,11 @@ static void test_directory(void)
RtlInitUnicodeString(&str, L"\\BaseNamedObjects");
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
status = pNtOpenDirectoryObject( &dir, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to open directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to open directory %08lx\n", status );
InitializeObjectAttributes(&attr, NULL, 0, dir, NULL);
status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenDirectoryObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenDirectoryObject got %08lx\n", status );
check_create_open_dir( dir, L"", STATUS_SUCCESS );
check_create_open_dir( dir, L"\\", STATUS_OBJECT_PATH_SYNTAX_BAD );
@@ -1210,9 +1211,9 @@ static void test_directory(void)
InitializeObjectAttributes(&attr, &str, 0, dir, NULL);
RtlInitUnicodeString(&str, L"om.c-test");
status = pNtCreateDirectoryObject( &dir1, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status );
status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to open directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to open directory %08lx\n", status );
pNtClose(h);
pNtClose(dir1);
@@ -1222,24 +1223,24 @@ static void test_directory(void)
RtlInitUnicodeString(&str, L"\\");
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
status = pNtOpenDirectoryObject( &dir, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to open directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to open directory %08lx\n", status );
InitializeObjectAttributes(&attr, &str, 0, dir, NULL);
status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenDirectoryObject got %08lx\n", status );
pNtClose(dir);
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\om.c-test");
status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status );
RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\om.c-test\\one more level");
status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status );
pNtClose(h);
InitializeObjectAttributes(&attr, &str, 0, dir, NULL);
RtlInitUnicodeString(&str, L"one more level");
status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status );
pNtClose(h);
pNtClose(dir);
@@ -1247,15 +1248,15 @@ static void test_directory(void)
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\Global\\om.c-test");
status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status );
RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\Local\\om.c-test\\one more level");
status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status );
pNtClose(h);
InitializeObjectAttributes(&attr, &str, 0, dir, NULL);
RtlInitUnicodeString(&str, L"one more level");
status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to create directory %08lx\n", status );
pNtClose(h);
pNtClose(dir);
@@ -1264,27 +1265,27 @@ static void test_directory(void)
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
RtlInitUnicodeString(&str, L"\\BaseNamedObjects");
status = pNtOpenDirectoryObject( &dir, DIRECTORY_QUERY, &attr );
- ok( status == STATUS_SUCCESS, "Failed to open directory %08x\n", status );
+ ok( status == STATUS_SUCCESS, "Failed to open directory %08lx\n", status );
InitializeObjectAttributes(&attr, &str, 0, dir, NULL);
/* Test invalid paths */
RtlInitUnicodeString(&str, L"\\om.c-mutant");
status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE);
ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD,
- "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status);
+ "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status);
RtlInitUnicodeString(&str, L"\\om.c-mutant\\");
status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE);
ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD,
- "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status);
+ "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status);
RtlInitUnicodeString(&str, L"om.c\\-mutant");
status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE);
ok(status == STATUS_OBJECT_PATH_NOT_FOUND,
- "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status);
+ "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status);
RtlInitUnicodeString(&str, L"om.c-mutant");
status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE);
- ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08lx)\n", status);
pNtClose(h);
pNtClose(dir);
@@ -1302,29 +1303,29 @@ static void test_symboliclink(void)
InitializeObjectAttributes(&attr, NULL, 0, 0, NULL);
RtlInitUnicodeString(&target, L"\\DosDevices");
status = pNtCreateSymbolicLinkObject( NULL, SYMBOLIC_LINK_QUERY, &attr, &target );
- ok(status == STATUS_ACCESS_VIOLATION, "got %#x\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "got %#lx\n", status);
status = pNtOpenSymbolicLinkObject( NULL, SYMBOLIC_LINK_QUERY, &attr );
- ok(status == STATUS_ACCESS_VIOLATION, "got %#x\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "got %#lx\n", status);
status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, NULL);
ok(status == STATUS_ACCESS_VIOLATION,
- "NtCreateSymbolicLinkObject should have failed with STATUS_ACCESS_VIOLATION got(%08x)\n", status);
+ "NtCreateSymbolicLinkObject should have failed with STATUS_ACCESS_VIOLATION got(%08lx)\n", status);
status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL);
ok(status == STATUS_INVALID_PARAMETER,
- "NtOpenSymbolicLinkObject should have failed with STATUS_INVALID_PARAMETER got(%08x)\n", status);
+ "NtOpenSymbolicLinkObject should have failed with STATUS_INVALID_PARAMETER got(%08lx)\n", status);
/* No attributes */
status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, &target);
ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_VIOLATION, /* nt4 */
- "NtCreateSymbolicLinkObject failed(%08x)\n", status);
+ "NtCreateSymbolicLinkObject failed(%08lx)\n", status);
InitializeObjectAttributes(&attr, NULL, 0, 0, NULL);
memset(&target, 0, sizeof(target));
status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target);
- ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status);
+ ok(status == STATUS_INVALID_PARAMETER, "got %#lx\n", status);
status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr);
ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD,
- "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status);
+ "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status);
/* Bad name */
RtlInitUnicodeString(&target, L"anywhere");
@@ -1332,48 +1333,48 @@ static void test_symboliclink(void)
RtlInitUnicodeString(&str, L"");
status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target);
- ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08x)\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08lx)\n", status);
status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr);
ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD,
- "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status);
+ "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status);
pNtClose(link);
RtlInitUnicodeString(&str, L"\\");
status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr, &target);
todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH,
- "NtCreateSymbolicLinkObject should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08x)\n", status);
+ "NtCreateSymbolicLinkObject should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status);
RtlInitUnicodeString( &target, L"->Somewhere");
RtlInitUnicodeString( &str, L"BaseNamedObjects" );
status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target );
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateSymbolicLinkObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateSymbolicLinkObject got %08lx\n", status );
status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr );
- ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenSymbolicLinkObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenSymbolicLinkObject got %08lx\n", status );
RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\" );
status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target );
- ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08lx\n", status );
status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr );
- ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08lx\n", status );
RtlInitUnicodeString( &str, L"\\\\BaseNamedObjects" );
status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target );
- ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08lx\n", status );
status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr );
- ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08lx\n", status );
RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\\\om.c-test" );
status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target );
- ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "NtCreateSymbolicLinkObject got %08lx\n", status );
status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr );
- ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08x\n", status );
+ ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenSymbolicLinkObject got %08lx\n", status );
RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\om.c-test\\" );
status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target );
- ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status );
+ ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#lx\n", status );
status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr );
- ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status );
+ ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#lx\n", status );
/* Compound test */
dir = get_base_dir();
@@ -1381,13 +1382,13 @@ static void test_symboliclink(void)
RtlInitUnicodeString(&str, L"test-link");
RtlInitUnicodeString(&target, L"\\DosDevices");
status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target);
- ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08x)\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08lx)\n", status);
RtlInitUnicodeString(&str, L"test-link\\NUL");
status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0);
- ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08x)\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08lx)\n", status);
status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE);
- ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08x)\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08lx)\n", status);
pNtClose(h);
pNtClose(link);
@@ -1396,59 +1397,59 @@ static void test_symboliclink(void)
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\om.c-test");
status = pNtCreateDirectoryObject(&dir, DIRECTORY_QUERY, &attr);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
RtlInitUnicodeString(&str, L"\\DosDevices\\test_link");
RtlInitUnicodeString(&target, L"\\BaseNamedObjects");
status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target);
- ok(status == STATUS_SUCCESS && !!link, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS && !!link, "Got unexpected status %#lx.\n", status);
status = NtCreateFile(&h, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 );
- ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status);
status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr );
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
pNtClose(h);
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\om.c-test\\" );
status = NtCreateFile(&h, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 );
- ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#lx.\n", status);
InitializeObjectAttributes(&attr, &str, 0, link, NULL);
RtlInitUnicodeString( &str, L"om.c-test\\test_object" );
status = pNtCreateMutant( &h, GENERIC_ALL, &attr, FALSE );
- ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status);
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
RtlInitUnicodeString( &str, L"\\DosDevices\\test_link\\om.c-test\\test_object" );
status = pNtCreateMutant( &h, GENERIC_ALL, &attr, FALSE );
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
status = pNtOpenMutant( &h2, GENERIC_ALL, &attr );
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
pNtClose(h2);
RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\om.c-test\\test_object" );
status = pNtCreateMutant( &h2, GENERIC_ALL, &attr, FALSE );
- ok(status == STATUS_OBJECT_NAME_COLLISION, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_OBJECT_NAME_COLLISION, "Got unexpected status %#lx.\n", status);
InitializeObjectAttributes(&attr, &str, 0, link, NULL);
RtlInitUnicodeString( &str, L"om.c-test\\test_object" );
status = pNtOpenMutant( &h2, GENERIC_ALL, &attr );
- ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status);
pNtClose(h);
status = pNtOpenMutant( &h, GENERIC_ALL, &attr );
- ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status);
InitializeObjectAttributes(&attr, &str, 0, dir, NULL);
RtlInitUnicodeString( &str, L"test_object" );
status = pNtCreateMutant( &h, GENERIC_ALL, &attr, FALSE );
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
status = pNtOpenMutant( &h2, GENERIC_ALL, &attr );
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
pNtClose(h);
pNtClose(h2);
@@ -1465,15 +1466,15 @@ static void _test_file_info(unsigned line, HANDLE handle)
status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef);
ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* Vista+ */,
- "expected STATUS_NOT_IMPLEMENTED, got %x\n", status);
+ "expected STATUS_NOT_IMPLEMENTED, got %lx\n", status);
status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation);
- ok_(__FILE__,line)(status == STATUS_SUCCESS, "FileAccessInformation returned %x\n", status);
+ ok_(__FILE__,line)(status == STATUS_SUCCESS, "FileAccessInformation returned %lx\n", status);
status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf),
FileIoCompletionNotificationInformation);
ok_(__FILE__,line)(status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS) /* XP */,
- "FileIoCompletionNotificationInformation returned %x\n", status);
+ "FileIoCompletionNotificationInformation returned %lx\n", status);
}
#define test_no_file_info(a) _test_no_file_info(__LINE__,a)
@@ -1485,16 +1486,16 @@ static void _test_no_file_info(unsigned line, HANDLE handle)
status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef);
ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* Vista+ */,
- "expected STATUS_NOT_IMPLEMENTED, got %x\n", status);
+ "expected STATUS_NOT_IMPLEMENTED, got %lx\n", status);
status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation);
ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH,
- "FileAccessInformation returned %x\n", status);
+ "FileAccessInformation returned %lx\n", status);
status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf),
FileIoCompletionNotificationInformation);
ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* XP */,
- "FileIoCompletionNotificationInformation returned %x\n", status);
+ "FileIoCompletionNotificationInformation returned %lx\n", status);
}
static OBJECT_TYPE_INFORMATION all_types[256];
@@ -1513,13 +1514,13 @@ static void add_object_type( OBJECT_TYPE_INFORMATION *info )
if (all_types[i].TypeName.Buffer) /* existing type */
{
ok( !memcmp( &all_types[i].GenericMapping, &info->GenericMapping, sizeof(GENERIC_MAPPING) ),
- "%u: mismatched mappings %08x,%08x,%08x,%08x / %08x,%08x,%08x,%08x\n", i,
+ "%u: mismatched mappings %08lx,%08lx,%08lx,%08lx / %08lx,%08lx,%08lx,%08lx\n", i,
all_types[i].GenericMapping.GenericRead, all_types[i].GenericMapping.GenericWrite,
all_types[i].GenericMapping.GenericExecute, all_types[i].GenericMapping.GenericAll,
info->GenericMapping.GenericRead, info->GenericMapping.GenericWrite,
info->GenericMapping.GenericExecute, info->GenericMapping.GenericAll );
ok( all_types[i].ValidAccessMask == info->ValidAccessMask,
- "%u: mismatched access mask %08x / %08x\n", i,
+ "%u: mismatched access mask %08lx / %08lx\n", i,
all_types[i].ValidAccessMask, info->ValidAccessMask );
}
else /* add it */
@@ -1527,10 +1528,10 @@ static void add_object_type( OBJECT_TYPE_INFORMATION *info )
all_types[i] = *info;
RtlDuplicateUnicodeString( 1, &info->TypeName, &all_types[i].TypeName );
}
- ok( info->TotalNumberOfObjects <= info->HighWaterNumberOfObjects, "%s: wrong object counts %u/%u\n",
+ ok( info->TotalNumberOfObjects <= info->HighWaterNumberOfObjects, "%s: wrong object counts %lu/%lu\n",
debugstr_w( all_types[i].TypeName.Buffer ),
info->TotalNumberOfObjects, info->HighWaterNumberOfObjects );
- ok( info->TotalNumberOfHandles <= info->HighWaterNumberOfHandles, "%s: wrong handle counts %u/%u\n",
+ ok( info->TotalNumberOfHandles <= info->HighWaterNumberOfHandles, "%s: wrong handle counts %lu/%lu\n",
debugstr_w( all_types[i].TypeName.Buffer ),
info->TotalNumberOfHandles, info->HighWaterNumberOfHandles );
}
@@ -1554,9 +1555,9 @@ static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expect
memset( buffer, 0, sizeof(buffer) );
status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len );
- ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status );
- ok_(__FILE__,line)( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len );
- ok_(__FILE__,line)( len >= sizeof(*type) + type->TypeName.Length, "unexpected len %u\n", len );
+ ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status );
+ ok_(__FILE__,line)( len > sizeof(UNICODE_STRING), "unexpected len %lu\n", len );
+ ok_(__FILE__,line)( len >= sizeof(*type) + type->TypeName.Length, "unexpected len %lu\n", len );
ok_(__FILE__,line)(compare_unicode_string( &type->TypeName, expected_name ), "wrong name %s\n",
debugstr_w( type->TypeName.Buffer ));
add_object_type( type );
@@ -1574,8 +1575,8 @@ static void _test_object_name( unsigned line, HANDLE handle, const WCHAR *expect
memset( buffer, 0, sizeof(buffer) );
status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len );
- ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status );
- ok_(__FILE__,line)( len >= sizeof(OBJECT_NAME_INFORMATION) + str->Length, "unexpected len %u\n", len );
+ ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status );
+ ok_(__FILE__,line)( len >= sizeof(OBJECT_NAME_INFORMATION) + str->Length, "unexpected len %lu\n", len );
todo_wine_if (todo)
ok_(__FILE__,line)(compare_unicode_string( str, expected_name ), "wrong name %s\n", debugstr_w( str->Buffer ));
}
@@ -1599,45 +1600,45 @@ static void test_query_object(void)
handle = CreateEventA( NULL, FALSE, FALSE, "test_event" );
status = pNtQueryObject( handle, ObjectBasicInformation, NULL, 0, NULL );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status );
status = pNtQueryObject( handle, ObjectBasicInformation, &info, 0, NULL );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status );
status = pNtQueryObject( handle, ObjectBasicInformation, NULL, 0, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status );
len = 0;
status = pNtQueryObject( handle, ObjectBasicInformation, &info, sizeof(OBJECT_BASIC_INFORMATION), &len );
- ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status );
- ok( len >= sizeof(OBJECT_BASIC_INFORMATION), "unexpected len %u\n", len );
+ ok( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status );
+ ok( len >= sizeof(OBJECT_BASIC_INFORMATION), "unexpected len %lu\n", len );
len = 0;
status = pNtQueryObject( handle, ObjectNameInformation, buffer, 0, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status );
- ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status );
+ ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %lu\n", len );
len = 0;
status = pNtQueryObject( handle, ObjectTypeInformation, buffer, 0, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status );
- ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status );
+ ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %lu\n", len );
len = 0;
status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(UNICODE_STRING), &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status );
- ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status );
+ ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %lu\n", len );
len = 0;
status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(OBJECT_TYPE_INFORMATION), &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status );
- ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status );
+ ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %lu\n", len );
len = 0;
status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len );
- ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status );
- ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len );
+ ok( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status );
+ ok( len > sizeof(UNICODE_STRING), "unexpected len %lu\n", len );
str = (UNICODE_STRING *)buffer;
- ok( sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR) == len, "unexpected len %u\n", len );
+ ok( sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR) == len, "unexpected len %lu\n", len );
ok( str->Length >= sizeof(name) - sizeof(WCHAR), "unexpected len %u\n", str->Length );
ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_event") * sizeof(WCHAR),
"name too short %s\n", wine_dbgstr_w(str->Buffer) );
@@ -1646,19 +1647,19 @@ static void test_query_object(void)
ok( (str->Length == wcslen( expect ) * sizeof(WCHAR) && !wcscmp( str->Buffer, expect )) ||
broken( !wcscmp( str->Buffer, name )), /* winxp */
"wrong name %s\n", wine_dbgstr_w(str->Buffer) );
- trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len );
+ trace( "got %s len %lu\n", wine_dbgstr_w(str->Buffer), len );
len -= sizeof(WCHAR);
status = pNtQueryObject( handle, ObjectNameInformation, buffer, len, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status );
- ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status );
+ ok( len >= sizeof(UNICODE_STRING) + sizeof(name), "unexpected len %lu\n", len );
test_object_type( handle, L"Event" );
len -= sizeof(WCHAR);
status = pNtQueryObject( handle, ObjectTypeInformation, buffer, len, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status );
- ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %u\n", len );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status );
+ ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(L"Event"), "unexpected len %lu\n", len );
test_no_file_info( handle );
pNtClose( handle );
@@ -1666,10 +1667,10 @@ static void test_query_object(void)
handle = CreateEventA( NULL, FALSE, FALSE, NULL );
len = 0;
status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len );
- ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status );
- ok( len == sizeof(UNICODE_STRING), "unexpected len %u\n", len );
+ ok( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status );
+ ok( len == sizeof(UNICODE_STRING), "unexpected len %lu\n", len );
str = (UNICODE_STRING *)buffer;
- ok( str->Length == 0, "unexpected len %u\n", len );
+ ok( str->Length == 0, "unexpected len %lu\n", len );
ok( str->Buffer == NULL, "unexpected ptr %p\n", str->Buffer );
test_no_file_info( handle );
pNtClose( handle );
@@ -1679,23 +1680,23 @@ static void test_query_object(void)
FILE_FLAG_BACKUP_SEMANTICS, 0 );
len = 0;
status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len );
- ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status );
- ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len );
+ ok( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status );
+ ok( len > sizeof(UNICODE_STRING), "unexpected len %lu\n", len );
str = (UNICODE_STRING *)buffer;
expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR);
- ok( len == expected_len, "unexpected len %u\n", len );
- trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len );
+ ok( len == expected_len, "unexpected len %lu\n", len );
+ trace( "got %s len %lu\n", wine_dbgstr_w(str->Buffer), len );
len = 0;
status = pNtQueryObject( handle, ObjectNameInformation, buffer, 0, &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status );
ok( len == expected_len || broken(!len /* XP */ || len == sizeof(UNICODE_STRING) /* 2003 */),
- "unexpected len %u\n", len );
+ "unexpected len %lu\n", len );
len = 0;
status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(UNICODE_STRING), &len );
- ok( status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status);
- ok( len == expected_len, "unexpected len %u\n", len );
+ ok( status == STATUS_BUFFER_OVERFLOW, "got %#lx\n", status);
+ ok( len == expected_len, "unexpected len %lu\n", len );
test_object_type( handle, L"File" );
@@ -1710,7 +1711,7 @@ static void test_query_object(void)
DeleteFileA( file1 );
status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, NULL, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateIoCompletion failed %x\n", status);
+ ok( status == STATUS_SUCCESS, "NtCreateIoCompletion failed %lx\n", status);
test_object_type( handle, L"IoCompletion" );
test_no_file_info( handle );
@@ -1719,7 +1720,7 @@ static void test_query_object(void)
RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_debug" );
status = pNtCreateDebugObject( &handle, DEBUG_ALL_ACCESS, &attr, 0 );
- ok(!status, "NtCreateDebugObject failed: %x\n", status);
+ ok(!status, "NtCreateDebugObject failed: %lx\n", status);
test_object_name( handle, L"\\BaseNamedObjects\\test_debug", FALSE );
test_object_type( handle, L"DebugObject" );
test_no_file_info( handle );
@@ -1727,7 +1728,7 @@ static void test_query_object(void)
RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_mutant" );
status = pNtCreateMutant( &handle, MUTANT_ALL_ACCESS, &attr, 0 );
- ok(!status, "NtCreateMutant failed: %x\n", status);
+ ok(!status, "NtCreateMutant failed: %lx\n", status);
test_object_name( handle, L"\\BaseNamedObjects\\test_mutant", FALSE );
test_object_type( handle, L"Mutant" );
test_no_file_info( handle );
@@ -1735,7 +1736,7 @@ static void test_query_object(void)
RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_sem" );
status = pNtCreateSemaphore( &handle, SEMAPHORE_ALL_ACCESS, &attr, 1, 2 );
- ok(!status, "NtCreateSemaphore failed: %x\n", status);
+ ok(!status, "NtCreateSemaphore failed: %lx\n", status);
test_object_name( handle, L"\\BaseNamedObjects\\test_sem", FALSE );
test_object_type( handle, L"Semaphore" );
test_no_file_info( handle );
@@ -1743,7 +1744,7 @@ static void test_query_object(void)
RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_keyed" );
status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr, 0 );
- ok(!status, "NtCreateKeyedEvent failed: %x\n", status);
+ ok(!status, "NtCreateKeyedEvent failed: %lx\n", status);
test_object_name( handle, L"\\BaseNamedObjects\\test_keyed", FALSE );
test_object_type( handle, L"KeyedEvent" );
test_no_file_info( handle );
@@ -1751,7 +1752,7 @@ static void test_query_object(void)
RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_compl" );
status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, &attr, 0 );
- ok(!status, "NtCreateIoCompletion failed: %x\n", status);
+ ok(!status, "NtCreateIoCompletion failed: %lx\n", status);
test_object_name( handle, L"\\BaseNamedObjects\\test_compl", FALSE );
test_object_type( handle, L"IoCompletion" );
test_no_file_info( handle );
@@ -1759,7 +1760,7 @@ static void test_query_object(void)
RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_job" );
status = pNtCreateJobObject( &handle, JOB_OBJECT_ALL_ACCESS, &attr );
- ok(!status, "NtCreateJobObject failed: %x\n", status);
+ ok(!status, "NtCreateJobObject failed: %lx\n", status);
test_object_name( handle, L"\\BaseNamedObjects\\test_job", FALSE );
test_object_type( handle, L"Job" );
test_no_file_info( handle );
@@ -1767,7 +1768,7 @@ static void test_query_object(void)
RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_timer" );
status = pNtCreateTimer( &handle, TIMER_ALL_ACCESS, &attr, NotificationTimer );
- ok(!status, "NtCreateTimer failed: %x\n", status);
+ ok(!status, "NtCreateTimer failed: %lx\n", status);
test_object_type( handle, L"Timer" );
test_no_file_info( handle );
pNtClose(handle);
@@ -1775,7 +1776,7 @@ static void test_query_object(void)
RtlInitUnicodeString( &path, L"\\DosDevices\\test_link" );
RtlInitUnicodeString( &target, L"\\DosDevices" );
status = pNtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, &target );
- ok(!status, "NtCreateSymbolicLinkObject failed: %x\n", status);
+ ok(!status, "NtCreateSymbolicLinkObject failed: %lx\n", status);
test_object_type( handle, L"SymbolicLink" );
test_no_file_info( handle );
pNtClose(handle);
@@ -1792,7 +1793,7 @@ static void test_query_object(void)
test_no_file_info( handle );
status = pNtCreateDirectoryObject( &handle, DIRECTORY_QUERY, NULL );
- ok(status == STATUS_SUCCESS, "Failed to create Directory %08x\n", status);
+ ok(status == STATUS_SUCCESS, "Failed to create Directory %08lx\n", status);
test_object_type( handle, L"Directory" );
test_no_file_info( handle );
@@ -1802,7 +1803,7 @@ static void test_query_object(void)
size.u.LowPart = 256;
size.u.HighPart = 0;
status = pNtCreateSection( &handle, SECTION_MAP_WRITE, NULL, &size, PAGE_READWRITE, SEC_COMMIT, 0 );
- ok( status == STATUS_SUCCESS , "NtCreateSection returned %x\n", status );
+ ok( status == STATUS_SUCCESS , "NtCreateSection returned %lx\n", status );
test_object_type( handle, L"Section" );
test_no_file_info( handle );
@@ -1810,20 +1811,20 @@ static void test_query_object(void)
pNtClose( handle );
handle = CreateMailslotA( "\\\\.\\mailslot\\test_mailslot", 100, 1000, NULL );
- ok( handle != INVALID_HANDLE_VALUE, "CreateMailslot failed err %u\n", GetLastError() );
+ ok( handle != INVALID_HANDLE_VALUE, "CreateMailslot failed err %lu\n", GetLastError() );
test_object_name( handle, L"\\Device\\Mailslot\\test_mailslot", FALSE );
test_object_type( handle, L"File" );
test_file_info( handle );
client = CreateFileA( "\\\\.\\mailslot\\test_mailslot", 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 );
- ok( client != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
+ ok( client != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() );
len = 0;
status = pNtQueryObject( client, ObjectNameInformation, buffer, sizeof(buffer), &len );
- ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryObject failed %lx\n", status );
str = (UNICODE_STRING *)buffer;
- ok( len == sizeof(UNICODE_STRING) + str->MaximumLength, "unexpected len %u\n", len );
+ ok( len == sizeof(UNICODE_STRING) + str->MaximumLength, "unexpected len %lu\n", len );
todo_wine
ok( compare_unicode_string( str, L"\\Device\\Mailslot" ) ||
compare_unicode_string( str, L"\\Device\\Mailslot\\test_mailslot" ) /* win8+ */,
@@ -1836,7 +1837,7 @@ static void test_query_object(void)
pNtClose( handle );
handle = CreateFileA( "\\\\.\\mailslot", 0, 0, NULL, OPEN_EXISTING, 0, 0 );
- ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
+ ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() );
test_object_name( handle, L"\\Device\\Mailslot", FALSE );
test_object_type( handle, L"File" );
@@ -1846,7 +1847,7 @@ static void test_query_object(void)
handle = CreateNamedPipeA( "\\\\.\\pipe\\test_pipe", PIPE_ACCESS_DUPLEX, PIPE_READMODE_BYTE,
1, 1000, 1000, 1000, NULL );
- ok( handle != INVALID_HANDLE_VALUE, "CreateNamedPipe failed err %u\n", GetLastError() );
+ ok( handle != INVALID_HANDLE_VALUE, "CreateNamedPipe failed err %lu\n", GetLastError() );
test_object_name( handle, L"\\Device\\NamedPipe\\test_pipe", FALSE );
test_object_type( handle, L"File" );
@@ -1854,7 +1855,7 @@ static void test_query_object(void)
client = CreateFileA( "\\\\.\\pipe\\test_pipe", GENERIC_READ | GENERIC_WRITE,
0, NULL, OPEN_EXISTING, 0, 0 );
- ok( client != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
+ ok( client != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() );
test_object_type( client, L"File" );
test_file_info( client );
@@ -1863,7 +1864,7 @@ static void test_query_object(void)
pNtClose( handle );
handle = CreateFileA( "\\\\.\\pipe", 0, 0, NULL, OPEN_EXISTING, 0, 0 );
- ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
+ ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() );
test_object_name( handle, L"\\Device\\NamedPipe", FALSE );
test_object_type( handle, L"File" );
@@ -1873,7 +1874,7 @@ static void test_query_object(void)
RtlInitUnicodeString( &path, L"\\REGISTRY\\Machine" );
status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 );
- ok( status == STATUS_SUCCESS, "NtCreateKey failed status %x\n", status );
+ ok( status == STATUS_SUCCESS, "NtCreateKey failed status %lx\n", status );
test_object_name( handle, L"\\REGISTRY\\MACHINE", FALSE );
test_object_type( handle, L"Key" );
@@ -1889,7 +1890,7 @@ static void test_query_object(void)
test_no_file_info( GetCurrentThread() );
status = pNtOpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &handle);
- ok(!status, "OpenProcessToken failed: %x\n", status);
+ ok(!status, "OpenProcessToken failed: %lx\n", status);
test_object_name( handle, L"", FALSE );
test_object_type( handle, L"Token" );
@@ -1898,7 +1899,7 @@ static void test_query_object(void)
pNtClose(handle);
handle = CreateFileA( "nul", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 );
- ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
+ ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() );
test_object_name( handle, L"\\Device\\Null", TRUE );
test_object_type( handle, L"File" );
test_file_info( handle );
@@ -1919,10 +1920,10 @@ static void test_type_mismatch(void)
attr.SecurityQualityOfService = NULL;
res = pNtCreateEvent( &h, 0, &attr, NotificationEvent, 0 );
- ok(!res, "can't create event: %x\n", res);
+ ok(!res, "can't create event: %lx\n", res);
res = pNtReleaseSemaphore( h, 30, NULL );
- ok(res == STATUS_OBJECT_TYPE_MISMATCH, "expected 0xc0000024, got %x\n", res);
+ ok(res == STATUS_OBJECT_TYPE_MISMATCH, "expected 0xc0000024, got %lx\n", res);
pNtClose( h );
}
@@ -1947,12 +1948,12 @@ static void test_null_device(void)
InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL);
status = pNtOpenSymbolicLinkObject(&null, SYMBOLIC_LINK_QUERY, &attr);
ok(status == STATUS_OBJECT_TYPE_MISMATCH,
- "expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status);
+ "expected STATUS_OBJECT_TYPE_MISMATCH, got %08lx\n", status);
status = pNtOpenFile(&null, GENERIC_READ | GENERIC_WRITE, &attr, &iosb,
FILE_SHARE_READ | FILE_SHARE_WRITE, 0);
ok(status == STATUS_SUCCESS,
- "expected STATUS_SUCCESS, got %08x\n", status);
+ "expected STATUS_SUCCESS, got %08lx\n", status);
test_object_type(null, L"File");
@@ -1960,26 +1961,26 @@ static void test_null_device(void)
ret = WriteFile(null, buf, sizeof(buf), &num_bytes, NULL);
ok(!ret, "WriteFile unexpectedly succeeded\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER,
- "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
+ "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError());
SetLastError(0xdeadbeef);
ret = ReadFile(null, buf, sizeof(buf), &num_bytes, NULL);
ok(!ret, "ReadFile unexpectedly succeeded\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER,
- "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
+ "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError());
num_bytes = 0xdeadbeef;
SetLastError(0xdeadbeef);
ret = WriteFile(null, buf, sizeof(buf), &num_bytes, &ov);
- ok(ret, "got error %u\n", GetLastError());
- ok(num_bytes == sizeof(buf), "expected num_bytes = %u, got %u\n",
+ ok(ret, "got error %lu\n", GetLastError());
+ ok(num_bytes == sizeof(buf), "expected num_bytes = %lu, got %lu\n",
(DWORD)sizeof(buf), num_bytes);
num_bytes = 0xdeadbeef;
SetLastError(0xdeadbeef);
ret = ReadFile(null, buf, sizeof(buf), &num_bytes, &ov);
ok(!ret, "expected failure\n");
- ok(GetLastError() == ERROR_HANDLE_EOF, "got error %u\n", GetLastError());
+ ok(GetLastError() == ERROR_HANDLE_EOF, "got error %lu\n", GetLastError());
pNtClose(null);
@@ -1988,14 +1989,14 @@ static void test_null_device(void)
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n");
ok(GetLastError() == ERROR_FILE_NOT_FOUND,
- "expected ERROR_FILE_NOT_FOUND, got %u\n", GetLastError());
+ "expected ERROR_FILE_NOT_FOUND, got %lu\n", GetLastError());
null = CreateFileA("\\\\.\\Device\\Null", GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n");
ok(GetLastError() == ERROR_PATH_NOT_FOUND,
- "expected ERROR_PATH_NOT_FOUND, got %u\n", GetLastError());
+ "expected ERROR_PATH_NOT_FOUND, got %lu\n", GetLastError());
CloseHandle(ov.hEvent);
}
@@ -2018,42 +2019,42 @@ static void test_process(void)
cid.UniqueProcess = 0;
cid.UniqueThread = 0;
status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, NULL, &cid );
- todo_wine ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcess returned %x\n", status );
+ todo_wine ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcess returned %lx\n", status );
status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, NULL );
- todo_wine ok( status == STATUS_INVALID_PARAMETER_MIX, "NtOpenProcess returned %x\n", status );
+ todo_wine ok( status == STATUS_INVALID_PARAMETER_MIX, "NtOpenProcess returned %lx\n", status );
cid.UniqueProcess = 0;
cid.UniqueThread = 0;
status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid );
- ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status );
+ ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %lx\n", status );
cid.UniqueProcess = ULongToHandle( 0xdeadbeef );
cid.UniqueThread = ULongToHandle( 0xdeadbeef );
process = (HANDLE)0xdeadbeef;
status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid );
- ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status );
+ ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %lx\n", status );
ok( !process || broken(process == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", process );
cid.UniqueProcess = ULongToHandle( GetCurrentThreadId() );
cid.UniqueThread = 0;
process = (HANDLE)0xdeadbeef;
status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid );
- ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status );
+ ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %lx\n", status );
ok( !process || broken(process == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", process );
cid.UniqueProcess = ULongToHandle( GetCurrentProcessId() );
cid.UniqueThread = 0;
status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid );
- ok( !status, "NtOpenProcess returned %x\n", status );
+ ok( !status, "NtOpenProcess returned %lx\n", status );
pNtClose( process );
cid.UniqueProcess = ULongToHandle( GetCurrentProcessId() );
cid.UniqueThread = ULongToHandle( GetCurrentThreadId() );
status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid );
- ok( !status, "NtOpenProcess returned %x\n", status );
+ ok( !status, "NtOpenProcess returned %lx\n", status );
pNtClose( process );
status = pNtOpenProcess( (HANDLE *)0xdeadbee0, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid );
- ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcess returned %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcess returned %lx\n", status );
}
static void test_token(void)
@@ -2062,28 +2063,28 @@ static void test_token(void)
HANDLE handle, handle2;
status = pNtOpenProcessToken( GetCurrentProcess(), TOKEN_ALL_ACCESS, (HANDLE *)0xdeadbee0 );
- ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %x\n", status);
+ ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %lx\n", status);
status = pNtOpenThreadToken( GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, (HANDLE *)0xdeadbee0 );
- ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %x\n", status);
+ ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %lx\n", status);
handle = (HANDLE)0xdeadbeef;
status = NtOpenProcessToken( (HANDLE)0xdead, TOKEN_ALL_ACCESS, &handle );
- ok( status == STATUS_INVALID_HANDLE, "NtOpenProcessToken failed: %x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "NtOpenProcessToken failed: %lx\n", status);
ok( !handle || broken(handle == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle );
handle = (HANDLE)0xdeadbeef;
status = pNtOpenThreadToken( (HANDLE)0xdead, TOKEN_ALL_ACCESS, TRUE, &handle );
- ok( status == STATUS_INVALID_HANDLE, "NtOpenThreadToken failed: %x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "NtOpenThreadToken failed: %lx\n", status);
ok( !handle || broken(handle == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle );
status = pNtOpenProcessToken( GetCurrentProcess(), TOKEN_ALL_ACCESS, &handle );
- ok( status == STATUS_SUCCESS, "NtOpenProcessToken failed: %x\n", status);
+ ok( status == STATUS_SUCCESS, "NtOpenProcessToken failed: %lx\n", status);
status = pNtDuplicateToken( handle, TOKEN_ALL_ACCESS, NULL, 0, TokenPrimary, &handle2 );
- ok( status == STATUS_SUCCESS, "NtOpenProcessToken failed: %x\n", status);
+ ok( status == STATUS_SUCCESS, "NtOpenProcessToken failed: %lx\n", status);
pNtClose( handle2 );
status = pNtDuplicateToken( handle, TOKEN_ALL_ACCESS, NULL, 0, TokenPrimary, (HANDLE *)0xdeadbee0 );
- ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %x\n", status);
+ ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcessToken failed: %lx\n", status);
handle2 = (HANDLE)0xdeadbeef;
status = pNtDuplicateToken( (HANDLE)0xdead, TOKEN_ALL_ACCESS, NULL, 0, TokenPrimary, &handle2 );
- ok( status == STATUS_INVALID_HANDLE, "NtOpenProcessToken failed: %x\n", status);
+ ok( status == STATUS_INVALID_HANDLE, "NtOpenProcessToken failed: %lx\n", status);
ok( !handle2 || broken(handle2 == (HANDLE)0xdeadbeef) /* vista */, "handle set %p\n", handle2 );
pNtClose( handle );
}
@@ -2179,27 +2180,27 @@ static void test_duplicate_object(void)
status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
&handle, PROCESS_ALL_ACCESS, 0, 0 );
- ok( !status, "NtDuplicateObject failed %x\n", status );
+ ok( !status, "NtDuplicateObject failed %lx\n", status );
pNtClose( handle );
status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
NULL, PROCESS_ALL_ACCESS, 0, 0 );
- ok( !status, "NtDuplicateObject failed %x\n", status );
+ ok( !status, "NtDuplicateObject failed %lx\n", status );
status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
(HANDLE *)0xdeadbee0, PROCESS_ALL_ACCESS, 0, 0 );
- ok( status == STATUS_ACCESS_VIOLATION, "NtDuplicateObject failed %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "NtDuplicateObject failed %lx\n", status );
handle = (HANDLE)0xdeadbeef;
status = pNtDuplicateObject( GetCurrentProcess(), (HANDLE)0xdead, GetCurrentProcess(),
&handle, PROCESS_ALL_ACCESS, 0, 0 );
- ok( status == STATUS_INVALID_HANDLE, "NtDuplicateObject failed %x\n", status );
+ ok( status == STATUS_INVALID_HANDLE, "NtDuplicateObject failed %lx\n", status );
ok( !handle, "handle set %p\n", handle );
handle = (HANDLE)0xdeadbeef;
status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
&handle, ~0u, 0, 0 );
todo_wine
- ok( status == STATUS_ACCESS_DENIED, "NtDuplicateObject failed %x\n", status );
+ ok( status == STATUS_ACCESS_DENIED, "NtDuplicateObject failed %lx\n", status );
todo_wine
ok( !handle, "handle set %p\n", handle );
if (!status) pNtClose( handle );
@@ -2243,17 +2244,17 @@ static void test_object_types(void)
memset( buffer, 0xcc, sizeof(buffer) );
status = pNtQueryObject( NULL, ObjectTypesInformation, info, sizeof(buffer), &len );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %lx\n", status );
ok( info->NumberOfTypes < 100 || info->NumberOfTypes == 0xcccccccc, /* wow64 */
- "wrong number of types %u\n", info->NumberOfTypes );
+ "wrong number of types %lu\n", info->NumberOfTypes );
info = malloc( len + 16 ); /* Windows gets the length wrong on WoW64 and overflows the buffer */
memset( info, 0xcc, sizeof(*info) );
status = pNtQueryObject( NULL, ObjectTypesInformation, info, len, &retlen );
- ok( retlen <= len + 16, "wrong len %x/%x\n", len, retlen );
+ ok( retlen <= len + 16, "wrong len %lx/%lx\n", len, retlen );
ok( len == retlen || broken( retlen >= len - 32 && retlen <= len + 32 ), /* wow64 */
- "wrong len %x/%x\n", len, retlen );
- ok( !status, "NtQueryObject failed %x\n", status );
+ "wrong len %lx/%lx\n", len, retlen );
+ ok( !status, "NtQueryObject failed %lx\n", status );
if (!status)
{
OBJECT_TYPE_INFORMATION *type = align_ptr( info + 1 );
@@ -2277,7 +2278,7 @@ static void test_object_types(void)
!((map.GenericWrite ^ tests[i].mapping.GenericWrite) & ~tests[i].broken) &&
!((map.GenericExecute ^ tests[i].mapping.GenericExecute) & ~tests[i].broken) &&
!((map.GenericAll ^ tests[i].mapping.GenericAll) & ~tests[i].broken) ),
- "%s: mismatched mappings %08x,%08x,%08x,%08x / %08x,%08x,%08x,%08x\n",
+ "%s: mismatched mappings %08lx,%08lx,%08lx,%08lx / %08lx,%08lx,%08lx,%08lx\n",
debugstr_w( tests[i].name ),
all_types[j].GenericMapping.GenericRead, all_types[j].GenericMapping.GenericWrite,
all_types[j].GenericMapping.GenericExecute, all_types[j].GenericMapping.GenericAll,
@@ -2285,7 +2286,7 @@ static void test_object_types(void)
tests[i].mapping.GenericExecute, tests[i].mapping.GenericAll );
ok( all_types[j].ValidAccessMask == tests[i].mask ||
broken( !((all_types[j].ValidAccessMask ^ tests[i].mask) & ~tests[i].broken) ),
- "%s: mismatched access mask %08x / %08x\n", debugstr_w( tests[i].name ),
+ "%s: mismatched access mask %08lx / %08lx\n", debugstr_w( tests[i].name ),
all_types[j].ValidAccessMask, tests[i].mask );
tested[j] = TRUE;
break;
@@ -2327,7 +2328,7 @@ static void test_get_next_thread(void)
thread = CreateThread( NULL, 0, test_get_next_thread_proc, event, 0, &thread_id );
status = pNtGetNextThread(hprocess, NULL, THREAD_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#lx.\n", status);
found = FALSE;
prev = NULL;
@@ -2341,7 +2342,7 @@ static void test_get_next_thread(void)
}
else
{
- ok(GetThreadId(handle) == GetCurrentThreadId(), "Got unexpected thread id %04x, current %04x.\n",
+ ok(GetThreadId(handle) == GetCurrentThreadId(), "Got unexpected thread id %04lx, current %04lx.\n",
GetThreadId(handle), GetCurrentThreadId());
}
prev = handle;
@@ -2349,26 +2350,26 @@ static void test_get_next_thread(void)
}
pNtClose(prev);
ok(!handle, "Got unexpected handle %p.\n", handle);
- ok(status == STATUS_NO_MORE_ENTRIES, "Unexpected status %#x.\n", status);
+ ok(status == STATUS_NO_MORE_ENTRIES, "Unexpected status %#lx.\n", status);
ok(found, "Thread not found.\n");
handle = (HANDLE)0xdeadbeef;
status = pNtGetNextThread((void *)0xdeadbeef, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle);
- ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#lx.\n", status);
ok(!handle, "Got unexpected handle %p.\n", handle);
handle = (HANDLE)0xdeadbeef;
status = pNtGetNextThread(hprocess, (void *)0xdeadbeef, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle);
- ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#lx.\n", status);
ok(!handle, "Got unexpected handle %p.\n", handle);
/* Reversed search is only supported on recent enough Win10. */
status = pNtGetNextThread(hprocess, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 1, &handle);
- ok(!status || broken(status == STATUS_INVALID_PARAMETER), "Unexpected status %#x.\n", status);
+ ok(!status || broken(status == STATUS_INVALID_PARAMETER), "Unexpected status %#lx.\n", status);
if (!status)
pNtClose(handle);
status = pNtGetNextThread(hprocess, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 2, &handle);
- ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#x.\n", status);
+ ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#lx.\n", status);
SetEvent(event);
WaitForSingleObject(thread, INFINITE);
@@ -2411,16 +2412,16 @@ static void test_globalroot(void)
pRtlInitUnicodeString(&str, symlinks[i].name);
InitializeObjectAttributes(&attr, &str, 0, 0, NULL);
status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr );
- ok(status == STATUS_SUCCESS, "NtOpenSymbolicLinkObject failed %08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtOpenSymbolicLinkObject failed %08lx\n", status);
str.Buffer = buffer;
str.MaximumLength = sizeof(buffer);
len = 0xdeadbeef;
memset( buffer, 0xaa, sizeof(buffer) );
status = pNtQuerySymbolicLinkObject( h, &str, &len);
- ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08lx\n", status );
full_len = str.Length + sizeof(WCHAR);
- ok( len == full_len, "bad length %u (expected %u)\n", len, full_len );
+ ok( len == full_len, "bad length %lu (expected %lu)\n", len, full_len );
ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" );
if (symlinks[i].target)
@@ -2440,7 +2441,7 @@ static void test_globalroot(void)
status = pNtOpenFile(&h, GENERIC_READ | GENERIC_WRITE, &attr, &iosb,
FILE_SHARE_READ | FILE_SHARE_WRITE, 0);
ok(status == STATUS_SUCCESS,
- "expected STATUS_SUCCESS, got %08x\n", status);
+ "expected STATUS_SUCCESS, got %08lx\n", status);
test_object_type(h, L"File");
@@ -2459,42 +2460,42 @@ static void test_object_identity(void)
}
status = pNtCompareObjects( GetCurrentProcess(), GetCurrentProcess() );
- ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() to self failed with %08x\n", status );
+ ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() to self failed with %08lx\n", status );
status = pNtCompareObjects( GetCurrentThread(), GetCurrentThread() );
- ok( status == STATUS_SUCCESS, "comparing GetCurrentThread() to self failed with %08x\n", status );
+ ok( status == STATUS_SUCCESS, "comparing GetCurrentThread() to self failed with %08lx\n", status );
status = pNtCompareObjects( GetCurrentProcess(), GetCurrentThread() );
- ok( status == STATUS_NOT_SAME_OBJECT, "comparing GetCurrentProcess() to GetCurrentThread() returned %08x\n", status );
+ ok( status == STATUS_NOT_SAME_OBJECT, "comparing GetCurrentProcess() to GetCurrentThread() returned %08lx\n", status );
h1 = NULL;
status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(),
&h1, 0, 0, DUPLICATE_SAME_ACCESS );
- ok( status == STATUS_SUCCESS, "failed to duplicate current process handle: %08x\n", status);
+ ok( status == STATUS_SUCCESS, "failed to duplicate current process handle: %08lx\n", status);
status = pNtCompareObjects( GetCurrentProcess(), h1 );
- ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() with %p failed with %08x\n", h1, status );
+ ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() with %p failed with %08lx\n", h1, status );
pNtClose( h1 );
h1 = CreateFileA( "\\\\.\\NUL", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 );
- ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
+ ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() );
h2 = NULL;
status = pNtDuplicateObject( GetCurrentProcess(), h1, GetCurrentProcess(),
&h2, 0, 0, DUPLICATE_SAME_ACCESS );
- ok( status == STATUS_SUCCESS, "failed to duplicate handle %p: %08x\n", h1, status);
+ ok( status == STATUS_SUCCESS, "failed to duplicate handle %p: %08lx\n", h1, status);
status = pNtCompareObjects( h1, h2 );
- ok( status == STATUS_SUCCESS, "comparing %p with %p failed with %08x\n", h1, h2, status );
+ ok( status == STATUS_SUCCESS, "comparing %p with %p failed with %08lx\n", h1, h2, status );
pNtClose( h2 );
h2 = CreateFileA( "\\\\.\\NUL", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 );
- ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() );
+ ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError() );
status = pNtCompareObjects( h1, h2 );
- ok( status == STATUS_NOT_SAME_OBJECT, "comparing %p with %p returned %08x\n", h1, h2, status );
+ ok( status == STATUS_NOT_SAME_OBJECT, "comparing %p with %p returned %08lx\n", h1, h2, status );
pNtClose( h2 );
pNtClose( h1 );
1
0
19 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/large_int.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c
index 00316fe65e0..3ae18f7906a 100644
--- a/dlls/ntdll/tests/large_int.c
+++ b/dlls/ntdll/tests/large_int.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>
@@ -297,7 +298,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t
#ifdef _WIN64
if (largeint2str->value >> 32 == 0xffffffff) /* this crashes on 64-bit Vista */
{
- skip( "Value ffffffff%08x broken on 64-bit windows\n", (DWORD)largeint2str->value );
+ skip( "Value ffffffff%08lx broken on 64-bit windows\n", (DWORD)largeint2str->value );
return;
}
#endif
@@ -340,7 +341,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t
} /* if */
} else {
ok(result == largeint2str->result,
- "(test %d): RtlInt64ToUnicodeString(0x%s, %d, [out]) has result %x, expected: %x\n",
+ "(test %d): RtlInt64ToUnicodeString(0x%s, %d, [out]) has result %lx, expected: %lx\n",
test_num, wine_dbgstr_longlong(largeint2str->value), largeint2str->base, result, largeint2str->result);
if (result == STATUS_SUCCESS) {
ok(unicode_string.Buffer[unicode_string.Length/sizeof(WCHAR)] == '\0',
@@ -349,7 +350,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t
} /* if */
} /* if */
ok(memcmp(unicode_string.Buffer, expected_unicode_string.Buffer, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0,
- "(test %d): RtlInt64ToUnicodeString(0x%x%08x, %d, [out]) assigns string \"%s\", expected: \"%s\"\n",
+ "(test %d): RtlInt64ToUnicodeString(0x%lx%08lx, %d, [out]) assigns string \"%s\", expected: \"%s\"\n",
test_num, (DWORD)(largeint2str->value >>32), (DWORD)largeint2str->value, largeint2str->base,
ansi_str.Buffer, expected_ansi_str.Buffer);
ok(unicode_string.Length == expected_unicode_string.Length,
@@ -384,7 +385,7 @@ static void one_RtlLargeIntegerToChar_test(int test_num, const largeint2str_t *l
#ifdef _WIN64
if (largeint2str->value >> 32 == 0xffffffff) /* this crashes on 64-bit Vista */
{
- skip( "Value ffffffff%08x broken on 64-bit windows\n", (DWORD)largeint2str->value );
+ skip( "Value ffffffff%08lx broken on 64-bit windows\n", (DWORD)largeint2str->value );
return;
}
#endif
@@ -398,7 +399,7 @@ static void one_RtlLargeIntegerToChar_test(int test_num, const largeint2str_t *l
result = pRtlLargeIntegerToChar(&value, largeint2str->base, largeint2str->MaximumLength, dest_str);
} /* if */
ok(result == largeint2str->result,
- "(test %d): RtlLargeIntegerToChar(0x%s, %d, %d, [out]) has result %x, expected: %x\n",
+ "(test %d): RtlLargeIntegerToChar(0x%s, %d, %d, [out]) has result %lx, expected: %lx\n",
test_num, wine_dbgstr_longlong(largeint2str->value), largeint2str->base,
largeint2str->MaximumLength, result, largeint2str->result);
ok(memcmp(dest_str, largeint2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0,
@@ -421,24 +422,24 @@ static void test_RtlLargeIntegerToChar(void)
value = largeint2str[0].value;
result = pRtlLargeIntegerToChar(&value, 20, largeint2str[0].MaximumLength, NULL);
ok(result == STATUS_INVALID_PARAMETER,
- "(test a): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n",
+ "(test a): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n",
wine_dbgstr_longlong(largeint2str[0].value), 20,
largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER);
result = pRtlLargeIntegerToChar(&value, 20, 0, NULL);
ok(result == STATUS_INVALID_PARAMETER,
- "(test b): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n",
+ "(test b): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n",
wine_dbgstr_longlong(largeint2str[0].value), 20,
largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER);
result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, 0, NULL);
ok(result == STATUS_BUFFER_OVERFLOW,
- "(test c): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n",
+ "(test c): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n",
wine_dbgstr_longlong(largeint2str[0].value), largeint2str[0].base, 0, result, STATUS_BUFFER_OVERFLOW);
result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, largeint2str[0].MaximumLength, NULL);
ok(result == STATUS_ACCESS_VIOLATION,
- "(test d): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n",
+ "(test d): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n",
wine_dbgstr_longlong(largeint2str[0].value),
largeint2str[0].base, largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION);
}
1
0
19 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/file.c | 1467 ++++++++++++++++++++++++-----------------------
1 file changed, 734 insertions(+), 733 deletions(-)
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 760e2ff167e..4014b395b56 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -23,6 +23,7 @@
* We use function pointers here as there is no import library for NTDLL on
* windows.
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include <stdio.h>
#include <stdarg.h>
@@ -117,9 +118,9 @@ static ULONG get_pending_msgs(HANDLE h)
ULONG a, req;
res = pNtQueryIoCompletion( h, IoCompletionBasicInformation, &a, sizeof(a), &req );
- ok( res == STATUS_SUCCESS, "NtQueryIoCompletion failed: %x\n", res );
+ ok( res == STATUS_SUCCESS, "NtQueryIoCompletion failed: %lx\n", res );
if (res != STATUS_SUCCESS) return -1;
- ok( req == sizeof(a), "Unexpected response size: %x\n", req );
+ ok( req == sizeof(a), "Unexpected response size: %lx\n", req );
return a;
}
@@ -127,10 +128,10 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved )
{
int *count = arg;
- trace( "apc called block %p iosb.status %x iosb.info %lu\n",
+ trace( "apc called block %p iosb.status %lx iosb.info %Iu\n",
iosb, U(*iosb).Status, iosb->Information );
(*count)++;
- ok( !reserved, "reserved is not 0: %x\n", reserved );
+ ok( !reserved, "reserved is not 0: %lx\n", reserved );
}
static void create_file_test(void)
@@ -166,31 +167,31 @@ static void create_file_test(void)
/* try various open modes and options on directories */
status = pNtCreateFile( &dir, GENERIC_READ|GENERIC_WRITE, &attr, &io, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_DIRECTORY_FILE, NULL, 0 );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
U(io).Status = 0xdeadbeef;
offset.QuadPart = 0;
status = pNtReadFile( dir, NULL, NULL, NULL, &io, buf, sizeof(buf), &offset, NULL );
- ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08x\n", status );
+ ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08lx\n", status );
if (status == STATUS_PENDING)
{
ret = WaitForSingleObject( dir, 1000 );
- ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", ret );
+ ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %lu\n", ret );
ok( U(io).Status == STATUS_INVALID_DEVICE_REQUEST,
- "expected STATUS_INVALID_DEVICE_REQUEST, got %08x\n", U(io).Status );
+ "expected STATUS_INVALID_DEVICE_REQUEST, got %08lx\n", U(io).Status );
}
U(io).Status = 0xdeadbeef;
offset.QuadPart = 0;
status = pNtWriteFile( dir, NULL, NULL, NULL, &io, testdata, sizeof(testdata), &offset, NULL);
todo_wine
- ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtWriteFile error %08x\n", status );
+ ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtWriteFile error %08lx\n", status );
if (status == STATUS_PENDING)
{
ret = WaitForSingleObject( dir, 1000 );
- ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", ret );
+ ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %lu\n", ret );
ok( U(io).Status == STATUS_INVALID_DEVICE_REQUEST,
- "expected STATUS_INVALID_DEVICE_REQUEST, got %08x\n", U(io).Status );
+ "expected STATUS_INVALID_DEVICE_REQUEST, got %08lx\n", U(io).Status );
}
CloseHandle( dir );
@@ -198,54 +199,54 @@ static void create_file_test(void)
status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, FILE_DIRECTORY_FILE, NULL, 0 );
ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_OPEN_IF, FILE_DIRECTORY_FILE, NULL, 0 );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
CloseHandle( dir );
status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_SUPERSEDE, FILE_DIRECTORY_FILE, NULL, 0 );
- ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( status == STATUS_INVALID_PARAMETER, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_OVERWRITE, FILE_DIRECTORY_FILE, NULL, 0 );
- ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( status == STATUS_INVALID_PARAMETER, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_OVERWRITE_IF, FILE_DIRECTORY_FILE, NULL, 0 );
- ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( status == STATUS_INVALID_PARAMETER, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_OPEN, 0, NULL, 0 );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
CloseHandle( dir );
status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_CREATE, 0, NULL, 0 );
ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_OPEN_IF, 0, NULL, 0 );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
CloseHandle( dir );
status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_SUPERSEDE, 0, NULL, 0 );
ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_OVERWRITE, 0, NULL, 0 );
ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,
FILE_OVERWRITE_IF, 0, NULL, 0 );
ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
pRtlFreeUnicodeString( &nameW );
@@ -261,7 +262,7 @@ static void create_file_test(void)
FILE_OPEN_IF, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );
todo_wine
ok( status == STATUS_INVALID_PARAMETER,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
/* Invalid chars in file/dirnames */
pRtlDosPathNameToNtPathName_U(questionmarkInvalidNameW, &nameW, NULL, NULL);
@@ -270,13 +271,13 @@ static void create_file_test(void)
FILE_SHARE_READ, FILE_CREATE,
FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0);
ok(status == STATUS_OBJECT_NAME_INVALID,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status);
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status);
status = pNtCreateFile(&file, GENERIC_WRITE|SYNCHRONIZE, &attr, &io, NULL, 0,
0, FILE_CREATE,
FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0);
ok(status == STATUS_OBJECT_NAME_INVALID,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status);
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status);
pRtlFreeUnicodeString(&nameW);
pRtlDosPathNameToNtPathName_U(pipeInvalidNameW, &nameW, NULL, NULL);
@@ -285,13 +286,13 @@ static void create_file_test(void)
FILE_SHARE_READ, FILE_CREATE,
FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0);
ok(status == STATUS_OBJECT_NAME_INVALID,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status);
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status);
status = pNtCreateFile(&file, GENERIC_WRITE|SYNCHRONIZE, &attr, &io, NULL, 0,
0, FILE_CREATE,
FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0);
ok(status == STATUS_OBJECT_NAME_INVALID,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status);
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status);
pRtlFreeUnicodeString(&nameW);
pRtlInitUnicodeString( &nameW, pathInvalidNtW );
@@ -299,33 +300,33 @@ static void create_file_test(void)
FILE_SHARE_READ, FILE_CREATE,
FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );
ok( status == STATUS_OBJECT_NAME_INVALID,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
status = pNtQueryFullAttributesFile( &attr, &info );
todo_wine ok( status == STATUS_OBJECT_NAME_INVALID,
- "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "query %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
pRtlInitUnicodeString( &nameW, pathInvalidNt2W );
status = pNtCreateFile( &dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0,
FILE_SHARE_READ, FILE_CREATE,
FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );
ok( status == STATUS_OBJECT_NAME_INVALID,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
status = pNtQueryFullAttributesFile( &attr, &info );
ok( status == STATUS_OBJECT_NAME_INVALID,
- "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "query %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
pRtlInitUnicodeString( &nameW, pathInvalidDosW );
status = pNtCreateFile( &dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0,
FILE_SHARE_READ, FILE_CREATE,
FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );
ok( status == STATUS_OBJECT_NAME_INVALID,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
status = pNtQueryFullAttributesFile( &attr, &info );
ok( status == STATUS_OBJECT_NAME_INVALID,
- "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "query %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
}
static void open_file_test(void)
@@ -353,14 +354,14 @@ static void open_file_test(void)
attr.SecurityQualityOfService = NULL;
status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
pRtlFreeUnicodeString( &nameW );
path[3] = 0; /* root of the drive */
pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL );
status = pNtOpenFile( &root, GENERIC_READ, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
pRtlFreeUnicodeString( &nameW );
/* test opening system dir with RootDirectory set to windows dir */
@@ -371,14 +372,14 @@ static void open_file_test(void)
attr.RootDirectory = dir;
status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
CloseHandle( handle );
/* try uppercase name */
for (i = len; path[i]; i++) if (path[i] >= 'a' && path[i] <= 'z') path[i] -= 'a' - 'A';
status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
CloseHandle( handle );
/* try with leading backslash */
@@ -389,14 +390,14 @@ static void open_file_test(void)
ok( status == STATUS_INVALID_PARAMETER ||
status == STATUS_OBJECT_NAME_INVALID ||
status == STATUS_OBJECT_PATH_SYNTAX_BAD,
- "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
if (!status) CloseHandle( handle );
/* try with empty name */
nameW.Length = 0;
status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
CloseHandle( handle );
CloseHandle( dir );
@@ -405,11 +406,11 @@ static void open_file_test(void)
pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL );
status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE );
- ok( status == STATUS_NOT_A_DIRECTORY, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( status == STATUS_NOT_A_DIRECTORY, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
CloseHandle( handle );
status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
CloseHandle( handle );
pRtlFreeUnicodeString( &nameW );
@@ -418,11 +419,11 @@ static void open_file_test(void)
status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE );
todo_wine
- ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE );
todo_wine
- ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
pRtlFreeUnicodeString( &nameW );
GetTempPathW( MAX_PATH, path );
@@ -433,15 +434,15 @@ static void open_file_test(void)
attr.RootDirectory = NULL;
status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
pRtlFreeUnicodeString( &nameW );
GetTempFileNameW( path, fooW, 0, tmpfile );
file = CreateFileW( tmpfile, FILE_WRITE_DATA, 0, NULL, CREATE_ALWAYS, 0, 0 );
- ok( file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError() );
+ ok( file != INVALID_HANDLE_VALUE, "CreateFile error %ld\n", GetLastError() );
numbytes = 0xdeadbeef;
ret = WriteFile( file, testdata, sizeof(testdata) - 1, &numbytes, NULL );
- ok( ret, "WriteFile failed with error %u\n", GetLastError() );
+ ok( ret, "WriteFile failed with error %lu\n", GetLastError() );
ok( numbytes == sizeof(testdata) - 1, "failed to write all data\n" );
CloseHandle( file );
@@ -465,7 +466,7 @@ static void open_file_test(void)
FILE_SHARE_READ,
FILE_OPEN_BY_FILE_ID |
((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) );
- ok( status == STATUS_SUCCESS, "open %s failed %x\n", wine_dbgstr_w(info->FileName), status );
+ ok( status == STATUS_SUCCESS, "open %s failed %lx\n", wine_dbgstr_w(info->FileName), status );
if (!status)
{
BYTE buf[sizeof(FILE_ALL_INFORMATION) + MAX_PATH * sizeof(WCHAR)];
@@ -493,7 +494,7 @@ static void open_file_test(void)
FILE_OPEN_BY_FILE_ID |
((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) );
ok( status == STATUS_SUCCESS || status == STATUS_NOT_IMPLEMENTED,
- "open %s failed %x\n", wine_dbgstr_w(info->FileName), status );
+ "open %s failed %lx\n", wine_dbgstr_w(info->FileName), status );
if (!status) CloseHandle( handle );
}
}
@@ -510,13 +511,13 @@ static void open_file_test(void)
attr.SecurityQualityOfService = NULL;
status = pNtOpenFile( &file, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io,
FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
pRtlFreeUnicodeString( &nameW );
numbytes = 0xdeadbeef;
memset( data, 0, sizeof(data) );
ret = ReadFile( file, data, sizeof(data), &numbytes, NULL );
- ok( ret, "ReadFile failed with error %u\n", GetLastError() );
+ ok( ret, "ReadFile failed with error %lu\n", GetLastError() );
ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" );
ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" );
@@ -527,7 +528,7 @@ static void open_file_test(void)
status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io,
FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT );
ok( status == STATUS_OBJECT_PATH_NOT_FOUND,
- "expected STATUS_OBJECT_PATH_NOT_FOUND, got %08x\n", status );
+ "expected STATUS_OBJECT_PATH_NOT_FOUND, got %08lx\n", status );
nameW.Length = 0;
nameW.Buffer = NULL;
@@ -535,24 +536,24 @@ static void open_file_test(void)
attr.ObjectName = &nameW;
status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io,
FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(tmpfile), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(tmpfile), status );
numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT );
- ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes );
+ ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %lu\n", numbytes );
numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT );
- ok( numbytes == 0, "SetFilePointer returned %u\n", numbytes );
+ ok( numbytes == 0, "SetFilePointer returned %lu\n", numbytes );
numbytes = 0xdeadbeef;
memset( data, 0, sizeof(data) );
ret = ReadFile( root, data, sizeof(data), &numbytes, NULL );
- ok( ret, "ReadFile failed with error %u\n", GetLastError() );
+ ok( ret, "ReadFile failed with error %lu\n", GetLastError() );
ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" );
ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" );
numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT );
- ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes );
+ ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %lu\n", numbytes );
numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT );
- ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes );
+ ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %lu\n", numbytes );
CloseHandle( file );
CloseHandle( root );
@@ -644,10 +645,10 @@ static void read_file_test(void)
ResetEvent( event );
status = pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL );
ok( status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */,
- "wrong status %x.\n", status );
+ "wrong status %lx.\n", status );
if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 );
- ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == strlen(text), "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -661,10 +662,10 @@ static void read_file_test(void)
status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, strlen(text) + 10, &offset, NULL );
ok(status == STATUS_PENDING
|| broken(status == STATUS_SUCCESS) /* before Vista */,
- "wrong status %x.\n", status);
+ "wrong status %lx.\n", status);
if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 );
- ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == strlen(text), "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -677,12 +678,12 @@ static void read_file_test(void)
offset.QuadPart = strlen(text) + 2;
status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL );
ok(status == STATUS_PENDING || broken(status == STATUS_END_OF_FILE) /* before Vista */,
- "expected STATUS_PENDING, got %#x\n", status);
+ "expected STATUS_PENDING, got %#lx\n", status);
if (status == STATUS_PENDING) /* vista */
{
WaitForSingleObject( event, 1000 );
- ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -700,10 +701,10 @@ static void read_file_test(void)
ok( status == STATUS_END_OF_FILE ||
status == STATUS_SUCCESS ||
status == STATUS_PENDING, /* vista */
- "wrong status %x\n", status );
+ "wrong status %lx\n", status );
if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 );
- ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == strlen(text), "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -715,9 +716,9 @@ static void read_file_test(void)
offset.QuadPart = 0;
ResetEvent( event );
status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, strlen(text) + 10, &offset, NULL );
- ok( status == STATUS_SUCCESS, "wrong status %x\n", status );
- ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information );
+ ok( status == STATUS_SUCCESS, "wrong status %lx\n", status );
+ ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == strlen(text), "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -730,9 +731,9 @@ static void read_file_test(void)
offset.QuadPart = strlen(text) + 2;
ResetEvent( event );
status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL );
- ok( status == STATUS_END_OF_FILE, "wrong status %x\n", status );
- ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status );
- ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
+ ok( status == STATUS_END_OF_FILE, "wrong status %lx\n", status );
+ ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %lx\n", U(iosb).Status );
+ ok( iosb.Information == 0, "wrong info %Iu\n", iosb.Information );
ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */
@@ -753,9 +754,9 @@ static void read_file_test(void)
aligned_buffer, sizeof(aligned_buffer), &offset, NULL);
ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING
|| broken(status == STATUS_SUCCESS) /* before Vista */,
- "Wrong status %x.\n", status);
- ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status);
- ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information);
+ "Wrong status %lx.\n", status);
+ ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %lx.\n", U(iosb).Status);
+ ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %Iu.\n", iosb.Information);
ok(is_signaled(event), "event is not signaled.\n");
ok(!apc_count, "apc was called.\n");
SleepEx(1, TRUE); /* alertable sleep */
@@ -769,10 +770,10 @@ static void read_file_test(void)
ResetEvent(event);
status = pNtReadFile(handle, event, apc, &apc_count, &iosb,
aligned_buffer, sizeof(aligned_buffer), &offset, NULL);
- ok(status == STATUS_PENDING, "Wrong status %x.\n", status);
+ ok(status == STATUS_PENDING, "Wrong status %lx.\n", status);
WaitForSingleObject(event, 1000);
- ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status);
- ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information);
+ ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %lx.\n", U(iosb).Status);
+ ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %Iu.\n", iosb.Information);
ok(is_signaled(event), "event is not signaled.\n");
ok(!apc_count, "apc was called.\n");
SleepEx(1, TRUE); /* alertable sleep */
@@ -796,57 +797,57 @@ static void append_file_test(void)
GetTempFileNameA( path, "foo", 0, buffer );
handle = CreateFileA(buffer, FILE_WRITE_DATA, 0, NULL, CREATE_ALWAYS, 0, 0);
- ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+ ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %ld\n", GetLastError());
U(iosb).Status = -1;
iosb.Information = -1;
status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text, 2, NULL, NULL);
- ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status);
- ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status);
- ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information);
+ ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status);
+ ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status);
+ ok(iosb.Information == 2, "expected 2, got %Iu\n", iosb.Information);
CloseHandle(handle);
/* It is possible to open a file with only FILE_APPEND_DATA access flags.
It matches the O_WRONLY|O_APPEND open() posix behavior */
handle = CreateFileA(buffer, FILE_APPEND_DATA, 0, NULL, OPEN_EXISTING, 0, 0);
- ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+ ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %ld\n", GetLastError());
U(iosb).Status = -1;
iosb.Information = -1;
offset.QuadPart = 1;
status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 2, 2, &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status);
- ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status);
- ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information);
+ ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status);
+ ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status);
+ ok(iosb.Information == 2, "expected 2, got %Iu\n", iosb.Information);
ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT);
- ok(ret == 4, "expected 4, got %u\n", ret);
+ ok(ret == 4, "expected 4, got %lu\n", ret);
U(iosb).Status = -1;
iosb.Information = -1;
offset.QuadPart = 3;
status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 4, 2, &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status);
- ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status);
- ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information);
+ ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status);
+ ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status);
+ ok(iosb.Information == 2, "expected 2, got %Iu\n", iosb.Information);
ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT);
- ok(ret == 6, "expected 6, got %u\n", ret);
+ ok(ret == 6, "expected 6, got %lu\n", ret);
CloseHandle(handle);
handle = CreateFileA(buffer, FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA, 0, NULL, OPEN_EXISTING, 0, 0);
- ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError());
+ ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %ld\n", GetLastError());
memset(buf, 0, sizeof(buf));
U(iosb).Status = -1;
iosb.Information = -1;
offset.QuadPart = 0;
status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status);
- ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status);
- ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information);
+ ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status);
+ ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status);
+ ok(iosb.Information == 6, "expected 6, got %Iu\n", iosb.Information);
buf[6] = 0;
ok(memcmp(buf, text, 6) == 0, "wrong file contents: %s\n", buf);
@@ -854,18 +855,18 @@ static void append_file_test(void)
iosb.Information = -1;
offset.QuadPart = 0;
status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 3, 3, &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status);
- ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status);
- ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information);
+ ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status);
+ ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status);
+ ok(iosb.Information == 3, "expected 3, got %Iu\n", iosb.Information);
memset(buf, 0, sizeof(buf));
U(iosb).Status = -1;
iosb.Information = -1;
offset.QuadPart = 0;
status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status);
- ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iosb).Status);
- ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information);
+ ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status);
+ ok(U(iosb).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iosb).Status);
+ ok(iosb.Information == 6, "expected 6, got %Iu\n", iosb.Information);
buf[6] = 0;
ok(memcmp(buf, "barbar", 6) == 0, "wrong file contents: %s\n", buf);
@@ -904,7 +905,7 @@ static void nt_mailslot_test(void)
&TimeOut);
ok( rc == STATUS_ACCESS_VIOLATION ||
rc == STATUS_INVALID_PARAMETER, /* win2k3 */
- "rc = %x not STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER\n", rc);
+ "rc = %lx not STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER\n", rc);
/*
* Test to see if the Timeout can be NULL
@@ -915,7 +916,7 @@ static void nt_mailslot_test(void)
NULL);
ok( rc == STATUS_SUCCESS ||
rc == STATUS_INVALID_PARAMETER, /* win2k3 */
- "rc = %x not STATUS_SUCCESS or STATUS_INVALID_PARAMETER\n", rc);
+ "rc = %lx not STATUS_SUCCESS or STATUS_INVALID_PARAMETER\n", rc);
ok( hslot != 0, "Handle is invalid\n");
if ( rc == STATUS_SUCCESS ) pNtClose(hslot);
@@ -927,7 +928,7 @@ static void nt_mailslot_test(void)
rc = pNtCreateMailslotFile(&hslot, DesiredAccess,
&attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize,
&TimeOut);
- ok( rc == STATUS_SUCCESS, "Create MailslotFile failed rc = %x\n", rc);
+ ok( rc == STATUS_SUCCESS, "Create MailslotFile failed rc = %lx\n", rc);
ok( hslot != 0, "Handle is invalid\n");
rc = pNtClose(hslot);
@@ -955,27 +956,27 @@ static void test_set_io_completion(void)
if (sizeof(size) > 4) size |= (ULONGLONG)0x12345678 << 32;
res = pNtCreateIoCompletion( &h, IO_COMPLETION_ALL_ACCESS, NULL, 0 );
- ok( res == STATUS_SUCCESS, "NtCreateIoCompletion failed: %#x\n", res );
+ ok( res == STATUS_SUCCESS, "NtCreateIoCompletion failed: %#lx\n", res );
ok( h && h != INVALID_HANDLE_VALUE, "got invalid handle %p\n", h );
res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout );
- ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletion failed: %#x\n", res );
+ ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletion failed: %#lx\n", res );
res = pNtSetIoCompletion( h, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, size );
- ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %x\n", res );
+ ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %lx\n", res );
count = get_pending_msgs(h);
- ok( count == 1, "Unexpected msg count: %d\n", count );
+ ok( count == 1, "Unexpected msg count: %ld\n", count );
res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout );
- ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#x\n", res );
- ok( key == CKEY_FIRST, "Invalid completion key: %#lx\n", key );
- ok( iosb.Information == size, "Invalid iosb.Information: %lu\n", iosb.Information );
- ok( U(iosb).Status == STATUS_INVALID_DEVICE_REQUEST, "Invalid iosb.Status: %#x\n", U(iosb).Status );
- ok( value == CVALUE_FIRST, "Invalid completion value: %#lx\n", value );
+ ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#lx\n", res );
+ ok( key == CKEY_FIRST, "Invalid completion key: %#Ix\n", key );
+ ok( iosb.Information == size, "Invalid iosb.Information: %Iu\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_INVALID_DEVICE_REQUEST, "Invalid iosb.Status: %#lx\n", U(iosb).Status );
+ ok( value == CVALUE_FIRST, "Invalid completion value: %#Ix\n", value );
count = get_pending_msgs(h);
- ok( !count, "Unexpected msg count: %d\n", count );
+ ok( !count, "Unexpected msg count: %ld\n", count );
if (!pNtRemoveIoCompletionEx)
{
@@ -986,92 +987,92 @@ static void test_set_io_completion(void)
count = 0xdeadbeef;
res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, FALSE );
- ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletionEx failed: %#x\n", res );
- ok( count == 1, "wrong count %u\n", count );
+ ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletionEx failed: %#lx\n", res );
+ ok( count == 1, "wrong count %lu\n", count );
res = pNtSetIoCompletion( h, 123, 456, 789, size );
- ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res );
+ ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res );
count = 0xdeadbeef;
res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, FALSE );
- ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res );
- ok( count == 1, "wrong count %u\n", count );
- ok( info[0].CompletionKey == 123, "wrong key %#lx\n", info[0].CompletionKey );
- ok( info[0].CompletionValue == 456, "wrong value %#lx\n", info[0].CompletionValue );
- ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n",
+ ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#lx\n", res );
+ ok( count == 1, "wrong count %lu\n", count );
+ ok( info[0].CompletionKey == 123, "wrong key %#Ix\n", info[0].CompletionKey );
+ ok( info[0].CompletionValue == 456, "wrong value %#Ix\n", info[0].CompletionValue );
+ ok( info[0].IoStatusBlock.Information == size, "wrong information %#Ix\n",
info[0].IoStatusBlock.Information );
- ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#x\n", U(info[0].IoStatusBlock).Status);
+ ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#lx\n", U(info[0].IoStatusBlock).Status);
res = pNtSetIoCompletion( h, 123, 456, 789, size );
- ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res );
+ ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res );
res = pNtSetIoCompletion( h, 12, 34, 56, size );
- ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res );
+ ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res );
count = 0xdeadbeef;
res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, FALSE );
- ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res );
- ok( count == 2, "wrong count %u\n", count );
- ok( info[0].CompletionKey == 123, "wrong key %#lx\n", info[0].CompletionKey );
- ok( info[0].CompletionValue == 456, "wrong value %#lx\n", info[0].CompletionValue );
- ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n",
+ ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#lx\n", res );
+ ok( count == 2, "wrong count %lu\n", count );
+ ok( info[0].CompletionKey == 123, "wrong key %#Ix\n", info[0].CompletionKey );
+ ok( info[0].CompletionValue == 456, "wrong value %#Ix\n", info[0].CompletionValue );
+ ok( info[0].IoStatusBlock.Information == size, "wrong information %#Ix\n",
info[0].IoStatusBlock.Information );
- ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#x\n", U(info[0].IoStatusBlock).Status);
- ok( info[1].CompletionKey == 12, "wrong key %#lx\n", info[1].CompletionKey );
- ok( info[1].CompletionValue == 34, "wrong value %#lx\n", info[1].CompletionValue );
- ok( info[1].IoStatusBlock.Information == size, "wrong information %#lx\n",
+ ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#lx\n", U(info[0].IoStatusBlock).Status);
+ ok( info[1].CompletionKey == 12, "wrong key %#Ix\n", info[1].CompletionKey );
+ ok( info[1].CompletionValue == 34, "wrong value %#Ix\n", info[1].CompletionValue );
+ ok( info[1].IoStatusBlock.Information == size, "wrong information %#Ix\n",
info[1].IoStatusBlock.Information );
- ok( U(info[1].IoStatusBlock).Status == 56, "wrong status %#x\n", U(info[1].IoStatusBlock).Status);
+ ok( U(info[1].IoStatusBlock).Status == 56, "wrong status %#lx\n", U(info[1].IoStatusBlock).Status);
res = pNtSetIoCompletion( h, 123, 456, 789, size );
- ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res );
+ ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res );
res = pNtSetIoCompletion( h, 12, 34, 56, size );
- ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res );
+ ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res );
count = 0xdeadbeef;
res = pNtRemoveIoCompletionEx( h, info, 1, &count, NULL, FALSE );
- ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res );
- ok( count == 1, "wrong count %u\n", count );
- ok( info[0].CompletionKey == 123, "wrong key %#lx\n", info[0].CompletionKey );
- ok( info[0].CompletionValue == 456, "wrong value %#lx\n", info[0].CompletionValue );
- ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n",
+ ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#lx\n", res );
+ ok( count == 1, "wrong count %lu\n", count );
+ ok( info[0].CompletionKey == 123, "wrong key %#Ix\n", info[0].CompletionKey );
+ ok( info[0].CompletionValue == 456, "wrong value %#Ix\n", info[0].CompletionValue );
+ ok( info[0].IoStatusBlock.Information == size, "wrong information %#Ix\n",
info[0].IoStatusBlock.Information );
- ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#x\n", U(info[0].IoStatusBlock).Status);
+ ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#lx\n", U(info[0].IoStatusBlock).Status);
count = 0xdeadbeef;
res = pNtRemoveIoCompletionEx( h, info, 1, &count, NULL, FALSE );
- ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res );
- ok( count == 1, "wrong count %u\n", count );
- ok( info[0].CompletionKey == 12, "wrong key %#lx\n", info[0].CompletionKey );
- ok( info[0].CompletionValue == 34, "wrong value %#lx\n", info[0].CompletionValue );
- ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n",
+ ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#lx\n", res );
+ ok( count == 1, "wrong count %lu\n", count );
+ ok( info[0].CompletionKey == 12, "wrong key %#Ix\n", info[0].CompletionKey );
+ ok( info[0].CompletionValue == 34, "wrong value %#Ix\n", info[0].CompletionValue );
+ ok( info[0].IoStatusBlock.Information == size, "wrong information %#Ix\n",
info[0].IoStatusBlock.Information );
- ok( U(info[0].IoStatusBlock).Status == 56, "wrong status %#x\n", U(info[0].IoStatusBlock).Status);
+ ok( U(info[0].IoStatusBlock).Status == 56, "wrong status %#lx\n", U(info[0].IoStatusBlock).Status);
apc_count = 0;
QueueUserAPC( user_apc_proc, GetCurrentThread(), (ULONG_PTR)&apc_count );
count = 0xdeadbeef;
res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, FALSE );
- ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletionEx failed: %#x\n", res );
- ok( count == 1, "wrong count %u\n", count );
+ ok( res == STATUS_TIMEOUT, "NtRemoveIoCompletionEx failed: %#lx\n", res );
+ ok( count == 1, "wrong count %lu\n", count );
ok( !apc_count, "wrong apc count %d\n", apc_count );
res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, TRUE );
- ok( res == STATUS_USER_APC, "NtRemoveIoCompletionEx failed: %#x\n", res );
- ok( count == 1, "wrong count %u\n", count );
+ ok( res == STATUS_USER_APC, "NtRemoveIoCompletionEx failed: %#lx\n", res );
+ ok( count == 1, "wrong count %lu\n", count );
ok( apc_count == 1, "wrong apc count %u\n", apc_count );
apc_count = 0;
QueueUserAPC( user_apc_proc, GetCurrentThread(), (ULONG_PTR)&apc_count );
res = pNtSetIoCompletion( h, 123, 456, 789, size );
- ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res );
+ ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#lx\n", res );
res = pNtRemoveIoCompletionEx( h, info, 2, &count, &timeout, TRUE );
- ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res );
- ok( count == 1, "wrong count %u\n", count );
+ ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#lx\n", res );
+ ok( count == 1, "wrong count %lu\n", count );
ok( !apc_count, "wrong apc count %u\n", apc_count );
SleepEx( 1, TRUE );
@@ -1097,7 +1098,7 @@ static void test_file_io_completion(void)
HANDLE h;
res = pNtCreateIoCompletion( &h, IO_COMPLETION_ALL_ACCESS, NULL, 0 );
- ok( res == STATUS_SUCCESS, "NtCreateIoCompletion failed: %#x\n", res );
+ ok( res == STATUS_SUCCESS, "NtCreateIoCompletion failed: %#lx\n", res );
ok( h && h != INVALID_HANDLE_VALUE, "got invalid handle %p\n", h );
fci.CompletionPort = h;
fci.CompletionKey = CKEY_SECOND;
@@ -1105,31 +1106,31 @@ static void test_file_io_completion(void)
server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND,
PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
4, 1024, 1024, 1000, NULL );
- ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError() );
+ ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() );
client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL );
- ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError() );
+ ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() );
U(iosb).Status = 0xdeadbeef;
res = pNtSetInformationFile( server, &iosb, &fci, sizeof(fci), FileCompletionInformation );
- ok( res == STATUS_INVALID_PARAMETER, "NtSetInformationFile failed: %#x\n", res );
+ ok( res == STATUS_INVALID_PARAMETER, "NtSetInformationFile failed: %#lx\n", res );
todo_wine
- ok( U(iosb).Status == 0xdeadbeef, "wrong status %#x\n", U(iosb).Status );
+ ok( U(iosb).Status == 0xdeadbeef, "wrong status %#lx\n", U(iosb).Status );
CloseHandle( client );
CloseHandle( server );
server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED,
PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
4, 1024, 1024, 1000, NULL );
- ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError() );
+ ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() );
client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL );
- ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError() );
+ ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() );
U(iosb).Status = 0xdeadbeef;
res = pNtSetInformationFile( server, &iosb, &fci, sizeof(fci), FileCompletionInformation );
- ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %#x\n", res );
- ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %#x\n", U(iosb).Status );
+ ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %#lx\n", res );
+ ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %#lx\n", U(iosb).Status );
memset( send_buf, 0, TEST_BUF_LEN );
memset( recv_buf, 0xde, TEST_BUF_LEN );
@@ -1141,11 +1142,11 @@ static void test_file_io_completion(void)
WriteFile( client, send_buf, TEST_BUF_LEN, &read, NULL );
res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout );
- ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#x\n", res );
- ok( key == CKEY_SECOND, "Invalid completion key: %#lx\n", key );
- ok( iosb.Information == 3, "Invalid iosb.Information: %ld\n", iosb.Information );
- ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#x\n", U(iosb).Status );
- ok( value == (ULONG_PTR)&o, "Invalid completion value: %#lx\n", value );
+ ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#lx\n", res );
+ ok( key == CKEY_SECOND, "Invalid completion key: %#Ix\n", key );
+ ok( iosb.Information == 3, "Invalid iosb.Information: %Id\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#lx\n", U(iosb).Status );
+ ok( value == (ULONG_PTR)&o, "Invalid completion value: %#Ix\n", value );
ok( !memcmp( send_buf, recv_buf, TEST_BUF_LEN ),
"Receive buffer (%02x %02x %02x) did not match send buffer (%02x %02x %02x)\n",
recv_buf[0], recv_buf[1], recv_buf[2], send_buf[0], send_buf[1], send_buf[2] );
@@ -1162,11 +1163,11 @@ static void test_file_io_completion(void)
ok( count == 1, "Unexpected msg count: %ld\n", count );
res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout );
- ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#x\n", res );
- ok( key == CKEY_SECOND, "Invalid completion key: %#lx\n", key );
- ok( iosb.Information == 2, "Invalid iosb.Information: %ld\n", iosb.Information );
- ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#x\n", U(iosb).Status );
- ok( value == (ULONG_PTR)&o, "Invalid completion value: %#lx\n", value );
+ ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#lx\n", res );
+ ok( key == CKEY_SECOND, "Invalid completion key: %#Ix\n", key );
+ ok( iosb.Information == 2, "Invalid iosb.Information: %Id\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#lx\n", U(iosb).Status );
+ ok( value == (ULONG_PTR)&o, "Invalid completion value: %#Ix\n", value );
ok( !memcmp( send_buf, recv_buf, 2 ),
"Receive buffer (%02x %02x) did not match send buffer (%02x %02x)\n",
recv_buf[0], recv_buf[1], send_buf[0], send_buf[1] );
@@ -1177,11 +1178,11 @@ static void test_file_io_completion(void)
ok( count == 1, "Unexpected msg count: %ld\n", count );
res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout );
- ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#x\n", res );
- ok( key == CKEY_SECOND, "Invalid completion key: %lx\n", key );
- ok( iosb.Information == 0, "Invalid iosb.Information: %ld\n", iosb.Information );
- ok( U(iosb).Status == STATUS_PIPE_BROKEN, "Invalid iosb.Status: %x\n", U(iosb).Status );
- ok( value == (ULONG_PTR)&o, "Invalid completion value: %lx\n", value );
+ ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#lx\n", res );
+ ok( key == CKEY_SECOND, "Invalid completion key: %Ix\n", key );
+ ok( iosb.Information == 0, "Invalid iosb.Information: %Id\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_PIPE_BROKEN, "Invalid iosb.Status: %lx\n", U(iosb).Status );
+ ok( value == (ULONG_PTR)&o, "Invalid completion value: %Ix\n", value );
CloseHandle( client );
@@ -1189,10 +1190,10 @@ static void test_file_io_completion(void)
server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED,
PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
4, 1024, 1024, 1000, NULL );
- ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError() );
+ ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() );
client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL );
- ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError() );
+ ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() );
memset( send_buf, 0, TEST_BUF_LEN );
memset( recv_buf, 0xde, TEST_BUF_LEN );
@@ -1202,19 +1203,19 @@ static void test_file_io_completion(void)
U(iosb).Status = 0xdeadbeef;
res = pNtSetInformationFile( server, &iosb, &fci, sizeof(fci), FileCompletionInformation );
- ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res );
- ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", U(iosb).Status );
+ ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %lx\n", res );
+ ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %lx\n", U(iosb).Status );
count = get_pending_msgs(h);
ok( !count, "Unexpected msg count: %ld\n", count );
WriteFile( client, send_buf, TEST_BUF_LEN, &read, NULL );
res = pNtRemoveIoCompletion( h, &key, &value, &iosb, &timeout );
- ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#x\n", res );
- ok( key == CKEY_SECOND, "Invalid completion key: %#lx\n", key );
- ok( iosb.Information == 3, "Invalid iosb.Information: %ld\n", iosb.Information );
- ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#x\n", U(iosb).Status );
- ok( value == (ULONG_PTR)&o, "Invalid completion value: %#lx\n", value );
+ ok( res == STATUS_SUCCESS, "NtRemoveIoCompletion failed: %#lx\n", res );
+ ok( key == CKEY_SECOND, "Invalid completion key: %#Ix\n", key );
+ ok( iosb.Information == 3, "Invalid iosb.Information: %Id\n", iosb.Information );
+ ok( U(iosb).Status == STATUS_SUCCESS, "Invalid iosb.Status: %#lx\n", U(iosb).Status );
+ ok( value == (ULONG_PTR)&o, "Invalid completion value: %#Ix\n", value );
ok( !memcmp( send_buf, recv_buf, TEST_BUF_LEN ),
"Receive buffer (%02x %02x %02x) did not match send buffer (%02x %02x %02x)\n",
recv_buf[0], recv_buf[1], recv_buf[2], send_buf[0], send_buf[1], send_buf[2] );
@@ -1224,7 +1225,7 @@ static void test_file_io_completion(void)
/* using APCs on handle with associated completion port is not allowed */
res = pNtReadFile( server, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL );
- ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res);
+ ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %lx\n", res);
CloseHandle( server );
CloseHandle( client );
@@ -1233,10 +1234,10 @@ static void test_file_io_completion(void)
server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED,
PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
4, 1024, 1024, 1000, NULL );
- ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError() );
+ ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() );
client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL );
- ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError() );
+ ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() );
apc_count = 0;
memset( send_buf, 0, TEST_BUF_LEN );
@@ -1245,12 +1246,12 @@ static void test_file_io_completion(void)
ok( !count, "Unexpected msg count: %ld\n", count );
res = pNtReadFile( server, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL );
- ok(res == STATUS_PENDING, "NtReadFile returned %x\n", res);
+ ok(res == STATUS_PENDING, "NtReadFile returned %lx\n", res);
U(iosb).Status = 0xdeadbeef;
res = pNtSetInformationFile( server, &iosb, &fci, sizeof(fci), FileCompletionInformation );
- ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res );
- ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", U(iosb).Status );
+ ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %lx\n", res );
+ ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %lx\n", U(iosb).Status );
count = get_pending_msgs(h);
ok( !count, "Unexpected msg count: %ld\n", count );
@@ -1267,7 +1268,7 @@ static void test_file_io_completion(void)
/* using APCs on handle with associated completion port is not allowed */
res = pNtReadFile( server, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL );
- ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res);
+ ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %lx\n", res);
CloseHandle( server );
CloseHandle( client );
@@ -1289,9 +1290,9 @@ static void test_file_full_size_information(void)
/* Assume No Quota Settings configured on Wine Testbot */
res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation);
- todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res);
+ todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res);
res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation);
- ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res);
+ ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res);
/* Test for FileFsSizeInformation */
ok(fsi.TotalAllocationUnits.QuadPart > 0,
@@ -1302,8 +1303,8 @@ static void test_file_full_size_information(void)
wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart));
/* Assume file system is NTFS */
- ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector);
- ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %d\n",fsi.SectorsPerAllocationUnit);
+ ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %ld\n",fsi.BytesPerSector);
+ ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %ld\n",fsi.SectorsPerAllocationUnit);
todo_wine
{
@@ -1329,8 +1330,8 @@ static void test_file_full_size_information(void)
/* Assume file system is NTFS */
todo_wine
{
- ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %d\n",ffsi.BytesPerSector);
- ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %d\n",ffsi.SectorsPerAllocationUnit);
+ ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %ld\n",ffsi.BytesPerSector);
+ ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %ld\n",ffsi.SectorsPerAllocationUnit);
}
CloseHandle( h );
@@ -1351,24 +1352,24 @@ static void test_file_basic_information(void)
res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res);
ok ( (fbi.FileAttributes & FILE_ATTRIBUTE_ARCHIVE) == FILE_ATTRIBUTE_ARCHIVE,
- "attribute %x not expected\n", fbi.FileAttributes );
+ "attribute %lx not expected\n", fbi.FileAttributes );
memset(&fbi2, 0, sizeof(fbi2));
fbi2.LastWriteTime.QuadPart = -1;
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res );
- ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status );
+ ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", U(io).Status );
memset(&fbi2, 0, sizeof(fbi2));
fbi2.LastAccessTime.QuadPart = 0x200deadcafebeef;
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile(h, &io, &fbi2, sizeof(fbi2), FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res );
- ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status );
+ ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", U(io).Status );
res = pNtQueryInformationFile(h, &io, &fbi, sizeof(fbi), FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't get system attribute, NtQueryInformationFile returned %x\n", res );
- ok ( U(io).Status == STATUS_SUCCESS, "can't get system attribute, io.Status is %x\n", U(io).Status );
+ ok ( U(io).Status == STATUS_SUCCESS, "can't get system attribute, io.Status is %lx\n", U(io).Status );
ok ( fbi2.LastAccessTime.QuadPart == fbi.LastAccessTime.QuadPart,
"large access time set/get does not match.\n" );
@@ -1381,7 +1382,7 @@ static void test_file_basic_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res );
- ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status );
+ ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", U(io).Status );
memset(&fbi2, 0, sizeof(fbi2));
res = pNtQueryInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation);
@@ -1395,12 +1396,12 @@ static void test_file_basic_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res );
- ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status );
+ ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", U(io).Status );
memset(&fbi, 0, sizeof(fbi));
res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't get attributes\n");
- todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM\n", fbi.FileAttributes );
+ todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %lx not FILE_ATTRIBUTE_SYSTEM\n", fbi.FileAttributes );
/* Then HIDDEN */
memset(&fbi, 0, sizeof(fbi));
@@ -1408,12 +1409,12 @@ static void test_file_basic_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res );
- ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status );
+ ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %lx\n", U(io).Status );
memset(&fbi, 0, sizeof(fbi));
res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't get attributes\n");
- todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN\n", fbi.FileAttributes );
+ todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %lx not FILE_ATTRIBUTE_HIDDEN\n", fbi.FileAttributes );
/* Check NORMAL last of all (to make sure we can clear attributes) */
memset(&fbi, 0, sizeof(fbi));
@@ -1421,12 +1422,12 @@ static void test_file_basic_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't set normal attribute, NtSetInformationFile returned %x\n", res );
- ok ( U(io).Status == STATUS_SUCCESS, "can't set normal attribute, io.Status is %x\n", U(io).Status );
+ ok ( U(io).Status == STATUS_SUCCESS, "can't set normal attribute, io.Status is %lx\n", U(io).Status );
memset(&fbi, 0, sizeof(fbi));
res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't get attributes\n");
- todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_NORMAL, "attribute %x not 0\n", fbi.FileAttributes );
+ todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_NORMAL, "attribute %lx not 0\n", fbi.FileAttributes );
CloseHandle( h );
}
@@ -1452,7 +1453,7 @@ static void test_file_all_information(void)
res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation);
ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res);
ok ( (fai_buf.fai.BasicInformation.FileAttributes & FILE_ATTRIBUTE_ARCHIVE) == FILE_ATTRIBUTE_ARCHIVE,
- "attribute %x not expected\n", fai_buf.fai.BasicInformation.FileAttributes );
+ "attribute %lx not expected\n", fai_buf.fai.BasicInformation.FileAttributes );
/* Then SYSTEM */
/* Clear fbi to avoid setting times */
@@ -1461,16 +1462,16 @@ static void test_file_all_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation);
ok ( res == STATUS_INVALID_INFO_CLASS || broken(res == STATUS_NOT_IMPLEMENTED), "shouldn't be able to set FileAllInformation, res %x\n", res);
- todo_wine ok ( U(io).Status == 0xdeadbeef, "shouldn't be able to set FileAllInformation, io.Status is %x\n", U(io).Status);
+ todo_wine ok ( U(io).Status == 0xdeadbeef, "shouldn't be able to set FileAllInformation, io.Status is %lx\n", U(io).Status);
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile(h, &io, &fai_buf.fai.BasicInformation, sizeof fai_buf.fai.BasicInformation, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't set system attribute, res: %x\n", res );
- ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %x\n", U(io).Status );
+ ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %lx\n", U(io).Status );
memset(&fai_buf.fai, 0, sizeof(fai_buf.fai));
res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation);
ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res);
- todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %x not FILE_ATTRIBUTE_SYSTEM\n", fai_buf.fai.BasicInformation.FileAttributes );
+ todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %lx not FILE_ATTRIBUTE_SYSTEM\n", fai_buf.fai.BasicInformation.FileAttributes );
/* Then HIDDEN */
memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation));
@@ -1478,12 +1479,12 @@ static void test_file_all_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile(h, &io, &fai_buf.fai.BasicInformation, sizeof fai_buf.fai.BasicInformation, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't set system attribute, res: %x\n", res );
- ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %x\n", U(io).Status );
+ ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %lx\n", U(io).Status );
memset(&fai_buf.fai, 0, sizeof(fai_buf.fai));
res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation);
ok ( res == STATUS_SUCCESS, "can't get attributes\n");
- todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %x not FILE_ATTRIBUTE_HIDDEN\n", fai_buf.fai.BasicInformation.FileAttributes );
+ todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %lx not FILE_ATTRIBUTE_HIDDEN\n", fai_buf.fai.BasicInformation.FileAttributes );
/* Check NORMAL last of all (to make sure we can clear attributes) */
memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation));
@@ -1491,12 +1492,12 @@ static void test_file_all_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile(h, &io, &fai_buf.fai.BasicInformation, sizeof fai_buf.fai.BasicInformation, FileBasicInformation);
ok ( res == STATUS_SUCCESS, "can't set system attribute, res: %x\n", res );
- ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %x\n", U(io).Status );
+ ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status: %lx\n", U(io).Status );
memset(&fai_buf.fai, 0, sizeof(fai_buf.fai));
res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation);
ok ( res == STATUS_SUCCESS, "can't get attributes\n");
- todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_NORMAL, "attribute %x not FILE_ATTRIBUTE_NORMAL\n", fai_buf.fai.BasicInformation.FileAttributes );
+ todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_NORMAL, "attribute %lx not FILE_ATTRIBUTE_NORMAL\n", fai_buf.fai.BasicInformation.FileAttributes );
CloseHandle( h );
}
@@ -1505,11 +1506,11 @@ static void delete_object( WCHAR *path )
{
BOOL ret = DeleteFileW( path );
ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED,
- "DeleteFileW failed with %u\n", GetLastError() );
+ "DeleteFileW failed with %lu\n", GetLastError() );
if (!ret && GetLastError() == ERROR_ACCESS_DENIED)
{
ret = RemoveDirectoryW( path );
- ok( ret, "RemoveDirectoryW failed with %u\n", GetLastError() );
+ ok( ret, "RemoveDirectoryW failed with %lu\n", GetLastError() );
}
}
@@ -1547,8 +1548,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( fileDeleted, "file should not exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1556,7 +1557,7 @@ static void test_file_rename_information(void)
fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) );
res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0;
ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n",
wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) );
@@ -1585,8 +1586,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1615,8 +1616,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( fileDeleted, "file should not exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1648,8 +1649,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1682,8 +1683,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1717,8 +1718,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( fileDeleted, "file should not exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1726,7 +1727,7 @@ static void test_file_rename_information(void)
fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) );
res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0;
ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n",
wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) );
@@ -1764,8 +1765,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- todo_wine ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ todo_wine ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
todo_wine ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1804,8 +1805,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1840,8 +1841,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1874,8 +1875,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( fileDeleted, "file should not exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1910,8 +1911,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1947,8 +1948,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -1983,8 +1984,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2022,8 +2023,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2056,8 +2057,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2089,8 +2090,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2123,8 +2124,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( fileDeleted, "file should not exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2132,7 +2133,7 @@ static void test_file_rename_information(void)
fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) );
res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0;
ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n",
wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) );
@@ -2160,8 +2161,8 @@ static void test_file_rename_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation );
- ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "got status %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "got io status %#lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "got status %lx\n", res );
ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" );
CloseHandle( handle );
@@ -2204,8 +2205,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2213,7 +2214,7 @@ static void test_file_link_information(void)
fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) );
res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0;
ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n",
wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) );
@@ -2242,8 +2243,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2272,8 +2273,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2303,8 +2304,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2312,7 +2313,7 @@ static void test_file_link_information(void)
CloseHandle( handle );
handle = FindFirstFileW( newpath, &find_data );
- ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError());
+ ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %ld\n", GetLastError());
if (handle != INVALID_HANDLE_VALUE)
{
todo_wine ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName),
@@ -2345,8 +2346,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2379,8 +2380,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2414,8 +2415,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef , "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef , "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2423,7 +2424,7 @@ static void test_file_link_information(void)
fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) );
res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0;
ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n",
wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) );
@@ -2461,8 +2462,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2495,9 +2496,9 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
ok( res == STATUS_OBJECT_NAME_COLLISION || res == STATUS_FILE_IS_A_DIRECTORY /* > Win XP */,
- "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %x\n", res );
+ "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2532,9 +2533,9 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
ok( res == STATUS_OBJECT_NAME_COLLISION || res == STATUS_FILE_IS_A_DIRECTORY /* > Win XP */,
- "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %x\n", res );
+ "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2567,8 +2568,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2603,8 +2604,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2640,9 +2641,9 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
ok( res == STATUS_OBJECT_NAME_COLLISION || res == STATUS_FILE_IS_A_DIRECTORY /* > Win XP */,
- "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %x\n", res );
+ "res expected STATUS_OBJECT_NAME_COLLISION or STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2677,8 +2678,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2716,8 +2717,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_FILE_IS_A_DIRECTORY, "res expected STATUS_FILE_IS_A_DIRECTORY, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2750,8 +2751,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2783,8 +2784,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status );
- ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", U(io).Status );
+ ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2817,8 +2818,8 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "file should exist\n" );
fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -2826,7 +2827,7 @@ static void test_file_link_information(void)
fni = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR) );
res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation );
- ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
+ ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0;
ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n",
wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) );
@@ -2854,14 +2855,14 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#x\n", U(io).Status );
- ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#lx\n", U(io).Status );
+ ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %lx\n", res );
fli->ReplaceIfExists = TRUE;
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "got status %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "got io status %#lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "got status %lx\n", res );
ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" );
CloseHandle( handle );
@@ -2885,19 +2886,19 @@ static void test_file_link_information(void)
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#x\n", U(io).Status );
- ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %x\n", res );
+ todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#lx\n", U(io).Status );
+ ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %lx\n", res );
fli->ReplaceIfExists = TRUE;
U(io).Status = 0xdeadbeef;
res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation );
- ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status );
- ok( res == STATUS_SUCCESS, "got status %x\n", res );
+ ok( U(io).Status == STATUS_SUCCESS, "got io status %#lx\n", U(io).Status );
+ ok( res == STATUS_SUCCESS, "got status %lx\n", res );
ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" );
CloseHandle( handle );
handle = FindFirstFileW( oldpath, &find_data );
- ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError());
+ ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %ld\n", GetLastError());
if (handle != INVALID_HANDLE_VALUE)
{
todo_wine ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName),
@@ -2976,10 +2977,10 @@ static void test_file_disposition_information(void)
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
res = pNtSetInformationFile( handle, &io, &fdi, 0, FileDispositionInformation );
todo_wine
- ok( res == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %x\n", res );
+ ok( res == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %lx\n", res );
fdi2 = 0x100;
res = pNtSetInformationFile( handle, &io, &fdi2, sizeof(fdi2), FileDispositionInformation );
- ok( res == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %x\n", res );
+ ok( res == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %lx\n", res );
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "File shouldn't have been deleted\n" );
@@ -2990,10 +2991,10 @@ static void test_file_disposition_information(void)
handle = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
res = pNtQueryInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_INVALID_INFO_CLASS || res == STATUS_NOT_IMPLEMENTED, "Unexpected NtQueryInformationFile result (expected STATUS_INVALID_INFO_CLASS, got %x)\n", res );
+ ok( res == STATUS_INVALID_INFO_CLASS || res == STATUS_NOT_IMPLEMENTED, "Unexpected NtQueryInformationFile result (expected STATUS_INVALID_INFO_CLASS, got %lx)\n", res );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_ACCESS_DENIED, "unexpected FileDispositionInformation result (expected STATUS_ACCESS_DENIED, got %x)\n", res );
+ ok( res == STATUS_ACCESS_DENIED, "unexpected FileDispositionInformation result (expected STATUS_ACCESS_DENIED, got %lx)\n", res );
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "File shouldn't have been deleted\n" );
@@ -3005,7 +3006,7 @@ static void test_file_disposition_information(void)
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res );
+ ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res );
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( fileDeleted, "File should have been deleted\n" );
@@ -3018,10 +3019,10 @@ static void test_file_disposition_information(void)
ok( handle2 != INVALID_HANDLE_VALUE, "failed to open temp file\n" );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res );
+ ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res );
res = nt_get_file_attrs( buffer, &fdi2 );
todo_wine
- ok( res == STATUS_DELETE_PENDING, "got %#x\n", res );
+ ok( res == STATUS_DELETE_PENDING, "got %#lx\n", res );
/* can't open the deleted file */
handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0);
todo_wine
@@ -3029,12 +3030,12 @@ static void test_file_disposition_information(void)
if (handle3 != INVALID_HANDLE_VALUE)
CloseHandle( handle3 );
todo_wine
- ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError());
/* can't open the deleted file (wrong sharing mode) */
handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, 0, 0);
ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" );
todo_wine
- ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError());
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "File shouldn't have been deleted\n" );
@@ -3050,11 +3051,11 @@ static void test_file_disposition_information(void)
handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0);
ok( handle2 != INVALID_HANDLE_VALUE, "failed to open temp file\n" );
res = nt_get_file_attrs( buffer, &fdi2 );
- ok( res == STATUS_SUCCESS, "got %#x\n", res );
+ ok( res == STATUS_SUCCESS, "got %#lx\n", res );
/* can't open the marked for delete file (wrong sharing mode) */
handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, 0, 0);
ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" );
- ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %lu\n", GetLastError());
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "File shouldn't have been deleted\n" );
@@ -3069,7 +3070,7 @@ static void test_file_disposition_information(void)
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res );
+ ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %lx)\n", res );
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "File shouldn't have been deleted\n" );
@@ -3083,7 +3084,7 @@ static void test_file_disposition_information(void)
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
todo_wine
- ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res );
+ ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %lx)\n", res );
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
todo_wine
@@ -3097,10 +3098,10 @@ static void test_file_disposition_information(void)
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res );
+ ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res );
fdi.DoDeleteFile = FALSE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res );
+ ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res );
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "File shouldn't have been deleted\n" );
@@ -3112,7 +3113,7 @@ static void test_file_disposition_information(void)
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
fdi.DoDeleteFile = FALSE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res );
+ ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res );
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( fileDeleted, "File should have been deleted\n" );
@@ -3127,7 +3128,7 @@ static void test_file_disposition_information(void)
ok( !fileDeleted, "File shouldn't have been deleted\n" );
fdi.DoDeleteFile = FALSE;
res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res );
+ ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res );
CloseHandle( handle2 );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( fileDeleted, "File should have been deleted\n" );
@@ -3138,7 +3139,7 @@ static void test_file_disposition_information(void)
ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );
fileDeleted = DeleteFileA( buffer );
ok( !fileDeleted, "File shouldn't have been deleted\n" );
- ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %lu\n", GetLastError());
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "File shouldn't have been deleted\n" );
@@ -3154,12 +3155,12 @@ static void test_file_disposition_information(void)
ok( !fileDeleted, "File shouldn't have been deleted\n" );
res = nt_get_file_attrs( buffer, &fdi2 );
todo_wine
- ok( res == STATUS_DELETE_PENDING, "got %#x\n", res );
+ ok( res == STATUS_DELETE_PENDING, "got %#lx\n", res );
/* can't open the deleted file */
handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0);
ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" );
todo_wine
- ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError());
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( fileDeleted, "File should have been deleted\n" );
@@ -3172,7 +3173,7 @@ static void test_file_disposition_information(void)
ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res );
+ ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res );
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( fileDeleted, "Directory should have been deleted\n" );
@@ -3185,7 +3186,7 @@ static void test_file_disposition_information(void)
ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" );
fileDeleted = RemoveDirectoryA( buffer );
ok( !fileDeleted, "Directory shouldn't have been deleted\n" );
- ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %lu\n", GetLastError());
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "Directory shouldn't have been deleted\n" );
@@ -3203,13 +3204,13 @@ static void test_file_disposition_information(void)
ok( !fileDeleted, "Directory shouldn't have been deleted\n" );
res = nt_get_file_attrs( buffer, &fdi2 );
todo_wine
- ok( res == STATUS_DELETE_PENDING, "got %#x\n", res );
+ ok( res == STATUS_DELETE_PENDING, "got %#lx\n", res );
/* can't open the deleted directory */
handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
todo_wine
ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" );
todo_wine
- ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError());
if (handle2 != INVALID_HANDLE_VALUE) CloseHandle( handle2 );
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
@@ -3225,10 +3226,10 @@ static void test_file_disposition_information(void)
ok( handle2 != INVALID_HANDLE_VALUE, "failed to open a directory\n" );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res );
+ ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %lx)\n", res );
res = nt_get_file_attrs( buffer, &fdi2 );
todo_wine
- ok( res == STATUS_DELETE_PENDING, "got %#x\n", res );
+ ok( res == STATUS_DELETE_PENDING, "got %#lx\n", res );
/* can't open the deleted directory */
handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
todo_wine
@@ -3236,12 +3237,12 @@ static void test_file_disposition_information(void)
if (handle3 != INVALID_HANDLE_VALUE)
CloseHandle( handle3 );
todo_wine
- ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError());
/* can't open the deleted directory (wrong sharing mode) */
handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" );
todo_wine
- ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_ACCESS_DENIED, "got %lu\n", GetLastError());
CloseHandle( handle2 );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "Directory shouldn't have been deleted\n" );
@@ -3261,7 +3262,7 @@ static void test_file_disposition_information(void)
/* can't open the marked for delete file (wrong sharing mode) */
handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" );
- ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %lu\n", GetLastError());
CloseHandle( handle );
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "Directory shouldn't have been deleted\n" );
@@ -3282,7 +3283,7 @@ static void test_file_disposition_information(void)
ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" );
SetLastError(0xdeadbeef);
CloseHandle( handle );
- ok(GetLastError() == 0xdeadbeef, "got %u\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "got %lu\n", GetLastError());
fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
ok( !fileDeleted, "Directory shouldn't have been deleted\n" );
buffer[dirpos] = '\\';
@@ -3304,7 +3305,7 @@ static void test_file_disposition_information(void)
CloseHandle( handle2 );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation );
- ok( res == STATUS_DIRECTORY_NOT_EMPTY, "unexpected FileDispositionInformation result (expected STATUS_DIRECTORY_NOT_EMPTY, got %x)\n", res );
+ ok( res == STATUS_DIRECTORY_NOT_EMPTY, "unexpected FileDispositionInformation result (expected STATUS_DIRECTORY_NOT_EMPTY, got %lx)\n", res );
fileDeleted = DeleteFileA( buffer );
ok( fileDeleted, "File should have been deleted\n" );
buffer[dirpos] = '\0';
@@ -3318,89 +3319,89 @@ static void test_file_disposition_information(void)
GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 );
- ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() );
+ ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() );
WriteFile(handle, "data", 4, &size, NULL);
mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL );
- ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() );
+ ok( !!mapping, "failed to create mapping, error %lu\n", GetLastError() );
fdi.DoDeleteFile = FALSE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation );
- ok( !res, "got %#x\n", res );
+ ok( !res, "got %#lx\n", res );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation );
- ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res );
+ ok( res == STATUS_CANNOT_DELETE, "got %#lx\n", res );
res = GetFileAttributesA( buffer );
ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" );
CloseHandle( mapping );
CloseHandle( handle );
res = DeleteFileA( buffer );
- ok( res, "got error %u\n", GetLastError() );
+ ok( res, "got error %lu\n", GetLastError() );
GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 );
- ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() );
+ ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() );
WriteFile(handle, "data", 4, &size, NULL);
mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL );
- ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() );
+ ok( !!mapping, "failed to create mapping, error %lu\n", GetLastError() );
CloseHandle( mapping );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation );
- ok( !res, "got %#x\n", res );
+ ok( !res, "got %#lx\n", res );
CloseHandle( handle );
res = DeleteFileA( buffer );
ok( !res, "expected failure\n" );
- ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %lu\n", GetLastError() );
/* a file with an open view cannot be deleted */
GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 );
- ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() );
+ ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() );
WriteFile(handle, "data", 4, &size, NULL);
mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL );
- ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() );
+ ok( !!mapping, "failed to create mapping, error %lu\n", GetLastError() );
view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4 );
- ok( !!view, "failed to map view, error %u\n", GetLastError() );
+ ok( !!view, "failed to map view, error %lu\n", GetLastError() );
CloseHandle( mapping );
fdi.DoDeleteFile = FALSE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation );
- ok( !res, "got %#x\n", res );
+ ok( !res, "got %#lx\n", res );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation );
- ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res );
+ ok( res == STATUS_CANNOT_DELETE, "got %#lx\n", res );
res = GetFileAttributesA( buffer );
ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" );
UnmapViewOfFile( view );
CloseHandle( handle );
res = DeleteFileA( buffer );
- ok( res, "got error %u\n", GetLastError() );
+ ok( res, "got error %lu\n", GetLastError() );
GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 );
- ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() );
+ ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() );
WriteFile(handle, "data", 4, &size, NULL);
mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL );
- ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() );
+ ok( !!mapping, "failed to create mapping, error %lu\n", GetLastError() );
view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4 );
- ok( !!view, "failed to map view, error %u\n", GetLastError() );
+ ok( !!view, "failed to map view, error %lu\n", GetLastError() );
CloseHandle( mapping );
UnmapViewOfFile( view );
fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation );
- ok( !res, "got %#x\n", res );
+ ok( !res, "got %#lx\n", res );
CloseHandle( handle );
res = DeleteFileA( buffer );
ok( !res, "expected failure\n" );
- ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %lu\n", GetLastError() );
}
static void test_file_name_information(void)
@@ -3451,33 +3452,33 @@ static void test_file_name_information(void)
ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n");
hr = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileNameInformation );
- ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x.\n", hr);
+ ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#lx.\n", hr);
memset( info, 0xcc, info_size );
hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation );
- ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n",
+ ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#lx, expected %#lx.\n",
hr, STATUS_BUFFER_OVERFLOW);
- ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n",
+ ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#lx, expected %#lx.\n",
U(io).Status, STATUS_BUFFER_OVERFLOW);
- ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength);
+ ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %lu\n", info->FileNameLength);
ok(info->FileName[2] == 0xcccc, "info->FileName[2] is %#x, expected 0xcccc.\n", info->FileName[2]);
ok(CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]),
"info->FileName[1] is %p, expected %p.\n",
CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1]));
- ok(io.Information == sizeof(*info), "io.Information is %lu\n", io.Information);
+ ok(io.Information == sizeof(*info), "io.Information is %Iu\n", io.Information);
memset( info, 0xcc, info_size );
hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation );
- ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS);
- ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS);
- ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength);
+ ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#lx, expected %#lx.\n", hr, STATUS_SUCCESS);
+ ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#lx, expected %#lx.\n", U(io).Status, STATUS_SUCCESS);
+ ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %lu\n", info->FileNameLength);
ok(info->FileName[info->FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->FileName[len] is %#x, expected 0xcccc.\n",
info->FileName[info->FileNameLength / sizeof(WCHAR)]);
info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0';
ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n",
wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected ));
ok(io.Information == FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength,
- "io.Information is %lu, expected %u.\n",
+ "io.Information is %Iu, expected %lu.\n",
io.Information, FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength);
CloseHandle( h );
@@ -3520,7 +3521,7 @@ static void test_file_name_information(void)
memset( info, 0xcc, info_size );
hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation );
- ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS);
+ ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#lx, expected %#lx.\n", hr, STATUS_SUCCESS);
info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0';
ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n",
wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected ));
@@ -3580,30 +3581,30 @@ static void test_file_all_name_information(void)
ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n");
hr = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileAllInformation );
- ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x, expected %#x.\n",
+ ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#lx, expected %#lx.\n",
hr, STATUS_INFO_LENGTH_MISMATCH);
memset( info, 0xcc, info_size );
hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileAllInformation );
- ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n",
+ ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#lx, expected %#lx.\n",
hr, STATUS_BUFFER_OVERFLOW);
- ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n",
+ ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#lx, expected %#lx.\n",
U(io).Status, STATUS_BUFFER_OVERFLOW);
ok(info->NameInformation.FileNameLength == lstrlenW( expected ) * sizeof(WCHAR),
- "info->NameInformation.FileNameLength is %u\n", info->NameInformation.FileNameLength );
+ "info->NameInformation.FileNameLength is %lu\n", info->NameInformation.FileNameLength );
ok(info->NameInformation.FileName[2] == 0xcccc,
"info->NameInformation.FileName[2] is %#x, expected 0xcccc.\n", info->NameInformation.FileName[2]);
ok(CharLowerW((LPWSTR)(UINT_PTR)info->NameInformation.FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]),
"info->NameInformation.FileName[1] is %p, expected %p.\n",
CharLowerW((LPWSTR)(UINT_PTR)info->NameInformation.FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1]));
- ok(io.Information == sizeof(*info), "io.Information is %lu\n", io.Information);
+ ok(io.Information == sizeof(*info), "io.Information is %Iu\n", io.Information);
memset( info, 0xcc, info_size );
hr = pNtQueryInformationFile( h, &io, info, info_size, FileAllInformation );
- ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS);
- ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS);
+ ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#lx, expected %#lx.\n", hr, STATUS_SUCCESS);
+ ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#lx, expected %#lx.\n", U(io).Status, STATUS_SUCCESS);
ok(info->NameInformation.FileNameLength == lstrlenW( expected ) * sizeof(WCHAR),
- "info->NameInformation.FileNameLength is %u\n", info->NameInformation.FileNameLength );
+ "info->NameInformation.FileNameLength is %lu\n", info->NameInformation.FileNameLength );
ok(info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)] == 0xcccc,
"info->NameInformation.FileName[len] is %#x, expected 0xcccc.\n",
info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)]);
@@ -3613,7 +3614,7 @@ static void test_file_all_name_information(void)
wine_dbgstr_w( info->NameInformation.FileName ), wine_dbgstr_w( expected ));
ok(io.Information == FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName)
+ info->NameInformation.FileNameLength,
- "io.Information is %lu\n", io.Information );
+ "io.Information is %Iu\n", io.Information );
CloseHandle( h );
HeapFree( GetProcessHeap(), 0, info );
@@ -3655,7 +3656,7 @@ static void test_file_all_name_information(void)
memset( info, 0xcc, info_size );
hr = pNtQueryInformationFile( h, &io, info, info_size, FileAllInformation );
- ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS);
+ ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#lx, expected %#lx.\n", hr, STATUS_SUCCESS);
info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)] = '\0';
ok(!lstrcmpiW( info->NameInformation.FileName, expected ), "info->NameInformation.FileName is %s, expected %s.\n",
wine_dbgstr_w( info->NameInformation.FileName ), wine_dbgstr_w( expected ));
@@ -3677,12 +3678,12 @@ static void _test_completion_flags(unsigned line, HANDLE handle, DWORD expected_
info.Flags = 0xdeadbeef;
status = pNtQueryInformationFile(handle, &io, &info, sizeof(info),
FileIoCompletionNotificationInformation);
- ok_(__FILE__,line)(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
- ok_(__FILE__,line)(io.Status == STATUS_SUCCESS, "Status = %x\n", io.Status);
- ok_(__FILE__,line)(io.Information == sizeof(info), "Information = %lu\n", io.Information);
+ ok_(__FILE__,line)(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
+ ok_(__FILE__,line)(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status);
+ ok_(__FILE__,line)(io.Information == sizeof(info), "Information = %Iu\n", io.Information);
/* FILE_SKIP_SET_USER_EVENT_ON_FAST_IO is not supported on win2k3 */
ok_(__FILE__,line)((info.Flags & ~FILE_SKIP_SET_USER_EVENT_ON_FAST_IO) == expected_flags,
- "got %08x\n", info.Flags);
+ "got %08lx\n", info.Flags);
}
static void test_file_completion_information(void)
@@ -3703,7 +3704,7 @@ static void test_file_completion_information(void)
status = pNtSetInformationFile(h, &io, &info, sizeof(info) - 1, FileIoCompletionNotificationInformation);
ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS /* XP */),
- "expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+ "expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);
if (status != STATUS_INFO_LENGTH_MISMATCH)
{
win_skip("FileIoCompletionNotificationInformation class not supported\n");
@@ -3713,34 +3714,34 @@ static void test_file_completion_information(void)
info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS;
status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+ ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %08lx\n", status);
CloseHandle(h);
if (!(h = create_temp_file(FILE_FLAG_OVERLAPPED))) return;
info.Flags = FILE_SKIP_SET_EVENT_ON_HANDLE;
status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
test_completion_flags(h, FILE_SKIP_SET_EVENT_ON_HANDLE);
info.Flags = FILE_SKIP_SET_USER_EVENT_ON_FAST_IO;
status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
test_completion_flags(h, FILE_SKIP_SET_EVENT_ON_HANDLE);
info.Flags = 0;
status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
test_completion_flags(h, FILE_SKIP_SET_EVENT_ON_HANDLE);
info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS;
status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
test_completion_flags(h, FILE_SKIP_SET_EVENT_ON_HANDLE | FILE_SKIP_COMPLETION_PORT_ON_SUCCESS);
info.Flags = 0xdeadbeef;
status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
test_completion_flags(h, FILE_SKIP_SET_EVENT_ON_HANDLE | FILE_SKIP_COMPLETION_PORT_ON_SUCCESS);
CloseHandle(h);
@@ -3750,36 +3751,36 @@ static void test_file_completion_information(void)
memset(&ov, 0, sizeof(ov));
ov.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
port = CreateIoCompletionPort(h, NULL, 0xdeadbeef, 0);
- ok(port != NULL, "CreateIoCompletionPort failed, error %u\n", GetLastError());
+ ok(port != NULL, "CreateIoCompletionPort failed, error %lu\n", GetLastError());
for (i = 0; i < 10; i++)
{
SetLastError(0xdeadbeef);
ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov);
ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */,
- "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError());
+ "Unexpected result %#x, GetLastError() %lu.\n", ret, GetLastError());
if (ret || GetLastError() != ERROR_IO_PENDING) break;
ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE);
- ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError());
+ ok(ret, "GetOverlappedResult failed, error %lu\n", GetLastError());
ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000);
- ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError());
+ ok(ret, "GetQueuedCompletionStatus failed, error %lu\n", GetLastError());
ret = FALSE;
}
if (ret)
{
- ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes);
+ ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %lu\n", num_bytes);
key = 0;
pov = NULL;
ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000);
- ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError());
- ok(key == 0xdeadbeef, "expected 0xdeadbeef, got %lx\n", key);
+ ok(ret, "GetQueuedCompletionStatus failed, error %lu\n", GetLastError());
+ ok(key == 0xdeadbeef, "expected 0xdeadbeef, got %Ix\n", key);
ok(pov == &ov, "expected %p, got %p\n", &ov, pov);
}
info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS;
status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
test_completion_flags(h, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS);
for (i = 0; i < 10; i++)
@@ -3787,15 +3788,15 @@ static void test_file_completion_information(void)
SetLastError(0xdeadbeef);
ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov);
ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */,
- "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError());
+ "Unexpected result %#x, GetLastError() %lu.\n", ret, GetLastError());
if (ret || GetLastError() != ERROR_IO_PENDING) break;
ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE);
- ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError());
+ ok(ret, "GetOverlappedResult failed, error %lu\n", GetLastError());
ret = FALSE;
}
if (ret)
{
- ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes);
+ ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %lu\n", num_bytes);
pov = (void *)0xdeadbeef;
ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 500);
@@ -3805,7 +3806,7 @@ static void test_file_completion_information(void)
info.Flags = 0;
status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status);
test_completion_flags(h, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS);
for (i = 0; i < 10; i++)
@@ -3813,17 +3814,17 @@ static void test_file_completion_information(void)
SetLastError(0xdeadbeef);
ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov);
ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */,
- "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError());
+ "Unexpected result %#x, GetLastError() %lu.\n", ret, GetLastError());
if (ret || GetLastError() != ERROR_IO_PENDING) break;
ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE);
- ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError());
+ ok(ret, "GetOverlappedResult failed, error %lu\n", GetLastError());
ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000);
- ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError());
+ ok(ret, "GetQueuedCompletionStatus failed, error %lu\n", GetLastError());
ret = FALSE;
}
if (ret)
{
- ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes);
+ ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %lu\n", num_bytes);
pov = (void *)0xdeadbeef;
ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000);
@@ -3838,32 +3839,32 @@ static void test_file_completion_information(void)
return;
port = CreateIoCompletionPort(h, NULL, 0xdeadbeef, 0);
- ok(port != NULL, "CreateIoCompletionPort failed, error %u.\n", GetLastError());
+ ok(port != NULL, "CreateIoCompletionPort failed, error %lu.\n", GetLastError());
info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS;
status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %#lx.\n", status);
test_completion_flags(h, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS);
ret = WriteFile(h, aligned_buf, sizeof(aligned_buf), &num_bytes, &ov);
if (!ret && GetLastError() == ERROR_IO_PENDING)
{
ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE);
- ok(ret, "GetOverlappedResult failed, error %u.\n", GetLastError());
- ok(num_bytes == sizeof(aligned_buf), "expected sizeof(aligned_buf), got %u.\n", num_bytes);
+ ok(ret, "GetOverlappedResult failed, error %lu.\n", GetLastError());
+ ok(num_bytes == sizeof(aligned_buf), "expected sizeof(aligned_buf), got %lu.\n", num_bytes);
ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000);
- ok(ret, "GetQueuedCompletionStatus failed, error %u.\n", GetLastError());
+ ok(ret, "GetQueuedCompletionStatus failed, error %lu.\n", GetLastError());
}
- ok(num_bytes == sizeof(aligned_buf), "expected sizeof(buf), got %u.\n", num_bytes);
+ ok(num_bytes == sizeof(aligned_buf), "expected sizeof(buf), got %lu.\n", num_bytes);
SetLastError(0xdeadbeef);
ret = ReadFile(h, aligned_buf, sizeof(aligned_buf), &num_bytes, &ov);
- ok(!ret && GetLastError() == ERROR_IO_PENDING, "Unexpected result, ret %#x, error %u.\n",
+ ok(!ret && GetLastError() == ERROR_IO_PENDING, "Unexpected result, ret %#x, error %lu.\n",
ret, GetLastError());
ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE);
- ok(ret, "GetOverlappedResult failed, error %u.\n", GetLastError());
+ ok(ret, "GetOverlappedResult failed, error %lu.\n", GetLastError());
ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000);
- ok(ret, "GetQueuedCompletionStatus failed, error %u.\n", GetLastError());
+ ok(ret, "GetQueuedCompletionStatus failed, error %lu.\n", GetLastError());
CloseHandle(ov.hEvent);
CloseHandle(port);
@@ -3896,15 +3897,15 @@ static void test_file_id_information(void)
ok( ret, "GetFileInformationByHandle failed\n" );
dwords = (DWORD *)&fid.VolumeSerialNumber;
- ok( dwords[0] == info.dwVolumeSerialNumber, "expected %08x, got %08x\n",
+ ok( dwords[0] == info.dwVolumeSerialNumber, "expected %08lx, got %08lx\n",
info.dwVolumeSerialNumber, dwords[0] );
ok( dwords[1] != 0x11111111, "expected != 0x11111111\n" );
dwords = (DWORD *)&fid.FileId;
- ok( dwords[0] == info.nFileIndexLow, "expected %08x, got %08x\n", info.nFileIndexLow, dwords[0] );
- ok( dwords[1] == info.nFileIndexHigh, "expected %08x, got %08x\n", info.nFileIndexHigh, dwords[1] );
- ok( dwords[2] == 0, "expected 0, got %08x\n", dwords[2] );
- ok( dwords[3] == 0, "expected 0, got %08x\n", dwords[3] );
+ ok( dwords[0] == info.nFileIndexLow, "expected %08lx, got %08lx\n", info.nFileIndexLow, dwords[0] );
+ ok( dwords[1] == info.nFileIndexHigh, "expected %08lx, got %08lx\n", info.nFileIndexHigh, dwords[1] );
+ ok( dwords[2] == 0, "expected 0, got %08lx\n", dwords[2] );
+ ok( dwords[3] == 0, "expected 0, got %08lx\n", dwords[3] );
CloseHandle( h );
}
@@ -3919,15 +3920,15 @@ static void test_file_access_information(void)
if (!(h = create_temp_file(0))) return;
status = pNtQueryInformationFile( h, &io, &info, sizeof(info) - 1, FileAccessInformation );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status );
status = pNtQueryInformationFile( (HANDLE)0xdeadbeef, &io, &info, sizeof(info), FileAccessInformation );
- ok( status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08x\n", status );
+ ok( status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08lx\n", status );
memset(&info, 0x11, sizeof(info));
status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAccessInformation );
- ok( status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status );
- ok( info.AccessFlags == 0x13019f, "got %08x\n", info.AccessFlags );
+ ok( status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status );
+ ok( info.AccessFlags == 0x13019f, "got %08lx\n", info.AccessFlags );
CloseHandle( h );
}
@@ -3943,37 +3944,37 @@ static void test_file_attribute_tag_information(void)
if (!(h = create_temp_file(0))) return;
status = pNtQueryInformationFile( h, &io, &info, sizeof(info) - 1, FileAttributeTagInformation );
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status );
status = pNtQueryInformationFile( (HANDLE)0xdeadbeef, &io, &info, sizeof(info), FileAttributeTagInformation );
- ok( status == STATUS_INVALID_HANDLE, "got %#x\n", status );
+ ok( status == STATUS_INVALID_HANDLE, "got %#lx\n", status );
memset(&info, 0x11, sizeof(info));
status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation );
- ok( status == STATUS_SUCCESS, "got %#x\n", status );
+ ok( status == STATUS_SUCCESS, "got %#lx\n", status );
info.FileAttributes &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
- ok( info.FileAttributes == FILE_ATTRIBUTE_ARCHIVE, "got attributes %#x\n", info.FileAttributes );
- ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag );
+ ok( info.FileAttributes == FILE_ATTRIBUTE_ARCHIVE, "got attributes %#lx\n", info.FileAttributes );
+ ok( !info.ReparseTag, "got reparse tag %#lx\n", info.ReparseTag );
fbi.FileAttributes = FILE_ATTRIBUTE_SYSTEM;
status = pNtSetInformationFile(h, &io, &fbi, sizeof(fbi), FileBasicInformation);
- ok( status == STATUS_SUCCESS, "got %#x\n", status );
+ ok( status == STATUS_SUCCESS, "got %#lx\n", status );
memset(&info, 0x11, sizeof(info));
status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation );
- ok( status == STATUS_SUCCESS, "got %#x\n", status );
- todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_SYSTEM, "got attributes %#x\n", info.FileAttributes );
- ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag );
+ ok( status == STATUS_SUCCESS, "got %#lx\n", status );
+ todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_SYSTEM, "got attributes %#lx\n", info.FileAttributes );
+ ok( !info.ReparseTag, "got reparse tag %#lx\n", info.ReparseTag );
fbi.FileAttributes = FILE_ATTRIBUTE_HIDDEN;
status = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation);
- ok( status == STATUS_SUCCESS, "got %#x\n", status );
+ ok( status == STATUS_SUCCESS, "got %#lx\n", status );
memset(&info, 0x11, sizeof(info));
status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation );
- ok( status == STATUS_SUCCESS, "got %#x\n", status );
- todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_HIDDEN, "got attributes %#x\n", info.FileAttributes );
- ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag );
+ ok( status == STATUS_SUCCESS, "got %#lx\n", status );
+ todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_HIDDEN, "got attributes %#lx\n", info.FileAttributes );
+ ok( !info.ReparseTag, "got reparse tag %#lx\n", info.ReparseTag );
CloseHandle( h );
}
@@ -4019,7 +4020,7 @@ static void test_file_mode(void)
GetTempPathW(MAX_PATH, tmp_path);
res = GetTempFileNameW(tmp_path, fooW, 0, dos_file_name);
- ok(res, "GetTempFileNameW failed: %u\n", GetLastError());
+ ok(res, "GetTempFileNameW failed: %lu\n", GetLastError());
pRtlDosPathNameToNtPathName_U( dos_file_name, &file_name, NULL, NULL );
pipe_dev_name.Buffer = pipe_devW;
@@ -4048,18 +4049,18 @@ static void test_file_mode(void)
if (option_tests[i].file_name == &file_name)
{
file = CreateFileW(dos_file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
- ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError());
+ ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError());
CloseHandle(file);
access |= GENERIC_WRITE | DELETE;
}
status = pNtOpenFile(&file, access, &attr, &io, 0, option_tests[i].options);
- ok(status == STATUS_SUCCESS, "[%u] NtOpenFile failed: %x\n", i, status);
+ ok(status == STATUS_SUCCESS, "[%u] NtOpenFile failed: %lx\n", i, status);
memset(&mode, 0xcc, sizeof(mode));
status = pNtQueryInformationFile(file, &io, &mode, sizeof(mode), FileModeInformation);
- ok(status == STATUS_SUCCESS, "[%u] can't get FileModeInformation: %x\n", i, status);
- ok(mode.Mode == option_tests[i].mode, "[%u] Mode = %x, expected %x\n",
+ ok(status == STATUS_SUCCESS, "[%u] can't get FileModeInformation: %lx\n", i, status);
+ ok(mode.Mode == option_tests[i].mode, "[%u] Mode = %lx, expected %lx\n",
i, mode.Mode, option_tests[i].mode);
pNtClose(file);
@@ -4092,7 +4093,7 @@ static void test_query_volume_information_file(void)
status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
pRtlFreeUnicodeString( &nameW );
ZeroMemory( buf, sizeof(buf) );
@@ -4103,19 +4104,19 @@ static void test_query_volume_information_file(void)
ffvi = (FILE_FS_VOLUME_INFORMATION *)buf;
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status);
- ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %ld\n", status);
+ ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %ld\n", U(io).Status);
ok(io.Information == (FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel) + ffvi->VolumeLabelLength),
- "expected %d, got %lu\n", (FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel) + ffvi->VolumeLabelLength),
+ "expected %ld, got %Iu\n", (FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel) + ffvi->VolumeLabelLength),
io.Information);
todo_wine ok(ffvi->VolumeCreationTime.QuadPart != 0, "Missing VolumeCreationTime\n");
ok(ffvi->VolumeSerialNumber != 0, "Missing VolumeSerialNumber\n");
ok(ffvi->SupportsObjects == 1,"expected 1, got %d\n", ffvi->SupportsObjects);
- ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "got %d\n", ffvi->VolumeLabelLength);
+ ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "got %ld\n", ffvi->VolumeLabelLength);
- trace("VolumeSerialNumber: %x VolumeLabelName: %s\n", ffvi->VolumeSerialNumber, wine_dbgstr_w(ffvi->VolumeLabel));
+ trace("VolumeSerialNumber: %lx VolumeLabelName: %s\n", ffvi->VolumeSerialNumber, wine_dbgstr_w(ffvi->VolumeLabel));
CloseHandle( dir );
}
@@ -4142,7 +4143,7 @@ static void test_query_attribute_information_file(void)
status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT );
- ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ ok( !status, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
pRtlFreeUnicodeString( &nameW );
ZeroMemory( buf, sizeof(buf) );
@@ -4153,13 +4154,13 @@ static void test_query_attribute_information_file(void)
ffai = (FILE_FS_ATTRIBUTE_INFORMATION *)buf;
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status);
- ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %ld\n", status);
+ ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %ld\n", U(io).Status);
ok(ffai->FileSystemAttributes != 0, "Missing FileSystemAttributes\n");
ok(ffai->MaximumComponentNameLength != 0, "Missing MaximumComponentNameLength\n");
ok(ffai->FileSystemNameLength != 0, "Missing FileSystemNameLength\n");
- trace("FileSystemAttributes: %x MaximumComponentNameLength: %x FileSystemName: %s\n",
+ trace("FileSystemAttributes: %lx MaximumComponentNameLength: %lx FileSystemName: %s\n",
ffai->FileSystemAttributes, ffai->MaximumComponentNameLength,
wine_dbgstr_wn(ffai->FileSystemName, ffai->FileSystemNameLength / sizeof(WCHAR)));
@@ -4220,11 +4221,11 @@ static void test_NtCreateFile(void)
td[i].attrib_in, FILE_SHARE_READ|FILE_SHARE_WRITE,
td[i].disposition, 0, NULL, 0);
- ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status);
+ ok(status == td[i].status, "%ld: expected %#lx got %#lx\n", i, td[i].status, status);
if (!status)
{
- ok(io.Information == td[i].result,"%d: expected %#x got %#lx\n", i, td[i].result, io.Information);
+ ok(io.Information == td[i].result,"%ld: expected %#lx got %#Ix\n", i, td[i].result, io.Information);
ret = GetFileAttributesW(path);
ret &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
@@ -4232,11 +4233,11 @@ static void test_NtCreateFile(void)
if (ret != td[i].attrib_out)
{
todo_wine
- ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret);
+ ok(ret == td[i].attrib_out, "%ld: expected %#lx got %#lx\n", i, td[i].attrib_out, ret);
SetFileAttributesW(path, td[i].attrib_out);
}
else
- ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret);
+ ok(ret == td[i].attrib_out, "%ld: expected %#lx got %#lx\n", i, td[i].attrib_out, ret);
CloseHandle(handle);
}
@@ -4270,33 +4271,33 @@ static void test_read_write(void)
iob.Information = -1;
offset.QuadPart = 0;
status = pNtReadFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL);
- ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information);
+ ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = 0;
status = pNtReadFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, NULL, sizeof(buf), &offset, NULL);
- ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information);
+ ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = 0;
status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL);
- ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information);
+ ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = 0;
status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL);
- ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information);
+ ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information);
hfile = create_temp_file(0);
if (!hfile) return;
@@ -4304,50 +4305,50 @@ static void test_read_write(void)
U(iob).Status = -1;
iob.Information = -1;
status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL);
- ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information);
+ ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information);
U(iob).Status = -1;
iob.Information = -1;
SetEvent(event);
status = pNtWriteFile(hfile, event, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL);
- ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information);
+ ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information);
ok(!is_signaled(event), "event is not signaled\n");
U(iob).Status = -1;
iob.Information = -1;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information);
+ ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information);
U(iob).Status = -1;
iob.Information = -1;
SetEvent(event);
status = pNtReadFile(hfile, event, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information);
+ ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information);
ok(is_signaled(event), "event is not signaled\n");
U(iob).Status = -1;
iob.Information = -1;
SetEvent(event);
status = pNtReadFile(hfile, event, NULL, NULL, &iob, (void*)0xdeadbeef, sizeof(contents), NULL, NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information);
+ ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information);
ok(is_signaled(event), "event is not signaled\n");
U(iob).Status = -1;
iob.Information = -1;
status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, 7, NULL, NULL);
- ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status);
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == 7, "expected 7, got %lu\n", iob.Information);
+ ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 7, "expected 7, got %Iu\n", iob.Information);
SetFilePointer(hfile, 0, NULL, FILE_BEGIN);
@@ -4355,41 +4356,41 @@ static void test_read_write(void)
iob.Information = -1;
offset.QuadPart = (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */;
status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents + 7, sizeof(contents) - 7, &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status);
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == sizeof(contents) - 7, "expected sizeof(contents)-7, got %lu\n", iob.Information);
+ ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == sizeof(contents) - 7, "expected sizeof(contents)-7, got %Iu\n", iob.Information);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off);
+ ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off);
bytes = 0xdeadbeef;
SetLastError(0xdeadbeef);
ret = ReadFile(INVALID_HANDLE_VALUE, buf, 0, &bytes, NULL);
ok(!ret, "ReadFile should fail\n");
- ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError());
+ ok(bytes == 0, "bytes %lu\n", bytes);
bytes = 0xdeadbeef;
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, 0, &bytes, NULL);
- ok(ret, "ReadFile error %d\n", GetLastError());
- ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(ret, "ReadFile error %ld\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError());
+ ok(bytes == 0, "bytes %lu\n", bytes);
bytes = 0xdeadbeef;
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL);
- ok(ret, "ReadFile error %d\n", GetLastError());
- ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(ret, "ReadFile error %ld\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError());
+ ok(bytes == 0, "bytes %lu\n", bytes);
SetFilePointer(hfile, 0, NULL, FILE_BEGIN);
bytes = 0;
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL);
- ok(ret, "ReadFile error %d\n", GetLastError());
- ok(bytes == sizeof(contents), "bytes %u\n", bytes);
+ ok(ret, "ReadFile error %ld\n", GetLastError());
+ ok(bytes == sizeof(contents), "bytes %lu\n", bytes);
ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n");
for (i = -20; i < -1; i++)
@@ -4400,9 +4401,9 @@ static void test_read_write(void)
iob.Information = -1;
offset.QuadPart = (LONGLONG)i;
status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL);
- ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information);
+ ok(status == STATUS_INVALID_PARAMETER, "%ld: expected STATUS_INVALID_PARAMETER, got %#lx\n", i, status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information);
}
SetFilePointer(hfile, sizeof(contents) - 4, NULL, FILE_BEGIN);
@@ -4411,65 +4412,65 @@ static void test_read_write(void)
iob.Information = -1;
offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */;
status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status);
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information);
+ ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 4, "expected 4, got %Iu\n", iob.Information);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off);
+ ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off);
U(iob).Status = -1;
iob.Information = -1;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL);
- ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status);
- ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status);
- ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information);
+ ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", status);
+ ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information);
SetFilePointer(hfile, 0, NULL, FILE_BEGIN);
bytes = 0;
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL);
- ok(ret, "ReadFile error %d\n", GetLastError());
- ok(bytes == sizeof(contents), "bytes %u\n", bytes);
+ ok(ret, "ReadFile error %ld\n", GetLastError());
+ ok(bytes == sizeof(contents), "bytes %lu\n", bytes);
ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n");
ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n");
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off);
+ ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off);
SetFilePointer(hfile, 0, NULL, FILE_BEGIN);
bytes = 0;
SetLastError(0xdeadbeef);
ret = WriteFile(hfile, contents, sizeof(contents), &bytes, NULL);
- ok(ret, "WriteFile error %d\n", GetLastError());
- ok(bytes == sizeof(contents), "bytes %u\n", bytes);
+ ok(ret, "WriteFile error %ld\n", GetLastError());
+ ok(bytes == sizeof(contents), "bytes %lu\n", bytes);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off);
+ ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off);
/* test reading beyond EOF */
bytes = -1;
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL);
- ok(ret, "ReadFile error %d\n", GetLastError());
- ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(ret, "ReadFile error %ld\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError());
+ ok(bytes == 0, "bytes %lu\n", bytes);
bytes = -1;
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, 0, &bytes, NULL);
- ok(ret, "ReadFile error %d\n", GetLastError());
- ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(ret, "ReadFile error %ld\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError());
+ ok(bytes == 0, "bytes %lu\n", bytes);
bytes = -1;
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, NULL, 0, &bytes, NULL);
- ok(ret, "ReadFile error %d\n", GetLastError());
- ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(ret, "ReadFile error %ld\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError());
+ ok(bytes == 0, "bytes %lu\n", bytes);
S(U(ovl)).Offset = sizeof(contents);
S(U(ovl)).OffsetHigh = 0;
@@ -4480,10 +4481,10 @@ static void test_read_write(void)
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl);
ok(!ret, "ReadFile should fail\n");
- ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %d\n", GetLastError());
- ok(bytes == 0, "bytes %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh);
+ ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %ld\n", GetLastError());
+ ok(bytes == 0, "bytes %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh);
S(U(ovl)).Offset = sizeof(contents);
S(U(ovl)).OffsetHigh = 0;
@@ -4493,57 +4494,57 @@ static void test_read_write(void)
bytes = -1;
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, 0, &bytes, &ovl);
- ok(ret, "ReadFile error %d\n", GetLastError());
- ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
- ok(bytes == 0, "bytes %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh);
+ ok(ret, "ReadFile error %ld\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %ld\n", GetLastError());
+ ok(bytes == 0, "bytes %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh);
U(iob).Status = -1;
iob.Information = -1;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL);
- ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status);
- ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status);
- ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information);
+ ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", status);
+ ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information);
U(iob).Status = -1;
iob.Information = -1;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, NULL, NULL);
- ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status);
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information);
+ ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = sizeof(contents);
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL);
- ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status);
- ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status);
- ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information);
+ ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", status);
+ ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = sizeof(contents);
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status);
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information);
+ ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL);
- ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status);
- ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status);
- ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information);
+ ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", status);
+ ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status);
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information);
+ ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information);
for (i = -20; i < 0; i++)
{
@@ -4553,9 +4554,9 @@ static void test_read_write(void)
iob.Information = -1;
offset.QuadPart = (LONGLONG)i;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL);
- ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information);
+ ok(status == STATUS_INVALID_PARAMETER, "%ld: expected STATUS_INVALID_PARAMETER, got %#lx\n", i, status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information);
}
SetFilePointer(hfile, 0, NULL, FILE_BEGIN);
@@ -4563,48 +4564,48 @@ static void test_read_write(void)
bytes = 0;
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL);
- ok(ret, "ReadFile error %d\n", GetLastError());
- ok(bytes == sizeof(contents), "bytes %u\n", bytes);
+ ok(ret, "ReadFile error %ld\n", GetLastError());
+ ok(bytes == sizeof(contents), "bytes %lu\n", bytes);
ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n");
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off);
+ ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = 0;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status);
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information);
+ ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %Iu\n", iob.Information);
ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n");
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off);
+ ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = sizeof(contents) - 4;
status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status);
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information);
+ ok(status == STATUS_SUCCESS, "NtWriteFile error %#lx\n", status);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 4, "expected 4, got %Iu\n", iob.Information);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off);
+ ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = 0;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL);
- ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status);
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information);
+ ok(status == STATUS_SUCCESS, "NtReadFile error %#lx\n", status);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %Iu\n", iob.Information);
ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n");
ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n");
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off);
+ ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off);
S(U(ovl)).Offset = sizeof(contents) - 4;
S(U(ovl)).OffsetHigh = 0;
@@ -4612,11 +4613,11 @@ static void test_read_write(void)
bytes = 0;
SetLastError(0xdeadbeef);
ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl);
- ok(ret, "WriteFile error %d\n", GetLastError());
- ok(bytes == 4, "bytes %u\n", bytes);
+ ok(ret, "WriteFile error %ld\n", GetLastError());
+ ok(bytes == 4, "bytes %lu\n", bytes);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off);
+ ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off);
S(U(ovl)).Offset = 0;
S(U(ovl)).OffsetHigh = 0;
@@ -4626,15 +4627,15 @@ static void test_read_write(void)
bytes = 0;
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl);
- ok(ret, "ReadFile error %d\n", GetLastError());
- ok(bytes == sizeof(contents), "bytes %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh);
+ ok(ret, "ReadFile error %ld\n", GetLastError());
+ ok(bytes == sizeof(contents), "bytes %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %Iu\n", ovl.InternalHigh);
ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n");
ok(!memcmp(buf + sizeof(contents) - 4, "ABCD", 4), "file contents mismatch\n");
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == sizeof(contents), "expected sizeof(contents), got %u\n", off);
+ ok(off == sizeof(contents), "expected sizeof(contents), got %lu\n", off);
CloseHandle(hfile);
@@ -4645,8 +4646,8 @@ static void test_read_write(void)
SetLastError(0xdeadbeef);
ret = ReadFile(INVALID_HANDLE_VALUE, buf, 0, &bytes, NULL);
ok(!ret, "ReadFile should fail\n");
- ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError());
+ ok(bytes == 0, "bytes %lu\n", bytes);
S(U(ovl)).Offset = 0;
S(U(ovl)).OffsetHigh = 0;
@@ -4657,23 +4658,23 @@ static void test_read_write(void)
SetLastError(0xdeadbeef);
/* ReadFile return value depends on Windows version and testing it is not practical */
ReadFile(hfile, buf, 0, &bytes, &ovl);
- ok(bytes == 0, "bytes %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh);
+ ok(bytes == 0, "bytes %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh);
bytes = 0xdeadbeef;
SetLastError(0xdeadbeef);
ret = WriteFile(hfile, contents, sizeof(contents), &bytes, NULL);
ok(!ret, "WriteFile should fail\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());
+ ok(bytes == 0, "bytes %lu\n", bytes);
U(iob).Status = -1;
iob.Information = -1;
status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), NULL, NULL);
- ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information);
+ ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information);
for (i = -20; i < -1; i++)
{
@@ -4681,9 +4682,9 @@ static void test_read_write(void)
iob.Information = -1;
offset.QuadPart = (LONGLONG)i;
status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL);
- ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information);
+ ok(status == STATUS_INVALID_PARAMETER, "%ld: expected STATUS_INVALID_PARAMETER, got %#lx\n", i, status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information);
}
U(iob).Status = -1;
@@ -4691,31 +4692,31 @@ static void test_read_write(void)
offset.QuadPart = 0;
status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL);
ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */,
- "expected STATUS_PENDING, got %#x.\n", status);
+ "expected STATUS_PENDING, got %#lx.\n", status);
if (status == STATUS_PENDING)
{
ret = WaitForSingleObject(hfile, 3000);
- ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret);
+ ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret);
}
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %Iu\n", iob.Information);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
bytes = 0xdeadbeef;
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL);
ok(!ret, "ReadFile should fail\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError());
+ ok(bytes == 0, "bytes %lu\n", bytes);
U(iob).Status = -1;
iob.Information = -1;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL);
- ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information);
+ ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information);
for (i = -20; i < 0; i++)
{
@@ -4723,13 +4724,13 @@ static void test_read_write(void)
iob.Information = -1;
offset.QuadPart = (LONGLONG)i;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL);
- ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information);
+ ok(status == STATUS_INVALID_PARAMETER, "%ld: expected STATUS_INVALID_PARAMETER, got %#lx\n", i, status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Id\n", iob.Information);
}
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
/* test reading beyond EOF */
offset.QuadPart = sizeof(contents);
@@ -4744,11 +4745,11 @@ static void test_read_write(void)
ok(!ret, "ReadFile should fail\n");
ret = GetLastError();
ok(ret == ERROR_IO_PENDING || broken(ret == ERROR_HANDLE_EOF) /* before Vista */,
- "expected ERROR_IO_PENDING, got %d\n", ret);
- ok(bytes == 0, "bytes %u\n", bytes);
+ "expected ERROR_IO_PENDING, got %ld\n", ret);
+ ok(bytes == 0, "bytes %lu\n", bytes);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
if (ret == ERROR_IO_PENDING)
{
@@ -4756,14 +4757,14 @@ static void test_read_write(void)
SetLastError(0xdeadbeef);
ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE);
ok(!ret, "GetOverlappedResult should report FALSE\n");
- ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %d\n", GetLastError());
- ok(bytes == 0, "expected 0, read %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh);
+ ok(GetLastError() == ERROR_HANDLE_EOF, "expected ERROR_HANDLE_EOF, got %ld\n", GetLastError());
+ ok(bytes == 0, "expected 0, read %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh);
}
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
offset.QuadPart = sizeof(contents);
S(U(ovl)).Offset = offset.u.LowPart;
@@ -4775,22 +4776,22 @@ static void test_read_write(void)
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, 0, &bytes, &ovl);
ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */,
- "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError());
+ "Unexpected result, ret %#lx, GetLastError() %lu.\n", ret, GetLastError());
ret = GetLastError();
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(bytes == 0, "bytes %lu\n", bytes);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
if (ret == ERROR_IO_PENDING)
{
bytes = 0xdeadbeef;
SetLastError(0xdeadbeef);
ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE);
- ok(ret, "GetOverlappedResult returned FALSE with %u (expected TRUE)\n", GetLastError());
- ok(bytes == 0, "expected 0, read %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh);
+ ok(ret, "GetOverlappedResult returned FALSE with %lu (expected TRUE)\n", GetLastError());
+ ok(bytes == 0, "expected 0, read %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh);
}
offset.QuadPart = sizeof(contents);
@@ -4803,22 +4804,22 @@ static void test_read_write(void)
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, NULL, 0, &bytes, &ovl);
ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */,
- "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError());
+ "Unexpected result, ret %#lx, GetLastError() %lu.\n", ret, GetLastError());
ret = GetLastError();
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(bytes == 0, "bytes %lu\n", bytes);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
if (ret == ERROR_IO_PENDING)
{
bytes = 0xdeadbeef;
SetLastError(0xdeadbeef);
ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE);
- ok(ret, "GetOverlappedResult returned FALSE with %u (expected TRUE)\n", GetLastError());
- ok(bytes == 0, "expected 0, read %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh);
+ ok(ret, "GetOverlappedResult returned FALSE with %lu (expected TRUE)\n", GetLastError());
+ ok(bytes == 0, "expected 0, read %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == 0, "expected 0, got %Iu\n", ovl.InternalHigh);
}
U(iob).Status = -1;
@@ -4828,41 +4829,41 @@ static void test_read_write(void)
if (status == STATUS_PENDING)
{
ret = WaitForSingleObject(hfile, 3000);
- ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret);
- ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status);
- ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information);
+ ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret);
+ ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information);
}
else
{
- ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status);
- ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);
- ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information);
+ ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", status);
+ ok(U(iob).Status == -1, "expected -1, got %#lx\n", U(iob).Status);
+ ok(iob.Information == -1, "expected -1, got %Iu\n", iob.Information);
}
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = sizeof(contents);
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL);
ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */,
- "expected STATUS_PENDING, got %#x.\n", status);
+ "expected STATUS_PENDING, got %#lx.\n", status);
if (status == STATUS_PENDING)
{
ret = WaitForSingleObject(hfile, 3000);
- ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret);
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information);
+ ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information);
}
else
{
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 0, "expected 0, got %Iu\n", iob.Information);
}
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
S(U(ovl)).Offset = 0;
S(U(ovl)).OffsetHigh = 0;
@@ -4873,27 +4874,27 @@ static void test_read_write(void)
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl);
ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */,
- "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError());
+ "Unexpected result, ret %#lx, GetLastError() %lu.\n", ret, GetLastError());
if (!ret)
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(bytes == 0, "bytes %lu\n", bytes);
else
- ok(bytes == 14, "bytes %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh);
+ ok(bytes == 14, "bytes %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %Iu\n", ovl.InternalHigh);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
bytes = 0xdeadbeef;
ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE);
- ok(ret, "GetOverlappedResult error %d\n", GetLastError());
- ok(bytes == sizeof(contents), "bytes %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh);
+ ok(ret, "GetOverlappedResult error %ld\n", GetLastError());
+ ok(bytes == sizeof(contents), "bytes %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %Iu\n", ovl.InternalHigh);
ok(!memcmp(contents, buf, sizeof(contents)), "file contents mismatch\n");
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
SetFilePointer(hfile, sizeof(contents) - 4, NULL, FILE_BEGIN);
SetEndOfFile(hfile);
@@ -4904,40 +4905,40 @@ static void test_read_write(void)
offset.QuadPart = (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */;
status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL);
ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */,
- "expected STATUS_PENDING, got %#x.\n", status);
+ "expected STATUS_PENDING, got %#lx.\n", status);
if (status == STATUS_PENDING)
{
ret = WaitForSingleObject(hfile, 3000);
- ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret);
+ ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret);
}
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == 4, "expected 4, got %Iu\n", iob.Information);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
U(iob).Status = -1;
iob.Information = -1;
offset.QuadPart = 0;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL);
ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */,
- "expected STATUS_PENDING, got %#x.\n", status);
+ "expected STATUS_PENDING, got %#lx.\n", status);
if (status == STATUS_PENDING)
{
ret = WaitForSingleObject(hfile, 3000);
- ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret);
+ ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret);
}
- ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
- ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information);
+ ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", U(iob).Status);
+ ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %Iu\n", iob.Information);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n");
ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n");
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
S(U(ovl)).Offset = sizeof(contents) - 4;
S(U(ovl)).OffsetHigh = 0;
@@ -4948,29 +4949,29 @@ static void test_read_write(void)
SetLastError(0xdeadbeef);
ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl);
ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */,
- "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError());
+ "Unexpected result %#lx, GetLastError() %lu.\n", ret, GetLastError());
if (!ret)
{
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(bytes == 0, "bytes %lu\n", bytes);
ret = WaitForSingleObject(hfile, 3000);
- ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret);
+ ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret);
}
- else ok(bytes == 4, "bytes %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == 4, "expected 4, got %lu\n", ovl.InternalHigh);
+ else ok(bytes == 4, "bytes %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == 4, "expected 4, got %Iu\n", ovl.InternalHigh);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
bytes = 0xdeadbeef;
ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE);
- ok(ret, "GetOverlappedResult error %d\n", GetLastError());
- ok(bytes == 4, "bytes %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == 4, "expected 4, got %lu\n", ovl.InternalHigh);
+ ok(ret, "GetOverlappedResult error %ld\n", GetLastError());
+ ok(bytes == 4, "bytes %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == 4, "expected 4, got %Iu\n", ovl.InternalHigh);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
S(U(ovl)).Offset = 0;
S(U(ovl)).OffsetHigh = 0;
@@ -4981,31 +4982,31 @@ static void test_read_write(void)
SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl);
ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */,
- "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError());
+ "Unexpected result %#lx, GetLastError() %lu.\n", ret, GetLastError());
if (!ret)
{
- ok(bytes == 0, "bytes %u\n", bytes);
+ ok(bytes == 0, "bytes %lu\n", bytes);
ret = WaitForSingleObject(hfile, 3000);
- ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret);
+ ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %ld\n", ret);
}
- else ok(bytes == 14, "bytes %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh);
+ else ok(bytes == 14, "bytes %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %Iu\n", ovl.InternalHigh);
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
bytes = 0xdeadbeef;
ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE);
- ok(ret, "GetOverlappedResult error %d\n", GetLastError());
- ok(bytes == sizeof(contents), "bytes %u\n", bytes);
- ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
- ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh);
+ ok(ret, "GetOverlappedResult error %ld\n", GetLastError());
+ ok(bytes == sizeof(contents), "bytes %lu\n", bytes);
+ ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#Ix\n", ovl.Internal);
+ ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %Iu\n", ovl.InternalHigh);
ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n");
ok(!memcmp(buf + sizeof(contents) - 4, "ABCD", 4), "file contents mismatch\n");
off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
- ok(off == 0, "expected 0, got %u\n", off);
+ ok(off == 0, "expected 0, got %lu\n", off);
CloseHandle(event);
CloseHandle(hfile);
@@ -5025,18 +5026,18 @@ static void test_ioctl(void)
SetEvent(event);
status = pNtFsControlFile(file, event, NULL, NULL, &iosb, 0xdeadbeef, 0, 0, 0, 0);
todo_wine
- ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile returned %x\n", status);
+ ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile returned %lx\n", status);
ok(!is_signaled(event), "event is signaled\n");
status = pNtFsControlFile(file, (HANDLE)0xdeadbeef, NULL, NULL, &iosb, 0xdeadbeef, 0, 0, 0, 0);
- ok(status == STATUS_INVALID_HANDLE, "NtFsControlFile returned %x\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "NtFsControlFile returned %lx\n", status);
memset(&iosb, 0x55, sizeof(iosb));
status = pNtFsControlFile(file, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0,
&peek_buf, sizeof(peek_buf));
todo_wine
- ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile failed: %x\n", status);
- ok(iosb.Status == 0x55555555, "iosb.Status = %x\n", iosb.Status);
+ ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile failed: %lx\n", status);
+ ok(iosb.Status == 0x55555555, "iosb.Status = %lx\n", iosb.Status);
CloseHandle(event);
CloseHandle(file);
@@ -5057,51 +5058,51 @@ static void test_flush_buffers_file(void)
hfileread = CreateFileA(buffer, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
OPEN_EXISTING, 0, NULL);
- ok(hfileread != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError());
+ ok(hfileread != INVALID_HANDLE_VALUE, "could not open temp file, error %ld.\n", GetLastError());
status = pNtFlushBuffersFile(hfile, NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#lx.\n", status);
status = pNtFlushBuffersFile(hfile, (IO_STATUS_BLOCK *)0xdeadbeaf);
- ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#lx.\n", status);
io_status_block.Information = 0xdeadbeef;
io_status_block.Status = 0xdeadbeef;
status = pNtFlushBuffersFile(hfile, &io_status_block);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status);
- ok(io_status_block.Status == STATUS_SUCCESS, "Got unexpected io_status_block.Status %#x.\n",
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx.\n", status);
+ ok(io_status_block.Status == STATUS_SUCCESS, "Got unexpected io_status_block.Status %#lx.\n",
io_status_block.Status);
- ok(!io_status_block.Information, "Got unexpected io_status_block.Information %#lx.\n",
+ ok(!io_status_block.Information, "Got unexpected io_status_block.Information %#Ix.\n",
io_status_block.Information);
status = pNtFlushBuffersFile(hfileread, &io_status_block);
- ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status);
+ ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#lx.\n", status);
io_status_block.Information = 0xdeadbeef;
io_status_block.Status = 0xdeadbeef;
status = pNtFlushBuffersFile(NULL, &io_status_block);
- ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status);
- ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#x.\n",
+ ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#lx.\n", status);
+ ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#lx.\n",
io_status_block.Status);
- ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#lx.\n",
+ ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#Ix.\n",
io_status_block.Information);
CloseHandle(hfileread);
CloseHandle(hfile);
hfile = CreateFileA(buffer, FILE_APPEND_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
OPEN_EXISTING, 0, NULL);
- ok(hfile != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError());
+ ok(hfile != INVALID_HANDLE_VALUE, "could not open temp file, error %ld.\n", GetLastError());
status = pNtFlushBuffersFile(hfile, &io_status_block);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx.\n", status);
io_status_block.Information = 0xdeadbeef;
io_status_block.Status = 0xdeadbeef;
status = pNtFlushBuffersFile((HANDLE)0xdeadbeef, &io_status_block);
- ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status);
- ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#x.\n",
+ ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#lx.\n", status);
+ ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#lx.\n",
io_status_block.Status);
- ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#lx.\n",
+ ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#Ix.\n",
io_status_block.Information);
CloseHandle(hfile);
@@ -5135,40 +5136,40 @@ static void test_file_readonly_access(void)
status = pNtCreateFile(&handle, FILE_GENERIC_WRITE, &attr, &io, NULL, FILE_ATTRIBUTE_READONLY, default_sharing,
FILE_CREATE, 0, NULL, 0);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx.\n", status);
CloseHandle(handle);
/* NtCreateFile FILE_GENERIC_WRITE */
status = pNtCreateFile(&handle, FILE_GENERIC_WRITE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, default_sharing,
FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0);
- ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status);
+ ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#lx.\n", status);
/* NtCreateFile DELETE without FILE_DELETE_ON_CLOSE */
status = pNtCreateFile(&handle, DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, default_sharing, FILE_OPEN,
FILE_NON_DIRECTORY_FILE, NULL, 0);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx.\n", status);
CloseHandle(handle);
/* NtCreateFile DELETE with FILE_DELETE_ON_CLOSE */
status = pNtCreateFile(&handle, SYNCHRONIZE | DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, default_sharing,
FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0);
- ok(status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %#x.\n", status);
+ ok(status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %#lx.\n", status);
/* NtOpenFile GENERIC_WRITE */
status = pNtOpenFile(&handle, GENERIC_WRITE, &attr, &io, default_sharing, FILE_NON_DIRECTORY_FILE);
- ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status);
+ ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#lx.\n", status);
/* NtOpenFile DELETE without FILE_DELETE_ON_CLOSE */
status = pNtOpenFile(&handle, DELETE, &attr, &io, default_sharing, FILE_NON_DIRECTORY_FILE);
- ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx.\n", status);
CloseHandle(handle);
/* NtOpenFile DELETE with FILE_DELETE_ON_CLOSE */
status = pNtOpenFile(&handle, DELETE, &attr, &io, default_sharing, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE);
- ok(status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %#x.\n", status);
+ ok(status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %#lx.\n", status);
ret = GetFileAttributesW(path);
- ok(ret & FILE_ATTRIBUTE_READONLY, "got wrong attribute: %#x.\n", ret);
+ ok(ret & FILE_ATTRIBUTE_READONLY, "got wrong attribute: %#lx.\n", ret);
/* Clean up */
pRtlFreeUnicodeString(&nameW);
@@ -5185,43 +5186,43 @@ static void test_mailslot_name(void)
NTSTATUS ret;
server = CreateMailslotA( "\\\\.\\mailslot\\winetest", 100, 1000, NULL );
- ok(server != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError());
+ ok(server != INVALID_HANDLE_VALUE, "got error %lu\n", GetLastError());
ret = NtQueryInformationFile( server, &io, buffer, 0, FileNameInformation );
- ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", ret);
+ ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", ret);
memset(buffer, 0xcc, sizeof(buffer));
ret = NtQueryInformationFile( server, &io, buffer,
offsetof(FILE_NAME_INFORMATION, FileName[5]), FileNameInformation );
- todo_wine ok(ret == STATUS_BUFFER_OVERFLOW, "got %#x\n", ret);
+ todo_wine ok(ret == STATUS_BUFFER_OVERFLOW, "got %#lx\n", ret);
if (ret == STATUS_BUFFER_OVERFLOW)
{
- ok(name->FileNameLength == 18, "got length %u\n", name->FileNameLength);
+ ok(name->FileNameLength == 18, "got length %lu\n", name->FileNameLength);
ok(!memcmp(name->FileName, L"\\wine", 10), "got %s\n",
debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR)));
}
memset(buffer, 0xcc, sizeof(buffer));
ret = NtQueryInformationFile( server, &io, buffer, sizeof(buffer), FileNameInformation );
- todo_wine ok(!ret, "got %#x\n", ret);
+ todo_wine ok(!ret, "got %#lx\n", ret);
if (!ret)
{
- ok(name->FileNameLength == 18, "got length %u\n", name->FileNameLength);
+ ok(name->FileNameLength == 18, "got length %lu\n", name->FileNameLength);
ok(!memcmp(name->FileName, L"\\winetest", 18), "got %s\n",
debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR)));
}
client = CreateFileA( "\\\\.\\mailslot\\winetest", 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL );
- ok(client != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError());
+ ok(client != INVALID_HANDLE_VALUE, "got error %lu\n", GetLastError());
ret = NtQueryInformationFile( client, &io, buffer, 0, FileNameInformation );
- ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", ret);
+ ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", ret);
ret = NtQueryInformationFile( client, &io, buffer, sizeof(buffer), FileNameInformation );
- todo_wine ok(ret == STATUS_INVALID_PARAMETER || !ret /* win8+ */, "got %#x\n", ret);
+ todo_wine ok(ret == STATUS_INVALID_PARAMETER || !ret /* win8+ */, "got %#lx\n", ret);
if (!ret)
{
- ok(name->FileNameLength == 18, "got length %u\n", name->FileNameLength);
+ ok(name->FileNameLength == 18, "got length %lu\n", name->FileNameLength);
ok(!memcmp(name->FileName, L"\\winetest", 18), "got %s\n",
debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR)));
}
@@ -5230,13 +5231,13 @@ static void test_mailslot_name(void)
CloseHandle( client );
device = CreateFileA("\\\\.\\mailslot", 0, 0, NULL, OPEN_EXISTING, 0, NULL);
- ok(device != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError());
+ ok(device != INVALID_HANDLE_VALUE, "got error %lu\n", GetLastError());
ret = NtQueryInformationFile( device, &io, buffer, 0, FileNameInformation );
- ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", ret);
+ ok(ret == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", ret);
ret = NtQueryInformationFile( device, &io, buffer, sizeof(buffer), FileNameInformation );
- todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret);
+ todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret);
CloseHandle( device );
}
1
0
[PATCH 1/2] sc: Fix parsing parameter name in the 'switch=param' constructs.
by Dmitry Timoshkov 19 Mar '22
by Dmitry Timoshkov 19 Mar '22
19 Mar '22
So, that 'sc create test binpath=test.exe' actually works.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
programs/sc/sc.c | 63 ++++++++++++++++++++++++------------------------
1 file changed, 31 insertions(+), 32 deletions(-)
diff --git a/programs/sc/sc.c b/programs/sc/sc.c
index 6cf27d93ac2..bd3064da2d8 100644
--- a/programs/sc/sc.c
+++ b/programs/sc/sc.c
@@ -58,44 +58,44 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa
for (i = 0; i < argc; i++)
{
- if (!wcsicmp( argv[i], L"displayname=" ) && i < argc - 1) cp->displayname = argv[i + 1];
- if (!wcsicmp( argv[i], L"binpath=" ) && i < argc - 1) cp->binpath = argv[i + 1];
- if (!wcsicmp( argv[i], L"group=" ) && i < argc - 1) cp->group = argv[i + 1];
- if (!wcsicmp( argv[i], L"depend=" ) && i < argc - 1) cp->depend = argv[i + 1];
- if (!wcsicmp( argv[i], L"obj=" ) && i < argc - 1) cp->obj = argv[i + 1];
- if (!wcsicmp( argv[i], L"password=" ) && i < argc - 1) cp->password = argv[i + 1];
+ if (!wcsnicmp( argv[i], L"displayname=", 12 )) cp->displayname = argv[i] + 12;
+ if (!wcsnicmp( argv[i], L"binpath=", 8 )) cp->binpath = argv[i] + 8;
+ if (!wcsnicmp( argv[i], L"group=", 6 )) cp->group = argv[i] + 6;
+ if (!wcsnicmp( argv[i], L"depend=", 7 )) cp->depend = argv[i] + 7;
+ if (!wcsnicmp( argv[i], L"obj=", 4 )) cp->obj = argv[i] + 4;
+ if (!wcsnicmp( argv[i], L"password=", 9 )) cp->password = argv[i] + 9;
- if (!wcsicmp( argv[i], L"tag=" ) && i < argc - 1)
+ if (!wcsnicmp( argv[i], L"tag=", 4 ))
{
- if (!wcsicmp( argv[i], L"yes" ))
+ if (!wcsicmp( argv[i] + 4, L"yes" ))
{
WINE_FIXME("tag argument not supported\n");
cp->tag = TRUE;
}
}
- if (!wcsicmp( argv[i], L"type=" ) && i < argc - 1)
+ if (!wcsnicmp( argv[i], L"type=", 5 ))
{
- if (!wcsicmp( argv[i + 1], L"own" )) cp->type = SERVICE_WIN32_OWN_PROCESS;
- if (!wcsicmp( argv[i + 1], L"share" )) cp->type = SERVICE_WIN32_SHARE_PROCESS;
- if (!wcsicmp( argv[i + 1], L"kernel" )) cp->type = SERVICE_KERNEL_DRIVER;
- if (!wcsicmp( argv[i + 1], L"filesys" )) cp->type = SERVICE_FILE_SYSTEM_DRIVER;
- if (!wcsicmp( argv[i + 1], L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER;
- if (!wcsicmp( argv[i + 1], L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS;
+ if (!wcsicmp( argv[i] + 5, L"own" )) cp->type = SERVICE_WIN32_OWN_PROCESS;
+ if (!wcsicmp( argv[i] + 5, L"share" )) cp->type = SERVICE_WIN32_SHARE_PROCESS;
+ if (!wcsicmp( argv[i] + 5, L"kernel" )) cp->type = SERVICE_KERNEL_DRIVER;
+ if (!wcsicmp( argv[i] + 5, L"filesys" )) cp->type = SERVICE_FILE_SYSTEM_DRIVER;
+ if (!wcsicmp( argv[i] + 5, L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER;
+ if (!wcsicmp( argv[i] + 5, L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS;
}
- if (!wcsicmp( argv[i], L"start=" ) && i < argc - 1)
+ if (!wcsnicmp( argv[i], L"start=", 6 ))
{
- if (!wcsicmp( argv[i + 1], L"boot" )) cp->start = SERVICE_BOOT_START;
- if (!wcsicmp( argv[i + 1], L"system" )) cp->start = SERVICE_SYSTEM_START;
- if (!wcsicmp( argv[i + 1], L"auto" )) cp->start = SERVICE_AUTO_START;
- if (!wcsicmp( argv[i + 1], L"demand" )) cp->start = SERVICE_DEMAND_START;
- if (!wcsicmp( argv[i + 1], L"disabled" )) cp->start = SERVICE_DISABLED;
+ if (!wcsicmp( argv[i] + 6, L"boot" )) cp->start = SERVICE_BOOT_START;
+ if (!wcsicmp( argv[i] + 6, L"system" )) cp->start = SERVICE_SYSTEM_START;
+ if (!wcsicmp( argv[i] + 6, L"auto" )) cp->start = SERVICE_AUTO_START;
+ if (!wcsicmp( argv[i] + 6, L"demand" )) cp->start = SERVICE_DEMAND_START;
+ if (!wcsicmp( argv[i] + 6, L"disabled" )) cp->start = SERVICE_DISABLED;
}
- if (!wcsicmp( argv[i], L"error=" ) && i < argc - 1)
+ if (!wcsnicmp( argv[i], L"error=", 6 ))
{
- if (!wcsicmp( argv[i + 1], L"normal" )) cp->error = SERVICE_ERROR_NORMAL;
- if (!wcsicmp( argv[i + 1], L"severe" )) cp->error = SERVICE_ERROR_SEVERE;
- if (!wcsicmp( argv[i + 1], L"critical" )) cp->error = SERVICE_ERROR_CRITICAL;
- if (!wcsicmp( argv[i + 1], L"ignore" )) cp->error = SERVICE_ERROR_IGNORE;
+ if (!wcsicmp( argv[i] + 6, L"normal" )) cp->error = SERVICE_ERROR_NORMAL;
+ if (!wcsicmp( argv[i] + 6, L"severe" )) cp->error = SERVICE_ERROR_SEVERE;
+ if (!wcsicmp( argv[i] + 6, L"critical" )) cp->error = SERVICE_ERROR_CRITICAL;
+ if (!wcsicmp( argv[i] + 6, L"ignore" )) cp->error = SERVICE_ERROR_IGNORE;
}
}
if (!cp->binpath) return FALSE;
@@ -158,13 +158,12 @@ static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE
for (i = 0; i < argc; i++)
{
- if (!wcsicmp( argv[i], L"reset=" ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 );
- if (!wcsicmp( argv[i], L"reboot=" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1];
- if (!wcsicmp( argv[i], L"command=" ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1];
- if (!wcsicmp( argv[i], L"actions=" ))
+ if (!wcsnicmp( argv[i], L"reset=", 6 )) fa->dwResetPeriod = wcstol( argv[i] + 6, NULL, 10 );
+ if (!wcsnicmp( argv[i], L"reboot=", 7 )) fa->lpRebootMsg = (WCHAR *)argv[i] + 7;
+ if (!wcsnicmp( argv[i], L"command=", 8 )) fa->lpCommand = (WCHAR *)argv[i] + 8;
+ if (!wcsnicmp( argv[i], L"actions=", 8 ))
{
- if (i == argc - 1) return FALSE;
- if (!parse_failure_actions( argv[i + 1], fa )) return FALSE;
+ if (!parse_failure_actions( argv[i] + 8, fa )) return FALSE;
}
}
return TRUE;
--
2.35.1
2
2
[PATCH v2 1/4] jscript: Pass null jsval to builtin functions instead of the global host.
by Gabriel Ivăncescu 18 Mar '22
by Gabriel Ivăncescu 18 Mar '22
18 Mar '22
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
dlls/jscript/function.c | 2 +-
dlls/jscript/tests/api.js | 45 +++++++++++++++++++++++++++++++++
dlls/mshtml/tests/es5.js | 53 +++++++++++++++++++++++++++++++++++++++
3 files changed, 99 insertions(+), 1 deletion(-)
diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c
index fd1380d..e0b7310 100644
--- a/dlls/jscript/function.c
+++ b/dlls/jscript/function.c
@@ -599,7 +599,7 @@ static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, ID
if(this_disp)
vthis = jsval_disp(this_disp);
else
- vthis = jsval_disp(lookup_global_host(ctx));
+ vthis = jsval_null();
return function->proc(ctx, vthis, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r);
}
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index d5d8e7d..44e0eaa 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -16,6 +16,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+var JS_E_NUMBER_EXPECTED = 0x800a1389;
+var JS_E_FUNCTION_EXPECTED = 0x800a138a;
+var JS_E_DATE_EXPECTED = 0x800a138e;
+var JS_E_OBJECT_EXPECTED = 0x800a138f;
+var JS_E_BOOLEAN_EXPECTED = 0x800a1392;
+var JS_E_VBARRAY_EXPECTED = 0x800a1395;
+var JS_E_ENUMERATOR_EXPECTED = 0x800a1397;
+var JS_E_REGEXP_EXPECTED = 0x800a1398;
+
var tmp, i;
var bigInt = Math.pow(2,40);
@@ -3061,6 +3070,42 @@ ok(unescape.length == 1, "unescape.length = " + unescape.length);
String.length = 3;
ok(String.length == 1, "String.length = " + String.length);
+(function() {
+ var tests = [
+ [ "Array.sort", JS_E_OBJECT_EXPECTED, function(ctx) { Array.prototype.sort.call(ctx); } ],
+ [ "Boolean.valueOf", JS_E_BOOLEAN_EXPECTED, function(ctx) { Boolean.prototype.valueOf.call(ctx); } ],
+ [ "Date.getYear", JS_E_DATE_EXPECTED, function(ctx) { Date.prototype.getYear.call(ctx); } ],
+ [ "Enumerator.atEnd", JS_E_ENUMERATOR_EXPECTED, function(ctx) { Enumerator.prototype.atEnd.call(ctx); } ],
+ [ "Function.apply", JS_E_FUNCTION_EXPECTED, function(ctx) { Function.prototype.apply.call(ctx, [ function() {} ]); } ],
+ [ "Number.toExponential", JS_E_NUMBER_EXPECTED, function(ctx) { Number.prototype.toExponential.call(ctx); } ],
+ [ "Object.hasOwnProperty", JS_E_OBJECT_EXPECTED, function(ctx) { Object.prototype.hasOwnProperty.call(ctx, "toString"); } ],
+ [ "RegExp.test", JS_E_REGEXP_EXPECTED, function(ctx) { RegExp.prototype.test.call(ctx, "foobar"); } ],
+ [ "VBArray.lbound", JS_E_VBARRAY_EXPECTED, function(ctx) { VBArray.prototype.lbound.call(ctx); } ]
+ ];
+
+ for(var i = 0; i < tests.length; i++) {
+ try {
+ tests[i][2](null);
+ ok(false, "expected exception calling " + tests[i][0] + " with null context");
+ }catch(ex) {
+ var n = ex.number >>> 0; /* make it unsigned like HRESULT */
+ ok(n === tests[i][1], tests[i][0] + " with null context exception code = " + n);
+ }
+ try {
+ tests[i][2](undefined);
+ ok(false, "expected exception calling " + tests[i][0] + " with undefined context");
+ }catch(ex) {
+ var n = ex.number >>> 0;
+ ok(n === tests[i][1], tests[i][0] + " with undefined context exception code = " + n);
+ }
+ }
+
+ var r = Error.prototype.toString.call(undefined);
+ ok(r === "[object Error]", "Error.toString with undefined context returned " + r);
+ r = String.prototype.slice.call(null, 1, 3);
+ ok(r === "ul", "String.slice with null context returned " + r);
+})();
+
var tmp = createArray();
ok(getVT(tmp) == "VT_ARRAY|VT_VARIANT", "getVT(createArray()) = " + getVT(tmp));
ok(getVT(VBArray(tmp)) == "VT_ARRAY|VT_VARIANT", "getVT(VBArray(tmp)) = " + getVT(VBArray(tmp)));
diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js
index 58b0d43..0fa6f7f 100644
--- a/dlls/mshtml/tests/es5.js
+++ b/dlls/mshtml/tests/es5.js
@@ -17,6 +17,14 @@
*/
var JS_E_PROP_DESC_MISMATCH = 0x800a01bd;
+var JS_E_NUMBER_EXPECTED = 0x800a1389;
+var JS_E_FUNCTION_EXPECTED = 0x800a138a;
+var JS_E_DATE_EXPECTED = 0x800a138e;
+var JS_E_OBJECT_EXPECTED = 0x800a138f;
+var JS_E_BOOLEAN_EXPECTED = 0x800a1392;
+var JS_E_VBARRAY_EXPECTED = 0x800a1395;
+var JS_E_ENUMERATOR_EXPECTED = 0x800a1397;
+var JS_E_REGEXP_EXPECTED = 0x800a1398;
var JS_E_INVALID_WRITABLE_PROP_DESC = 0x800a13ac;
var JS_E_NONCONFIGURABLE_REDEFINED = 0x800a13d6;
var JS_E_NONWRITABLE_MODIFIED = 0x800a13d7;
@@ -1222,6 +1230,51 @@ sync_test("isFrozen", function() {
ok(Object.isExtensible(o) === false, "o is extensible");
});
+sync_test("builtin_context", function() {
+ var tests = [
+ [ "Array.map", JS_E_OBJECT_EXPECTED, function(ctx) { Array.prototype.map.call(ctx, function(a, b) {}); } ],
+ [ "Array.sort", JS_E_OBJECT_EXPECTED, function(ctx) { Array.prototype.sort.call(ctx); } ],
+ [ "Boolean.toString", JS_E_BOOLEAN_EXPECTED, function(ctx) { Boolean.prototype.toString.call(ctx); } ],
+ [ "Date.getTime", JS_E_DATE_EXPECTED, function(ctx) { Date.prototype.getTime.call(ctx); } ],
+ [ "Date.toGMTString", JS_E_DATE_EXPECTED, function(ctx) { Date.prototype.toGMTString.call(ctx); } ],
+ [ "Enumerator.item", JS_E_ENUMERATOR_EXPECTED, function(ctx) { Enumerator.prototype.item.call(ctx); } ],
+ [ "Error.toString", JS_E_OBJECT_EXPECTED, function(ctx) { Error.prototype.toString.call(ctx); } ],
+ [ "Function.call", JS_E_FUNCTION_EXPECTED, function(ctx) { Function.prototype.call.call(ctx, function() {}); } ],
+ [ "Map.clear", JS_E_OBJECT_EXPECTED, function(ctx) { Map.prototype.clear.call(ctx); } ],
+ [ "Number.toFixed", JS_E_NUMBER_EXPECTED, function(ctx) { Number.prototype.toFixed.call(ctx); } ],
+ [ "Object.isPrototypeOf", JS_E_OBJECT_EXPECTED, function(ctx) { Object.prototype.isPrototypeOf.call(ctx, Object); } ],
+ [ "RegExp.exec", JS_E_REGEXP_EXPECTED, function(ctx) { RegExp.prototype.exec.call(ctx, "foobar"); } ],
+ [ "String.search", JS_E_OBJECT_EXPECTED, function(ctx) { String.prototype.search.call(ctx, /foobar/g); } ],
+ [ "String.trim", JS_E_OBJECT_EXPECTED, function(ctx) { String.prototype.trim.call(ctx); } ],
+ [ "VBArray.dimensions", JS_E_VBARRAY_EXPECTED, function(ctx) { VBArray.prototype.dimensions.call(ctx); } ]
+ ];
+
+ /* make global object suitable for some calls */
+ window[0] = "foo";
+ window[1] = "bar";
+ window.length = 2;
+
+ for(var i = 0; i < tests.length; i++) {
+ try {
+ tests[i][2](null);
+ ok(false, "expected exception calling " + tests[i][0] + " with null context");
+ }catch(ex) {
+ var n = ex.number >>> 0; /* make it unsigned like HRESULT */
+ ok(n === tests[i][1], tests[i][0] + " with null context exception code = " + n);
+ }
+ try {
+ tests[i][2](undefined);
+ ok(false, "expected exception calling " + tests[i][0] + " with undefined context");
+ }catch(ex) {
+ var n = ex.number >>> 0;
+ ok(n === tests[i][1], tests[i][0] + " with undefined context exception code = " + n);
+ }
+ }
+
+ var obj = (function() { return this; }).call(null);
+ ok(obj === window, "obj = " + obj);
+});
+
sync_test("head_setter", function() {
document.head = "";
ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head));
--
2.34.1
3
10
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/)
Supersedes 227636 - 227644.
Supersedes 228988 - 228998.
[1] https://bugs.winehq.org/show_bug.cgi?id=52401
[2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html
Jinoh Kang (10):
server: Actually set initial status in set_async_direct_result
handler.
server: Ensure initial status is set in async_set_result().
server: Ensure completion_callback is called before async is
destroyed.
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 | 27 +++---
server/protocol.def | 5 +-
server/sock.c | 164 +++++++++++++++++++++++----------
7 files changed, 213 insertions(+), 108 deletions(-)
--
2.34.1
2
11
18 Mar '22
Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com>
---
Notes:
v1 -> v2: no changes
v2 -> v3: use lowercase letters for uuid(<hex>)
include/shobjidl.idl | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/include/shobjidl.idl b/include/shobjidl.idl
index c1a36ab5e93..b654d78c9cd 100644
--- a/include/shobjidl.idl
+++ b/include/shobjidl.idl
@@ -471,6 +471,36 @@ interface IShellItem2 : IShellItem
[out] BOOL *pf);
}
+/*****************************************************************************
+ * IShellItemImageFactory interface
+ */
+[
+ object,
+ uuid(bcc18b79-ba16-442f-80c4-8a59c30c463b),
+ pointer_default(unique)
+]
+interface IShellItemImageFactory : IUnknown
+{
+ [v1_enum] enum _SIIGBF {
+ SIIGBF_RESIZETOFIT = 0x00000000,
+ SIIGBF_BIGGERSIZEOK = 0x00000001,
+ SIIGBF_MEMORYONLY = 0x00000002,
+ SIIGBF_ICONONLY = 0x00000004,
+ SIIGBF_THUMBNAILONLY = 0x00000008,
+ SIIGBF_INCACHEONLY = 0x00000010,
+ SIIGBF_CROPTOSQUARE = 0x00000020,
+ SIIGBF_WIDETHUMBNAILS = 0x00000040,
+ SIIGBF_ICONBACKGROUND = 0x00000080,
+ SIIGBF_SCALEUP = 0x00000100,
+ };
+ typedef DWORD SIIGBF;
+
+ HRESULT GetImage(
+ [in] SIZE size,
+ [in] SIIGBF flags,
+ [out] HBITMAP *phbm);
+}
+
typedef [v1_enum] enum tagNWMF {
NWMF_UNLOADING = 0x00000001,
NWMF_USERINITED = 0x00000002,
--
2.34.1
2
7
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
---
Fixes permanently shown warning about unsupported driver version in AC Odyssey.
dlls/wbemprox/builtin.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index fb6fb654400..bb1c10ac2fd 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -4060,8 +4060,8 @@ static enum fill_status fill_videocontroller( struct table *table, const struct
rec->current_verticalres = vres;
rec->description = heap_strdupW( name );
rec->device_id = L"VideoController1";
- rec->driverdate = L"20170101000000.000000+000";
- rec->driverversion = L"1.0";
+ rec->driverdate = L"20220118000000.000000-000";
+ rec->driverversion = L"30.0.14023.3004";
rec->installeddriver = get_videocontroller_installeddriver( desc.VendorId );
rec->name = heap_strdupW( name );
rec->pnpdevice_id = get_videocontroller_pnpdeviceid( &desc );
--
2.35.1
2
1
mainly using Unicode strings in printf
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
Eric Pouech (3):
programs/winedbg: get rid of dbg_outputW helper
programs/winedbg: use Unicode APIs for process/thread enumeration
programs/winedbg: get rid of dbg_W2A helper
programs/winedbg/debugger.h | 2 --
programs/winedbg/gdbproxy.c | 8 ++++----
programs/winedbg/info.c | 16 ++++++++--------
programs/winedbg/memory.c | 6 +-----
programs/winedbg/stack.c | 5 ++---
programs/winedbg/tgt_active.c | 4 ++--
programs/winedbg/tgt_minidump.c | 4 ++--
programs/winedbg/winedbg.c | 29 -----------------------------
8 files changed, 19 insertions(+), 55 deletions(-)
1
3
From: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/dxgi/tests/Makefile.in | 1 -
dlls/dxgi/tests/dxgi.c | 1768 +++++++++++++++++------------------
2 files changed, 876 insertions(+), 893 deletions(-)
diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in
index 3bbece2d0a1..1c99d70957d 100644
--- a/dlls/dxgi/tests/Makefile.in
+++ b/dlls/dxgi/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = dxgi.dll
IMPORTS = d3d10_1 dxgi user32
diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c
index f70d849aebc..89e32367231 100644
--- a/dlls/dxgi/tests/dxgi.c
+++ b/dlls/dxgi/tests/dxgi.c
@@ -244,7 +244,7 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid,
out = (IUnknown *)0xdeadbeef;
hr = IUnknown_QueryInterface(unknown, iid, (void **)&out);
ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr),
- "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr);
if (SUCCEEDED(hr))
IUnknown_Release(out);
else
@@ -266,9 +266,9 @@ static unsigned int check_multisample_quality_levels(IDXGIDevice *dxgi_device,
HRESULT hr;
hr = IDXGIDevice_QueryInterface(dxgi_device, &IID_ID3D10Device, (void **)&device);
- ok(hr == S_OK, "Failed to query ID3D10Device, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3D10Device_CheckMultisampleQualityLevels(device, format, sample_count, &levels);
- ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID3D10Device_Release(device);
return levels;
@@ -353,16 +353,16 @@ static void check_adapter_desc_(unsigned int line, const DXGI_ADAPTER_DESC *desc
"Got revision %02x, expected %02x.\n",
desc->Revision, expected_desc->Revision);
ok_(__FILE__, line)(desc->DedicatedVideoMemory == expected_desc->DedicatedVideoMemory,
- "Got dedicated video memory %lu, expected %lu.\n",
+ "Got dedicated video memory %Iu, expected %Iu.\n",
desc->DedicatedVideoMemory, expected_desc->DedicatedVideoMemory);
ok_(__FILE__, line)(desc->DedicatedSystemMemory == expected_desc->DedicatedSystemMemory,
- "Got dedicated system memory %lu, expected %lu.\n",
+ "Got dedicated system memory %Iu, expected %Iu.\n",
desc->DedicatedSystemMemory, expected_desc->DedicatedSystemMemory);
ok_(__FILE__, line)(desc->SharedSystemMemory == expected_desc->SharedSystemMemory,
- "Got shared system memory %lu, expected %lu.\n",
+ "Got shared system memory %Iu, expected %Iu.\n",
desc->SharedSystemMemory, expected_desc->SharedSystemMemory);
ok_(__FILE__, line)(equal_luid(desc->AdapterLuid, expected_desc->AdapterLuid),
- "Got LUID %08x:%08x, expected %08x:%08x.\n",
+ "Got LUID %08lx:%08lx, expected %08lx:%08lx.\n",
desc->AdapterLuid.HighPart, desc->AdapterLuid.LowPart,
expected_desc->AdapterLuid.HighPart, expected_desc->AdapterLuid.LowPart);
}
@@ -387,9 +387,9 @@ static void check_output_equal_(unsigned int line, IDXGIOutput *output1, IDXGIOu
HRESULT hr;
hr = IDXGIOutput_GetDesc(output1, &desc1);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDesc(output2, &desc2);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_output_desc_(line, &desc1, &desc2);
}
@@ -401,12 +401,12 @@ static BOOL output_belongs_to_adapter(IDXGIOutput *output, IDXGIAdapter *adapter
HRESULT hr;
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(SUCCEEDED(hr), "Failed to get output desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (output_idx = 0; IDXGIAdapter_EnumOutputs(adapter, output_idx, &o) != DXGI_ERROR_NOT_FOUND; ++output_idx)
{
hr = IDXGIOutput_GetDesc(o, &desc);
- ok(SUCCEEDED(hr), "Failed to get output desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIOutput_Release(o);
if (!lstrcmpW(desc.DeviceName, output_desc.DeviceName)
@@ -462,10 +462,10 @@ static void check_fullscreen_state_(unsigned int line, const struct fullscreen_s
{
todo_wine_if(!windowed)
ok_(__FILE__, line)((state->style & ~WS_VISIBLE) == (expected_state->style & ~WS_VISIBLE),
- "Got style %#x, expected %#x.\n",
+ "Got style %#lx, expected %#lx.\n",
state->style & ~(DWORD)WS_VISIBLE, expected_state->style & ~(DWORD)WS_VISIBLE);
ok_(__FILE__, line)((state->exstyle & ~WS_EX_TOPMOST) == (expected_state->exstyle & ~WS_EX_TOPMOST),
- "Got exstyle %#x, expected %#x.\n",
+ "Got exstyle %#lx, expected %#lx.\n",
state->exstyle & ~(DWORD)WS_EX_TOPMOST, expected_state->exstyle & ~(DWORD)WS_EX_TOPMOST);
ok_(__FILE__, line)(EqualRect(&state->window_rect, &expected_state->window_rect),
"Got window rect %s, expected %s.\n",
@@ -500,7 +500,7 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain
HRESULT hr;
hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc);
- ok_(__FILE__, line)(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get swapchain desc, hr %#lx.\n", hr);
check_window_fullscreen_state_(line, swapchain_desc.OutputWindow,
&expected_state->fullscreen_state, swapchain_desc.Windowed);
@@ -509,7 +509,7 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain
swapchain_desc.Windowed, !expected_state->fullscreen);
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target);
- ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#lx.\n", hr);
ok_(__FILE__, line)(fullscreen == expected_state->fullscreen, "Got fullscreen %#x, expected %#x.\n",
fullscreen, expected_state->fullscreen);
@@ -518,10 +518,10 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain
IDXGIAdapter *adapter;
hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output);
- ok_(__FILE__, line)(hr == S_OK, "Failed to get containing output, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get containing output, hr %#lx.\n", hr);
hr = IDXGIOutput_GetParent(containing_output, &IID_IDXGIAdapter, (void **)&adapter);
- ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#lx.\n", hr);
check_output_equal_(line, target, expected_state->target);
ok_(__FILE__, line)(target == containing_output, "Got target %p, expected %p.\n",
@@ -562,7 +562,7 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_
mode_desc.Width = new_width;
mode_desc.Height = new_height;
hr = IDXGIOutput_FindClosestMatchingMode(target, &mode_desc, &mode_desc, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "FindClosestMatchingMode failed, hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "FindClosestMatchingMode failed, hr %#lx.\n", hr);
new_width = mode_desc.Width;
new_height = mode_desc.Height;
}
@@ -615,7 +615,7 @@ static void wait_fullscreen_state_(unsigned int line, IDXGISwapChain *swapchain,
Sleep(wait_step);
total_time += wait_step;
}
- ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#lx.\n", hr);
todo_wine_if(todo) ok_(__FILE__, line)(state == expected,
"Got unexpected state %#x, expected %#x.\n", state, expected);
}
@@ -665,7 +665,7 @@ static IDXGIAdapter *create_adapter(void)
if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory)))
{
- trace("Failed to create IDXGIFactory, hr %#x.\n", hr);
+ trace("Failed to create IDXGIFactory, hr %#lx.\n", hr);
return NULL;
}
@@ -679,7 +679,7 @@ static IDXGIAdapter *create_adapter(void)
}
else
{
- trace("Failed to get IDXGIFactory4, hr %#x.\n", hr);
+ trace("Failed to get IDXGIFactory4, hr %#lx.\n", hr);
}
}
else
@@ -688,7 +688,7 @@ static IDXGIAdapter *create_adapter(void)
}
IDXGIFactory_Release(factory);
if (FAILED(hr))
- trace("Failed to get adapter, hr %#x.\n", hr);
+ trace("Failed to get adapter, hr %#lx.\n", hr);
return adapter;
}
@@ -788,7 +788,7 @@ static ID3D12CommandQueue *create_d3d12_direct_queue(ID3D12Device *device)
command_queue_desc.NodeMask = 0;
hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc,
&IID_ID3D12CommandQueue, (void **)&queue);
- ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
return queue;
}
@@ -823,12 +823,12 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm
hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE,
&IID_ID3D12Fence, (void **)&fence);
- ok_(__FILE__, line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create fence, hr %#lx.\n", hr);
hr = ID3D12CommandQueue_Signal(queue, fence, 1);
- ok_(__FILE__, line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to signal fence, hr %#lx.\n", hr);
hr = wait_for_fence(fence, 1);
- ok_(__FILE__, line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to wait for fence, hr %#lx.\n", hr);
ID3D12Fence_Release(fence);
}
@@ -845,7 +845,7 @@ static void wait_device_idle_(unsigned int line, IUnknown *device)
return;
hr = ID3D12CommandQueue_GetDevice(queue, &IID_ID3D12Device, (void **)&d3d12_device);
- ok_(__FILE__, line)(hr == S_OK, "Failed to get d3d12 device, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get d3d12 device, hr %#lx.\n", hr);
wait_queue_idle_(line, d3d12_device, queue);
@@ -863,15 +863,15 @@ static void get_factory_(unsigned int line, IUnknown *device, BOOL is_d3d12, IDX
if (is_d3d12)
{
hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)factory);
- ok_(__FILE__, line)(hr == S_OK, "Failed to create factory, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create factory, hr %#lx.\n", hr);
}
else
{
dxgi_device = (IDXGIDevice *)device;
hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter);
- ok_(__FILE__, line)(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get adapter, hr %#lx.\n", hr);
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)factory);
- ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#lx.\n", hr);
IDXGIAdapter_Release(adapter);
}
}
@@ -890,11 +890,11 @@ static IDXGIAdapter *get_adapter_(unsigned int line, IUnknown *device, BOOL is_d
{
get_factory_(line, device, is_d3d12, &factory);
hr = ID3D12CommandQueue_GetDevice((ID3D12CommandQueue *)device, &IID_ID3D12Device, (void **)&d3d12_device);
- ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
luid = ID3D12Device_GetAdapterLuid(d3d12_device);
ID3D12Device_Release(d3d12_device);
hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4);
- ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory4_EnumAdapterByLuid(factory4, luid, &IID_IDXGIAdapter, (void **)&adapter);
IDXGIFactory4_Release(factory4);
IDXGIFactory_Release(factory);
@@ -902,7 +902,7 @@ static IDXGIAdapter *get_adapter_(unsigned int line, IUnknown *device, BOOL is_d
else
{
hr = IDXGIDevice_GetAdapter((IDXGIDevice *)device, &adapter);
- ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
}
return adapter;
@@ -934,7 +934,7 @@ static IDXGISwapChain *create_swapchain_(unsigned int line, IUnknown *device, BO
get_factory(device, is_d3d12, &factory);
hr = IDXGIFactory_CreateSwapChain(factory, device, &desc, &swapchain);
- ok_(__FILE__, line)(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr);
IDXGIFactory_Release(factory);
return swapchain;
@@ -957,33 +957,32 @@ static void test_adapter_desc(void)
}
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetDesc(adapter, NULL);
- ok(hr == E_INVALIDARG, "GetDesc returned %#x, expected %#x.\n",
- hr, E_INVALIDARG);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetDesc(adapter, &desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
trace("%s.\n", wine_dbgstr_w(desc.Description));
trace("%04x: %04x:%04x (rev %02x).\n",
desc.SubSysId, desc.VendorId, desc.DeviceId, desc.Revision);
- trace("Dedicated video memory: %lu (%lu MB).\n",
+ trace("Dedicated video memory: %Iu (%Iu MB).\n",
desc.DedicatedVideoMemory, desc.DedicatedVideoMemory / (1024 * 1024));
- trace("Dedicated system memory: %lu (%lu MB).\n",
+ trace("Dedicated system memory: %Iu (%Iu MB).\n",
desc.DedicatedSystemMemory, desc.DedicatedSystemMemory / (1024 * 1024));
- trace("Shared system memory: %lu (%lu MB).\n",
+ trace("Shared system memory: %Iu (%Iu MB).\n",
desc.SharedSystemMemory, desc.SharedSystemMemory / (1024 * 1024));
- trace("LUID: %08x:%08x.\n", desc.AdapterLuid.HighPart, desc.AdapterLuid.LowPart);
+ trace("LUID: %08lx:%08lx.\n", desc.AdapterLuid.HighPart, desc.AdapterLuid.LowPart);
hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1);
- ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#lx.\n", hr);
if (hr == E_NOINTERFACE)
goto done;
hr = IDXGIAdapter1_GetDesc1(adapter1, &desc1);
- ok(SUCCEEDED(hr), "GetDesc1 failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!lstrcmpW(desc.Description, desc1.Description),
"Got unexpected description %s.\n", wine_dbgstr_w(desc1.Description));
@@ -992,13 +991,13 @@ static void test_adapter_desc(void)
ok(desc1.SubSysId == desc.SubSysId, "Got unexpected sub system ID %04x.\n", desc1.SubSysId);
ok(desc1.Revision == desc.Revision, "Got unexpected revision %02x.\n", desc1.Revision);
ok(desc1.DedicatedVideoMemory == desc.DedicatedVideoMemory,
- "Got unexpected dedicated video memory %lu.\n", desc1.DedicatedVideoMemory);
+ "Got unexpected dedicated video memory %Iu.\n", desc1.DedicatedVideoMemory);
ok(desc1.DedicatedSystemMemory == desc.DedicatedSystemMemory,
- "Got unexpected dedicated system memory %lu.\n", desc1.DedicatedSystemMemory);
+ "Got unexpected dedicated system memory %Iu.\n", desc1.DedicatedSystemMemory);
ok(desc1.SharedSystemMemory == desc.SharedSystemMemory,
- "Got unexpected shared system memory %lu.\n", desc1.SharedSystemMemory);
+ "Got unexpected shared system memory %Iu.\n", desc1.SharedSystemMemory);
ok(equal_luid(desc1.AdapterLuid, desc.AdapterLuid),
- "Got unexpected adapter LUID %08x:%08x.\n", desc1.AdapterLuid.HighPart, desc1.AdapterLuid.LowPart);
+ "Got unexpected adapter LUID %08lx:%08lx.\n", desc1.AdapterLuid.HighPart, desc1.AdapterLuid.LowPart);
trace("Flags: %08x.\n", desc1.Flags);
IDXGIAdapter1_Release(adapter1);
@@ -1006,7 +1005,7 @@ static void test_adapter_desc(void)
done:
IDXGIAdapter_Release(adapter);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void test_adapter_luid(void)
@@ -1031,22 +1030,22 @@ static void test_adapter_luid(void)
}
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetDesc(adapter, &device_adapter_desc);
- ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIAdapter_Release(adapter);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
is_null_luid_adapter = !device_adapter_desc.AdapterLuid.LowPart
&& !device_adapter_desc.SubSysId && !device_adapter_desc.Revision
&& !device_adapter_desc.VendorId && !device_adapter_desc.DeviceId;
hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory);
- ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4);
- ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr);
have_unique_luid = TRUE;
found_adapter_count = 0;
@@ -1054,7 +1053,7 @@ static void test_adapter_luid(void)
while ((hr = IDXGIFactory_EnumAdapters(factory, adapter_index, &adapter)) == S_OK)
{
hr = IDXGIAdapter_GetDesc(adapter, &desc);
- ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
if (equal_luid(desc.AdapterLuid, device_adapter_desc.AdapterLuid))
{
@@ -1069,32 +1068,32 @@ static void test_adapter_luid(void)
{
hr = IDXGIFactory4_EnumAdapterByLuid(factory4, desc.AdapterLuid,
&IID_IDXGIAdapter, (void **)&adapter2);
- ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetDesc(adapter2, &desc2);
- ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to get adapter desc, hr %#lx.\n", hr);
check_adapter_desc(&desc2, &desc);
ok(adapter2 != adapter, "Expected to get new instance of IDXGIAdapter.\n");
refcount = IDXGIAdapter_Release(adapter2);
- ok(!refcount, "Adapter has %u references left.\n", refcount);
+ ok(!refcount, "Adapter has %lu references left.\n", refcount);
}
refcount = IDXGIAdapter_Release(adapter);
- ok(!refcount, "Adapter has %u references left.\n", refcount);
+ ok(!refcount, "Adapter has %lu references left.\n", refcount);
++adapter_index;
}
- ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#lx.\n", hr);
/* Older versions of WARP aren't enumerated by IDXGIFactory_EnumAdapters(). */
ok(found_adapter_count == 1 || broken(is_null_luid_adapter),
- "Found %u adapters for LUID %08x:%08x.\n",
+ "Found %u adapters for LUID %08lx:%08lx.\n",
found_adapter_count, device_adapter_desc.AdapterLuid.HighPart,
device_adapter_desc.AdapterLuid.LowPart);
if (factory4)
IDXGIFactory4_Release(factory4);
refcount = IDXGIFactory_Release(factory);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
if (!pCreateDXGIFactory2
|| FAILED(hr = pCreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory4)))
@@ -1105,24 +1104,24 @@ static void test_adapter_luid(void)
hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid,
&IID_IDXGIAdapter, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid,
&IID_IDXGIAdapter, (void **)&adapter);
- ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
hr = IDXGIAdapter_GetDesc(adapter, &desc);
- ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_adapter_desc(&desc, &device_adapter_desc);
refcount = IDXGIAdapter_Release(adapter);
- ok(!refcount, "Adapter has %u references left.\n", refcount);
+ ok(!refcount, "Adapter has %lu references left.\n", refcount);
}
if (have_unique_luid)
{
hr = IDXGIFactory4_EnumAdapterByLuid(factory4, luid, &IID_IDXGIAdapter, (void **)&adapter);
- ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#lx.\n", hr);
}
else
{
@@ -1130,7 +1129,7 @@ static void test_adapter_luid(void)
}
refcount = IDXGIFactory4_Release(factory4);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
}
static void test_query_video_memory_info(void)
@@ -1149,14 +1148,14 @@ static void test_query_video_memory_info(void)
}
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter3, (void **)&adapter3);
- ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr);
if (hr == E_NOINTERFACE)
goto done;
hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &memory_info);
- ok(hr == S_OK, "Failed to query video memory info, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(memory_info.Budget >= memory_info.AvailableForReservation,
"Available for reservation 0x%s is greater than budget 0x%s.\n",
wine_dbgstr_longlong(memory_info.AvailableForReservation),
@@ -1165,7 +1164,7 @@ static void test_query_video_memory_info(void)
wine_dbgstr_longlong(memory_info.CurrentReservation));
hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL, &memory_info);
- ok(hr == S_OK, "Failed to query video memory info, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(memory_info.Budget >= memory_info.AvailableForReservation,
"Available for reservation 0x%s is greater than budget 0x%s.\n",
wine_dbgstr_longlong(memory_info.AvailableForReservation),
@@ -1174,14 +1173,14 @@ static void test_query_video_memory_info(void)
wine_dbgstr_longlong(memory_info.CurrentReservation));
hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL + 1, &memory_info);
- ok(hr == E_INVALIDARG, "Failed to query video memory info, hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
IDXGIAdapter3_Release(adapter3);
done:
IDXGIAdapter_Release(adapter);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void test_check_interface_support(void)
@@ -1200,16 +1199,16 @@ static void test_check_interface_support(void)
}
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, &driver_version);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, &driver_version);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
trace("UMD version: %u.%u.%u.%u.\n",
HIWORD(U(driver_version).HighPart), LOWORD(U(driver_version).HighPart),
@@ -1220,9 +1219,9 @@ static void test_check_interface_support(void)
{
IUnknown_Release(iface);
hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device1, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device1, &driver_version);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
}
else
{
@@ -1230,16 +1229,16 @@ static void test_check_interface_support(void)
}
hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D11Device, NULL);
- ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#lx.\n", hr);
driver_version.LowPart = driver_version.HighPart = 0xdeadbeef;
hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D11Device, &driver_version);
- ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#x.\n", hr);
- ok(driver_version.HighPart == 0xdeadbeef, "Got unexpected driver version %#x.\n", driver_version.HighPart);
- ok(driver_version.LowPart == 0xdeadbeef, "Got unexpected driver version %#x.\n", driver_version.LowPart);
+ ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#lx.\n", hr);
+ ok(driver_version.HighPart == 0xdeadbeef, "Got unexpected driver version %#lx.\n", driver_version.HighPart);
+ ok(driver_version.LowPart == 0xdeadbeef, "Got unexpected driver version %#lx.\n", driver_version.LowPart);
IDXGIAdapter_Release(adapter);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void test_create_surface(void)
@@ -1264,7 +1263,7 @@ static void test_create_surface(void)
desc.SampleDesc.Quality = 0;
hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_RENDER_TARGET_OUTPUT, NULL, &surface);
- ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_interface(surface, &IID_ID3D10Texture2D, TRUE, FALSE);
/* Not available on all Windows versions. */
@@ -1274,7 +1273,7 @@ static void test_create_surface(void)
IDXGISurface_Release(surface);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
/* DXGI_USAGE_UNORDERED_ACCESS */
if (!(device = create_d3d11_device()))
@@ -1285,7 +1284,7 @@ static void test_create_surface(void)
surface = NULL;
hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_UNORDERED_ACCESS, NULL, &surface);
- ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
if (surface)
{
@@ -1293,12 +1292,12 @@ static void test_create_surface(void)
ID3D11Device *d3d_device;
hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture2d);
- ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID3D11Texture2D_GetDevice(texture2d, &d3d_device);
hr = ID3D11Device_CreateUnorderedAccessView(d3d_device, (ID3D11Resource *)texture2d, NULL, &uav);
- ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID3D11UnorderedAccessView_Release(uav);
ID3D11Device_Release(d3d_device);
@@ -1308,7 +1307,7 @@ static void test_create_surface(void)
}
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void test_parents(void)
@@ -1336,16 +1335,16 @@ static void test_parents(void)
surface_desc.SampleDesc.Quality = 0;
hr = IDXGIDevice_CreateSurface(device, &surface_desc, 1, DXGI_USAGE_RENDER_TARGET_OUTPUT, NULL, &surface);
- ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISurface_GetParent(surface, &IID_IDXGIDevice, (void **)&parent);
IDXGISurface_Release(surface);
- ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(parent == (IUnknown *)device, "Got parent %p, expected %p.\n", parent, device);
IUnknown_Release(parent);
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output);
if (hr == DXGI_ERROR_NOT_FOUND)
@@ -1354,31 +1353,31 @@ static void test_parents(void)
}
else
{
- ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&parent);
IDXGIOutput_Release(output);
- ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(parent == (IUnknown *)adapter, "Got parent %p, expected %p.\n", parent, adapter);
IUnknown_Release(parent);
}
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
- ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory_GetParent(factory, &IID_IUnknown, (void **)&parent);
- ok(hr == E_NOINTERFACE, "GetParent returned %#x, expected %#x.\n", hr, E_NOINTERFACE);
+ ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr);
ok(parent == NULL, "Got parent %p, expected %p.\n", parent, NULL);
IDXGIFactory_Release(factory);
hr = IDXGIDevice_GetParent(device, &IID_IDXGIAdapter, (void **)&parent);
- ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(parent == (IUnknown *)adapter, "Got parent %p, expected %p.\n", parent, adapter);
IUnknown_Release(parent);
IDXGIAdapter_Release(adapter);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void test_output(void)
@@ -1399,10 +1398,10 @@ static void test_output(void)
}
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_EnumOutputs(adapter, 0, NULL);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output);
if (hr == DXGI_ERROR_NOT_FOUND)
@@ -1412,15 +1411,14 @@ static void test_output(void)
IDXGIDevice_Release(device);
return;
}
- ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL);
- ok(SUCCEEDED(hr)
- || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Remote Desktop Services / Win 7 testbot */
- "Failed to list modes, hr %#x.\n", hr);
+ ok(hr == S_OK|| broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Remote Desktop Services / Win 7 testbot */
+ "Got unexpected hr %#lx.\n", hr);
if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE)
{
win_skip("GetDisplayModeList() not supported.\n");
@@ -1432,12 +1430,12 @@ static void test_output(void)
mode_count_comp = mode_count;
hr = IDXGIOutput_GetDisplayModeList(output, 0, 0, &mode_count, NULL);
- ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!mode_count, "Got unexpected mode_count %u.\n", mode_count);
hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_ENUM_MODES_SCALING, &mode_count, NULL);
- ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(mode_count >= mode_count_comp, "Got unexpected mode_count %u, expected >= %u.\n", mode_count, mode_count_comp);
mode_count_comp = mode_count;
@@ -1446,19 +1444,19 @@ static void test_output(void)
hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_ENUM_MODES_SCALING, NULL, modes);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
ok(!modes[0].Height, "No output was expected.\n");
mode_count = 0;
hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_ENUM_MODES_SCALING, &mode_count, modes);
- ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#lx.\n", hr);
ok(!modes[0].Height, "No output was expected.\n");
mode_count = mode_count_comp;
hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_ENUM_MODES_SCALING, &mode_count, modes);
- ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(mode_count == mode_count_comp, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp);
last_width = last_height = 0;
@@ -1498,7 +1496,7 @@ static void test_output(void)
mode_count += 5;
hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_ENUM_MODES_SCALING, &mode_count, modes);
- ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(mode_count == mode_count_comp, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp);
if (mode_count_comp)
@@ -1506,7 +1504,7 @@ static void test_output(void)
mode_count = mode_count_comp - 1;
hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_ENUM_MODES_SCALING, &mode_count, modes);
- ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#lx.\n", hr);
ok(mode_count == mode_count_comp - 1, "Got unexpected mode_count %u, expected %u.\n",
mode_count, mode_count_comp - 1);
}
@@ -1519,7 +1517,7 @@ static void test_output(void)
IDXGIOutput_Release(output);
IDXGIAdapter_Release(adapter);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void test_find_closest_matching_mode(void)
@@ -1544,7 +1542,7 @@ static void test_find_closest_matching_mode(void)
}
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output);
if (hr == DXGI_ERROR_NOT_FOUND)
@@ -1554,12 +1552,12 @@ static void test_find_closest_matching_mode(void)
IDXGIDevice_Release(device);
return;
}
- ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
memset(&mode, 0, sizeof(mode));
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Win 7 testbot */
- "Got unexpected hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE)
{
win_skip("FindClosestMatchingMode() not supported.\n");
@@ -1568,42 +1566,42 @@ static void test_find_closest_matching_mode(void)
memset(&mode, 0, sizeof(mode));
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, (IUnknown *)device);
- todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL);
- ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
modes = heap_calloc(mode_count, sizeof(*modes));
ok(!!modes, "Failed to allocate memory.\n");
hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes);
- ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < mode_count; ++i)
{
mode = modes[i];
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_mode_desc(&matching_mode, &modes[i], MODE_DESC_IGNORE_SCALING);
mode.Format = DXGI_FORMAT_UNKNOWN;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
mode = modes[i];
mode.Width = 0;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
mode = modes[i];
mode.Height = 0;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
mode = modes[i];
mode.Width = mode.Height = 0;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_mode_desc(&matching_mode, &modes[i], MODE_DESC_IGNORE_SCALING | MODE_DESC_IGNORE_RESOLUTION);
ok(matching_mode.Width > 0 && matching_mode.Height > 0, "Got unexpected resolution %ux%u.\n",
matching_mode.Width, matching_mode.Height);
@@ -1611,7 +1609,7 @@ static void test_find_closest_matching_mode(void)
mode = modes[i];
mode.RefreshRate.Numerator = mode.RefreshRate.Denominator = 0;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_mode_desc(&matching_mode, &modes[i], MODE_DESC_IGNORE_SCALING | MODE_DESC_IGNORE_REFRESH_RATE);
ok(matching_mode.RefreshRate.Numerator > 0 && matching_mode.RefreshRate.Denominator > 0,
"Got unexpected refresh rate %u / %u.\n",
@@ -1620,7 +1618,7 @@ static void test_find_closest_matching_mode(void)
mode = modes[i];
mode.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_mode_desc(&matching_mode, &modes[i], MODE_DESC_IGNORE_SCALING | MODE_DESC_IGNORE_SCANLINE_ORDERING);
ok(matching_mode.ScanlineOrdering, "Got unexpected scanline ordering %#x.\n",
matching_mode.ScanlineOrdering);
@@ -1630,7 +1628,7 @@ static void test_find_closest_matching_mode(void)
mode.Height = modes[i].Height;
mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_mode_desc(&matching_mode, &modes[i], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT);
memset(&mode, 0, sizeof(mode));
@@ -1638,7 +1636,7 @@ static void test_find_closest_matching_mode(void)
mode.Height = modes[i].Height - 1;
mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_mode_desc(&matching_mode, &modes[i],
(MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT) | MODE_DESC_IGNORE_EXACT_RESOLUTION);
@@ -1647,7 +1645,7 @@ static void test_find_closest_matching_mode(void)
mode.Height = modes[i].Height + 1;
mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_mode_desc(&matching_mode, &modes[i],
(MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT) | MODE_DESC_IGNORE_EXACT_RESOLUTION);
}
@@ -1656,7 +1654,7 @@ static void test_find_closest_matching_mode(void)
mode.Width = mode.Height = 10;
mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Find mode for the lowest resolution. */
mode = modes[0];
for (i = 0; i < mode_count; ++i)
@@ -1672,7 +1670,7 @@ static void test_find_closest_matching_mode(void)
mode.Format = modes[0].Format;
mode.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT);
memset(&mode, 0, sizeof(mode));
@@ -1681,7 +1679,7 @@ static void test_find_closest_matching_mode(void)
mode.Format = modes[0].Format;
mode.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT);
for (i = 0; i < ARRAY_SIZE(scaling_tests); ++i)
@@ -1697,7 +1695,7 @@ static void test_find_closest_matching_mode(void)
mode.Format = modes[j].Format;
mode.Scaling = modes[j].Scaling;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
check_mode_desc(&matching_mode, &modes[j],
MODE_DESC_IGNORE_REFRESH_RATE | MODE_DESC_IGNORE_SCANLINE_ORDERING);
break;
@@ -1710,7 +1708,7 @@ done:
IDXGIOutput_Release(output);
IDXGIAdapter_Release(adapter);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
struct refresh_rates
@@ -1774,90 +1772,90 @@ static void test_create_swapchain(void)
creation_desc.Flags = 0;
hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj);
- ok(hr == S_OK, "IDXGIDevice does not implement IUnknown.\n");
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
- ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
expected_refcount = get_refcount(adapter);
refcount = get_refcount(factory);
- ok(refcount == 2, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount);
refcount = get_refcount(device);
- ok(refcount == 2, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount);
creation_desc.OutputWindow = NULL;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
creation_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0);
memset(&initial_state, 0, sizeof(initial_state));
capture_fullscreen_state(&initial_state.fullscreen_state, creation_desc.OutputWindow);
hr = IDXGIFactory_CreateSwapChain(factory, NULL, &creation_desc, &swapchain);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory_CreateSwapChain(factory, obj, NULL, &swapchain);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = get_refcount(adapter);
- ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", refcount, expected_refcount);
+ ok(refcount >= expected_refcount, "Got refcount %lu, expected >= %lu.\n", refcount, expected_refcount);
refcount = get_refcount(factory);
- todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount);
+ todo_wine ok(refcount == 4, "Got unexpected refcount %lu.\n", refcount);
refcount = get_refcount(device);
- ok(refcount == 3, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 3, "Got unexpected refcount %lu.\n", refcount);
hr = IDXGISwapChain_GetDesc(swapchain, NULL);
- ok(hr == E_INVALIDARG, "GetDesc unexpectedly returned %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetParent(swapchain, &IID_IUnknown, (void **)&parent);
- ok(hr == S_OK, "Failed to get parent,%#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent);
refcount = IUnknown_Release(parent);
- todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount);
+ todo_wine ok(refcount == 4, "Got unexpected refcount %lu.\n", refcount);
hr = IDXGISwapChain_GetParent(swapchain, &IID_IDXGIFactory, (void **)&parent);
- ok(hr == S_OK, "Failed to get parent,%#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent);
refcount = IUnknown_Release(parent);
- todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount);
+ todo_wine ok(refcount == 4, "Got unexpected refcount %lu.\n", refcount);
hr = IDXGISwapChain_QueryInterface(swapchain, &IID_IDXGISwapChain1, (void **)&swapchain1);
ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */,
- "Failed to query IDXGISwapChain1 interface, hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
hr = IDXGISwapChain1_GetDesc1(swapchain1, NULL);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain1_GetDesc1(swapchain1, &swapchain_desc);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!swapchain_desc.Stereo, "Got unexpected stereo %#x.\n", swapchain_desc.Stereo);
ok(swapchain_desc.Scaling == DXGI_SCALING_STRETCH,
"Got unexpected scaling %#x.\n", swapchain_desc.Scaling);
ok(swapchain_desc.AlphaMode == DXGI_ALPHA_MODE_IGNORE,
"Got unexpected alpha mode %#x.\n", swapchain_desc.AlphaMode);
hr = IDXGISwapChain1_GetFullscreenDesc(swapchain1, NULL);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain1_GetFullscreenDesc(swapchain1, &fullscreen_desc);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(fullscreen_desc.Windowed == creation_desc.Windowed,
"Got unexpected windowed %#x.\n", fullscreen_desc.Windowed);
hr = IDXGISwapChain1_GetHwnd(swapchain1, &window);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(window == creation_desc.OutputWindow, "Got unexpected window %p.\n", window);
IDXGISwapChain1_Release(swapchain1);
}
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "Swapchain has %u references left.\n", refcount);
+ ok(!refcount, "Swapchain has %lu references left.\n", refcount);
refcount = get_refcount(factory);
- ok(refcount == 2, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount);
for (i = 0; i < ARRAY_SIZE(refresh_list); ++i)
{
@@ -1865,10 +1863,10 @@ static void test_create_swapchain(void)
creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(hr == S_OK, "Test %u: Failed to create swapchain, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(hr == S_OK, "Test %u: Failed to get swapchain desc, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(result_desc.Windowed == creation_desc.Windowed, "Test %u: Got unexpected windowed %#x.\n",
i, result_desc.Windowed);
@@ -1884,19 +1882,19 @@ static void test_create_swapchain(void)
fullscreen = 0xdeadbeef;
target = (void *)0xdeadbeef;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target);
- ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(!fullscreen, "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen);
ok(!target, "Test %u: Got unexpected target %p.\n", i, target);
hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
fullscreen = 0xdeadbeef;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(!fullscreen, "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen);
target = (void *)0xdeadbeef;
hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(!target, "Test %u: Got unexpected target %p.\n", i, target);
check_swapchain_fullscreen_state(swapchain, &initial_state);
@@ -1913,7 +1911,7 @@ static void test_create_swapchain(void)
ok(hr == S_OK, "IDXGIDevice does not implement IUnknown.\n");
hr = IDXGIFactory_CreateSwapChain(factory, obj2, &creation_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface1, (void **)&surface);
if (SUCCEEDED(hr))
@@ -1921,7 +1919,7 @@ static void test_create_swapchain(void)
HDC hdc;
hr = IDXGISurface1_GetDC(surface, FALSE, &hdc);
- ok(FAILED(hr), "Expected GetDC() to fail, %#x\n", hr);
+ ok(FAILED(hr), "Got unexpected hr %#lx.\n", hr);
IDXGISurface1_Release(surface);
IDXGISwapChain_Release(swapchain);
@@ -1930,16 +1928,16 @@ static void test_create_swapchain(void)
creation_desc.Flags = DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE;
hr = IDXGIFactory_CreateSwapChain(factory, obj2, &creation_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
creation_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
creation_desc.Flags = 0;
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface1, (void **)&surface);
- ok(hr == S_OK, "Failed to get front buffer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISurface1_GetDC(surface, FALSE, &hdc);
- ok(hr == S_OK, "Expected GetDC() to succeed, %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGISurface1_ReleaseDC(surface, NULL);
IDXGISurface1_Release(surface);
@@ -1961,10 +1959,10 @@ static void test_create_swapchain(void)
creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(SUCCEEDED(hr), "Test %u: Failed to create swapchain, hr %#x.\n", i, hr);
+ ok(hr == S_OK || hr == DXGI_STATUS_OCCLUDED, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(hr == S_OK, "Test %u: Failed to get swapchain desc, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* When numerator is non-zero and denominator is zero, the windowed mode is used.
* Additionally, some versions of WARP seem to always fail to change fullscreen state. */
@@ -1982,7 +1980,7 @@ static void test_create_swapchain(void)
fullscreen = FALSE;
target = NULL;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target);
- ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(fullscreen == !result_desc.Windowed, "Test %u: Got fullscreen %#x, expected %#x.\n",
i, fullscreen, result_desc.Windowed);
ok(result_desc.Windowed ? !target : !!target, "Test %u: Got unexpected target %p.\n", i, target);
@@ -1990,7 +1988,7 @@ static void test_create_swapchain(void)
{
IDXGIOutput *containing_output;
hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output);
- ok(hr == S_OK, "Test %u: Failed to get containing output, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(containing_output == target, "Test %u: Got unexpected containing output pointer %p.\n",
i, containing_output);
IDXGIOutput_Release(containing_output);
@@ -2001,25 +1999,25 @@ static void test_create_swapchain(void)
IDXGIOutput_Release(target);
hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
fullscreen = FALSE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(fullscreen, "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen);
target = NULL;
hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(!!target, "Test %u: Got unexpected target %p.\n", i, target);
IDXGIOutput_Release(target);
}
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Test %u: Failed to set fullscreen state, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
fullscreen = 0xdeadbeef;
target = (void *)0xdeadbeef;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target);
- ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(!fullscreen, "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen);
ok(!target, "Test %u: Got unexpected target %p.\n", i, target);
@@ -2034,16 +2032,16 @@ static void test_create_swapchain(void)
creation_desc.Windowed = TRUE;
creation_desc.Flags = 0;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
creation_desc.Windowed = FALSE;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
creation_desc.BufferCount = 2;
creation_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(hr == E_INVALIDARG || hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG || hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
creation_desc.BufferCount = 1;
creation_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
@@ -2063,9 +2061,9 @@ static void test_create_swapchain(void)
creation_desc.Windowed = TRUE;
creation_desc.Flags = 0;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n",
result_desc.BufferDesc.Width, expected_width);
ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n",
@@ -2087,9 +2085,9 @@ static void test_create_swapchain(void)
creation_desc.BufferDesc.Width = 0;
creation_desc.BufferDesc.Height = 0;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n",
result_desc.BufferDesc.Width, expected_width);
ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n",
@@ -2110,9 +2108,9 @@ static void test_create_swapchain(void)
creation_desc.BufferDesc.Width = 0;
creation_desc.BufferDesc.Height = 0;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n",
result_desc.BufferDesc.Width, expected_width);
ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n",
@@ -2127,14 +2125,14 @@ static void test_create_swapchain(void)
/* Fullscreen */
creation_desc.Windowed = FALSE;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Failed to set fullscreen state, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target);
ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */,
- "Failed to get containing output, hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &initial_state);
IDXGISwapChain_Release(swapchain);
if (hr == DXGI_ERROR_UNSUPPORTED)
@@ -2159,16 +2157,16 @@ static void test_create_swapchain(void)
expected_height = expected_client_rect->bottom - expected_client_rect->top;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
todo_wine ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n",
result_desc.BufferDesc.Width, expected_width);
todo_wine ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n",
result_desc.BufferDesc.Height, expected_height);
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Failed to set fullscreen state, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &initial_state);
IDXGISwapChain_Release(swapchain);
@@ -2183,16 +2181,16 @@ static void test_create_swapchain(void)
expected_height = expected_client_rect->bottom - expected_client_rect->top;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
todo_wine ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n",
result_desc.BufferDesc.Width, expected_width);
todo_wine ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n",
result_desc.BufferDesc.Height, expected_height);
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Failed to set fullscreen state, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &initial_state);
IDXGISwapChain_Release(swapchain);
@@ -2201,11 +2199,11 @@ static void test_create_swapchain(void)
done:
IUnknown_Release(obj);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
refcount = IDXGIAdapter_Release(adapter);
- ok(!refcount, "Adapter has %u references left.\n", refcount);
+ ok(!refcount, "Adapter has %lu references left.\n", refcount);
refcount = IDXGIFactory_Release(factory);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
check_window_fullscreen_state(creation_desc.OutputWindow, &initial_state.fullscreen_state);
DestroyWindow(creation_desc.OutputWindow);
}
@@ -2238,7 +2236,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
output_count = 0;
while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_count, &output)) != DXGI_ERROR_NOT_FOUND)
{
- ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_count, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIOutput_Release(output);
++output_count;
}
@@ -2263,7 +2261,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
get_factory(device, is_d3d12, &factory);
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
monitor = MonitorFromWindow(swapchain_desc.OutputWindow, 0);
ok(!!monitor, "MonitorFromWindow failed.\n");
@@ -2274,7 +2272,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
hr = IDXGISwapChain_GetContainingOutput(swapchain, &output);
ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */,
- "GetContainingOutput failed, hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
if (hr == DXGI_ERROR_UNSUPPORTED)
{
win_skip("GetContainingOutput() not supported.\n");
@@ -2282,17 +2280,17 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
}
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2);
- ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(output != output2, "Got unexpected output pointers %p, %p.\n", output, output2);
check_output_equal(output, output2);
refcount = IDXGIOutput_Release(output);
- ok(!refcount, "IDXGIOutput has %u references left.\n", refcount);
+ ok(!refcount, "IDXGIOutput has %lu references left.\n", refcount);
refcount = IDXGIOutput_Release(output2);
- ok(!refcount, "IDXGIOutput has %u references left.\n", refcount);
+ ok(!refcount, "IDXGIOutput has %lu references left.\n", refcount);
ok(!lstrcmpW(output_desc.DeviceName, monitor_info.szDevice),
"Got unexpected device name %s, expected %s.\n",
@@ -2309,7 +2307,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
++output_idx)
{
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx,
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx,
output_idx, hr);
/* Move the OutputWindow to the current output. */
@@ -2320,7 +2318,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2);
if (FAILED(hr))
{
- win_skip("Adapter %u output %u: GetContainingOutput failed, hr %#x.\n",
+ win_skip("Adapter %u output %u: GetContainingOutput failed, hr %#lx.\n",
adapter_idx, output_idx, hr);
IDXGIOutput_Release(output);
continue;
@@ -2329,7 +2327,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
check_output_equal(output, output2);
refcount = IDXGIOutput_Release(output2);
- ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n",
+ ok(!refcount, "Adapter %u output %u: IDXGIOutput has %lu references left.\n",
adapter_idx, output_idx, refcount);
/* Move the OutputWindow around the corners of the current output desktop coordinates. */
@@ -2393,17 +2391,16 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2);
ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED),
- "Adapter %u output %u point %u: Failed to get containing output, hr %#x.\n",
- adapter_idx, output_idx, i, hr);
+ "Adapter %u output %u point %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, i, hr);
if (hr != S_OK)
continue;
ok(!!output2, "Adapter %u output %u point %u: Got unexpected containing output %p.\n",
adapter_idx, output_idx, i, output2);
hr = IDXGIOutput_GetDesc(output2, &output_desc);
- ok(hr == S_OK, "Adapter %u output %u point %u: Failed to get output desc, hr %#x.\n",
+ ok(hr == S_OK, "Adapter %u output %u point %u: Got unexpected hr %#lx.\n",
adapter_idx, output_idx, i, hr);
refcount = IDXGIOutput_Release(output2);
- ok(!refcount, "Adapter %u output %u point %u: IDXGIOutput has %u references left.\n",
+ ok(!refcount, "Adapter %u output %u point %u: IDXGIOutput has %lu references left.\n",
adapter_idx, output_idx, i, refcount);
ok(!lstrcmpW(output_desc.DeviceName, monitor_info.szDevice),
@@ -2426,14 +2423,14 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
if (FAILED(hr))
{
- skip("SetFullscreenState failed, hr %#x.\n", hr);
+ skip("SetFullscreenState failed, hr %#lx.\n", hr);
goto done;
}
hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2);
if (FAILED(hr))
{
- win_skip("GetContainingOutput failed, hr %#x.\n", hr);
+ win_skip("GetContainingOutput failed, hr %#lx.\n", hr);
IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
goto done;
}
@@ -2445,8 +2442,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
++output_idx)
{
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx,
- output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
IDXGIOutput_Release(output);
/* Move the OutputWindow to the current output. */
@@ -2455,7 +2451,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
ok(ret, "Adapter %u output %u: SetWindowPos failed.\n", adapter_idx, output_idx);
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output);
- ok(hr == S_OK, "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n",
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n",
adapter_idx, output_idx, hr);
ok(fullscreen, "Adapter %u output %u: Expect swapchain full screen.\n", adapter_idx,
output_idx);
@@ -2464,8 +2460,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
IDXGIOutput_Release(output);
hr = IDXGISwapChain_GetContainingOutput(swapchain, &output);
- ok(hr == S_OK, "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n",
- adapter_idx, output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
ok(output == output2, "Adapter %u output %u: Expect output %p, got %p.\n",
adapter_idx, output_idx, output2, output);
IDXGIOutput_Release(output);
@@ -2475,7 +2470,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
IDXGIOutput_Release(output2);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Test GetContainingOutput after a full screen swapchain is made windowed by pressing
* Alt+Enter, then move it to another output and use Alt+Enter to enter full screen */
@@ -2502,7 +2497,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
IDXGIOutput_Release(output);
if (FAILED(hr))
{
- skip("SetFullscreenState failed, hr %#x.\n", hr);
+ skip("SetFullscreenState failed, hr %#lx.\n", hr);
IDXGIOutput_Release(output2);
goto done;
}
@@ -2512,12 +2507,12 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
(MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001);
flush_events();
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!fullscreen, "Expect swapchain not full screen.\n");
/* Move the swapchain output window to the second output */
hr = IDXGIOutput_GetDesc(output2, &output_desc2);
- ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc2.DesktopCoordinates.left,
output_desc2.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
ok(ret, "SetWindowPos failed.\n");
@@ -2528,13 +2523,13 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
flush_events();
output = NULL;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output);
- ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(fullscreen, "Expect swapchain full screen.\n");
ok(!!output, "Expect output not NULL.\n");
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDesc(output2, &output_desc2);
- ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName),
"Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName),
wine_dbgstr_w(output_desc.DeviceName));
@@ -2542,17 +2537,17 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
output = NULL;
hr = IDXGISwapChain_GetContainingOutput(swapchain, &output);
- ok(hr == S_OK, "GetContainingOutput failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDesc(output2, &output_desc2);
- ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName),
"Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName),
wine_dbgstr_w(output_desc.DeviceName));
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
}
else
{
@@ -2566,9 +2561,9 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12)
done:
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "IDXGIFactory has %u references left.\n", refcount);
+ ok(refcount == !is_d3d12, "IDXGIFactory has %lu references left.\n", refcount);
DestroyWindow(swapchain_desc.OutputWindow);
}
@@ -2585,7 +2580,7 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain,
BOOL ret;
hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, initial_state);
@@ -2593,10 +2588,10 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain,
compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state,
&swapchain_desc, &initial_state->fullscreen_state.monitor_rect, 800, 600, NULL);
hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target);
- ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#lx.\n", hr);
if (FAILED(hr))
{
skip("Could not change fullscreen state.\n");
@@ -2606,15 +2601,15 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain,
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, initial_state);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, initial_state);
IDXGIOutput_Release(expected_state.target);
@@ -2632,10 +2627,10 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain,
for (i = 0; i < output_count; ++i)
{
hr = IDXGIAdapter_EnumOutputs(adapter, i, &output);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
output_monitor_info[i].cbSize = sizeof(*output_monitor_info);
ret = GetMonitorInfoW(output_desc.Monitor, (MONITORINFO *)&output_monitor_info[i]);
@@ -2651,9 +2646,9 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain,
BOOL fullscreen;
hr = IDXGIAdapter_EnumOutputs(adapter, i, &output);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
expected_state = *initial_state;
expected_state.target = output;
@@ -2663,33 +2658,33 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain,
&swapchain_desc, &orig_monitor_rect, 800, 600, NULL);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &expected_state);
target = NULL;
hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target);
- ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(target == output, "Got target pointer %p, expected %p.\n", target, output);
IDXGIOutput_Release(target);
fullscreen = FALSE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr);
- ok(fullscreen, "Got unexpected fullscreen %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+ ok(fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, output);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, initial_state);
fullscreen = TRUE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr);
- ok(!fullscreen, "Got unexpected fullscreen %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+ ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen);
check_swapchain_fullscreen_state(swapchain, initial_state);
monitor_info.cbSize = sizeof(monitor_info);
@@ -2699,22 +2694,22 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain,
wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&orig_monitor_rect));
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIOutput_Release(output);
}
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, initial_state);
for (i = 0; i < output_count; ++i)
{
hr = IDXGIAdapter_EnumOutputs(adapter, i, &output);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
monitor_info.cbSize = sizeof(monitor_info);
ret = GetMonitorInfoW(output_desc.Monitor, (MONITORINFO *)&monitor_info);
@@ -2764,105 +2759,105 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12)
memset(&initial_state, 0, sizeof(initial_state));
capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow);
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetContainingOutput(swapchain, &output);
- ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */
- "Failed to get containing output, hr %#x.\n", hr);
+ ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */
+ "Got unexpected hr %#lx.\n", hr);
if (FAILED(hr))
{
skip("Could not get output.\n");
goto done;
}
hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&adapter);
- ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIOutput_Release(output);
check_swapchain_fullscreen_state(swapchain, &initial_state);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE
+ ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE
|| broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */
- "SetFullscreenState failed, hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
if (FAILED(hr))
{
skip("Could not change fullscreen state.\n");
goto done;
}
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
DestroyWindow(swapchain_desc.OutputWindow);
swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0);
check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state);
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &initial_state);
test_swapchain_fullscreen_state(swapchain, adapter, &initial_state);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
DestroyWindow(swapchain_desc.OutputWindow);
swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0);
check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state);
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen);
DestroyWindow(swapchain_desc.OutputWindow);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0);
check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state);
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen);
DestroyWindow(swapchain_desc.OutputWindow);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0);
check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state);
swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &initial_state);
test_swapchain_fullscreen_state(swapchain, adapter, &initial_state);
@@ -2870,12 +2865,12 @@ done:
if (adapter)
IDXGIAdapter_Release(adapter);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state);
DestroyWindow(swapchain_desc.OutputWindow);
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount);
}
static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d12)
@@ -2919,31 +2914,25 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1
swapchain_desc.OutputWindow = create_window();
swapchain_desc.Windowed = TRUE;
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(SUCCEEDED(hr), "Adapter %u output %u: CreateSwapChain failed, hr %#x.\n",
- adapter_idx, output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &containing_output);
- ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n",
- adapter_idx, output_idx, hr);
- ok(!fullscreen, "Adapter %u output %u: Expected not fullscreen.\n", adapter_idx,
- output_idx);
- ok(!containing_output, "Adapter %u output %u: Expected a null output.\n", adapter_idx,
- output_idx);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
+ ok(!fullscreen, "Adapter %u output %u: Expected not fullscreen.\n", adapter_idx, output_idx);
+ ok(!containing_output, "Adapter %u output %u: Expected a null output.\n", adapter_idx, output_idx);
/* Move the OutputWindow to the current output. */
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx,
- output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
ret = SetWindowPos(swapchain_desc.OutputWindow, 0,
output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top,
0, 0, SWP_NOSIZE | SWP_NOZORDER);
- ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#x.\n", adapter_idx,
+ ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#lx.\n", adapter_idx,
output_idx, GetLastError());
hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output);
- ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */,
- "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", adapter_idx,
- output_idx, hr);
+ ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */,
+ "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
if (hr == DXGI_ERROR_UNSUPPORTED)
{
win_skip("Adapter %u output %u: GetContainingOutput() not supported.\n",
@@ -2955,9 +2944,8 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1
}
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE,
- "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", adapter_idx,
- output_idx, hr);
+ ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE,
+ "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE)
{
skip("Adapter %u output %u: Could not change fullscreen state.\n", adapter_idx,
@@ -2976,35 +2964,32 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1
target = NULL;
hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target);
- ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n",
- adapter_idx, output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
ok(target != containing_output,
"Adapter %u output %u: Got unexpected output %p, expected %p.\n", adapter_idx,
output_idx, target, containing_output);
check_output_equal(target, containing_output);
refcount = IDXGIOutput_Release(containing_output);
- ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n",
+ ok(!refcount, "Adapter %u output %u: IDXGIOutput has %lu references left.\n",
adapter_idx, output_idx, refcount);
hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output);
- ok(SUCCEEDED(hr), "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n",
- adapter_idx, output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
ok(containing_output == target,
"Adapter %u output %u: Got unexpected containing output %p, expected %p.\n",
adapter_idx, output_idx, containing_output, target);
refcount = IDXGIOutput_Release(containing_output);
- ok(refcount >= 2, "Adapter %u output %u: Got unexpected refcount %u.\n", adapter_idx,
+ ok(refcount >= 2, "Adapter %u output %u: Got unexpected refcount %lu.\n", adapter_idx,
output_idx, refcount);
refcount = IDXGIOutput_Release(target);
- ok(refcount >= 1, "Adapter %u output %u: Got unexpected refcount %u.\n", adapter_idx,
+ ok(refcount >= 1, "Adapter %u output %u: Got unexpected refcount %lu.\n", adapter_idx,
output_idx, refcount);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(SUCCEEDED(hr), "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n",
- adapter_idx, output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %u references left.\n",
+ ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %lu references left.\n",
adapter_idx, output_idx, refcount);
DestroyWindow(swapchain_desc.OutputWindow);
@@ -3017,12 +3002,12 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1
swapchain_desc.Windowed = FALSE;
ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc.DesktopCoordinates.left,
output_desc.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
- ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#x.\n", adapter_idx,
+ ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#lx.\n", adapter_idx,
output_idx, GetLastError());
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
if (FAILED(hr))
{
- skip("Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", adapter_idx,
+ skip("Adapter %u output %u: CreateSwapChain failed, hr %#lx.\n", adapter_idx,
output_idx, hr);
IDXGIOutput_Release(output);
DestroyWindow(swapchain_desc.OutputWindow);
@@ -3030,16 +3015,14 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1
}
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &containing_output);
- ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n",
- adapter_idx, output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
ok(fullscreen, "Adapter %u output %u: Expected fullscreen.\n", adapter_idx, output_idx);
- ok(!!containing_output, "Adapter %u output %u: Expected a valid output.\n", adapter_idx,
- output_idx);
+ ok(!!containing_output, "Adapter %u output %u: Expected a valid output.\n", adapter_idx, output_idx);
if (containing_output)
IDXGIOutput_Release(containing_output);
ret = GetWindowRect(swapchain_desc.OutputWindow, &window_rect);
- ok(ret, "Adapter %u output %u: GetWindowRect failed, error %#x.\n", adapter_idx,
+ ok(ret, "Adapter %u output %u: GetWindowRect failed, error %#lx.\n", adapter_idx,
output_idx, GetLastError());
ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates),
"Adapter %u output %u: Expect window rect %s, got %s.\n", adapter_idx,
@@ -3047,8 +3030,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1
wine_dbgstr_rect(&window_rect));
hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output);
- ok(hr == S_OK, "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n",
- adapter_idx, output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
ok(containing_output != output,
"Adapter %u output %u: Got unexpected output %p, expected %p.\n", adapter_idx,
output_idx, output, containing_output);
@@ -3056,13 +3038,12 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1
IDXGIOutput_Release(containing_output);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n",
- adapter_idx, output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %u references left.\n",
+ ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %lu references left.\n",
adapter_idx, output_idx, refcount);
refcount = IDXGIOutput_Release(output);
- ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n",
+ ok(!refcount, "Adapter %u output %u: IDXGIOutput has %lu references left.\n",
adapter_idx, output_idx, refcount);
DestroyWindow(swapchain_desc.OutputWindow);
}
@@ -3070,7 +3051,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1
}
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "IDXGIFactory has %u references left.\n", refcount);
+ ok(refcount == !is_d3d12, "IDXGIFactory has %lu references left.\n", refcount);
}
static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window,
@@ -3129,20 +3110,20 @@ static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window,
mode.Width = sizes[i].width;
mode.Height = sizes[i].height;
hr = IDXGISwapChain_ResizeTarget(swapchain, &mode);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &expected_state);
}
ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOZORDER);
- ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError());
+ ok(ret, "SetWindowPos failed, error %#lx.\n", GetLastError());
GetWindowRect(window, &e->window_rect);
GetClientRect(window, &e->client_rect);
ret = SetWindowPos(window, 0, 0, 0, 200, 200, SWP_NOMOVE | SWP_NOZORDER);
- ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError());
+ ok(ret, "SetWindowPos failed, error %#lx.\n", GetLastError());
memset(&mode, 0, sizeof(mode));
hr = IDXGISwapChain_ResizeTarget(swapchain, &mode);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &expected_state);
GetWindowRect(window, &e->window_rect);
@@ -3162,14 +3143,14 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain,
HRESULT hr;
hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target);
- ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDisplayModeList(target, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL);
- ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Win 7 testbot */
- "Failed to list modes, hr %#x.\n", hr);
+ ok(hr == S_OK || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Win 7 testbot */
+ "Got unexpected hr %#lx.\n", hr);
if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE)
{
win_skip("GetDisplayModeList() not supported.\n");
@@ -3181,7 +3162,7 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain,
ok(!!modes, "Failed to allocate memory.\n");
hr = IDXGIOutput_GetDisplayModeList(target, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes);
- ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
expected_state = *initial_state;
for (i = 0; i < min(mode_count, 20); ++i)
@@ -3192,13 +3173,13 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain,
continue;
hr = IDXGIOutput_GetDesc(target, &output_desc);
- ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state,
&swapchain_desc, &output_desc.DesktopCoordinates, modes[i].Width, modes[i].Height, NULL);
hr = IDXGISwapChain_ResizeTarget(swapchain, &modes[i]);
- ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#lx.\n", hr);
if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE)
{
skip("Failed to change to video mode %u.\n", i);
@@ -3207,7 +3188,7 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain,
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGIOutput_GetDesc(target, &output_desc);
- ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(EqualRect(&output_desc.DesktopCoordinates, &expected_state.fullscreen_state.monitor_rect),
"Got desktop coordinates %s, expected %s.\n",
wine_dbgstr_rect(&output_desc.DesktopCoordinates),
@@ -3278,8 +3259,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12)
++output_idx)
{
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx,
- output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
for (test_idx = 0; test_idx < ARRAY_SIZE(tests); ++test_idx)
{
@@ -3300,7 +3280,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12)
capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow);
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(SUCCEEDED(hr), "Adapter %u output %u test %u: CreateSwapChain failed, hr %#x.\n",
+ ok(hr == S_OK, "Adapter %u output %u test %u: Got unexpected hr %#lx.\n",
adapter_idx, output_idx, test_idx, hr);
check_swapchain_fullscreen_state(swapchain, &initial_state);
@@ -3311,8 +3291,8 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12)
compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state,
&swapchain_desc, &initial_state.fullscreen_state.monitor_rect, 800, 600, NULL);
hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target);
- ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */,
- "Adapter %u output %u test %u: GetContainingOutput failed, hr %#x.\n",
+ ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */,
+ "Adapter %u output %u test %u: Got unexpected hr %#lx.\n",
adapter_idx, output_idx, test_idx, hr);
if (hr == DXGI_ERROR_UNSUPPORTED)
{
@@ -3324,8 +3304,8 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12)
}
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE,
- "Adapter %u output %u test %u: SetFullscreenState failed, hr %#x.\n",
+ ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE,
+ "Adapter %u output %u test %u: Got unexpected hr %#lx.\n",
adapter_idx, output_idx, test_idx, hr);
if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE)
{
@@ -3340,7 +3320,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12)
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGISwapChain_ResizeTarget(swapchain, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Adapter %u output %u test %u: Got unexpected hr %#x.\n",
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Adapter %u output %u test %u: Got unexpected hr %#lx.\n",
adapter_idx, output_idx, test_idx, hr);
check_swapchain_fullscreen_state(swapchain, &expected_state);
@@ -3349,7 +3329,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12)
test_fullscreen_resize_target(swapchain, &expected_state);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(SUCCEEDED(hr), "Adapter %u output %u test %u: SetFullscreenState failed, hr %#x.\n",
+ ok(hr == S_OK, "Adapter %u output %u test %u: Got unexpected hr %#lx.\n",
adapter_idx, output_idx, test_idx, hr);
check_swapchain_fullscreen_state(swapchain, &initial_state);
IDXGIOutput_Release(expected_state.target);
@@ -3364,7 +3344,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12)
}
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "Adapter %u output %u test %u: IDXGISwapChain has %u references left.\n",
+ ok(!refcount, "Adapter %u output %u test %u: IDXGISwapChain has %lu references left.\n",
adapter_idx, output_idx, test_idx, refcount);
check_window_fullscreen_state(swapchain_desc.OutputWindow, &expected_state.fullscreen_state);
DestroyWindow(swapchain_desc.OutputWindow);
@@ -3374,7 +3354,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12)
IDXGIAdapter_Release(adapter);
}
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount);
}
static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam)
@@ -3388,7 +3368,7 @@ static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, W
case WM_SIZE:
ok(!!swapchain, "GWLP_USERDATA is NULL.\n");
hr = IDXGISwapChain_GetDesc(swapchain, &desc);
- ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(desc.BufferDesc.Width == 800, "Got unexpected buffer width %u.\n", desc.BufferDesc.Width);
ok(desc.BufferDesc.Height == 600, "Got unexpected buffer height %u.\n", desc.BufferDesc.Height);
return 0;
@@ -3421,7 +3401,7 @@ static DWORD WINAPI window_thread(void *data)
ok(!!thread_data->window, "Failed to create window.\n");
ret = SetEvent(thread_data->window_created);
- ok(ret, "Failed to set event, last error %#x.\n", GetLastError());
+ ok(ret, "Failed to set event, last error %#lx.\n", GetLastError());
for (;;)
{
@@ -3432,7 +3412,7 @@ static DWORD WINAPI window_thread(void *data)
if (ret != WAIT_TIMEOUT)
break;
}
- ok(ret == WAIT_OBJECT_0, "Failed to wait for event, ret %#x, last error %#x.\n", ret, GetLastError());
+ ok(ret == WAIT_OBJECT_0, "Failed to wait for event, ret %#x, last error %#lx.\n", ret, GetLastError());
DestroyWindow(thread_data->window);
thread_data->window = NULL;
@@ -3466,19 +3446,19 @@ static void test_resize_target_wndproc(void)
memset(&thread_data, 0, sizeof(thread_data));
thread_data.window_created = CreateEventA(NULL, FALSE, FALSE, NULL);
- ok(!!thread_data.window_created, "Failed to create event, last error %#x.\n", GetLastError());
+ ok(!!thread_data.window_created, "Failed to create event, last error %#lx.\n", GetLastError());
thread_data.finished = CreateEventA(NULL, FALSE, FALSE, NULL);
- ok(!!thread_data.finished, "Failed to create event, last error %#x.\n", GetLastError());
+ ok(!!thread_data.finished, "Failed to create event, last error %#lx.\n", GetLastError());
thread = CreateThread(NULL, 0, window_thread, &thread_data, 0, NULL);
- ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError());
+ ok(!!thread, "Failed to create thread, last error %#lx.\n", GetLastError());
ret = WaitForSingleObject(thread_data.window_created, INFINITE);
- ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError());
+ ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#lx.\n", ret, GetLastError());
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
- ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
swapchain_desc.BufferDesc.Width = 800;
swapchain_desc.BufferDesc.Height = 600;
@@ -3496,7 +3476,7 @@ static void test_resize_target_wndproc(void)
swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
swapchain_desc.Flags = 0;
hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
data = SetWindowLongPtrA(thread_data.window, GWLP_USERDATA, (LONG_PTR)swapchain);
ok(!data, "Got unexpected GWLP_USERDATA %p.\n", (void *)data);
@@ -3505,10 +3485,10 @@ static void test_resize_target_wndproc(void)
mode.Width = 600;
mode.Height = 400;
hr = IDXGISwapChain_ResizeTarget(swapchain, &mode);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc);
- ok(hr == S_OK, "Getswapchain_desc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(swapchain_desc.BufferDesc.Width == 800,
"Got unexpected buffer width %u.\n", swapchain_desc.BufferDesc.Width);
ok(swapchain_desc.BufferDesc.Height == 600,
@@ -3520,18 +3500,18 @@ static void test_resize_target_wndproc(void)
"Got unexpected client rect %s.\n", wine_dbgstr_rect(&rect));
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
IDXGIAdapter_Release(adapter);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
refcount = IDXGIFactory_Release(factory);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
ret = SetEvent(thread_data.finished);
- ok(ret, "Failed to set event, last error %#x.\n", GetLastError());
+ ok(ret, "Failed to set event, last error %#lx.\n", GetLastError());
ret = WaitForSingleObject(thread, INFINITE);
- ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError());
+ ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#lx.\n", ret, GetLastError());
CloseHandle(thread);
CloseHandle(thread_data.window_created);
CloseHandle(thread_data.finished);
@@ -3568,10 +3548,10 @@ static void test_inexact_modes(void)
}
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
- ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
swapchain_desc.BufferDesc.Width = 800;
swapchain_desc.BufferDesc.Height = 600;
@@ -3593,16 +3573,16 @@ static void test_inexact_modes(void)
capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow);
hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain);
- ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetContainingOutput(swapchain, &output);
- ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */,
- "GetContainingOutput failed, hr %#x.\n", hr);
+ ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */,
+ "Got unexpected hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
if (hr == DXGI_ERROR_UNSUPPORTED)
{
win_skip("GetContainingOutput() not supported.\n");
@@ -3629,22 +3609,22 @@ static void test_inexact_modes(void)
sizes[i].width, sizes[i].height, output);
hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain);
- ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n",
result_desc.BufferDesc.Width, sizes[i].width);
ok(result_desc.BufferDesc.Height == sizes[i].height, "Got height %u, expected %u.\n",
result_desc.BufferDesc.Height, sizes[i].height);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &initial_state);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
/* Test SetFullscreenState(). */
swapchain_desc.BufferDesc.Width = sizes[i].width;
@@ -3652,25 +3632,25 @@ static void test_inexact_modes(void)
swapchain_desc.Windowed = TRUE;
hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain);
- ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output);
- ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n",
result_desc.BufferDesc.Width, sizes[i].width);
ok(result_desc.BufferDesc.Height == sizes[i].height, "Got height %u, expected %u.\n",
result_desc.BufferDesc.Height, sizes[i].height);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &initial_state);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
/* Test ResizeTarget(). */
swapchain_desc.BufferDesc.Width = 800;
@@ -3678,28 +3658,28 @@ static void test_inexact_modes(void)
swapchain_desc.Windowed = TRUE;
hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain);
- ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output);
- ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
swapchain_desc.BufferDesc.Width = sizes[i].width;
swapchain_desc.BufferDesc.Height = sizes[i].height;
hr = IDXGISwapChain_ResizeTarget(swapchain, &swapchain_desc.BufferDesc);
- ok(SUCCEEDED(hr), "ResizeTarget failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &expected_state);
hr = IDXGISwapChain_GetDesc(swapchain, &result_desc);
- ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(result_desc.BufferDesc.Width == 800, "Got width %u.\n", result_desc.BufferDesc.Width);
ok(result_desc.BufferDesc.Height == 600, "Got height %u.\n", result_desc.BufferDesc.Height);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_swapchain_fullscreen_state(swapchain, &initial_state);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
}
done:
@@ -3707,9 +3687,9 @@ done:
IDXGIOutput_Release(output);
IDXGIAdapter_Release(adapter);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
refcount = IDXGIFactory_Release(factory);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
DestroyWindow(swapchain_desc.OutputWindow);
}
@@ -3721,35 +3701,35 @@ static void test_create_factory(void)
iface = (void *)0xdeadbeef;
hr = CreateDXGIFactory(&IID_IDXGIDevice, (void **)&iface);
- ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr);
ok(!iface, "Got unexpected iface %p.\n", iface);
hr = CreateDXGIFactory(&IID_IUnknown, (void **)&iface);
- ok(SUCCEEDED(hr), "Failed to create factory with IID_IUnknown, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IUnknown_Release(iface);
hr = CreateDXGIFactory(&IID_IDXGIObject, (void **)&iface);
- ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IUnknown_Release(iface);
hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&iface);
- ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_interface(iface, &IID_IDXGIFactory1, FALSE, FALSE);
IUnknown_Release(iface);
iface = (void *)0xdeadbeef;
hr = CreateDXGIFactory(&IID_IDXGIFactory1, (void **)&iface);
- ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr);
ok(!iface, "Got unexpected iface %p.\n", iface);
iface = NULL;
hr = CreateDXGIFactory(&IID_IDXGIFactory2, (void **)&iface);
ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */,
- "Got unexpected hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
refcount = IUnknown_Release(iface);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
}
if (!pCreateDXGIFactory1)
@@ -3760,35 +3740,35 @@ static void test_create_factory(void)
iface = (void *)0xdeadbeef;
hr = pCreateDXGIFactory1(&IID_IDXGIDevice, (void **)&iface);
- ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr);
ok(!iface, "Got unexpected iface %p.\n", iface);
hr = pCreateDXGIFactory1(&IID_IUnknown, (void **)&iface);
- ok(SUCCEEDED(hr), "Failed to create factory with IID_IUnknown, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IUnknown_Release(iface);
hr = pCreateDXGIFactory1(&IID_IDXGIObject, (void **)&iface);
- ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IUnknown_Release(iface);
hr = pCreateDXGIFactory1(&IID_IDXGIFactory, (void **)&iface);
- ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_interface(iface, &IID_IDXGIFactory1, TRUE, FALSE);
refcount = IUnknown_Release(iface);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
hr = pCreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&iface);
- ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory1, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IUnknown_Release(iface);
iface = NULL;
hr = pCreateDXGIFactory1(&IID_IDXGIFactory2, (void **)&iface);
ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */,
- "Got unexpected hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
refcount = IUnknown_Release(iface);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
}
if (!pCreateDXGIFactory2)
@@ -3798,7 +3778,7 @@ static void test_create_factory(void)
}
hr = pCreateDXGIFactory2(0, &IID_IDXGIFactory3, (void **)&iface);
- ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_interface(iface, &IID_IDXGIFactory, TRUE, FALSE);
check_interface(iface, &IID_IDXGIFactory1, TRUE, FALSE);
check_interface(iface, &IID_IDXGIFactory2, TRUE, FALSE);
@@ -3807,16 +3787,16 @@ static void test_create_factory(void)
check_interface(iface, &IID_IDXGIFactory4, TRUE, TRUE);
check_interface(iface, &IID_IDXGIFactory5, TRUE, TRUE);
refcount = IUnknown_Release(iface);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
hr = pCreateDXGIFactory2(0, &IID_IDXGIFactory, (void **)&iface);
- ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_interface(iface, &IID_IDXGIFactory, TRUE, FALSE);
check_interface(iface, &IID_IDXGIFactory1, TRUE, FALSE);
check_interface(iface, &IID_IDXGIFactory2, TRUE, FALSE);
check_interface(iface, &IID_IDXGIFactory3, TRUE, FALSE);
refcount = IUnknown_Release(iface);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
}
static void test_private_data(void)
@@ -3856,67 +3836,67 @@ static void test_private_data(void)
* NULL interface is not considered a clear but as setting an interface pointer that
* happens to be NULL. */
hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 0, NULL);
- ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, ~0U, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, ~0U, NULL);
- ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
size = sizeof(ptr) * 2;
ptr = (IUnknown *)0xdeadbeef;
hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!ptr, "Got unexpected pointer %p.\n", ptr);
ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size);
refcount = get_refcount(test_object);
hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid,
(IUnknown *)test_object);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
expected_refcount = refcount + 1;
refcount = get_refcount(test_object);
- ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+ ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount);
hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid,
(IUnknown *)test_object);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = get_refcount(test_object);
- ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+ ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount);
hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
expected_refcount--;
refcount = get_refcount(test_object);
- ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+ ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount);
hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid,
(IUnknown *)test_object);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
size = sizeof(data);
hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, size, data);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = get_refcount(test_object);
- ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+ ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount);
hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 42, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 42, NULL);
- ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid,
(IUnknown *)test_object);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
expected_refcount++;
size = 2 * sizeof(ptr);
ptr = NULL;
hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(size == sizeof(test_object), "Got unexpected size %u.\n", size);
expected_refcount++;
refcount = get_refcount(test_object);
- ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+ ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount);
if (ptr)
IUnknown_Release(ptr);
expected_refcount--;
@@ -3924,35 +3904,35 @@ static void test_private_data(void)
ptr = (IUnknown *)0xdeadbeef;
size = 1;
hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(size == sizeof(device), "Got unexpected size %u.\n", size);
size = 2 * sizeof(ptr);
hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(size == sizeof(device), "Got unexpected size %u.\n", size);
refcount = get_refcount(test_object);
- ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+ ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount);
size = 1;
hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr);
- ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#lx.\n", hr);
ok(size == sizeof(device), "Got unexpected size %u.\n", size);
ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr);
hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid2, NULL, NULL);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
size = 0xdeadbabe;
hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid2, &size, &ptr);
- ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#lx.\n", hr);
ok(size == 0, "Got unexpected size %u.\n", size);
ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr);
hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, NULL, &ptr);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
refcount = IDXGIDevice_Release(test_object);
- ok(!refcount, "Test object has %u references left.\n", refcount);
+ ok(!refcount, "Test object has %lu references left.\n", refcount);
}
#define check_surface_desc(a, b) check_surface_desc_(__LINE__, a, b)
@@ -3963,7 +3943,7 @@ static void check_surface_desc_(unsigned int line, IDXGISurface *surface,
HRESULT hr;
hr = IDXGISurface_GetDesc(surface, &surface_desc);
- ok_(__FILE__, line)(hr == S_OK, "Failed to get surface desc, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get surface desc, hr %#lx.\n", hr);
ok_(__FILE__, line)(surface_desc.Width == swapchain_desc->BufferDesc.Width,
"Got Width %u, expected %u.\n", surface_desc.Width, swapchain_desc->BufferDesc.Width);
ok_(__FILE__, line)(surface_desc.Height == swapchain_desc->BufferDesc.Height,
@@ -4074,17 +4054,17 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12)
swapchain_desc.Flags = 0;
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface);
expected_hr = is_d3d12 ? E_NOINTERFACE : S_OK;
- ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr);
ok(!surface || hr == S_OK, "Got unexpected pointer %p.\n", surface);
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&texture);
- ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr);
ok(!texture || hr == S_OK, "Got unexpected pointer %p.\n", texture);
expected_hr = is_d3d12 ? S_OK : E_NOINTERFACE;
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&resource);
- ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr);
ok(!resource || hr == S_OK, "Got unexpected pointer %p.\n", resource);
ret = GetClientRect(window, &r);
@@ -4094,7 +4074,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12)
memset(&swapchain_desc, 0, sizeof(swapchain_desc));
hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc);
- ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(swapchain_desc.BufferDesc.Width == 640,
"Got unexpected BufferDesc.Width %u.\n", swapchain_desc.BufferDesc.Width);
ok(swapchain_desc.BufferDesc.Height == 480,
@@ -4136,7 +4116,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12)
check_resource_desc(resource, &swapchain_desc);
hr = IDXGISwapChain_ResizeBuffers(swapchain, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
ret = GetClientRect(window, &r);
ok(ret, "Failed to get client rect.\n");
@@ -4145,7 +4125,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12)
memset(&swapchain_desc, 0, sizeof(swapchain_desc));
hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc);
- ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(swapchain_desc.BufferDesc.Width == 640,
"Got unexpected BufferDesc.Width %u.\n", swapchain_desc.BufferDesc.Width);
ok(swapchain_desc.BufferDesc.Height == 480,
@@ -4196,17 +4176,17 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12)
}
hr = IDXGISwapChain_ResizeBuffers(swapchain, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0);
- ok(hr == S_OK, "Failed to resize buffers, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface);
expected_hr = is_d3d12 ? E_NOINTERFACE : S_OK;
- ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr);
ok(!surface || hr == S_OK, "Got unexpected pointer %p.\n", surface);
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&texture);
- ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr);
ok(!texture || hr == S_OK, "Got unexpected pointer %p.\n", texture);
expected_hr = is_d3d12 ? S_OK : E_NOINTERFACE;
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&resource);
- ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr);
ok(!resource || hr == S_OK, "Got unexpected pointer %p.\n", resource);
ret = GetClientRect(window, &r);
@@ -4216,7 +4196,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12)
memset(&swapchain_desc, 0, sizeof(swapchain_desc));
hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc);
- ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(swapchain_desc.BufferDesc.Width == 320,
"Got unexpected BufferDesc.Width %u.\n", swapchain_desc.BufferDesc.Width);
ok(swapchain_desc.BufferDesc.Height == 240,
@@ -4267,16 +4247,16 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12)
}
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Failed to resize buffers, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
memset(&swapchain_desc, 0, sizeof(swapchain_desc));
hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc);
- ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(swapchain_desc.BufferDesc.Width == client_rect.right - client_rect.left,
- "Got unexpected BufferDesc.Width %u, expected %u.\n",
+ "Got unexpected BufferDesc.Width %u, expected %lu.\n",
swapchain_desc.BufferDesc.Width, client_rect.right - client_rect.left);
ok(swapchain_desc.BufferDesc.Height == client_rect.bottom - client_rect.top,
- "Got unexpected bufferDesc.Height %u, expected %u.\n",
+ "Got unexpected bufferDesc.Height %u, expected %lu.\n",
swapchain_desc.BufferDesc.Height, client_rect.bottom - client_rect.top);
ok(swapchain_desc.BufferDesc.RefreshRate.Numerator == 60,
"Got unexpected BufferDesc.RefreshRate.Numerator %u.\n",
@@ -4317,35 +4297,41 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12)
}
else if (!is_d3d12)
{
- hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr);
+ hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240,
+ DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
IDXGISwapChain3_Release(swapchain3);
}
else
{
- hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue);
- ok(hr == S_OK, "Failed to resize buffers, hr %#x.\n", hr);
- hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, present_queue);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr);
+ hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240,
+ DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+ hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240,
+ DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, present_queue);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 0, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
node_mask[0] = 2;
node_mask[1] = 2;
- hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr);
- /* Windows validates node masks even when the buffer count is zero. It defaults to the current buffer count.
- * NULL queues cause some Windows versions to crash. */
- hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 0, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr);
+ hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240,
+ DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
+ /* Windows validates node masks even when the buffer count is zero.
+ * It defaults to the current buffer count. NULL queues cause some
+ * Windows versions to crash. */
+ hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 0, 320, 240,
+ DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
IDXGISwapChain3_Release(swapchain3);
}
IDXGISwapChain_Release(swapchain);
DestroyWindow(window);
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount);
}
static void test_swapchain_parameters(void)
@@ -4474,12 +4460,12 @@ static void test_swapchain_parameters(void)
window = create_window();
hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj);
- ok(hr == S_OK, "IDXGIDevice does not implement IUnknown.\n");
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
- ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIAdapter_Release(adapter);
for (i = 0; i < ARRAY_SIZE(tests); ++i)
@@ -4499,16 +4485,16 @@ static void test_swapchain_parameters(void)
hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain);
ok(hr == tests[i].hr || broken(hr == tests[i].vista_hr)
|| (SUCCEEDED(tests[i].hr) && hr == DXGI_STATUS_OCCLUDED),
- "Got unexpected hr %#x, test %u.\n", hr, i);
+ "Got unexpected hr %#lx, test %u.\n", hr, i);
if (FAILED(hr))
continue;
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGIResource, (void **)&resource);
- todo_wine ok(SUCCEEDED(hr), "GetBuffer(0) failed, hr %#x, test %u.\n", hr, i);
+ todo_wine ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i);
if (FAILED(hr))
{
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGISwapChain_Release(swapchain);
continue;
@@ -4516,19 +4502,19 @@ static void test_swapchain_parameters(void)
expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER;
hr = IDXGIResource_GetUsage(resource, &usage);
- ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#x, test %u.\n", hr, i);
+ ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i);
ok((usage & expected_usage) == expected_usage, "Got usage %x, expected %x, test %u.\n",
usage, expected_usage, i);
IDXGIResource_Release(resource);
hr = IDXGISwapChain_GetDesc(swapchain, &desc);
- ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (j = 1; j <= tests[i].highest_accessible_buffer; j++)
{
hr = IDXGISwapChain_GetBuffer(swapchain, j, &IID_IDXGIResource, (void **)&resource);
- ok(SUCCEEDED(hr), "GetBuffer(%u) failed, hr %#x, test %u.\n", hr, i, j);
+ ok(hr == S_OK, "Got unexpected hr %#lx, test %u, buffer %u.\n", hr, i, j);
/* Buffers > 0 are supposed to be read only. This is the case except that in
* fullscreen mode on Windows <= 8 the last backbuffer (BufferCount - 1) is
@@ -4553,7 +4539,7 @@ static void test_swapchain_parameters(void)
broken_usage |= DXGI_USAGE_READ_ONLY;
hr = IDXGIResource_GetUsage(resource, &usage);
- ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#x, test %u, buffer %u.\n", hr, i, j);
+ ok(hr == S_OK, "Got unexpected hr %#lx, test %u, buffer %u.\n", hr, i, j);
ok(usage == expected_usage || broken(usage == broken_usage),
"Got usage %x, expected %x, test %u, buffer %u.\n",
usage, expected_usage, i, j);
@@ -4561,10 +4547,10 @@ static void test_swapchain_parameters(void)
IDXGIResource_Release(resource);
}
hr = IDXGISwapChain_GetBuffer(swapchain, j, &IID_IDXGIResource, (void **)&resource);
- ok(hr == DXGI_ERROR_INVALID_CALL, "GetBuffer(%u) returned unexpected hr %#x, test %u.\n", j, hr, i);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx, test %u.\n", hr, i);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i);
IDXGISwapChain_Release(swapchain);
}
@@ -4584,10 +4570,10 @@ static void test_swapchain_parameters(void)
desc.Windowed = TRUE;
desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain);
- ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i);
+ ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i);
hr = IDXGISwapChain_GetDesc(swapchain, &desc);
- ok(hr == S_OK, "Failed to get swapchain desc, hr %#x, test %u.\n", hr, i);
+ ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i);
todo_wine_if(usage & ~(DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_SHADER_INPUT))
ok(desc.BufferUsage == usage, "Got usage %#x, expected %#x, test %u.\n", desc.BufferUsage, usage, i);
@@ -4598,7 +4584,7 @@ static void test_swapchain_parameters(void)
expected_bind_flags |= D3D11_BIND_SHADER_RESOURCE;
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&d3d10_texture);
- ok(hr == S_OK, "Failed to get d3d10 texture, hr %#x, test %u.\n", hr, i);
+ ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i);
ID3D10Texture2D_GetDesc(d3d10_texture, &d3d10_texture_desc);
ok(d3d10_texture_desc.BindFlags == expected_bind_flags,
"Got d3d10 bind flags %#x, expected %#x, test %u.\n",
@@ -4606,7 +4592,7 @@ static void test_swapchain_parameters(void)
ID3D10Texture2D_Release(d3d10_texture);
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D11Texture2D, (void **)&d3d11_texture);
- ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Failed to get d3d11 texture, hr %#x, test %u.\n", hr, i);
+ ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#lx, test %u.\n", hr, i);
if (SUCCEEDED(hr))
{
ID3D11Texture2D_GetDesc(d3d11_texture, &d3d11_texture_desc);
@@ -4617,7 +4603,7 @@ static void test_swapchain_parameters(void)
}
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGIResource, (void **)&resource);
- todo_wine ok(hr == S_OK, "Failed to get buffer, hr %#x, test %u.\n", hr, i);
+ todo_wine ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i);
if (FAILED(hr))
{
IDXGISwapChain_Release(swapchain);
@@ -4625,7 +4611,7 @@ static void test_swapchain_parameters(void)
}
expected_usage = usage | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_DISCARD_ON_PRESENT;
hr = IDXGIResource_GetUsage(resource, &usage);
- ok(hr == S_OK, "Failed to get resource usage, hr %#x, test %u.\n", hr, i);
+ ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i);
ok(usage == expected_usage, "Got usage %x, expected %x, test %u.\n", usage, expected_usage, i);
IDXGIResource_Release(resource);
@@ -4644,19 +4630,19 @@ static void test_swapchain_parameters(void)
desc.Windowed = TRUE;
desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
if (check_multisample_quality_levels(device, desc.BufferDesc.Format, desc.SampleDesc.Count))
{
desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGISwapChain_Release(swapchain);
desc.SwapEffect = DXGI_SWAP_EFFECT_SEQUENTIAL;
hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGISwapChain_Release(swapchain);
}
else
@@ -4667,7 +4653,7 @@ static void test_swapchain_parameters(void)
IDXGIFactory_Release(factory);
IUnknown_Release(obj);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
DestroyWindow(window);
}
@@ -4702,16 +4688,16 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12)
swapchain_desc.Flags = 0;
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < 10; ++i)
{
hr = IDXGISwapChain_Present(swapchain, i, 0);
ok(hr == (i <= 4 ? S_OK : DXGI_ERROR_INVALID_CALL),
- "Got unexpected hr %#x for sync interval %u.\n", hr, i);
+ "Got unexpected hr %#lx for sync interval %u.\n", hr, i);
}
hr = IDXGISwapChain_Present(swapchain, 0, 0);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(flags); ++i)
{
@@ -4720,18 +4706,18 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12)
/* Another window covers the swapchain window. Not reported as occluded. */
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* Minimised window. */
ShowWindow(swapchain_desc.OutputWindow, SW_MINIMIZE);
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
- ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Test %u: Got unexpected hr %#lx.\n", i, hr);
ShowWindow(swapchain_desc.OutputWindow, SW_NORMAL);
/* Hidden window. */
ShowWindow(swapchain_desc.OutputWindow, SW_HIDE);
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ShowWindow(swapchain_desc.OutputWindow, SW_SHOW);
DestroyWindow(occluding_window);
@@ -4746,15 +4732,15 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12)
continue;
}
flush_events();
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
output = NULL;
fullscreen = FALSE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i);
ok(!!output, "Test %u: Got unexpected output.\n", i);
@@ -4763,14 +4749,14 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12)
/* Still fullscreen. */
fullscreen = FALSE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i);
/* Calling IDXGISwapChain_Present() will exit fullscreen. */
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
fullscreen = TRUE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* Now fullscreen mode is exited. */
if (!flags[i] && !is_d3d12)
/* Still fullscreen on vista and 2008. */
@@ -4789,26 +4775,26 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12)
* compositing. D3d12 fullscreen mode acts just like borderless
* fullscreen window mode. */
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
fullscreen = FALSE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i);
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
occluding_window = CreateWindowA("static", "occluding_window", WS_POPUP, 0, 0, 400, 200, 0, 0, 0, 0);
/* An invisible window doesn't cause the swapchain to exit fullscreen
* mode. */
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
fullscreen = FALSE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i);
/* A visible, but with bottom z-order window still causes the
* swapchain to exit fullscreen mode. */
@@ -4822,19 +4808,19 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12)
* for d3d12. */
fullscreen = TRUE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen,
"Test %u: Got unexpected fullscreen status.\n", i);
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK),
- "Test %u: Got unexpected hr %#x.\n", i, hr);
+ "Test %u: Got unexpected hr %#lx.\n", i, hr);
fullscreen = TRUE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
if (flags[i] == DXGI_PRESENT_TEST)
todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen,
"Test %u: Got unexpected fullscreen status.\n", i);
@@ -4846,67 +4832,67 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12)
* IDXGISwapChain_Present() calls to work, otherwise they will return
* DXGI_ERROR_INVALID_CALL */
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
if (flags[i] == DXGI_PRESENT_TEST)
todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK),
- "Test %u: Got unexpected hr %#x.\n", i, hr);
+ "Test %u: Got unexpected hr %#lx.\n", i, hr);
else
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* Trying to break out of fullscreen mode again. This time, don't call
* IDXGISwapChain_GetFullscreenState() before IDXGISwapChain_Present(). */
ShowWindow(occluding_window, SW_HIDE);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ShowWindow(occluding_window, SW_SHOW);
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
/* hr == S_OK on vista and 2008 */
todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK),
- "Test %u: Got unexpected hr %#x.\n", i, hr);
+ "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
if (flags[i] == DXGI_PRESENT_TEST)
{
todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK),
- "Test %u: Got unexpected hr %#x.\n", i, hr);
+ "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* IDXGISwapChain_Present() without flags refreshes the occlusion
* state. */
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_Present(swapchain, 0, 0);
todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK),
- "Test %u: Got unexpected hr %#x.\n", i, hr);
+ "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
}
else
{
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
}
fullscreen = TRUE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i);
DestroyWindow(occluding_window);
flush_events();
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
}
wait_device_idle(device);
@@ -4914,7 +4900,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12)
IDXGISwapChain_Release(swapchain);
DestroyWindow(swapchain_desc.OutputWindow);
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount);
}
static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12)
@@ -4964,7 +4950,7 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12)
swapchain_desc.SwapEffect = swap_effects[i];
expected_hr = is_d3d12 && !is_flip_model(swap_effects[i]) ? DXGI_ERROR_INVALID_CALL : S_OK;
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ ok(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr);
if (FAILED(hr))
continue;
@@ -4982,20 +4968,20 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12)
expected_index = is_d3d12 ? j % swapchain_desc.BufferCount : 0;
ok(index == expected_index, "Got back buffer index %u, expected %u.\n", index, expected_index);
hr = IDXGISwapChain3_Present(swapchain3, 0, 0);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
}
wait_device_idle(device);
IDXGISwapChain3_Release(swapchain3);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "Swapchain has %u references left.\n", refcount);
+ ok(!refcount, "Swapchain has %lu references left.\n", refcount);
}
done:
DestroyWindow(swapchain_desc.OutputWindow);
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount);
}
static void test_swapchain_formats(IUnknown *device, BOOL is_d3d12)
@@ -5082,18 +5068,18 @@ static void test_swapchain_formats(IUnknown *device, BOOL is_d3d12)
ok(hr == expected_hr
/* Flip presentation model not supported. */
|| broken(hr == DXGI_ERROR_INVALID_CALL && is_flip_model(tests[i].swap_effect) && !is_d3d12),
- "Test %u, d3d12 %#x: Got hr %#x, expected %#x.\n", i, is_d3d12, hr, expected_hr);
+ "Test %u, d3d12 %#x: Got unexpected hr %#lx, expected %#lx.\n", i, is_d3d12, hr, expected_hr);
if (SUCCEEDED(hr))
{
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "Swapchain has %u references left.\n", refcount);
+ ok(!refcount, "Swapchain has %lu references left.\n", refcount);
}
}
DestroyWindow(swapchain_desc.OutputWindow);
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount);
}
static void test_maximum_frame_latency(void)
@@ -5113,28 +5099,28 @@ static void test_maximum_frame_latency(void)
if (SUCCEEDED(IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice1, (void **)&device1)))
{
hr = IDXGIDevice1_GetMaximumFrameLatency(device1, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(max_latency == DEFAULT_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency);
hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency);
hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY + 1);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency);
hr = IDXGIDevice1_SetMaximumFrameLatency(device1, 0);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* 0 does not reset to the default frame latency on all Windows versions. */
ok(max_latency == DEFAULT_FRAME_LATENCY || broken(!max_latency),
"Got unexpected maximum frame latency %u.\n", max_latency);
@@ -5147,7 +5133,7 @@ static void test_maximum_frame_latency(void)
}
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void test_output_desc(void)
@@ -5161,26 +5147,27 @@ static void test_output_desc(void)
HRESULT hr;
hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create DXGI factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; ; ++i)
{
hr = IDXGIFactory_EnumAdapters(factory, i, &adapter);
if (hr == DXGI_ERROR_NOT_FOUND)
break;
- ok(SUCCEEDED(hr), "Failed to enumerate adapter %u, hr %#x.\n", i, hr);
+ winetest_push_context("Adapter %u", i);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory_EnumAdapters(factory, i, &adapter2);
- ok(SUCCEEDED(hr), "Failed to enumerate adapter %u, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(adapter != adapter2, "Expected to get new instance of IDXGIAdapter, %p == %p.\n", adapter, adapter2);
refcount = get_refcount(adapter);
- ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i);
+ ok(refcount == 1, "Get unexpected refcount %lu.\n", refcount);
IDXGIAdapter_Release(adapter2);
refcount = get_refcount(factory);
- ok(refcount == 2, "Get unexpected refcount %u.\n", refcount);
+ ok(refcount == 2, "Get unexpected refcount %lu.\n", refcount);
refcount = get_refcount(adapter);
- ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i);
+ ok(refcount == 1, "Get unexpected refcount %lu.\n", refcount);
for (j = 0; ; ++j)
{
@@ -5190,24 +5177,25 @@ static void test_output_desc(void)
hr = IDXGIAdapter_EnumOutputs(adapter, j, &output);
if (hr == DXGI_ERROR_NOT_FOUND)
break;
- ok(SUCCEEDED(hr), "Failed to enumerate output %u on adapter %u, hr %#x.\n", j, i, hr);
+ winetest_push_context("Output %u", j);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_EnumOutputs(adapter, j, &output2);
- ok(SUCCEEDED(hr), "Failed to enumerate output %u on adapter %u, hr %#x.\n", j, i, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(output != output2, "Expected to get new instance of IDXGIOutput, %p == %p.\n", output, output2);
refcount = get_refcount(output);
- ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i);
+ ok(refcount == 1, "Get unexpected refcount %lu.\n", refcount);
IDXGIOutput_Release(output2);
refcount = get_refcount(factory);
- ok(refcount == 2, "Get unexpected refcount %u.\n", refcount);
+ ok(refcount == 2, "Get unexpected refcount %lu.\n", refcount);
refcount = get_refcount(adapter);
- ok(refcount == 2, "Get unexpected refcount %u for adapter %u.\n", refcount, i);
+ ok(refcount == 2, "Get unexpected refcount %lu.\n", refcount);
refcount = get_refcount(output);
- ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i);
+ ok(refcount == 1, "Get unexpected refcount %lu.\n", refcount);
hr = IDXGIOutput_GetDesc(output, &desc);
- ok(SUCCEEDED(hr), "Failed to get desc for output %u on adapter %u, hr %#x.\n", j, i, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
monitor_info.cbSize = sizeof(monitor_info);
ret = GetMonitorInfoW(desc.Monitor, (MONITORINFO *)&monitor_info);
@@ -5221,16 +5209,20 @@ static void test_output_desc(void)
IDXGIOutput_Release(output);
refcount = get_refcount(adapter);
- ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i);
+ ok(refcount == 1, "Get unexpected refcount %lu.\n", refcount);
+
+ winetest_pop_context();
}
IDXGIAdapter_Release(adapter);
refcount = get_refcount(factory);
- ok(refcount == 1, "Get unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Get unexpected refcount %lu.\n", refcount);
+
+ winetest_pop_context();
}
refcount = IDXGIFactory_Release(factory);
- ok(!refcount, "IDXGIFactory has %u references left.\n", refcount);
+ ok(!refcount, "IDXGIFactory has %lu references left.\n", refcount);
}
struct dxgi_factory
@@ -5469,7 +5461,7 @@ static void test_object_wrapping(void)
HRESULT hr;
hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory);
- ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter);
if (hr == DXGI_ERROR_NOT_FOUND)
@@ -5478,7 +5470,7 @@ static void test_object_wrapping(void)
IDXGIFactory_Release(factory);
return;
}
- ok(hr == S_OK, "Failed to enumerate adapter, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
wrapper.IDXGIAdapter_iface.lpVtbl = &dxgi_adapter_vtbl;
wrapper.wrapped_iface = adapter;
@@ -5492,19 +5484,19 @@ static void test_object_wrapping(void)
if (SUCCEEDED(hr))
{
refcount = ID3D10Device1_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
hr = IDXGIAdapter_GetDesc(&wrapper.IDXGIAdapter_iface, &desc);
- ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!wrapper.factory.wrapped_adapter_count, "Got unexpected wrapped adapter count %u.\n",
wrapper.factory.wrapped_adapter_count);
ok(!wrapper.wrapped_output_count, "Got unexpected wrapped output count %u.\n", wrapper.wrapped_output_count);
refcount = IDXGIAdapter_Release(&wrapper.IDXGIAdapter_iface);
- ok(!refcount, "Adapter has %u references left.\n", refcount);
+ ok(!refcount, "Adapter has %lu references left.\n", refcount);
refcount = IDXGIFactory_Release(factory);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
}
struct adapter_info
@@ -5558,12 +5550,12 @@ static void test_multi_adapter(void)
if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory)))
{
- skip("Failed to create IDXGIFactory, hr %#x.\n", hr);
+ skip("Failed to create IDXGIFactory, hr %#lx.\n", hr);
return;
}
hr = IDXGIFactory_EnumAdapters(factory, 0, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter);
if (hr == DXGI_ERROR_NOT_FOUND)
@@ -5572,14 +5564,14 @@ static void test_multi_adapter(void)
IDXGIFactory_Release(factory);
return;
}
- ok(hr == S_OK, "Failed to enumerate adapter, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (adapter_index = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_index, &adapter)); ++adapter_index)
{
for (output_index = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_index, &output)); ++output_index)
{
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index,
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_index,
output_index, hr);
found = FALSE;
@@ -5596,15 +5588,15 @@ static void test_multi_adapter(void)
adapter_index, output_index, wine_dbgstr_w(output_desc.DeviceName));
ok(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP,
- "Adapter %u output %u: Got unexpected state flags %#x.\n", adapter_index,
+ "Adapter %u output %u: Got unexpected state flags %#lx.\n", adapter_index,
output_index, display_device.StateFlags);
if (!adapter_index && !output_index)
ok(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE,
- "Adapter %u output %u: Got unexpected state flags %#x.\n", adapter_index,
+ "Adapter %u output %u: Got unexpected state flags %#lx.\n", adapter_index,
output_index, display_device.StateFlags);
else
ok(!(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE),
- "Adapter %u output %u: Got unexpected state flags %#x.\n", adapter_index,
+ "Adapter %u output %u: Got unexpected state flags %#lx.\n", adapter_index,
output_index, display_device.StateFlags);
/* Should have the same monitor handle. */
@@ -5618,7 +5610,7 @@ static void test_multi_adapter(void)
/* Should have the same monitor rectangle. */
monitor_info.cbSize = sizeof(monitor_info);
ret = GetMonitorInfoA(monitor, &monitor_info);
- ok(ret, "Adapter %u output %u: Failed to get monitor info, error %#x.\n", adapter_index,
+ ok(ret, "Adapter %u output %u: Failed to get monitor info, error %#lx.\n", adapter_index,
output_index, GetLastError());
ok(EqualRect(&monitor_info.rcMonitor, &output_desc.DesktopCoordinates),
"Adapter %u output %u: Got unexpected output rect %s, expected %s.\n",
@@ -5642,7 +5634,7 @@ static void test_multi_adapter(void)
ret = EnumDisplaySettingsW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &old_mode);
/* Win10 TestBots may return FALSE but it's actually successful */
ok(ret || broken(!ret),
- "Adapter %u output %u: EnumDisplaySettingsW failed for %s, error %#x.\n",
+ "Adapter %u output %u: EnumDisplaySettingsW failed for %s, error %#lx.\n",
adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName),
GetLastError());
@@ -5654,11 +5646,11 @@ static void test_multi_adapter(void)
ret = ChangeDisplaySettingsExW(display_device.DeviceName, &mode, NULL,
CDS_UPDATEREGISTRY | CDS_NORESET, NULL);
ok(ret == DISP_CHANGE_SUCCESSFUL,
- "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n",
+ "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %ld.\n",
adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret);
ret = ChangeDisplaySettingsExW(display_device.DeviceName, NULL, NULL, 0, NULL);
ok(ret == DISP_CHANGE_SUCCESSFUL,
- "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n",
+ "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %ld.\n",
adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret);
/* Check if it is really detached */
@@ -5667,7 +5659,7 @@ static void test_multi_adapter(void)
ret = EnumDisplaySettingsW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &mode);
/* Win10 TestBots may return FALSE but it's actually successful */
ok(ret || broken(!ret) ,
- "Adapter %u output %u: EnumDisplaySettingsW failed for %s, error %#x.\n",
+ "Adapter %u output %u: EnumDisplaySettingsW failed for %s, error %#lx.\n",
adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName),
GetLastError());
if (mode.dmPelsWidth && mode.dmPelsHeight)
@@ -5684,7 +5676,7 @@ static void test_multi_adapter(void)
* unimplemented in Wine */
memset(&output_desc, 0, sizeof(output_desc));
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index,
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_index,
output_index, hr);
ok(!lstrcmpiW(output_desc.DeviceName, old_output_desc.DeviceName),
"Adapter %u output %u: Expect device name %s, got %s.\n", adapter_index,
@@ -5710,11 +5702,11 @@ static void test_multi_adapter(void)
/* Call IDXGIAdapter_EnumOutputs() again to get up-to-date output description */
hr = IDXGIAdapter_EnumOutputs(adapter, output_index, &output);
- ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index,
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_index,
output_index, hr);
memset(&output_desc, 0, sizeof(output_desc));
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index,
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_index,
output_index, hr);
ok(!lstrcmpiW(output_desc.DeviceName, display_device.DeviceName),
"Adapter %u output %u: Expect device name %s, got %s.\n", adapter_index,
@@ -5736,11 +5728,11 @@ static void test_multi_adapter(void)
ret = ChangeDisplaySettingsExW(display_device.DeviceName, &old_mode, NULL,
CDS_UPDATEREGISTRY | CDS_NORESET, NULL);
ok(ret == DISP_CHANGE_SUCCESSFUL,
- "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n",
+ "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %ld.\n",
adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret);
ret = ChangeDisplaySettingsExW(display_device.DeviceName, NULL, NULL, 0, NULL);
ok(ret == DISP_CHANGE_SUCCESSFUL,
- "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n",
+ "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %ld.\n",
adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret);
IDXGIOutput_Release(output);
@@ -5759,9 +5751,9 @@ static void test_multi_adapter(void)
}
hr = IDXGIFactory_EnumAdapters(factory, adapter_index - 1, &adapter);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
todo_wine ok(!lstrcmpW(adapter_desc.Description, L"Microsoft Basic Render Driver"),
"Got unexpected description %s.\n", wine_dbgstr_w(adapter_desc.Description));
todo_wine ok(adapter_desc.VendorId == 0x1414,
@@ -5773,16 +5765,16 @@ static void test_multi_adapter(void)
ok(adapter_desc.Revision == 0x0000,
"Got unexpected revision %#x.\n", adapter_desc.Revision);
todo_wine ok(!adapter_desc.DedicatedVideoMemory,
- "Got unexpected DedicatedVideoMemory %#lx.\n", adapter_desc.DedicatedVideoMemory);
+ "Got unexpected DedicatedVideoMemory %#Ix.\n", adapter_desc.DedicatedVideoMemory);
ok(!adapter_desc.DedicatedSystemMemory,
- "Got unexpected DedicatedSystemMemory %#lx.\n", adapter_desc.DedicatedSystemMemory);
+ "Got unexpected DedicatedSystemMemory %#Ix.\n", adapter_desc.DedicatedSystemMemory);
hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1);
- ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
hr = IDXGIAdapter1_GetDesc1(adapter1, &adapter_desc1);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
todo_wine ok(adapter_desc1.Flags == DXGI_ADAPTER_FLAG_SOFTWARE,
"Got unexpected flags %#x.\n", adapter_desc1.Flags);
IDXGIAdapter1_Release(adapter1);
@@ -5818,7 +5810,7 @@ static BOOL check_message(const struct message *expected,
if (expected->check_wparam)
{
ok(wparam == expected->expect_wparam,
- "Got unexpected wparam %lx for message %x, expected %lx.\n",
+ "Got unexpected wparam %Ix for message %x, expected %Ix.\n",
wparam, message, expected->expect_wparam);
}
@@ -5827,7 +5819,7 @@ static BOOL check_message(const struct message *expected,
static LRESULT CALLBACK test_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam)
{
- ok(!expect_no_messages, "Got unexpected message %#x, hwnd %p, wparam %#lx, lparam %#lx.\n",
+ ok(!expect_no_messages, "Got unexpected message %#x, hwnd %p, wparam %#Ix, lparam %#Ix.\n",
message, hwnd, wparam, lparam);
if (expect_messages)
@@ -5928,9 +5920,9 @@ static void test_swapchain_window_messages(void)
ok(!!window, "Failed to create window.\n");
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
- ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIAdapter_Release(adapter);
swapchain_desc.BufferDesc.Width = 800;
@@ -5953,7 +5945,7 @@ static void test_swapchain_window_messages(void)
flush_events();
expect_no_messages = TRUE;
hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
flush_events();
expect_no_messages = FALSE;
@@ -5963,7 +5955,7 @@ static void test_swapchain_window_messages(void)
mode_desc.Width = 800;
mode_desc.Height = 600;
hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc);
- ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
flush_events();
ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message);
@@ -5972,7 +5964,7 @@ static void test_swapchain_window_messages(void)
mode_desc.Width = 400;
mode_desc.Height = 200;
hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc);
- ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
flush_events();
ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message);
@@ -5982,7 +5974,7 @@ static void test_swapchain_window_messages(void)
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE
|| broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */
- "Failed to enter fullscreen, hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
if (FAILED(hr))
{
skip("Could not change fullscreen state.\n");
@@ -5998,13 +5990,13 @@ static void test_swapchain_window_messages(void)
/* leave fullscreen */
expect_messages = leave_fullscreen_messages;
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
flush_events();
ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message);
expect_messages = NULL;
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
/* create fullscreen swapchain */
DestroyWindow(window);
@@ -6018,7 +6010,7 @@ static void test_swapchain_window_messages(void)
expect_messages = enter_fullscreen_messages;
expect_messages_broken = enter_fullscreen_messages_vista;
hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
flush_events();
todo_wine
ok(!expect_messages->message || broken(!expect_messages_broken->message),
@@ -6029,20 +6021,20 @@ static void test_swapchain_window_messages(void)
/* leave fullscreen */
expect_messages = leave_fullscreen_messages;
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
flush_events();
ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message);
expect_messages = NULL;
done:
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
DestroyWindow(window);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
refcount = IDXGIFactory_Release(factory);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL));
}
@@ -6099,9 +6091,9 @@ static void test_swapchain_window_styles(void)
}
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
- ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIAdapter_Release(adapter);
swapchain_desc.BufferDesc.Width = 800;
@@ -6121,15 +6113,17 @@ static void test_swapchain_window_styles(void)
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
+ winetest_push_context("Test %u", i);
+
swapchain_desc.OutputWindow = CreateWindowExA(tests[i].exstyle, "static", "dxgi_test",
tests[i].style, 0, 0, 400, 200, 0, 0, 0, 0);
style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE);
exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE);
- ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n",
- i, style, tests[i].expected_style);
- ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n",
- i, exstyle, tests[i].expected_exstyle);
+ ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n",
+ style, tests[i].expected_style);
+ ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n",
+ exstyle, tests[i].expected_exstyle);
fullscreen_style = tests[i].expected_style & ~(WS_POPUP | WS_MAXIMIZEBOX
| WS_MINIMIZEBOX | WS_THICKFRAME | WS_SYSMENU | WS_DLGFRAME | WS_BORDER);
@@ -6138,97 +6132,95 @@ static void test_swapchain_window_styles(void)
fullscreen_exstyle |= WS_EX_TOPMOST;
hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE);
exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE);
- ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n",
- i, style, tests[i].expected_style);
- ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n",
- i, exstyle, tests[i].expected_exstyle);
+ ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n",
+ style, tests[i].expected_style);
+ ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n",
+ exstyle, tests[i].expected_exstyle);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE
|| broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */
- "Failed to set fullscreen state, hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE);
exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE);
- todo_wine
- ok(style == fullscreen_style, "Test %u: Got style %#x, expected %#x.\n",
- i, style, fullscreen_style);
- ok(exstyle == fullscreen_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n",
- i, exstyle, fullscreen_exstyle);
+ todo_wine ok(style == fullscreen_style, "Got unexpected style %#lx, expected %#lx.\n",
+ style, fullscreen_style);
+ ok(exstyle == fullscreen_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n",
+ exstyle, fullscreen_exstyle);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
}
else
{
- skip("Test %u: Could not change fullscreen state.\n", i);
+ skip("Could not change fullscreen state.\n");
}
style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE);
exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE);
- ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n",
- i, style, tests[i].expected_style);
- ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n",
- i, exstyle, tests[i].expected_exstyle);
+ ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n",
+ style, tests[i].expected_style);
+ ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n",
+ exstyle, tests[i].expected_exstyle);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE
|| broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */
- "Failed to set fullscreen state, hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE);
exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE);
- todo_wine
- ok(style == fullscreen_style, "Test %u: Got style %#x, expected %#x.\n",
- i, style, fullscreen_style);
- ok(exstyle == fullscreen_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n",
- i, exstyle, fullscreen_exstyle);
+ todo_wine ok(style == fullscreen_style, "Got unexpected style %#lx, expected %#lx.\n",
+ style, fullscreen_style);
+ ok(exstyle == fullscreen_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n",
+ exstyle, fullscreen_exstyle);
SetWindowLongW(swapchain_desc.OutputWindow, GWL_STYLE, fullscreen_style);
SetWindowLongW(swapchain_desc.OutputWindow, GWL_EXSTYLE, fullscreen_exstyle);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE);
exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE);
+ todo_wine ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n",
+ style, tests[i].expected_style);
todo_wine
- ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n",
- i, style, tests[i].expected_style);
- todo_wine
- ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n",
- i, exstyle, tests[i].expected_exstyle);
+ ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n",
+ exstyle, tests[i].expected_exstyle);
}
else
{
- skip("Test %u: Could not change fullscreen state.\n", i);
+ skip("Could not change fullscreen state.\n");
}
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE);
exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE);
+ todo_wine ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n",
+ style, tests[i].expected_style);
todo_wine
- ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n",
- i, style, tests[i].expected_style);
- todo_wine
- ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n",
- i, exstyle, tests[i].expected_exstyle);
+ ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n",
+ exstyle, tests[i].expected_exstyle);
DestroyWindow(swapchain_desc.OutputWindow);
+
+ winetest_pop_context();
}
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
refcount = IDXGIFactory_Release(factory);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
}
static void test_gamma_control(void)
@@ -6252,7 +6244,7 @@ static void test_gamma_control(void)
}
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output);
if (hr == DXGI_ERROR_NOT_FOUND)
@@ -6262,11 +6254,11 @@ static void test_gamma_control(void)
IDXGIDevice_Release(device);
return;
}
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetGammaControlCapabilities(output, &caps);
todo_wine
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
IDXGIOutput_Release(output);
swapchain_desc.BufferDesc.Width = 640;
@@ -6286,14 +6278,14 @@ static void test_gamma_control(void)
swapchain_desc.Flags = 0;
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE
|| broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */
- "Failed to enter fullscreen, hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
if (FAILED(hr))
{
skip("Could not change fullscreen state.\n");
@@ -6301,11 +6293,11 @@ static void test_gamma_control(void)
}
hr = IDXGISwapChain_GetContainingOutput(swapchain, &output);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
memset(&caps, 0, sizeof(caps));
hr = IDXGIOutput_GetGammaControlCapabilities(output, &caps);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(caps.MaxConvertedValue > caps.MinConvertedValue
|| broken(caps.MaxConvertedValue == 0.0f && caps.MinConvertedValue == 1.0f) /* WARP */,
@@ -6322,25 +6314,25 @@ static void test_gamma_control(void)
memset(&gamma, 0, sizeof(gamma));
hr = IDXGIOutput_GetGammaControl(output, &gamma);
todo_wine
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_SetGammaControl(output, &gamma);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIOutput_Release(output);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
done:
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
DestroyWindow(swapchain_desc.OutputWindow);
IDXGIAdapter_Release(adapter);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
refcount = IDXGIFactory_Release(factory);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
}
static void test_window_association(IUnknown *device, BOOL is_d3d12)
@@ -6406,28 +6398,28 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12)
hwnd2 = CreateWindowA("static", "dxgi_test2", 0, 0, 0, 400, 200, 0, 0, 0, 0);
hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory2);
- ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
get_factory(device, is_d3d12, &factory);
hr = IDXGIFactory_GetWindowAssociation(factory, NULL);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i <= DXGI_MWA_VALID; ++i)
{
hr = IDXGIFactory_MakeWindowAssociation(factory, NULL, i);
- ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i);
+ ok(hr == S_OK, "Got unexpected hr %#lx for flags %#x.\n", hr, i);
hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, i);
- ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i);
+ ok(hr == S_OK, "Got unexpected hr %#lx for flags %#x.\n", hr, i);
wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC);
- ok(wndproc == original_wndproc, "Got unexpected wndproc %#lx, expected %#lx for flags %#x.\n",
+ ok(wndproc == original_wndproc, "Got unexpected wndproc %#Ix, expected %#Ix for flags %#x.\n",
wndproc, original_wndproc, i);
hwnd = (HWND)0xdeadbeef;
hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd);
- ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i);
+ ok(hr == S_OK, "Got unexpected hr %#lx for flags %#x.\n", hr, i);
/* Apparently GetWindowAssociation() always returns NULL, even when
* MakeWindowAssociation() and GetWindowAssociation() are both
* successfully called. */
@@ -6435,19 +6427,19 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12)
}
hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
/* Alt+Enter tests. */
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC);
- ok(wndproc == original_wndproc, "Got unexpected wndproc %#lx, expected %#lx.\n", wndproc, original_wndproc);
+ ok(wndproc == original_wndproc, "Got unexpected wndproc %#Ix, expected %#Ix.\n", wndproc, original_wndproc);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE
|| broken(hr == DXGI_ERROR_UNSUPPORTED) /* Windows 7 testbot */,
- "Got unexpected hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
if (FAILED(hr))
{
skip("Could not change fullscreen state.\n");
@@ -6455,27 +6447,29 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12)
else
{
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
+ winetest_push_context("Test %u", i);
+
/* First associate a window with the opposite flags. */
hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, ~tests[i].flag & DXGI_MWA_VALID);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Associate the current test window. */
hwnd = tests[i].flag ? swapchain_desc.OutputWindow : NULL;
hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd, tests[i].flag);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Associating a new test window doesn't override the old window. */
hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, ~tests[i].flag & DXGI_MWA_VALID);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Associations with a different factory don't affect the existing
* association. */
hr = IDXGIFactory_MakeWindowAssociation(factory2, hwnd, ~tests[i].flag & DXGI_MWA_VALID);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Post synthesized Alt + VK_RETURN WM_SYSKEYDOWN. */
PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN,
@@ -6483,33 +6477,35 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12)
flush_events();
output = NULL;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(fullscreen == tests[i].expect_fullscreen
|| broken(tests[i].broken_d3d10 && fullscreen),
- "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen);
- ok(fullscreen ? !!output : !output, "Test %u: Got wrong output.\n", i);
+ "Got unexpected fullscreen %#x.\n", fullscreen);
+ ok(fullscreen ? !!output : !output, "Got unexpected output.\n");
if (output)
IDXGIOutput_Release(output);
wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC);
- ok(wndproc == original_wndproc, "Test %u: Got unexpected wndproc %#lx, expected %#lx.\n",
- i, wndproc, original_wndproc);
+ ok(wndproc == original_wndproc, "Got unexpected wndproc %#Ix, expected %#Ix.\n",
+ wndproc, original_wndproc);
+
+ winetest_pop_context();
}
}
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = IDXGIFactory_Release(factory2);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
DestroyWindow(hwnd2);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
DestroyWindow(swapchain_desc.OutputWindow);
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "IDXGIFactory has %u references left.\n", refcount);
+ ok(refcount == !is_d3d12, "IDXGIFactory has %lu references left.\n", refcount);
}
static void test_output_ownership(IUnknown *device, BOOL is_d3d12)
@@ -6552,19 +6548,19 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12)
IDXGIFactory_Release(factory);
return;
}
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
lstrcpyW(open_adapter_gdi_desc.DeviceName, output_desc.DeviceName);
status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
check_ownership_desc.hAdapter = open_adapter_gdi_desc.hAdapter;
check_ownership_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId;
status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status,
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx, expected %#lx.\n", status,
STATUS_SUCCESS);
swapchain_desc.BufferDesc.Width = 800;
@@ -6583,7 +6579,7 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12)
swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD;
swapchain_desc.Flags = 0;
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Swapchain in fullscreen mode. */
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output);
@@ -6594,17 +6590,17 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12)
skip("Failed to change fullscreen state.\n");
goto done;
}
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
fullscreen = FALSE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(fullscreen, "Got unexpected fullscreen state.\n");
/* Win10 1909 doesn't seem to grab output exclusive ownership.
* And all output ownership calls return S_OK on D3D10 and D3D12 with 1909. */
if (is_d3d12)
{
status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status,
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx, expected %#lx.\n", status,
STATUS_SUCCESS);
}
else
@@ -6613,26 +6609,26 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12)
STATUS_GRAPHICS_PRESENT_OCCLUDED);
todo_wine ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED ||
broken(status == STATUS_SUCCESS), /* Win10 1909 */
- "Got unexpected status %#x, expected %#x.\n", status,
+ "Got unexpected status %#lx, expected %#lx.\n", status,
STATUS_GRAPHICS_PRESENT_OCCLUDED);
}
hr = IDXGIOutput_TakeOwnership(output, NULL, FALSE);
ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == S_OK), /* Win10 1909 */
- "Got unexpected hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_TakeOwnership(output, NULL, TRUE);
ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == S_OK), /* Win10 1909 */
- "Got unexpected hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_TakeOwnership(output, device, FALSE);
if (is_d3d12)
- todo_wine ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#lx.\n", hr);
else
todo_wine ok(hr == E_INVALIDARG || broken(hr == S_OK), /* Win10 1909 */
- "Got unexpected hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_TakeOwnership(output, device, TRUE);
- ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIOutput_ReleaseOwnership(output);
status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status,
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx, expected %#lx.\n", status,
STATUS_SUCCESS);
/* IDXGIOutput_TakeOwnership always returns E_NOINTERFACE for d3d12. Tests
@@ -6642,46 +6638,46 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12)
hr = IDXGIOutput_TakeOwnership(output, device, FALSE);
ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == S_OK), /* Win10 1909 */
- "Got unexpected hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
IDXGIOutput_ReleaseOwnership(output);
hr = IDXGIOutput_TakeOwnership(output, device, TRUE);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Note that the "exclusive" parameter to IDXGIOutput_TakeOwnership()
* seems to behave opposite to what's described by MSDN. */
status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc,
STATUS_GRAPHICS_PRESENT_OCCLUDED);
ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED ||
broken(status == STATUS_SUCCESS), /* Win10 1909 */
- "Got unexpected status %#x, expected %#x.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED);
+ "Got unexpected status %#lx, expected %#lx.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED);
hr = IDXGIOutput_TakeOwnership(output, device, FALSE);
- ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Win10 1909 */, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Win10 1909 */, "Got unexpected hr %#lx.\n", hr);
IDXGIOutput_ReleaseOwnership(output);
/* Swapchain in windowed mode. */
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
fullscreen = TRUE;
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!fullscreen, "Unexpected fullscreen state.\n");
status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status,
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx, expected %#lx.\n", status,
STATUS_SUCCESS);
hr = IDXGIOutput_TakeOwnership(output, device, FALSE);
ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == S_OK), /* Win10 1909 */
- "Got unexpected hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_TakeOwnership(output, device, TRUE);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc,
STATUS_GRAPHICS_PRESENT_OCCLUDED);
ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || broken(hr == S_OK), /* Win10 1909 */
- "Got unexpected status %#x, expected %#x.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED);
+ "Got unexpected status %#lx, expected %#lx.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED);
IDXGIOutput_ReleaseOwnership(output);
status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status,
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx, expected %#lx.\n", status,
STATUS_SUCCESS);
done:
@@ -6692,11 +6688,11 @@ done:
IDXGISwapChain_Release(swapchain);
DestroyWindow(swapchain_desc.OutputWindow);
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount);
close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter;
status = pD3DKMTCloseAdapter(&close_adapter_desc);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
}
static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12)
@@ -6728,31 +6724,30 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12)
for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter));
++adapter_idx)
{
+ winetest_push_context("Adapter %u", adapter_idx);
+
for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output));
++output_idx)
{
- hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count,
- NULL);
- ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Win 7 TestBots */
- "Adapter %u output %u: GetDisplayModeList failed, hr %#x.\n", adapter_idx,
- output_idx, hr);
+ winetest_push_context("Output %u", output_idx);
+
+ hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL);
+ ok(hr == S_OK || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Win 7 TestBots */
+ "Got unexpected hr %#lx.\n", hr);
if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE)
{
- win_skip("Adapter %u output %u: GetDisplayModeList() not supported.\n", adapter_idx,
- output_idx);
+ win_skip("GetDisplayModeList() not supported.\n");
IDXGIOutput_Release(output);
+ winetest_pop_context();
continue;
}
modes = heap_calloc(mode_count, sizeof(*modes));
- hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count,
- modes);
- ok(hr == S_OK, "Adapter %u output %u: GetDisplayModeList failed, hr %#x.\n",
- adapter_idx, output_idx, hr);
+ hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx,
- output_idx, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
width = output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left;
height = output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top;
for (mode_idx = 0; mode_idx < mode_count; ++mode_idx)
@@ -6761,18 +6756,14 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12)
break;
}
ok(modes[mode_idx].Width != width && modes[mode_idx].Height != height,
- "Adapter %u output %u: Failed to find a different mode than %ux%u.\n",
- adapter_idx, output_idx, width, height);
+ "Failed to find a different mode than %ux%u.\n", width, height);
ret = ClipCursor(NULL);
- ok(ret, "Adapter %u output %u: ClipCursor failed, error %#x.\n",
- adapter_idx, output_idx, GetLastError());
+ ok(ret, "ClipCursor failed, error %#lx.\n", GetLastError());
get_virtual_rect(&virtual_rect);
ret = GetClipCursor(&clip_rect);
- ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx,
- output_idx, GetLastError());
- ok(EqualRect(&clip_rect, &virtual_rect),
- "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx,
+ ok(ret, "GetClipCursor failed, error %#lx.\n", GetLastError());
+ ok(EqualRect(&clip_rect, &virtual_rect), "Expect clip rect %s, got %s.\n",
wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));
swapchain_desc.BufferDesc.Width = modes[mode_idx].Width;
@@ -6784,68 +6775,61 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12)
swapchain_desc.OutputWindow = create_window();
heap_free(modes);
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "Adapter %u output %u: CreateSwapChain failed, hr %#x.\n",
- adapter_idx, output_idx, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
flush_events();
get_virtual_rect(&virtual_rect);
ret = GetClipCursor(&clip_rect);
- ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx,
- output_idx, GetLastError());
- ok(EqualRect(&clip_rect, &virtual_rect),
- "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx,
+ ok(ret, "GetClipCursor failed, error %#lx.\n", GetLastError());
+ ok(EqualRect(&clip_rect, &virtual_rect), "Expect clip rect %s, got %s.\n",
wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE ||
- broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */
- "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", adapter_idx,
- output_idx, hr);
+ ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE
+ || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */
+ "Got unexpected hr %#lx.\n", hr);
if (FAILED(hr))
{
- skip("Adapter %u output %u: Could not change fullscreen state, hr %#x.\n",
- adapter_idx, output_idx, hr);
+ skip("Could not change fullscreen state, hr %#lx.\n", hr);
IDXGISwapChain_Release(swapchain);
IDXGIOutput_Release(output);
DestroyWindow(swapchain_desc.OutputWindow);
+ winetest_pop_context();
continue;
}
flush_events();
get_virtual_rect(&virtual_rect);
ret = GetClipCursor(&clip_rect);
- ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx,
- output_idx, GetLastError());
- ok(EqualRect(&clip_rect, &virtual_rect),
- "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx,
+ ok(ret, "GetClipCursor failed, error %#lx.\n", GetLastError());
+ ok(EqualRect(&clip_rect, &virtual_rect), "Expect clip rect %s, got %s.\n",
wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_idx,
- output_idx, hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %u references left.\n",
- adapter_idx, output_idx, refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
refcount = IDXGIOutput_Release(output);
- ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n",
- adapter_idx, output_idx, refcount);
+ ok(!refcount, "IDXGIOutput has %lu references left.\n", refcount);
DestroyWindow(swapchain_desc.OutputWindow);
flush_events();
get_virtual_rect(&virtual_rect);
ret = GetClipCursor(&clip_rect);
- ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx,
- output_idx, GetLastError());
- ok(EqualRect(&clip_rect, &virtual_rect),
- "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx,
+ ok(ret, "GetClipCursor failed, error %#lx.\n", GetLastError());
+ ok(EqualRect(&clip_rect, &virtual_rect), "Expect clip rect %s, got %s.\n",
wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));
+
+ winetest_pop_context();
}
IDXGIAdapter_Release(adapter);
+
+ winetest_pop_context();
}
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount);
}
static void test_factory_check_feature_support(void)
@@ -6862,28 +6846,28 @@ static void test_factory_check_feature_support(void)
}
hr = IDXGIFactory5_CheckFeatureSupport(factory, 0x12345678, (void *)&data, sizeof(data));
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
/* Crashes on Windows. */
if (0)
{
hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, NULL, sizeof(data));
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
}
hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) - 1);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) + 1);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
data = (BOOL)0xdeadbeef;
hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data));
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(data == TRUE || data == FALSE, "Got unexpected data %#x.\n", data);
ref_count = IDXGIFactory5_Release(factory);
- ok(!ref_count, "Factory has %u references left.\n", ref_count);
+ ok(!ref_count, "Factory has %lu references left.\n", ref_count);
}
static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12)
@@ -6928,7 +6912,7 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12)
hr = IDXGIFactory2_CreateSwapChainForHwnd(factory2, device,
window, &swapchain_desc, NULL, NULL, &swapchain1);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain2, (void**)&swapchain2);
IDXGISwapChain1_Release(swapchain1);
@@ -6943,24 +6927,24 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12)
/* test swap chain without waitable object */
frame_latency = 0xdeadbeef;
hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
ok(frame_latency == 0xdeadbeef, "Got unexpected frame latency %#x.\n", frame_latency);
hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 1);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
event = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2);
ok(!event, "Got unexpected event %p.\n", event);
ref_count = IDXGISwapChain2_Release(swapchain2);
- ok(!ref_count, "Swap chain has %u references left.\n", ref_count);
+ ok(!ref_count, "Swap chain has %lu references left.\n", ref_count);
/* test swap chain with waitable object */
swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT;
hr = IDXGIFactory2_CreateSwapChainForHwnd(factory2, device,
window, &swapchain_desc, NULL, NULL, &swapchain1);
- ok(hr == S_OK, "Failed to create swap chain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Failed to create swap chain, hr %#lx.\n", hr);
hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain2, (void**)&swapchain2);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGISwapChain1_Release(swapchain1);
event = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2);
@@ -6968,50 +6952,50 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12)
/* auto-reset event */
wait_result = WaitForSingleObject(event, 0);
- ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result);
+ ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result);
wait_result = WaitForSingleObject(event, 0);
- ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#x.\n", wait_result);
+ ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result);
hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame_latency == 1, "Got unexpected frame latency %#x.\n", frame_latency);
hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 0);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame_latency == 1, "Got unexpected frame latency %#x.\n", frame_latency);
hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 3);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame_latency == 3, "Got unexpected frame latency %#x.\n", frame_latency);
wait_result = WaitForSingleObject(event, 0);
- todo_wine ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result);
+ todo_wine ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result);
wait_result = WaitForSingleObject(event, 0);
- todo_wine ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result);
+ todo_wine ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result);
wait_result = WaitForSingleObject(event, 100);
- ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#x.\n", wait_result);
+ ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result);
for (i = 0; i < 5; i++)
{
hr = IDXGISwapChain2_Present(swapchain2, 0, 0);
- ok(hr == S_OK, "Present %u failed with hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Present %u failed with hr %#lx.\n", i, hr);
wait_result = WaitForSingleObject(event, 100);
- ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result);
+ ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result);
}
wait_result = WaitForSingleObject(event, 100);
- ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#x.\n", wait_result);
+ ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result);
ref_count = IDXGISwapChain2_Release(swapchain2);
- ok(!ref_count, "Swap chain has %u references left.\n", ref_count);
+ ok(!ref_count, "Swap chain has %lu references left.\n", ref_count);
DestroyWindow(window);
ref_count = IDXGIFactory2_Release(factory2);
- ok(ref_count == !is_d3d12, "Factory has %u references left.\n", ref_count);
+ ok(ref_count == !is_d3d12, "Factory has %lu references left.\n", ref_count);
}
static void test_colour_space_support(IUnknown *device, BOOL is_d3d12)
@@ -7078,7 +7062,7 @@ static void test_colour_space_support(IUnknown *device, BOOL is_d3d12)
hr = IDXGIFactory2_CreateSwapChainForHwnd(factory2, device,
window, &swapchain_desc, NULL, NULL, &swapchain1);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain3, (void**)&swapchain3);
IDXGISwapChain1_Release(swapchain1);
@@ -7094,7 +7078,7 @@ static void test_colour_space_support(IUnknown *device, BOOL is_d3d12)
{
support = 0xdeadbeef;
hr = IDXGISwapChain3_CheckColorSpaceSupport(swapchain3, colour_spaces[i], &support);
- ok(hr == S_OK, "Got unexpected hr %#x for test %u.\n", hr, i);
+ ok(hr == S_OK, "Got unexpected hr %#lx for test %u.\n", hr, i);
ok(!(support & ~DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT),
"Got unexpected support flags %#x for test %u.\n", support, i);
@@ -7110,14 +7094,14 @@ static void test_colour_space_support(IUnknown *device, BOOL is_d3d12)
hr = IDXGISwapChain3_SetColorSpace1(swapchain3, colour_spaces[i]);
ok(hr == (support & DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT) ? S_OK : E_INVALIDARG,
- "Got unexpected hr %#x for text %u.\n", hr, i);
+ "Got unexpected hr %#lx for text %u.\n", hr, i);
}
ref_count = IDXGISwapChain3_Release(swapchain3);
- ok(!ref_count, "Swap chain has %u references left.\n", ref_count);
+ ok(!ref_count, "Swap chain has %lu references left.\n", ref_count);
DestroyWindow(window);
ref_count = IDXGIFactory2_Release(factory2);
- ok(ref_count == !is_d3d12, "Factory has %u references left.\n", ref_count);
+ ok(ref_count == !is_d3d12, "Factory has %lu references left.\n", ref_count);
}
static void test_mode_change(IUnknown *device, BOOL is_d3d12)
@@ -7140,10 +7124,10 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12)
memset(&devmode, 0, sizeof(devmode));
devmode.dmSize = sizeof(devmode);
ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
ok(equal_mode_rect(&devmode, ®istry_mode), "Got a different mode.\n");
ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
ok(equal_mode_rect(&devmode, ®istry_mode), "Got a different mode.\n");
while (EnumDisplaySettingsW(NULL, mode_idx++, &devmode))
@@ -7179,7 +7163,7 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12)
/* Test that no mode restorations if no mode changes actually happened */
change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET);
- ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret);
+ ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret);
swapchain_desc.BufferDesc.Width = registry_mode.dmPelsWidth;
swapchain_desc.BufferDesc.Height = registry_mode.dmPelsHeight;
@@ -7198,14 +7182,14 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12)
swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
memset(&devmode2, 0, sizeof(devmode2));
devmode2.dmSize = sizeof(devmode2);
ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
ok(equal_mode_rect(&devmode2, ®istry_mode), "Got a different mode.\n");
ret = restore_display_modes(original_modes, display_count);
ok(ret, "Failed to restore display modes.\n");
@@ -7213,48 +7197,48 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12)
/* If current display settings are different than the display settings in registry before
* calling SetFullscreenState() */
change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET);
- ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret);
+ ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret);
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
ok(hr == DXGI_ERROR_UNSUPPORTED /* Win7 */
|| hr == S_OK /* Win8~Win10 1909 */
|| hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, /* Win10 2004 */
- "Got unexpected hr %#x.\n", hr);
+ "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
ret = restore_display_modes(original_modes, display_count);
ok(ret, "Failed to restore display modes.\n");
/* Test that mode restorations use display settings in the registry with a fullscreen device */
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
if (FAILED(hr))
{
- skip("SetFullscreenState failed, hr %#x.\n", hr);
+ skip("SetFullscreenState failed, hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
goto done;
}
change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET);
- ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret);
+ ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
ok(equal_mode_rect(&devmode2, &devmode), "Got a different mode.\n");
ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode2);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
ok(equal_mode_rect(&devmode2, &devmode), "Got a different mode.\n");
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
ret = restore_display_modes(original_modes, display_count);
ok(ret, "Failed to restore display modes.\n");
@@ -7263,7 +7247,7 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12)
for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)); ++output_idx)
{
hr = IDXGIOutput_GetDesc(output, &output_desc);
- ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_idx, output_idx, hr);
+ ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr);
if ((adapter_idx || output_idx) && output_desc.AttachedToDesktop)
{
@@ -7289,7 +7273,7 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12)
memset(&old_devmode, 0, sizeof(old_devmode));
old_devmode.dmSize = sizeof(old_devmode);
ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &old_devmode);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
mode_idx = 0;
d3d_width = 0;
@@ -7324,88 +7308,88 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12)
/* Test that mode restorations for non-primary outputs upon fullscreen state changes */
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, CDS_RESET, NULL);
- ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret);
+ ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %ld.\n", change_ret);
ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
if (devmode2.dmPelsWidth == old_devmode.dmPelsWidth
&& devmode2.dmPelsHeight == old_devmode.dmPelsHeight)
{
skip("Failed to change display settings of the second monitor.\n");
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
goto done;
}
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n");
ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n");
hr = IDXGIOutput_GetDesc(second_output, &output_desc);
- ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left ==
- old_devmode.dmPelsWidth, "Expected width %u, got %u.\n", old_devmode.dmPelsWidth,
+ old_devmode.dmPelsWidth, "Expected width %lu, got %lu.\n", old_devmode.dmPelsWidth,
output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left);
ok(output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top ==
- old_devmode.dmPelsHeight, "Expected height %u, got %u.\n", old_devmode.dmPelsHeight,
+ old_devmode.dmPelsHeight, "Expected height %lu, got %lu.\n", old_devmode.dmPelsHeight,
output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
ret = restore_display_modes(original_modes, display_count);
ok(ret, "Failed to restore display modes.\n");
/* Test that mode restorations for non-primary outputs use display settings in the registry */
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL,
CDS_UPDATEREGISTRY | CDS_NORESET, NULL);
- ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret);
+ ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %ld.\n", change_ret);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight,
- "Expected resolution %ux%u, got %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight,
+ "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight,
devmode2.dmPelsWidth, devmode2.dmPelsHeight);
ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight,
- "Expected resolution %ux%u, got %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight,
+ "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight,
devmode2.dmPelsWidth, devmode2.dmPelsHeight);
hr = IDXGIOutput_GetDesc(second_output, &output_desc);
- ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left ==
- devmode.dmPelsWidth, "Expected width %u, got %u.\n", devmode.dmPelsWidth,
+ devmode.dmPelsWidth, "Expected width %lu, got %lu.\n", devmode.dmPelsWidth,
output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left);
ok(output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top ==
- devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight,
+ devmode.dmPelsHeight, "Expected height %lu, got %lu.\n", devmode.dmPelsHeight,
output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
ret = restore_display_modes(original_modes, display_count);
ok(ret, "Failed to restore display modes.\n");
/* Test that mode restorations for non-primary outputs on fullscreen state changes when there
* are two fullscreen swapchains on different outputs */
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain);
- ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
swapchain_desc2 = swapchain_desc;
swapchain_desc.BufferDesc.Width = d3d_width;
@@ -7413,52 +7397,52 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12)
swapchain_desc2.OutputWindow = CreateWindowA("static", "dxgi_test2", 0,
old_devmode.dmPosition.x, old_devmode.dmPosition.y, 400, 200, 0, 0, 0, 0);
hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc2, &swapchain2);
- ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);
- ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_SetFullscreenState(swapchain2, TRUE, NULL);
if (FAILED(hr))
{
- skip("SetFullscreenState failed, hr %#x.\n", hr);
+ skip("SetFullscreenState failed, hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain2);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
goto done;
}
hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);
- ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
- ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!fullscreen, "Expected swapchain not fullscreen.\n");
hr = IDXGISwapChain_GetFullscreenState(swapchain2, &fullscreen, NULL);
- ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(fullscreen, "Expected swapchain fullscreen.\n");
ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n");
ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2);
- ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError());
+ ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError());
ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n");
hr = IDXGIOutput_GetDesc(second_output, &output_desc);
- ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left ==
- old_devmode.dmPelsWidth, "Expected width %u, got %u.\n", old_devmode.dmPelsWidth,
+ old_devmode.dmPelsWidth, "Expected width %lu, got %lu.\n", old_devmode.dmPelsWidth,
output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left);
ok(output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top ==
- old_devmode.dmPelsHeight, "Expected height %u, got %u.\n", old_devmode.dmPelsHeight,
+ old_devmode.dmPelsHeight, "Expected height %lu, got %lu.\n", old_devmode.dmPelsHeight,
output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top);
hr = IDXGISwapChain_SetFullscreenState(swapchain2, FALSE, NULL);
- ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = IDXGISwapChain_Release(swapchain2);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount);
+ ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);
DestroyWindow(swapchain_desc2.OutputWindow);
ret = restore_display_modes(original_modes, display_count);
ok(ret, "Failed to restore display modes.\n");
@@ -7468,7 +7452,7 @@ done:
IDXGIOutput_Release(second_output);
DestroyWindow(swapchain_desc.OutputWindow);
refcount = IDXGIFactory_Release(factory);
- ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount);
ret = restore_display_modes(original_modes, display_count);
ok(ret, "Failed to restore display modes.\n");
heap_free(original_modes);
@@ -7486,44 +7470,44 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12)
present_count = ~0u;
hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!present_count, "Got unexpected present count %u.\n", present_count);
hr = IDXGISwapChain_Present(swapchain, 0, 0);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
expected = present_count + 1;
hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected);
hr = IDXGISwapChain_Present(swapchain, 10, 0);
- ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
expected = present_count;
hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected);
hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
expected = present_count;
hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected);
ShowWindow(window, SW_MINIMIZE);
hr = IDXGISwapChain_Present(swapchain, 0, 0);
- ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr);
+ ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#lx.\n", hr);
expected = present_count + !!is_d3d12;
hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected);
ShowWindow(window, SW_NORMAL);
hr = IDXGISwapChain_Present(swapchain, 0, 0);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
expected = present_count + 1;
hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected);
IDXGISwapChain_Release(swapchain);
@@ -7544,7 +7528,7 @@ static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12))
test_func((IUnknown *)device, FALSE);
refcount = IDXGIDevice_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12))
@@ -7566,9 +7550,9 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12))
wait_queue_idle(device, queue);
refcount = ID3D12CommandQueue_Release(queue);
- ok(!refcount, "Command queue has %u references left.\n", refcount);
+ ok(!refcount, "Command queue has %lu references left.\n", refcount);
refcount = ID3D12Device_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
START_TEST(dxgi)
--
2.30.2
2
1
From: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/d3d12/Makefile.in | 1 -
dlls/d3d12/d3d12_main.c | 14 +++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in
index e5fb77be025..09ca3f24d9e 100644
--- a/dlls/d3d12/Makefile.in
+++ b/dlls/d3d12/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = d3d12.dll
IMPORTLIB = d3d12
IMPORTS = dxgi dxguid wined3d gdi32 user32 uuid win32u
diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c
index 40e3165ee80..2dddfe60efe 100644
--- a/dlls/d3d12/d3d12_main.c
+++ b/dlls/d3d12/d3d12_main.c
@@ -89,13 +89,13 @@ static HRESULT d3d12_get_adapter(IWineDXGIAdapter **wine_adapter, IUnknown *adap
{
if (FAILED(hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory)))
{
- WARN("Failed to create DXGI factory, hr %#x.\n", hr);
+ WARN("Failed to create DXGI factory, hr %#lx.\n", hr);
goto done;
}
if (FAILED(hr = IDXGIFactory4_EnumAdapters(factory, 0, &dxgi_adapter)))
{
- WARN("Failed to enumerate primary adapter, hr %#x.\n", hr);
+ WARN("Failed to enumerate primary adapter, hr %#lx.\n", hr);
goto done;
}
@@ -103,7 +103,7 @@ static HRESULT d3d12_get_adapter(IWineDXGIAdapter **wine_adapter, IUnknown *adap
}
if (FAILED(hr = IUnknown_QueryInterface(adapter, &IID_IWineDXGIAdapter, (void **)wine_adapter)))
- WARN("Invalid adapter %p, hr %#x.\n", adapter, hr);
+ WARN("Invalid adapter %p, hr %#lx.\n", adapter, hr);
done:
if (dxgi_adapter)
@@ -284,7 +284,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe
if (FAILED(hr = IWineDXGIAdapter_get_adapter_info(wine_adapter, &adapter_info)))
{
- WARN("Failed to get adapter info, hr %#x.\n", hr);
+ WARN("Failed to get adapter info, hr %#lx.\n", hr);
goto done;
}
@@ -305,7 +305,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe
if (FAILED(hr = vkd3d_create_instance(&instance_create_info, &instance)))
{
- WARN("Failed to create vkd3d instance, hr %#x.\n", hr);
+ WARN("Failed to create vkd3d instance, hr %#lx.\n", hr);
goto done;
}
@@ -332,7 +332,7 @@ done:
HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size,
REFIID iid, void **deserializer)
{
- TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n",
+ TRACE("data %p, data_size %Iu, iid %s, deserializer %p.\n",
data, data_size, debugstr_guid(iid), deserializer);
return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer);
@@ -341,7 +341,7 @@ HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T dat
HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size,
REFIID iid, void **deserializer)
{
- TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n",
+ TRACE("data %p, data_size %Iu, iid %s, deserializer %p.\n",
data, data_size, debugstr_guid(iid), deserializer);
return vkd3d_create_versioned_root_signature_deserializer(data, data_size, iid, deserializer);
--
2.30.2
1
0
From: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/d3d12/tests/Makefile.in | 1 -
dlls/d3d12/tests/d3d12.c | 158 +++++++++++++++++------------------
2 files changed, 79 insertions(+), 80 deletions(-)
diff --git a/dlls/d3d12/tests/Makefile.in b/dlls/d3d12/tests/Makefile.in
index ad0eff48cf7..b3406f9e6c1 100644
--- a/dlls/d3d12/tests/Makefile.in
+++ b/dlls/d3d12/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = d3d12.dll
IMPORTS = d3d12 dxgi user32
diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c
index f5a4c2ba11e..0d3deafda45 100644
--- a/dlls/d3d12/tests/d3d12.c
+++ b/dlls/d3d12/tests/d3d12.c
@@ -90,7 +90,7 @@ static IDXGIAdapter *create_adapter(void)
return NULL;
hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory);
- ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
adapter = NULL;
if (use_warp_adapter)
@@ -103,7 +103,7 @@ static IDXGIAdapter *create_adapter(void)
}
IDXGIFactory4_Release(factory);
if (FAILED(hr))
- trace("Failed to get adapter, hr %#x.\n", hr);
+ trace("Failed to get adapter, hr %#lx.\n", hr);
return adapter;
}
@@ -138,16 +138,16 @@ static void print_adapter_info(void)
ID3D12Device_Release(device);
hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory);
- ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory4_EnumAdapterByLuid(factory, luid, &IID_IDXGIAdapter, (void **)&adapter);
- ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIFactory4_Release(factory);
if (FAILED(hr))
return;
hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc);
- ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIAdapter_Release(adapter);
trace("Adapter: %s, %04x:%04x.\n", wine_dbgstr_w(adapter_desc.Description),
@@ -171,7 +171,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO
expected_hr = supported ? S_OK : E_NOINTERFACE;
hr = IUnknown_QueryInterface(iface, iid, (void **)&unk);
- ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ ok_(__FILE__, line)(hr == expected_hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr);
if (SUCCEEDED(hr))
IUnknown_Release(unk);
}
@@ -210,7 +210,7 @@ static ID3D12RootSignature *create_default_root_signature(ID3D12Device *device)
root_signature_desc.pStaticSamplers = NULL;
root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE;
hr = create_root_signature(device, &root_signature_desc, &root_signature);
- ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
return root_signature;
}
@@ -282,7 +282,7 @@ static ID3D12PipelineState *create_pipeline_state_(unsigned int line, ID3D12Devi
pipeline_state_desc.SampleDesc.Count = 1;
hr = ID3D12Device_CreateGraphicsPipelineState(device, &pipeline_state_desc,
&IID_ID3D12PipelineState, (void **)&pipeline_state);
- ok_(__FILE__, line)(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create graphics pipeline state, hr %#lx.\n", hr);
return pipeline_state;
}
@@ -301,7 +301,7 @@ static ID3D12CommandQueue *create_command_queue_(unsigned int line,
command_queue_desc.NodeMask = 0;
hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc,
&IID_ID3D12CommandQueue, (void **)&queue);
- ok_(__FILE__, line)(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create command queue, hr %#lx.\n", hr);
return queue;
}
@@ -342,9 +342,9 @@ static void reset_command_list_(unsigned int line, struct test_context *context,
assert(index < MAX_FRAME_COUNT);
hr = ID3D12CommandAllocator_Reset(context->allocator[index]);
- ok_(__FILE__, line)(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to reset command allocator, hr %#lx.\n", hr);
hr = ID3D12GraphicsCommandList_Reset(context->list[index], context->allocator[index], NULL);
- ok_(__FILE__, line)(hr == S_OK, "Failed to reset command list, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to reset command list, hr %#lx.\n", hr);
}
static void destroy_render_targets(struct test_context *context)
@@ -394,7 +394,7 @@ static void create_render_target_(unsigned int line, struct test_context *contex
&heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
&IID_ID3D12Resource, (void **)&context->render_target[0]);
- ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr);
set_viewport(&context->viewport, 0.0f, 0.0f, resource_desc.Width, resource_desc.Height, 0.0f, 1.0f);
SetRect(&context->scissor_rect, 0, 0, resource_desc.Width, resource_desc.Height);
@@ -427,14 +427,14 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context,
{
hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT,
&IID_ID3D12CommandAllocator, (void **)&context->allocator[i]);
- ok_(__FILE__, line)(hr == S_OK, "Failed to create command allocator %u, hr %#x.\n", i, hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create command allocator %u, hr %#lx.\n", i, hr);
}
for (i = 0; i < ARRAY_SIZE(context->list); ++i)
{
hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
context->allocator[i], NULL, &IID_ID3D12GraphicsCommandList, (void **)&context->list[i]);
- ok_(__FILE__, line)(hr == S_OK, "Failed to create command list %u, hr %#x.\n", i, hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create command list %u, hr %#lx.\n", i, hr);
}
if (desc && desc->no_render_target)
@@ -446,7 +446,7 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context,
rtv_heap_desc.NodeMask = 0;
hr = ID3D12Device_CreateDescriptorHeap(device, &rtv_heap_desc,
&IID_ID3D12DescriptorHeap, (void **)&context->rtv_heap);
- ok_(__FILE__, line)(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create descriptor heap, hr %#lx.\n", hr);
rtv_size = ID3D12Device_GetDescriptorHandleIncrementSize(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
for (i = 0; i < ARRAY_SIZE(context->rtv); ++i)
@@ -528,12 +528,12 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm
hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE,
&IID_ID3D12Fence, (void **)&fence);
- ok_(__FILE__, line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create fence, hr %#lx.\n", hr);
hr = ID3D12CommandQueue_Signal(queue, fence, 1);
- ok_(__FILE__, line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to signal fence, hr %#lx.\n", hr);
hr = wait_for_fence(fence, 1);
- ok_(__FILE__, line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to wait for fence, hr %#lx.\n", hr);
ID3D12Fence_Release(fence);
}
@@ -581,7 +581,7 @@ static ID3D12Resource *create_buffer_(unsigned int line, ID3D12Device *device,
hr = ID3D12Device_CreateCommittedResource(device, &heap_properties,
D3D12_HEAP_FLAG_NONE, &resource_desc, initial_resource_state,
NULL, &IID_ID3D12Resource, (void **)&buffer);
- ok_(__FILE__, line)(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create buffer, hr %#lx.\n", hr);
return buffer;
}
@@ -614,7 +614,7 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12Com
destroy_render_targets(context);
hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory);
- ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
desc.Width = width;
desc.Height = height;
@@ -629,12 +629,12 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12Com
desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED;
desc.Flags = 0;
hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &desc, NULL, NULL, &swapchain1);
- ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIFactory4_Release(factory);
hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain3, (void **)&swapchain);
- ok(hr == S_OK, "Failed to query IDXGISwapChain3, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGISwapChain1_Release(swapchain1);
if (context)
@@ -645,7 +645,7 @@ static IDXGISwapChain3 *create_swapchain(struct test_context *context, ID3D12Com
for (i = 0; i < buffer_count; ++i)
{
hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&context->render_target[i]);
- ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#lx.\n", i, hr);
ID3D12Device_CreateRenderTargetView(context->device, context->render_target[i], NULL, context->rtv[i]);
}
}
@@ -674,7 +674,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi
HRESULT hr;
hr = ID3D12Resource_GetDevice(texture, &IID_ID3D12Device, (void **)&device);
- ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
resource_desc = ID3D12Resource_GetDesc(texture);
ok(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER,
@@ -707,7 +707,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi
ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL);
hr = ID3D12GraphicsCommandList_Close(command_list);
- ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
exec_command_list(queue, command_list);
wait_queue_idle(device, queue);
@@ -716,7 +716,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi
read_range.Begin = 0;
read_range.End = resource_desc.Width;
hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data);
- ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
}
static void *get_readback_data(struct resource_readback *rb, unsigned int x, unsigned int y,
@@ -825,7 +825,7 @@ static void test_interfaces(void)
desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
desc.NodeMask = 0;
hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&queue);
- ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_interface(queue, &IID_ID3D12Object, TRUE);
check_interface(queue, &IID_ID3D12DeviceChild, TRUE);
@@ -841,9 +841,9 @@ static void test_interfaces(void)
check_interface(queue, &IID_IDXGIDevice4, FALSE);
refcount = ID3D12CommandQueue_Release(queue);
- ok(!refcount, "Command queue has %u references left.\n", refcount);
+ ok(!refcount, "Command queue has %lu references left.\n", refcount);
refcount = ID3D12Device_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void test_create_device(void)
@@ -868,28 +868,28 @@ static void test_create_device(void)
return;
}
refcount = ID3D12Device_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIFactory4_EnumAdapters(factory, 0, &adapter);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIFactory4_Release(factory);
hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
adapter_luid = adapter_desc.AdapterLuid;
refcount = get_refcount(adapter);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
hr = D3D12CreateDevice((IUnknown *)adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = IDXGIAdapter_Release(adapter);
- ok(refcount >= 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount >= 1, "Got unexpected refcount %lu.\n", refcount);
adapter = NULL;
luid = ID3D12Device_GetAdapterLuid(device);
- ok(equal_luid(luid, adapter_luid), "Got LUID %08x:%08x, expected %08x:%08x.\n",
+ ok(equal_luid(luid, adapter_luid), "Got unexpected LUID %08lx:%08lx, expected %08lx:%08lx.\n",
luid.HighPart, luid.LowPart, adapter_luid.HighPart, adapter_luid.LowPart);
queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT);
@@ -901,18 +901,18 @@ static void test_create_device(void)
hr = IDXGISwapChain3_GetContainingOutput(swapchain, &output);
if (hr != DXGI_ERROR_UNSUPPORTED)
{
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&adapter);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIOutput_Release(output);
memset(&adapter_desc, 0, sizeof(adapter_desc));
hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIAdapter_Release(adapter);
ok(equal_luid(adapter_desc.AdapterLuid, adapter_luid),
- "Got LUID %08x:%08x, expected %08x:%08x.\n",
+ "Got unexpected LUID %08lx:%08lx, expected %08lx:%08lx.\n",
adapter_desc.AdapterLuid.HighPart, adapter_desc.AdapterLuid.LowPart,
adapter_luid.HighPart, adapter_luid.LowPart);
}
@@ -922,12 +922,12 @@ static void test_create_device(void)
}
refcount = IDXGISwapChain3_Release(swapchain);
- ok(!refcount, "Swapchain has %u references left.\n", refcount);
+ ok(!refcount, "Swapchain has %lu references left.\n", refcount);
DestroyWindow(window);
ID3D12CommandQueue_Release(queue);
refcount = ID3D12Device_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void test_draw(void)
@@ -1059,17 +1059,17 @@ static void test_swapchain_draw(void)
transition_sub_resource_state(command_list, backbuffer, 0,
D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PRESENT);
hr = ID3D12GraphicsCommandList_Close(command_list);
- ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
exec_command_list(queue, command_list);
hr = IDXGISwapChain3_Present(swapchain, 0, 0);
- ok(hr == S_OK, "Failed to present, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
wait_queue_idle(device, queue);
destroy_render_targets(&context);
refcount = IDXGISwapChain3_Release(swapchain);
- ok(!refcount, "Swapchain has %u references left.\n", refcount);
+ ok(!refcount, "Swapchain has %lu references left.\n", refcount);
ID3D12PipelineState_Release(context.pipeline_state);
context.pipeline_state = NULL;
@@ -1107,45 +1107,45 @@ static void test_swapchain_refcount(void)
for (i = 0; i < buffer_count; ++i)
{
refcount = get_refcount(swapchain);
- todo_wine ok(refcount == 2, "Got refcount %u.\n", refcount);
+ todo_wine ok(refcount == 2, "Got refcount %lu.\n", refcount);
ID3D12Resource_Release(context.render_target[i]);
context.render_target[i] = NULL;
}
refcount = get_refcount(swapchain);
- ok(refcount == 1, "Got refcount %u.\n", refcount);
+ ok(refcount == 1, "Got refcount %lu.\n", refcount);
refcount = IDXGISwapChain3_AddRef(swapchain);
- ok(refcount == 2, "Got refcount %u.\n", refcount);
+ ok(refcount == 2, "Got refcount %lu.\n", refcount);
hr = IDXGISwapChain3_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&context.render_target[0]);
- ok(hr == S_OK, "Failed to get swapchain buffer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = get_refcount(swapchain);
- todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount);
+ todo_wine ok(refcount == 3, "Got refcount %lu.\n", refcount);
refcount = ID3D12Resource_AddRef(context.render_target[0]);
- ok(refcount == 2, "Got refcount %u.\n", refcount);
+ ok(refcount == 2, "Got refcount %lu.\n", refcount);
refcount = get_refcount(swapchain);
- todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount);
+ todo_wine ok(refcount == 3, "Got refcount %lu.\n", refcount);
hr = IDXGISwapChain3_GetBuffer(swapchain, 1, &IID_ID3D12Resource, (void **)&context.render_target[1]);
- ok(hr == S_OK, "Failed to get swapchain buffer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = get_refcount(swapchain);
- todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount);
+ todo_wine ok(refcount == 3, "Got refcount %lu.\n", refcount);
ID3D12Resource_Release(context.render_target[0]);
ID3D12Resource_Release(context.render_target[0]);
context.render_target[0] = NULL;
refcount = get_refcount(swapchain);
- todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount);
+ todo_wine ok(refcount == 3, "Got refcount %lu.\n", refcount);
refcount = IDXGISwapChain3_Release(swapchain);
- todo_wine ok(refcount == 2, "Got refcount %u.\n", refcount);
+ todo_wine ok(refcount == 2, "Got refcount %lu.\n", refcount);
ID3D12Resource_Release(context.render_target[1]);
context.render_target[1] = NULL;
refcount = get_refcount(swapchain);
- ok(refcount == 1, "Got refcount %u.\n", refcount);
+ ok(refcount == 1, "Got refcount %lu.\n", refcount);
refcount = IDXGISwapChain3_Release(swapchain);
- ok(!refcount, "Swapchain has %u references left.\n", refcount);
+ ok(!refcount, "Swapchain has %lu references left.\n", refcount);
DestroyWindow(window);
destroy_test_context(&context);
}
@@ -1196,18 +1196,18 @@ static void test_swapchain_size_mismatch(void)
transition_sub_resource_state(command_list, backbuffer, 0,
D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PRESENT);
hr = ID3D12GraphicsCommandList_Close(command_list);
- ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
exec_command_list(queue, command_list);
hr = IDXGISwapChain3_Present(swapchain, 1, 0);
- ok(hr == S_OK, "Failed to present, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
wait_queue_idle(device, queue);
reset_command_list(&context, 0);
destroy_render_targets(&context);
refcount = IDXGISwapChain3_Release(swapchain);
- ok(!refcount, "Swapchain has %u references left.\n", refcount);
+ ok(!refcount, "Swapchain has %lu references left.\n", refcount);
DestroyWindow(window);
window = create_window(WS_VISIBLE);
@@ -1216,12 +1216,12 @@ static void test_swapchain_size_mismatch(void)
swapchain = create_swapchain(&context, queue, window, 4, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom);
hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence);
- ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(context.list); ++i)
{
hr = ID3D12GraphicsCommandList_Close(context.list[i]);
- ok(hr == S_OK, "Failed to close command list %u, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Failed to close command list %u, hr %#lx.\n", i, hr);
}
fence_value = 1;
@@ -1230,7 +1230,7 @@ static void test_swapchain_size_mismatch(void)
index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain);
hr = wait_for_fence(fence, frame_fence_value[index]);
- ok(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
reset_command_list(&context, index);
backbuffer = context.render_target[index];
@@ -1243,11 +1243,11 @@ static void test_swapchain_size_mismatch(void)
transition_sub_resource_state(command_list, backbuffer, 0,
D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT);
hr = ID3D12GraphicsCommandList_Close(command_list);
- ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
exec_command_list(queue, command_list);
hr = IDXGISwapChain3_Present(swapchain, 1, 0);
- ok(hr == S_OK, "Failed to present, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
if (i == 6)
{
@@ -1257,7 +1257,7 @@ static void test_swapchain_size_mismatch(void)
frame_fence_value[index] = fence_value;
hr = ID3D12CommandQueue_Signal(queue, fence, fence_value);
- ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++fence_value;
}
@@ -1266,7 +1266,7 @@ static void test_swapchain_size_mismatch(void)
ID3D12Fence_Release(fence);
destroy_render_targets(&context);
refcount = IDXGISwapChain3_Release(swapchain);
- ok(!refcount, "Swapchain has %u references left.\n", refcount);
+ ok(!refcount, "Swapchain has %lu references left.\n", refcount);
DestroyWindow(window);
destroy_test_context(&context);
}
@@ -1308,12 +1308,12 @@ static void test_swapchain_backbuffer_index(void)
buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom);
hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence);
- ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(context.list); ++i)
{
hr = ID3D12GraphicsCommandList_Close(context.list[i]);
- ok(hr == S_OK, "Failed to close command list %u, hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Failed to close command list %u, hr %#lx.\n", i, hr);
}
index = 1;
@@ -1325,7 +1325,7 @@ static void test_swapchain_backbuffer_index(void)
ok(index == expected_index, "Test %u: Got index %u, expected %u.\n", i, index, expected_index);
hr = wait_for_fence(fence, frame_fence_value[index]);
- ok(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
reset_command_list(&context, index);
backbuffer = context.render_target[index];
@@ -1338,7 +1338,7 @@ static void test_swapchain_backbuffer_index(void)
transition_sub_resource_state(command_list, backbuffer, 0,
D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT);
hr = ID3D12GraphicsCommandList_Close(command_list);
- ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
exec_command_list(queue, command_list);
if (i <= 4 || (8 <= i && i <= 14))
@@ -1347,11 +1347,11 @@ static void test_swapchain_backbuffer_index(void)
sync_interval = 0;
hr = IDXGISwapChain3_Present(swapchain, sync_interval, 0);
- ok(hr == S_OK, "Failed to present, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
frame_fence_value[index] = fence_value;
hr = ID3D12CommandQueue_Signal(queue, fence, fence_value);
- ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++fence_value;
}
@@ -1360,7 +1360,7 @@ static void test_swapchain_backbuffer_index(void)
ID3D12Fence_Release(fence);
destroy_render_targets(&context);
refcount = IDXGISwapChain3_Release(swapchain);
- ok(!refcount, "Swapchain has %u references left.\n", refcount);
+ ok(!refcount, "Swapchain has %lu references left.\n", refcount);
DestroyWindow(window);
destroy_test_context(&context);
}
@@ -1389,7 +1389,7 @@ static void test_desktop_window(void)
ok(ret, "Failed to get client rect.\n");
hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory);
- ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
swapchain_desc.Width = 640;
swapchain_desc.Height = 480;
@@ -1404,12 +1404,12 @@ static void test_desktop_window(void)
swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED;
swapchain_desc.Flags = 0;
hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, queue, window, &swapchain_desc, NULL, NULL, &swapchain);
- ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_ACCESSDENIED, "Got unexpected hr %#lx.\n", hr);
swapchain_desc.Width = rect.right;
swapchain_desc.Height = rect.bottom;
hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, queue, window, &swapchain_desc, NULL, NULL, &swapchain);
- ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_ACCESSDENIED, "Got unexpected hr %#lx.\n", hr);
IDXGIFactory4_Release(factory);
destroy_test_context(&context);
--
2.30.2
1
0
From: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/dxgi/Makefile.in | 1 -
dlls/dxgi/adapter.c | 12 +++++------
dlls/dxgi/device.c | 20 +++++++++---------
dlls/dxgi/dxgi_main.c | 6 +++---
dlls/dxgi/factory.c | 20 +++++++++---------
dlls/dxgi/output.c | 16 +++++++--------
dlls/dxgi/surface.c | 4 ++--
dlls/dxgi/swapchain.c | 48 +++++++++++++++++++++----------------------
8 files changed, 63 insertions(+), 64 deletions(-)
diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in
index d4398008dad..db52f49a68a 100644
--- a/dlls/dxgi/Makefile.in
+++ b/dlls/dxgi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dxgi.dll
IMPORTLIB = dxgi
IMPORTS = gdi32 dxguid uuid wined3d user32 win32u
diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c
index 644f7e889ec..8962c082c17 100644
--- a/dlls/dxgi/adapter.c
+++ b/dlls/dxgi/adapter.c
@@ -55,7 +55,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IWineDXGIAdapter *iface)
struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface);
ULONG refcount = InterlockedIncrement(&adapter->refcount);
- TRACE("%p increasing refcount to %u.\n", iface, refcount);
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount;
}
@@ -65,7 +65,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IWineDXGIAdapter *iface)
struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface);
ULONG refcount = InterlockedDecrement(&adapter->refcount);
- TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount)
{
@@ -165,7 +165,7 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_
if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, ARRAY_SIZE(description)))
{
DWORD err = GetLastError();
- ERR("Failed to translate description %s (%#x).\n", debugstr_a(description), err);
+ ERR("Failed to translate description %s (%#lx).\n", debugstr_a(description), err);
hr = E_FAIL;
}
@@ -285,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_RegisterHardwareContentProtectionT
static void STDMETHODCALLTYPE dxgi_adapter_UnregisterHardwareContentProtectionTeardownStatus(
IWineDXGIAdapter *iface, DWORD cookie)
{
- FIXME("iface %p, cookie %#x stub!\n", iface, cookie);
+ FIXME("iface %p, cookie %#lx stub!\n", iface, cookie);
}
static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdapter *iface,
@@ -354,7 +354,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_RegisterVideoMemoryBudgetChangeNot
static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification(
IWineDXGIAdapter *iface, DWORD cookie)
{
- FIXME("iface %p, cookie %#x stub!\n", iface, cookie);
+ FIXME("iface %p, cookie %#lx stub!\n", iface, cookie);
}
static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc)
@@ -431,7 +431,7 @@ struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface)
return NULL;
if (FAILED(hr = IDXGIAdapter_QueryInterface(iface, &IID_IWineDXGIAdapter, (void **)&wine_adapter)))
{
- ERR("Failed to get IWineDXGIAdapter interface, hr %#x.\n", hr);
+ ERR("Failed to get IWineDXGIAdapter interface, hr %#lx.\n", hr);
return NULL;
}
assert(wine_adapter->lpVtbl == &dxgi_adapter_vtbl);
diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c
index 7dcc081ee0a..b9c5ff177c9 100644
--- a/dlls/dxgi/device.c
+++ b/dlls/dxgi/device.c
@@ -71,7 +71,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IWineDXGIDevice *iface)
struct dxgi_device *device = impl_from_IWineDXGIDevice(iface);
ULONG refcount = InterlockedIncrement(&device->refcount);
- TRACE("%p increasing refcount to %u\n", device, refcount);
+ TRACE("%p increasing refcount to %lu\n", device, refcount);
return refcount;
}
@@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface)
struct dxgi_device *device = impl_from_IWineDXGIDevice(iface);
ULONG refcount = InterlockedDecrement(&device->refcount);
- TRACE("%p decreasing refcount to %u.\n", device, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", device, refcount);
if (!refcount)
{
@@ -141,7 +141,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, R
hr = IWineDXGIDevice_GetAdapter(iface, &adapter);
if (FAILED(hr))
{
- ERR("Failed to get adapter, hr %#x.\n", hr);
+ ERR("Failed to get adapter, hr %#lx.\n", hr);
return hr;
}
@@ -209,7 +209,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac
if (FAILED(hr = device_parent->ops->create_swapchain_texture(device_parent,
NULL, &surface_desc, 0, &wined3d_texture)))
{
- ERR("Failed to create surface, hr %#x.\n", hr);
+ ERR("Failed to create surface, hr %#lx.\n", hr);
goto fail;
}
@@ -344,7 +344,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa
if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, wined3d_texture)))
{
- WARN("Failed to initialize surface, hr %#x.\n", hr);
+ WARN("Failed to initialize surface, hr %#lx.\n", hr);
heap_free(object);
return hr;
}
@@ -440,7 +440,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX
if (FAILED(hr = dxgi_get_output_from_window(&dxgi_factory->IWineDXGIFactory_iface, window, &containing_output)))
{
- WARN("Failed to get output from window %p, hr %#x.\n", window, hr);
+ WARN("Failed to get output from window %p, hr %#lx.\n", window, hr);
return hr;
}
@@ -458,7 +458,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX
if (FAILED(hr = d3d11_swapchain_init(object, device, &wined3d_desc)))
{
- WARN("Failed to initialise swapchain, hr %#x.\n", hr);
+ WARN("Failed to initialise swapchain, hr %#lx.\n", hr);
heap_free(object);
return hr;
}
@@ -517,7 +517,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l
if (FAILED(hr = layer->create(layer->id, &layer_base, 0,
device, &IID_IUnknown, (void **)&device->child_layer)))
{
- WARN("Failed to create device, returning %#x.\n", hr);
+ WARN("Failed to create device, returning %#lx.\n", hr);
wined3d_private_store_cleanup(&device->private_store);
wined3d_mutex_unlock();
return hr;
@@ -540,7 +540,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l
(const enum wined3d_feature_level *)feature_levels, level_count,
wined3d_device_parent, &device->wined3d_device)))
{
- WARN("Failed to create a wined3d device, returning %#x.\n", hr);
+ WARN("Failed to create a wined3d device, returning %#lx.\n", hr);
IUnknown_Release(device->child_layer);
wined3d_private_store_cleanup(&device->private_store);
wined3d_mutex_unlock();
@@ -579,7 +579,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l
if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc)))
{
- WARN("Failed to initialize swapchain, hr %#x.\n", hr);
+ WARN("Failed to initialize swapchain, hr %#lx.\n", hr);
heap_free(swapchain);
wined3d_device_decref(device->wined3d_device);
IUnknown_Release(device->child_layer);
diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c
index 3a69e1d55c2..5dd85a1b374 100644
--- a/dlls/dxgi/dxgi_main.c
+++ b/dlls/dxgi/dxgi_main.c
@@ -118,7 +118,7 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core)
hr = d3d11core_register_layers();
if (FAILED(hr))
{
- ERR("Failed to register d3d11 layers, returning %#x.\n", hr);
+ ERR("Failed to register d3d11 layers, returning %#lx.\n", hr);
FreeLibrary(mod);
wined3d_mutex_unlock();
return hr;
@@ -154,7 +154,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I
hr = register_d3d10core_layers(d3d10core);
if (FAILED(hr))
{
- ERR("Failed to register d3d10core layers, returning %#x.\n", hr);
+ ERR("Failed to register d3d10core layers, returning %#lx.\n", hr);
return hr;
}
@@ -194,7 +194,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I
hr = dxgi_device_init(dxgi_device, &d3d10_layer, factory, adapter, feature_levels, level_count);
if (FAILED(hr))
{
- WARN("Failed to initialize device, hr %#x.\n", hr);
+ WARN("Failed to initialize device, hr %#lx.\n", hr);
heap_free(dxgi_device);
*device = NULL;
return hr;
diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c
index 97f71bc8fc1..8de882b388d 100644
--- a/dlls/dxgi/factory.c
+++ b/dlls/dxgi/factory.c
@@ -60,7 +60,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IWineDXGIFactory *iface)
struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface);
ULONG refcount = InterlockedIncrement(&factory->refcount);
- TRACE("%p increasing refcount to %u.\n", iface, refcount);
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount;
}
@@ -70,7 +70,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface)
struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface);
ULONG refcount = InterlockedDecrement(&factory->refcount);
- TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount)
{
@@ -353,7 +353,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusEvent(IWineDXG
static void STDMETHODCALLTYPE dxgi_factory_UnregisterStereoStatus(IWineDXGIFactory *iface, DWORD cookie)
{
- FIXME("iface %p, cookie %#x stub!\n", iface, cookie);
+ FIXME("iface %p, cookie %#lx stub!\n", iface, cookie);
}
static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusWindow(IWineDXGIFactory *iface,
@@ -375,7 +375,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterOcclusionStatusEvent(IWine
static void STDMETHODCALLTYPE dxgi_factory_UnregisterOcclusionStatus(IWineDXGIFactory *iface, DWORD cookie)
{
- FIXME("iface %p, cookie %#x stub!\n", iface, cookie);
+ FIXME("iface %p, cookie %#lx stub!\n", iface, cookie);
}
static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForComposition(IWineDXGIFactory *iface,
@@ -402,7 +402,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory
IDXGIAdapter1 *adapter1;
HRESULT hr;
- TRACE("iface %p, luid %08x:%08x, iid %s, adapter %p.\n",
+ TRACE("iface %p, luid %08lx:%08lx, iid %s, adapter %p.\n",
iface, luid.HighPart, luid.LowPart, debugstr_guid(iid), adapter);
if (!adapter)
@@ -413,7 +413,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory
{
if (FAILED(hr = IDXGIAdapter1_GetDesc1(adapter1, &desc)))
{
- WARN("Failed to get adapter %u desc, hr %#x.\n", adapter_index, hr);
+ WARN("Failed to get adapter %u desc, hr %#lx.\n", adapter_index, hr);
++adapter_index;
continue;
}
@@ -430,7 +430,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory
++adapter_index;
}
if (hr != DXGI_ERROR_NOT_FOUND)
- WARN("Failed to enumerate adapters, hr %#x.\n", hr);
+ WARN("Failed to enumerate adapters, hr %#lx.\n", hr);
WARN("Adapter could not be found.\n");
return DXGI_ERROR_NOT_FOUND;
@@ -495,7 +495,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterAdaptersChangedEvent(IWine
static HRESULT STDMETHODCALLTYPE dxgi_factory_UnregisterAdaptersChangedEvent(IWineDXGIFactory *iface,
DWORD cookie)
{
- FIXME("iface %p, cookie %#x stub!\n", iface, cookie);
+ FIXME("iface %p, cookie %#lx stub!\n", iface, cookie);
return E_NOTIMPL;
}
@@ -553,7 +553,7 @@ struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface)
return NULL;
if (FAILED(hr = IDXGIFactory_QueryInterface(iface, &IID_IWineDXGIFactory, (void **)&wine_factory)))
{
- ERR("Failed to get IWineDXGIFactory interface, hr %#x.\n", hr);
+ ERR("Failed to get IWineDXGIFactory interface, hr %#lx.\n", hr);
return NULL;
}
assert(wine_factory->lpVtbl == &dxgi_factory_vtbl);
@@ -592,7 +592,7 @@ HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended)
if (FAILED(hr = dxgi_factory_init(object, extended)))
{
- WARN("Failed to initialize factory, hr %#x.\n", hr);
+ WARN("Failed to initialize factory, hr %#lx.\n", hr);
heap_free(object);
return hr;
}
diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c
index 585f5ae5b82..797851c67f1 100644
--- a/dlls/dxgi/output.c
+++ b/dlls/dxgi/output.c
@@ -146,7 +146,7 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output,
if (FAILED(hr = wined3d_output_get_mode(output->wined3d_output, wined3d_format,
WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode)))
{
- WARN("Failed to get output mode %u, hr %#x.\n", i, hr);
+ WARN("Failed to get output mode %u, hr %#lx.\n", i, hr);
wined3d_mutex_unlock();
return hr;
}
@@ -220,7 +220,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput6 *iface)
struct dxgi_output *output = impl_from_IDXGIOutput6(iface);
ULONG refcount = InterlockedIncrement(&output->refcount);
- TRACE("%p increasing refcount to %u.\n", output, refcount);
+ TRACE("%p increasing refcount to %lu.\n", output, refcount);
return refcount;
}
@@ -230,7 +230,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput6 *iface)
struct dxgi_output *output = impl_from_IDXGIOutput6(iface);
ULONG refcount = InterlockedDecrement(&output->refcount);
- TRACE("%p decreasing refcount to %u.\n", output, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", output, refcount);
if (!refcount)
{
@@ -303,7 +303,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_O
hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc);
if (FAILED(hr))
{
- WARN("Failed to get output desc, hr %#x.\n", hr);
+ WARN("Failed to get output desc, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr;
}
@@ -311,7 +311,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_O
hr = wined3d_output_get_display_mode(output->wined3d_output, &mode, &rotation);
if (FAILED(hr))
{
- WARN("Failed to get output display mode, hr %#x.\n", hr);
+ WARN("Failed to get output display mode, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr;
}
@@ -610,7 +610,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface,
hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc);
if (FAILED(hr))
{
- WARN("Failed to get output desc, hr %#x.\n", hr);
+ WARN("Failed to get output desc, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr;
}
@@ -618,7 +618,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface,
hr = wined3d_output_get_display_mode(output->wined3d_output, &mode, &rotation);
if (FAILED(hr))
{
- WARN("Failed to get output display mode, hr %#x.\n", hr);
+ WARN("Failed to get output display mode, hr %#lx.\n", hr);
wined3d_mutex_unlock();
return hr;
}
@@ -626,7 +626,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface,
if (FAILED(hr))
{
- WARN("Failed to get output desc, hr %#x.\n", hr);
+ WARN("Failed to get output desc, hr %#lx.\n", hr);
return hr;
}
diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c
index dd069524fbc..628e335ee0d 100644
--- a/dlls/dxgi/surface.c
+++ b/dlls/dxgi/surface.c
@@ -56,7 +56,7 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_AddRef(IUnknown *iface)
struct dxgi_surface *surface = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&surface->refcount);
- TRACE("%p increasing refcount to %u.\n", surface, refcount);
+ TRACE("%p increasing refcount to %lu.\n", surface, refcount);
return refcount;
}
@@ -66,7 +66,7 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface)
struct dxgi_surface *surface = impl_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&surface->refcount);
- TRACE("%p decreasing refcount to %u.\n", surface, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", surface, refcount);
if (!refcount)
{
diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c
index 98b020217e4..9677142e0af 100644
--- a/dlls/dxgi/swapchain.c
+++ b/dlls/dxgi/swapchain.c
@@ -123,7 +123,7 @@ HRESULT dxgi_get_output_from_window(IWineDXGIFactory *factory, HWND window, IDXG
{
if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc)))
{
- WARN("Adapter %u output %u: Failed to get output desc, hr %#x.\n", adapter_idx,
+ WARN("Adapter %u output %u: Failed to get output desc, hr %#lx.\n", adapter_idx,
output_idx, hr);
IDXGIOutput_Release(output);
continue;
@@ -142,7 +142,7 @@ HRESULT dxgi_get_output_from_window(IWineDXGIFactory *factory, HWND window, IDXG
}
if (hr != DXGI_ERROR_NOT_FOUND)
- WARN("Failed to enumerate outputs, hr %#x.\n", hr);
+ WARN("Failed to enumerate outputs, hr %#lx.\n", hr);
WARN("Output could not be found.\n");
return DXGI_ERROR_NOT_FOUND;
@@ -213,7 +213,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_AddRef(IDXGISwapChain1 *iface)
struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface);
ULONG refcount = InterlockedIncrement(&swapchain->refcount);
- TRACE("%p increasing refcount to %u.\n", swapchain, refcount);
+ TRACE("%p increasing refcount to %lu.\n", swapchain, refcount);
if (refcount == 1)
wined3d_swapchain_incref(swapchain->wined3d_swapchain);
@@ -226,7 +226,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface)
struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface);
ULONG refcount = InterlockedDecrement(&swapchain->refcount);
- TRACE("%p decreasing refcount to %u.\n", swapchain, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", swapchain, refcount);
if (!refcount)
{
@@ -399,7 +399,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen
}
else if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &target)))
{
- WARN("Failed to get target output for swapchain, hr %#x.\n", hr);
+ WARN("Failed to get target output for swapchain, hr %#lx.\n", hr);
return hr;
}
dxgi_output = unsafe_impl_from_IDXGIOutput(target);
@@ -849,7 +849,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi
if (FAILED(hr = IWineDXGIAdapter_GetParent(device->adapter,
&IID_IWineDXGIFactory, (void **)&swapchain->factory)))
{
- WARN("Failed to get adapter parent, hr %#x.\n", hr);
+ WARN("Failed to get adapter parent, hr %#lx.\n", hr);
return hr;
}
IWineDXGIDevice_AddRef(swapchain->device = &device->IWineDXGIDevice_iface);
@@ -874,7 +874,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi
if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, &swapchain->state_parent,
swapchain, &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain)))
{
- WARN("Failed to create wined3d swapchain, hr %#x.\n", hr);
+ WARN("Failed to create wined3d swapchain, hr %#lx.\n", hr);
goto cleanup;
}
@@ -889,14 +889,14 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi
if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(&swapchain->IDXGISwapChain1_iface,
&swapchain->target)))
{
- WARN("Failed to get target output for fullscreen swapchain, hr %#x.\n", hr);
+ WARN("Failed to get target output for fullscreen swapchain, hr %#lx.\n", hr);
wined3d_swapchain_decref(swapchain->wined3d_swapchain);
goto cleanup;
}
if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(state, desc, NULL)))
{
- WARN("Failed to set fullscreen state, hr %#x.\n", hr);
+ WARN("Failed to set fullscreen state, hr %#lx.\n", hr);
IDXGIOutput_Release(swapchain->target);
wined3d_swapchain_decref(swapchain->wined3d_swapchain);
goto cleanup;
@@ -1537,7 +1537,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain,
if (FAILED(hr = vkd3d_create_image_resource(device, &resource_info, &swapchain->buffers[i])))
{
- WARN("Failed to create vkd3d resource for Vulkan image %u, hr %#x.\n", i, hr);
+ WARN("Failed to create vkd3d resource for Vulkan image %u, hr %#lx.\n", i, hr);
return hr;
}
@@ -1769,7 +1769,7 @@ static HRESULT d3d12_swapchain_recreate_vulkan_swapchain(struct d3d12_swapchain
}
else
{
- ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr);
+ ERR("Failed to recreate Vulkan swapchain, hr %#lx.\n", hr);
}
return hr;
@@ -1811,7 +1811,7 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_AddRef(IDXGISwapChain4 *iface)
struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface);
ULONG refcount = InterlockedIncrement(&swapchain->refcount);
- TRACE("%p increasing refcount to %u.\n", swapchain, refcount);
+ TRACE("%p increasing refcount to %lu.\n", swapchain, refcount);
return refcount;
}
@@ -1865,7 +1865,7 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain4 *iface)
struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface);
ULONG refcount = InterlockedDecrement(&swapchain->refcount);
- TRACE("%p decreasing refcount to %u.\n", swapchain, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", swapchain, refcount);
if (!refcount)
{
@@ -2106,14 +2106,14 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain,
if (FAILED(hr = ID3D12CommandQueue_Signal(swapchain->command_queue,
swapchain->frame_latency_fence, swapchain->frame_number)))
{
- ERR("Failed to signal frame latency fence, hr %#x.\n", hr);
+ ERR("Failed to signal frame latency fence, hr %#lx.\n", hr);
return hr;
}
if (FAILED(hr = ID3D12Fence_SetEventOnCompletion(swapchain->frame_latency_fence,
swapchain->frame_number - swapchain->frame_latency, frame_latency_event)))
{
- ERR("Failed to enqueue frame latency event, hr %#x.\n", hr);
+ ERR("Failed to enqueue frame latency event, hr %#lx.\n", hr);
return hr;
}
}
@@ -2189,7 +2189,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen
}
else if (FAILED(hr = IDXGISwapChain4_GetContainingOutput(iface, &target)))
{
- WARN("Failed to get target output for swapchain, hr %#x.\n", hr);
+ WARN("Failed to get target output for swapchain, hr %#lx.\n", hr);
return hr;
}
@@ -2312,7 +2312,7 @@ static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain,
ID3D12Resource_AddRef(swapchain->buffers[i]);
if ((refcount = ID3D12Resource_Release(swapchain->buffers[i])))
{
- WARN("Buffer %p has %u references left.\n", swapchain->buffers[i], refcount);
+ WARN("Buffer %p has %lu references left.\n", swapchain->buffers[i], refcount);
return DXGI_ERROR_INVALID_CALL;
}
}
@@ -2328,7 +2328,7 @@ static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain,
if (!GetClientRect(swapchain->window, &client_rect))
{
- WARN("Failed to get client rect, last error %#x.\n", GetLastError());
+ WARN("Failed to get client rect, last error %#lx.\n", GetLastError());
return DXGI_ERROR_INVALID_CALL;
}
@@ -2397,13 +2397,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh
if (FAILED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter)))
{
- WARN("Failed to get adapter, hr %#x.\n", hr);
+ WARN("Failed to get adapter, hr %#lx.\n", hr);
return hr;
}
if (FAILED(hr = IDXGIAdapter_GetParent(adapter, &IID_IWineDXGIFactory, (void **)&factory)))
{
- WARN("Failed to get factory, hr %#x.\n", hr);
+ WARN("Failed to get factory, hr %#lx.\n", hr);
IDXGIAdapter_Release(adapter);
return hr;
}
@@ -2921,7 +2921,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI
if (FAILED(hr = dxgi_get_output_from_window(factory, window, &output)))
{
- WARN("Failed to get output from window %p, hr %#x.\n", window, hr);
+ WARN("Failed to get output from window %p, hr %#lx.\n", window, hr);
return hr;
}
@@ -3047,7 +3047,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI
if (FAILED(hr = ID3D12Device_CreateFence(device, DXGI_MAX_SWAP_CHAIN_BUFFERS,
0, &IID_ID3D12Fence, (void **)&swapchain->frame_latency_fence)))
{
- WARN("Failed to create frame latency fence, hr %#x.\n", hr);
+ WARN("Failed to create frame latency fence, hr %#lx.\n", hr);
d3d12_swapchain_destroy(swapchain);
return hr;
}
@@ -3055,7 +3055,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI
if (!(swapchain->frame_latency_event = CreateEventW(NULL, FALSE, TRUE, NULL)))
{
hr = HRESULT_FROM_WIN32(GetLastError());
- WARN("Failed to create frame latency event, hr %#x.\n", hr);
+ WARN("Failed to create frame latency event, hr %#lx.\n", hr);
d3d12_swapchain_destroy(swapchain);
return hr;
}
@@ -3090,7 +3090,7 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu
if (FAILED(hr = ID3D12CommandQueue_GetDevice(queue, &IID_ID3D12Device, (void **)&device)))
{
- ERR("Failed to get D3D12 device, hr %#x.\n", hr);
+ ERR("Failed to get d3d12 device, hr %#lx.\n", hr);
heap_free(object);
return hr;
}
--
2.30.2
1
0
[PATCH 2/5] wined3d: Store "multisample_quality" as an unsigned int in struct wined3d_swapchain_desc.
by Henri Verbeet 18 Mar '22
by Henri Verbeet 18 Mar '22
18 Mar '22
Consistent with what we do in other places in wined3d, like e.g. struct
wined3d_resource_desc.
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
include/wine/wined3d.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 1fdbd105cc4..7fbff07a3ad 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1774,7 +1774,7 @@ struct wined3d_swapchain_desc
unsigned int backbuffer_count;
unsigned int backbuffer_bind_flags;
enum wined3d_multisample_type multisample_type;
- DWORD multisample_quality;
+ unsigned int multisample_quality;
enum wined3d_swap_effect swap_effect;
HWND device_window;
BOOL windowed;
--
2.30.2
1
0
[PATCH 5/5] win32u: Don't use designated initializers for lazy_load_driver.
by Jacek Caban 18 Mar '22
by Jacek Caban 18 Mar '22
18 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/win32u/driver.c | 86 +++++++++++++++++++++++---------------------
1 file changed, 45 insertions(+), 41 deletions(-)
2
1
18 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/winpos.c | 123 +------------------------------------------
dlls/win32u/window.c | 44 ++++++++++++++++
include/ntuser.h | 1 +
3 files changed, 46 insertions(+), 122 deletions(-)
3
2
18 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/driver.c | 20 +--
dlls/user32/painting.c | 150 ---------------------
dlls/user32/user_main.c | 1 -
dlls/user32/user_private.h | 6 -
dlls/user32/win.c | 142 --------------------
dlls/user32/win.h | 5 -
dlls/user32/winpos.c | 227 --------------------------------
dlls/win32u/dce.c | 211 ++++++++++++++++++++++++++++++
dlls/win32u/driver.c | 2 +
dlls/win32u/ntuser_private.h | 3 -
dlls/win32u/sysparams.c | 6 -
dlls/win32u/win32u_private.h | 8 ++
dlls/win32u/window.c | 246 +++++++++++++++++++++++++++++++++--
include/ntuser.h | 4 -
14 files changed, 455 insertions(+), 576 deletions(-)
3
2
18 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/class.c | 11 -
dlls/user32/controls.h | 1 -
dlls/user32/driver.c | 13 +-
dlls/user32/user_main.c | 12 +-
dlls/user32/user_private.h | 3 -
dlls/user32/win.c | 544 ++---------------------------------
dlls/user32/win.h | 1 -
dlls/user32/winpos.c | 176 ------------
dlls/user32/winproc.c | 39 ---
dlls/win32u/class.c | 29 ++
dlls/win32u/dce.c | 11 +
dlls/win32u/driver.c | 6 +
dlls/win32u/gdiobj.c | 1 +
dlls/win32u/menu.c | 8 +
dlls/win32u/message.c | 19 +-
dlls/win32u/ntuser_private.h | 39 +--
dlls/win32u/sysparams.c | 5 +-
dlls/win32u/win32u.spec | 2 +-
dlls/win32u/win32u_private.h | 10 +-
dlls/win32u/window.c | 488 ++++++++++++++++++++++++++++++-
dlls/win32u/wrappers.c | 12 +
include/ntuser.h | 10 +-
22 files changed, 616 insertions(+), 824 deletions(-)
3
3
[PATCH 1/5] user32: Move MDI child coordinates fixup out of WIN_FixCoordinates.
by Jacek Caban 18 Mar '22
by Jacek Caban 18 Mar '22
18 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/win.c | 53 +++++++++++++++++++++++------------------------
1 file changed, 26 insertions(+), 27 deletions(-)
3
2
18 Mar '22
And get rid of vdisp_t since it's no longer needed.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
The spec says that in ES3, apply and call convert null or undefined arguments
to the global object, but that's wrong for builtins. Or at least, it's
not how it works on Windows. In fact, passing them to builtin functions
results in exceptions in many cases, because they're not objects or can't
be converted to objects. So the ES5 checks are still needed.
dlls/jscript/activex.c | 2 +-
dlls/jscript/array.c | 250 +++++++++++++++++++++++---------------
dlls/jscript/bool.c | 44 ++++---
dlls/jscript/date.c | 199 +++++++++++++++---------------
dlls/jscript/dispex.c | 17 +--
dlls/jscript/enumerator.c | 28 ++---
dlls/jscript/error.c | 28 +++--
dlls/jscript/function.c | 51 ++++----
dlls/jscript/global.c | 34 +++---
dlls/jscript/jscript.h | 75 +-----------
dlls/jscript/json.c | 4 +-
dlls/jscript/jsregexp.c | 32 +++--
dlls/jscript/math.c | 36 +++---
dlls/jscript/number.c | 69 ++++++-----
dlls/jscript/object.c | 182 ++++++++++++++++++---------
dlls/jscript/set.c | 81 +++++++-----
dlls/jscript/string.c | 180 +++++++++++++--------------
dlls/jscript/vbarray.c | 24 ++--
18 files changed, 696 insertions(+), 640 deletions(-)
diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c
index 42cb513..5d79d2b 100644
--- a/dlls/jscript/activex.c
+++ b/dlls/jscript/activex.c
@@ -138,7 +138,7 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid)
return obj;
}
-static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT ActiveXObject_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsstr_t * progid_str;
diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c
index 6ee1809..9b97ef2 100644
--- a/dlls/jscript/array.c
+++ b/dlls/jscript/array.c
@@ -37,14 +37,10 @@ static inline ArrayInstance *array_from_jsdisp(jsdisp_t *jsdisp)
return CONTAINING_RECORD(jsdisp, ArrayInstance, dispex);
}
-static inline ArrayInstance *array_from_vdisp(vdisp_t *vdisp)
+static inline ArrayInstance *array_this(jsval_t vthis)
{
- return array_from_jsdisp(vdisp->u.jsdisp);
-}
-
-static inline ArrayInstance *array_this(vdisp_t *jsthis)
-{
- return is_vclass(jsthis, JSCLASS_ARRAY) ? array_from_vdisp(jsthis) : NULL;
+ jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL;
+ return (jsdisp && is_class(jsdisp, JSCLASS_ARRAY)) ? array_from_jsdisp(jsdisp) : NULL;
}
unsigned array_get_length(jsdisp_t *array)
@@ -53,33 +49,38 @@ unsigned array_get_length(jsdisp_t *array)
return array_from_jsdisp(array)->length;
}
-static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsdisp_t **jsthis, UINT32 *ret)
+static HRESULT get_length(script_ctx_t *ctx, jsval_t vthis, jsdisp_t **jsthis, UINT32 *ret)
{
- ArrayInstance *array;
+ jsdisp_t *jsdisp;
+ IDispatch *disp;
jsval_t val;
HRESULT hres;
- array = array_this(vdisp);
- if(array) {
- *jsthis = &array->dispex;
- *ret = array->length;
- return S_OK;
- }
+ hres = to_object(ctx, vthis, &disp);
+ if(FAILED(hres))
+ return hres;
- if(!is_jsdisp(vdisp))
+ jsdisp = iface_to_jsdisp(disp);
+ IDispatch_Release(disp);
+ if(!jsdisp)
return JS_E_JSCRIPT_EXPECTED;
+ *jsthis = jsdisp;
- hres = jsdisp_propget_name(vdisp->u.jsdisp, L"length", &val);
- if(FAILED(hres))
- return hres;
+ if(is_class(jsdisp, JSCLASS_ARRAY)) {
+ *ret = array_from_jsdisp(jsdisp)->length;
+ return S_OK;
+ }
- hres = to_uint32(ctx, val, ret);
- jsval_release(val);
- if(FAILED(hres))
- return hres;
+ hres = jsdisp_propget_name(jsdisp, L"length", &val);
+ if(SUCCEEDED(hres)) {
+ hres = to_uint32(ctx, val, ret);
+ jsval_release(val);
+ if(SUCCEEDED(hres))
+ return hres;
+ }
- *jsthis = vdisp->u.jsdisp;
- return S_OK;
+ jsdisp_release(jsdisp);
+ return hres;
}
static HRESULT set_length(jsdisp_t *obj, DWORD length)
@@ -183,20 +184,25 @@ static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len)
return jsdisp_propput_idx(array, (*len)++, jsval_disp(obj));
}
-static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_concat(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
+ IDispatch *jsthis;
jsdisp_t *ret;
DWORD len = 0;
HRESULT hres;
TRACE("\n");
- hres = create_array(ctx, 0, &ret);
+ hres = to_object(ctx, vthis, &jsthis);
if(FAILED(hres))
return hres;
- hres = concat_obj(ret, jsthis->u.disp, &len);
+ hres = create_array(ctx, 0, &ret);
+ if(FAILED(hres))
+ goto done;
+
+ hres = concat_obj(ret, jsthis, &len);
if(SUCCEEDED(hres)) {
DWORD i;
@@ -211,12 +217,14 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
}
if(FAILED(hres))
- return hres;
+ goto done;
if(r)
*r = jsval_obj(ret);
else
jsdisp_release(ret);
+done:
+ IDispatch_Release(jsthis);
return S_OK;
}
@@ -310,7 +318,7 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons
}
/* ECMA-262 3rd Edition 15.4.4.5 */
-static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_join(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *jsthis;
@@ -329,7 +337,7 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne
hres = to_flat_string(ctx, argv[0], &sep_str, &sep);
if(FAILED(hres))
- return hres;
+ goto done;
hres = array_join(ctx, jsthis, length, sep, jsstr_length(sep_str), r);
@@ -338,10 +346,12 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne
hres = array_join(ctx, jsthis, length, L",", 1, r);
}
+done:
+ jsdisp_release(jsthis);
return hres;
}
-static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_pop(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *jsthis;
@@ -358,11 +368,11 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned
if(!length) {
hres = set_length(jsthis, 0);
if(FAILED(hres))
- return hres;
+ goto done;
if(r)
*r = jsval_undefined();
- return S_OK;
+ goto done;
}
length--;
@@ -373,25 +383,27 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned
val = jsval_undefined();
hres = S_OK;
}else
- return hres;
+ goto done;
if(SUCCEEDED(hres))
hres = set_length(jsthis, length);
if(FAILED(hres)) {
jsval_release(val);
- return hres;
+ goto done;
}
if(r)
*r = val;
else
jsval_release(val);
+done:
+ jsdisp_release(jsthis);
return hres;
}
/* ECMA-262 3rd Edition 15.4.4.7 */
-static HRESULT Array_push(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_push(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *jsthis;
@@ -408,19 +420,21 @@ static HRESULT Array_push(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne
for(i=0; i < argc; i++) {
hres = jsdisp_propput_idx(jsthis, length+i, argv[i]);
if(FAILED(hres))
- return hres;
+ goto done;
}
hres = set_length(jsthis, length+argc);
if(FAILED(hres))
- return hres;
+ goto done;
if(r)
*r = jsval_number(length+argc);
- return S_OK;
+done:
+ jsdisp_release(jsthis);
+ return hres;
}
-static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_reverse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *jsthis;
@@ -439,12 +453,13 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi
hres1 = jsdisp_get_idx(jsthis, k, &v1);
if(FAILED(hres1) && hres1!=DISP_E_UNKNOWNNAME)
- return hres1;
+ goto done;
hres2 = jsdisp_get_idx(jsthis, l, &v2);
if(FAILED(hres2) && hres2!=DISP_E_UNKNOWNNAME) {
jsval_release(v1);
- return hres2;
+ hres1 = hres2;
+ goto done;
}
if(hres1 == DISP_E_UNKNOWNNAME)
@@ -455,7 +470,7 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi
if(FAILED(hres1)) {
jsval_release(v1);
jsval_release(v2);
- return hres1;
+ goto done;
}
if(hres2 == DISP_E_UNKNOWNNAME)
@@ -465,17 +480,20 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi
if(FAILED(hres2)) {
jsval_release(v2);
- return hres2;
+ hres1 = hres2;
+ goto done;
}
}
if(r)
*r = jsval_obj(jsdisp_addref(jsthis));
- return S_OK;
+done:
+ jsdisp_release(jsthis);
+ return hres1;
}
/* ECMA-262 3rd Edition 15.4.4.9 */
-static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_shift(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *jsthis;
@@ -492,11 +510,11 @@ static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign
if(!length) {
hres = set_length(jsthis, 0);
if(FAILED(hres))
- return hres;
+ goto done;
if(r)
*r = jsval_undefined();
- return S_OK;
+ goto done;
}
hres = jsdisp_get_idx(jsthis, 0, &ret);
@@ -520,17 +538,19 @@ static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign
}
if(FAILED(hres))
- return hres;
+ goto done;
if(r)
*r = ret;
else
jsval_release(ret);
+done:
+ jsdisp_release(jsthis);
return hres;
}
/* ECMA-262 3rd Edition 15.4.4.10 */
-static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Array_slice(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
jsdisp_t *arr, *jsthis;
DOUBLE range;
@@ -546,7 +566,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign
if(argc) {
hres = to_number(ctx, argv[0], &range);
if(FAILED(hres))
- return hres;
+ goto done;
range = floor(range);
if(-range>length || isnan(range)) start = 0;
@@ -559,7 +579,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign
if(argc > 1) {
hres = to_number(ctx, argv[1], &range);
if(FAILED(hres))
- return hres;
+ goto done;
range = floor(range);
if(-range>length) end = 0;
@@ -571,7 +591,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign
hres = create_array(ctx, (end>start)?end-start:0, &arr);
if(FAILED(hres))
- return hres;
+ goto done;
for(idx=start; idx<end; idx++) {
jsval_t v;
@@ -587,7 +607,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign
if(FAILED(hres)) {
jsdisp_release(arr);
- return hres;
+ goto done;
}
}
@@ -595,8 +615,11 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign
*r = jsval_obj(arr);
else
jsdisp_release(arr);
+ hres = S_OK;
- return S_OK;
+done:
+ jsdisp_release(jsthis);
+ return hres;
}
static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, jsval_t v1, jsval_t v2, INT *cmp)
@@ -651,7 +674,7 @@ static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, jsval_t v1, jsval
}
/* ECMA-262 3rd Edition 15.4.4.11 */
-static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_sort(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *jsthis, *cmp_func = NULL;
@@ -670,18 +693,21 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne
if(is_object_instance(argv[0])) {
if(argc > 1 && ctx->version < SCRIPTLANGUAGEVERSION_ES5) {
WARN("invalid arg_cnt %d\n", argc);
- return JS_E_JSCRIPT_EXPECTED;
+ hres = JS_E_JSCRIPT_EXPECTED;
+ goto done;
}
cmp_func = iface_to_jsdisp(get_object(argv[0]));
if(!cmp_func || !is_class(cmp_func, JSCLASS_FUNCTION)) {
WARN("cmp_func is not a function\n");
if(cmp_func)
jsdisp_release(cmp_func);
- return JS_E_JSCRIPT_EXPECTED;
+ hres = JS_E_JSCRIPT_EXPECTED;
+ goto done;
}
}else if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5 ? !is_undefined(argv[0]) : !is_null(argv[0])) {
WARN("invalid arg %s\n", debugstr_jsval(argv[0]));
- return JS_E_JSCRIPT_EXPECTED;
+ hres = JS_E_JSCRIPT_EXPECTED;
+ goto done;
}
}
@@ -690,7 +716,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne
jsdisp_release(cmp_func);
if(r)
*r = jsval_obj(jsdisp_addref(jsthis));
- return S_OK;
+ goto done;
}
vtab = heap_alloc_zero(length * sizeof(*vtab));
@@ -789,15 +815,17 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne
jsdisp_release(cmp_func);
if(FAILED(hres))
- return hres;
+ goto done;
if(r)
*r = jsval_obj(jsdisp_addref(jsthis));
- return S_OK;
+done:
+ jsdisp_release(jsthis);
+ return hres;
}
/* ECMA-262 3rd Edition 15.4.4.12 */
-static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_splice(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
UINT32 length, start=0, delete_cnt=0, i, add_args = 0;
@@ -816,7 +844,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig
if(argc) {
hres = to_integer(ctx, argv[0], &d);
if(FAILED(hres))
- return hres;
+ goto done;
if(is_int32(d)) {
if((n = d) >= 0)
@@ -831,7 +859,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig
if(argc >= 2) {
hres = to_integer(ctx, argv[1], &d);
if(FAILED(hres))
- return hres;
+ goto done;
if(is_int32(d)) {
if((n = d) > 0)
@@ -846,7 +874,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig
if(r) {
hres = create_array(ctx, 0, &ret_array);
if(FAILED(hres))
- return hres;
+ goto done;
for(i=0; SUCCEEDED(hres) && i < delete_cnt; i++) {
hres = jsdisp_get_idx(jsthis, start+i, &val);
@@ -896,37 +924,39 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig
if(FAILED(hres)) {
if(ret_array)
jsdisp_release(ret_array);
- return hres;
+ goto done;
}
if(r)
*r = jsval_obj(ret_array);
- return S_OK;
+done:
+ jsdisp_release(jsthis);
+ return hres;
}
/* ECMA-262 3rd Edition 15.4.4.2 */
-static HRESULT Array_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
ArrayInstance *array;
TRACE("\n");
- array = array_this(jsthis);
+ array = array_this(vthis);
if(!array)
return JS_E_ARRAY_EXPECTED;
return array_join(ctx, &array->dispex, array->length, L",", 1, r);
}
-static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_toLocaleString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FIXME("\n");
return E_NOTIMPL;
}
-static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
IDispatch *context_obj = NULL, *callback;
@@ -944,14 +974,16 @@ static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi
/* Fixme check IsCallable */
if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) {
FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined()));
- return E_INVALIDARG;
+ hres = E_INVALIDARG;
+ goto done;
}
callback = get_object(argv[0]);
if(argc > 1 && !is_undefined(argv[1])) {
if(!is_object_instance(argv[1]) || !get_object(argv[1])) {
FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1]));
- return E_NOTIMPL;
+ hres = E_NOTIMPL;
+ goto done;
}
context_obj = get_object(argv[1]);
}
@@ -961,7 +993,7 @@ static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi
if(hres == DISP_E_UNKNOWNNAME)
continue;
if(FAILED(hres))
- return hres;
+ goto done;
args[0] = value;
args[1] = jsval_number(i);
@@ -969,15 +1001,18 @@ static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi
hres = disp_call_value(ctx, callback, context_obj, DISPATCH_METHOD, ARRAY_SIZE(args), args, &res);
jsval_release(value);
if(FAILED(hres))
- return hres;
+ goto done;
jsval_release(res);
}
if(r) *r = jsval_undefined();
- return S_OK;
+ hres = S_OK;
+done:
+ jsdisp_release(jsthis);
+ return hres;
}
-static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_indexOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *jsthis;
@@ -993,7 +1028,7 @@ static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi
return hres;
if(!length) {
if(r) *r = jsval_number(-1);
- return S_OK;
+ goto done;
}
search = argc ? argv[0] : jsval_undefined();
@@ -1003,7 +1038,7 @@ static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi
hres = to_integer(ctx, argv[1], &from_arg);
if(FAILED(hres))
- return hres;
+ goto done;
if(from_arg >= 0)
from = min(from_arg, length);
@@ -1016,23 +1051,26 @@ static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi
if(hres == DISP_E_UNKNOWNNAME)
continue;
if(FAILED(hres))
- return hres;
+ goto done;
hres = jsval_strict_equal(value, search, &eq);
jsval_release(value);
if(FAILED(hres))
- return hres;
+ goto done;
if(eq) {
if(r) *r = jsval_number(i);
- return S_OK;
+ goto done;
}
}
if(r) *r = jsval_number(-1);
- return S_OK;
+ hres = S_OK;
+done:
+ jsdisp_release(jsthis);
+ return hres;
}
-static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Array_map(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
IDispatch *context_this = NULL, *callback;
jsval_t callback_args[3], mapped_value;
@@ -1051,7 +1089,8 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned
/* FIXME: check IsCallable */
if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) {
FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined()));
- return E_INVALIDARG;
+ hres = E_INVALIDARG;
+ goto done;
}
callback = get_object(argv[0]);
@@ -1060,13 +1099,14 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned
context_this = get_object(argv[1]);
}else if(!is_undefined(argv[1])) {
FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1]));
- return E_NOTIMPL;
+ hres = E_NOTIMPL;
+ goto done;
}
}
hres = create_array(ctx, length, &array);
if(FAILED(hres))
- return hres;
+ goto done;
for(k = 0; k < length; k++) {
hres = jsdisp_get_idx(jsthis, k, &callback_args[0]);
@@ -1091,10 +1131,12 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned
*r = jsval_obj(array);
else
jsdisp_release(array);
+done:
+ jsdisp_release(jsthis);
return hres;
}
-static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Array_reduce(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
IDispatch *context_this = NULL, *callback;
jsval_t callback_args[4], acc, new_acc;
@@ -1114,7 +1156,8 @@ static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig
/* Fixme check IsCallable */
if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) {
FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined()));
- return E_INVALIDARG;
+ hres = E_INVALIDARG;
+ goto done;
}
callback = get_object(argv[0]);
@@ -1122,7 +1165,7 @@ static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig
have_value = TRUE;
hres = jsval_copy(argv[1], &acc);
if(FAILED(hres))
- return hres;
+ goto done;
}
for(k = 0; k < length; k++) {
@@ -1159,11 +1202,13 @@ static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig
*r = acc;
else if(have_value)
jsval_release(acc);
+done:
+ jsdisp_release(jsthis);
return hres;
}
/* ECMA-262 3rd Edition 15.4.4.13 */
-static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Array_unshift(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *jsthis;
@@ -1191,35 +1236,38 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi
if(SUCCEEDED(hres)) {
hres = jsdisp_propget(jsthis, id, &val);
if(FAILED(hres))
- return hres;
+ goto done;
hres = jsdisp_propput_idx(jsthis, i+argc, val);
jsval_release(val);
}else if(hres == DISP_E_UNKNOWNNAME) {
- hres = IDispatchEx_DeleteMemberByDispID(vthis->u.dispex, id);
+ hres = IDispatchEx_DeleteMemberByDispID(&jsthis->IDispatchEx_iface, id);
}
}
if(FAILED(hres))
- return hres;
+ goto done;
}
for(i=0; i<argc; i++) {
hres = jsdisp_propput_idx(jsthis, i, argv[i]);
if(FAILED(hres))
- return hres;
+ goto done;
}
if(argc) {
length += argc;
hres = set_length(jsthis, length);
if(FAILED(hres))
- return hres;
+ goto done;
}
if(r)
*r = ctx->version < 2 ? jsval_undefined() : jsval_number(length);
- return S_OK;
+ hres = S_OK;
+done:
+ jsdisp_release(jsthis);
+ return hres;
}
static void Array_destructor(jsdisp_t *dispex)
@@ -1291,7 +1339,7 @@ static const builtin_info_t ArrayInst_info = {
};
/* ECMA-262 5.1 Edition 15.4.3.2 */
-static HRESULT ArrayConstr_isArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT ArrayConstr_isArray(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
jsdisp_t *obj;
@@ -1308,7 +1356,7 @@ static HRESULT ArrayConstr_isArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags
return S_OK;
}
-static HRESULT ArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT ArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *obj;
diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c
index 184d8d0..a230855 100644
--- a/dlls/jscript/bool.c
+++ b/dlls/jscript/bool.c
@@ -36,14 +36,16 @@ static inline BoolInstance *bool_from_jsdisp(jsdisp_t *jsdisp)
return CONTAINING_RECORD(jsdisp, BoolInstance, dispex);
}
-static inline BoolInstance *bool_from_vdisp(vdisp_t *vdisp)
+static inline HRESULT boolval_this(jsval_t vthis, BOOL *ret)
{
- return bool_from_jsdisp(vdisp->u.jsdisp);
-}
-
-static inline BoolInstance *bool_this(vdisp_t *jsthis)
-{
- return is_vclass(jsthis, JSCLASS_BOOLEAN) ? bool_from_vdisp(jsthis) : NULL;
+ jsdisp_t *jsdisp;
+ if(is_bool(vthis))
+ *ret = get_bool(vthis);
+ else if(is_object_instance(vthis) && (jsdisp = to_jsdisp(get_object(vthis))) && is_class(jsdisp, JSCLASS_BOOLEAN))
+ *ret = bool_from_jsdisp(jsdisp)->val;
+ else
+ return JS_E_BOOLEAN_EXPECTED;
+ return S_OK;
}
BOOL bool_obj_value(jsdisp_t *obj)
@@ -53,19 +55,21 @@ BOOL bool_obj_value(jsdisp_t *obj)
}
/* ECMA-262 3rd Edition 15.6.4.2 */
-static HRESULT Bool_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Bool_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
- BoolInstance *bool;
+ BOOL boolval;
+ HRESULT hres;
TRACE("\n");
- if(!(bool = bool_this(jsthis)))
- return JS_E_BOOLEAN_EXPECTED;
+ hres = boolval_this(vthis, &boolval);
+ if(FAILED(hres))
+ return hres;
if(r) {
jsstr_t *val;
- val = jsstr_alloc(bool->val ? L"true" : L"false");
+ val = jsstr_alloc(boolval ? L"true" : L"false");
if(!val)
return E_OUTOFMEMORY;
@@ -76,21 +80,23 @@ static HRESULT Bool_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
}
/* ECMA-262 3rd Edition 15.6.4.3 */
-static HRESULT Bool_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Bool_valueOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
- BoolInstance *bool;
+ BOOL boolval;
+ HRESULT hres;
TRACE("\n");
- if(!(bool = bool_this(jsthis)))
- return JS_E_BOOLEAN_EXPECTED;
+ hres = boolval_this(vthis, &boolval);
+ if(FAILED(hres))
+ return hres;
if(r)
- *r = jsval_bool(bool->val);
+ *r = jsval_bool(boolval);
return S_OK;
}
-static HRESULT Bool_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Bool_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
@@ -129,7 +135,7 @@ static const builtin_info_t BoolInst_info = {
NULL
};
-static HRESULT BoolConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT BoolConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
BOOL value = FALSE;
diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c
index b130c83..e482c4a 100644
--- a/dlls/jscript/date.c
+++ b/dlls/jscript/date.c
@@ -49,9 +49,10 @@ static inline DateInstance *date_from_jsdisp(jsdisp_t *jsdisp)
return CONTAINING_RECORD(jsdisp, DateInstance, dispex);
}
-static inline DateInstance *date_this(vdisp_t *jsthis)
+static inline DateInstance *date_this(jsval_t vthis)
{
- return is_vclass(jsthis, JSCLASS_DATE) ? date_from_jsdisp(jsthis->u.jsdisp) : NULL;
+ jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL;
+ return (jsdisp && is_class(jsdisp, JSCLASS_DATE)) ? date_from_jsdisp(jsdisp) : NULL;
}
/*ECMA-262 3rd Edition 15.9.1.2 */
@@ -513,20 +514,20 @@ static HRESULT dateobj_to_string(DateInstance *date, jsval_t *r)
return date_to_string(time, TRUE, offset, r);
}
-static HRESULT Date_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Date_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
return dateobj_to_string(date, r);
}
/* ECMA-262 3rd Edition 15.9.1.5 */
-static HRESULT Date_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_toLocaleString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
SYSTEMTIME st;
@@ -536,7 +537,7 @@ static HRESULT Date_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(isnan(date->time)) {
@@ -569,7 +570,7 @@ static HRESULT Date_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag
return S_OK;
}
-static HRESULT Date_toISOString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_toISOString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -578,7 +579,7 @@ static HRESULT Date_toISOString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
year = year_from_time(date->time);
@@ -611,14 +612,14 @@ static HRESULT Date_toISOString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
return S_OK;
}
-static HRESULT Date_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_valueOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -626,7 +627,7 @@ static HRESULT Date_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
return S_OK;
}
-static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r)
+static inline HRESULT create_utc_string(script_ctx_t *ctx, jsval_t vthis, jsval_t *r)
{
static const DWORD week_ids[] = { LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1,
LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4,
@@ -646,7 +647,7 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva
int year, day;
DWORD lcid_en;
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(isnan(date->time)) {
@@ -687,18 +688,18 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva
}
/* ECMA-262 3rd Edition 15.9.5.42 */
-static HRESULT Date_toUTCString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_toUTCString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
- return create_utc_string(ctx, jsthis, r);
+ return create_utc_string(ctx, vthis, r);
}
-static HRESULT Date_toGMTString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_toGMTString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
- return create_utc_string(ctx, jsthis, r);
+ return create_utc_string(ctx, vthis, r);
}
/* ECMA-262 3rd Edition 15.9.5.3 */
@@ -758,19 +759,19 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r)
return S_OK;
}
-static HRESULT Date_toDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_toDateString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
return dateobj_to_date_string(date, r);
}
/* ECMA-262 3rd Edition 15.9.5.4 */
-static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_toTimeString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -782,7 +783,7 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(isnan(date->time)) {
@@ -821,7 +822,7 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
}
/* ECMA-262 3rd Edition 15.9.5.6 */
-static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
SYSTEMTIME st;
@@ -831,7 +832,7 @@ static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(isnan(date->time)) {
@@ -860,7 +861,7 @@ static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD
}
/* ECMA-262 3rd Edition 15.9.5.7 */
-static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
SYSTEMTIME st;
@@ -870,7 +871,7 @@ static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(isnan(date->time)) {
@@ -882,7 +883,7 @@ static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD
st = create_systemtime(local_time(date->time, date));
if(st.wYear<1601 || st.wYear>9999)
- return Date_toTimeString(ctx, jsthis, flags, argc, argv, r);
+ return Date_toTimeString(ctx, vthis, flags, argc, argv, r);
if(r) {
WCHAR *ptr;
@@ -899,14 +900,14 @@ static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD
}
/* ECMA-262 3rd Edition 15.9.5.9 */
-static HRESULT Date_getTime(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getTime(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -915,14 +916,14 @@ static HRESULT Date_getTime(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
}
/* ECMA-262 3rd Edition 15.9.5.10 */
-static HRESULT Date_getFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getFullYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r) {
@@ -934,14 +935,14 @@ static HRESULT Date_getFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
}
/* ECMA-262 3rd Edition 15.9.5.11 */
-static HRESULT Date_getUTCFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getUTCFullYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -950,13 +951,13 @@ static HRESULT Date_getUTCFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag
}
/* ECMA-262 3rd Edition 15.9.5.12 */
-static HRESULT Date_getMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Date_getMonth(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -965,14 +966,14 @@ static HRESULT Date_getMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
}
/* ECMA-262 3rd Edition 15.9.5.13 */
-static HRESULT Date_getUTCMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getUTCMonth(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -981,13 +982,13 @@ static HRESULT Date_getUTCMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
}
/* ECMA-262 3rd Edition 15.9.5.14 */
-static HRESULT Date_getDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Date_getDate(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -996,14 +997,14 @@ static HRESULT Date_getDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
}
/* ECMA-262 3rd Edition 15.9.5.15 */
-static HRESULT Date_getUTCDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getUTCDate(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1012,14 +1013,14 @@ static HRESULT Date_getUTCDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
}
/* ECMA-262 3rd Edition 15.9.5.16 */
-static HRESULT Date_getDay(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getDay(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1028,14 +1029,14 @@ static HRESULT Date_getDay(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
}
/* ECMA-262 3rd Edition 15.9.5.17 */
-static HRESULT Date_getUTCDay(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getUTCDay(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1044,14 +1045,14 @@ static HRESULT Date_getUTCDay(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
}
/* ECMA-262 3rd Edition 15.9.5.18 */
-static HRESULT Date_getHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getHours(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1060,14 +1061,14 @@ static HRESULT Date_getHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
}
/* ECMA-262 3rd Edition 15.9.5.19 */
-static HRESULT Date_getUTCHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getUTCHours(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1076,14 +1077,14 @@ static HRESULT Date_getUTCHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
}
/* ECMA-262 3rd Edition 15.9.5.20 */
-static HRESULT Date_getMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getMinutes(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1092,14 +1093,14 @@ static HRESULT Date_getMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
}
/* ECMA-262 3rd Edition 15.9.5.21 */
-static HRESULT Date_getUTCMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getUTCMinutes(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1108,13 +1109,13 @@ static HRESULT Date_getUTCMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
}
/* ECMA-262 3rd Edition 15.9.5.22 */
-static HRESULT Date_getSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Date_getSeconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1123,14 +1124,14 @@ static HRESULT Date_getSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
}
/* ECMA-262 3rd Edition 15.9.5.23 */
-static HRESULT Date_getUTCSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getUTCSeconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1139,14 +1140,14 @@ static HRESULT Date_getUTCSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
}
/* ECMA-262 3rd Edition 15.9.5.24 */
-static HRESULT Date_getMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getMilliseconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1155,14 +1156,14 @@ static HRESULT Date_getMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
}
/* ECMA-262 3rd Edition 15.9.5.25 */
-static HRESULT Date_getUTCMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getUTCMilliseconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1171,14 +1172,14 @@ static HRESULT Date_getUTCMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD
}
/* ECMA-262 3rd Edition 15.9.5.26 */
-static HRESULT Date_getTimezoneOffset(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getTimezoneOffset(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(r)
@@ -1187,7 +1188,7 @@ static HRESULT Date_getTimezoneOffset(script_ctx_t *ctx, vdisp_t *jsthis, WORD f
}
/* ECMA-262 3rd Edition 15.9.5.27 */
-static HRESULT Date_setTime(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setTime(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double n;
@@ -1196,7 +1197,7 @@ static HRESULT Date_setTime(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1214,7 +1215,7 @@ static HRESULT Date_setTime(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
}
/* ECMA-262 3rd Edition 15.9.5.28 */
-static HRESULT Date_setMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setMilliseconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1223,7 +1224,7 @@ static HRESULT Date_setMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1244,7 +1245,7 @@ static HRESULT Date_setMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
}
/* ECMA-262 3rd Edition 15.9.5.29 */
-static HRESULT Date_setUTCMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setUTCMilliseconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1253,7 +1254,7 @@ static HRESULT Date_setUTCMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1274,7 +1275,7 @@ static HRESULT Date_setUTCMilliseconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD
}
/* ECMA-262 3rd Edition 15.9.5.30 */
-static HRESULT Date_setSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setSeconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1283,7 +1284,7 @@ static HRESULT Date_setSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1313,7 +1314,7 @@ static HRESULT Date_setSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
}
/* ECMA-262 3rd Edition 15.9.5.31 */
-static HRESULT Date_setUTCSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setUTCSeconds(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1322,7 +1323,7 @@ static HRESULT Date_setUTCSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1352,7 +1353,7 @@ static HRESULT Date_setUTCSeconds(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
}
/* ECMA-262 3rd Edition 15.9.5.33 */
-static HRESULT Date_setMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setMinutes(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1361,7 +1362,7 @@ static HRESULT Date_setMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1399,7 +1400,7 @@ static HRESULT Date_setMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
}
/* ECMA-262 3rd Edition 15.9.5.34 */
-static HRESULT Date_setUTCMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setUTCMinutes(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1408,7 +1409,7 @@ static HRESULT Date_setUTCMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1446,7 +1447,7 @@ static HRESULT Date_setUTCMinutes(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
}
/* ECMA-262 3rd Edition 15.9.5.35 */
-static HRESULT Date_setHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setHours(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1455,7 +1456,7 @@ static HRESULT Date_setHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1500,7 +1501,7 @@ static HRESULT Date_setHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
}
/* ECMA-262 3rd Edition 15.9.5.36 */
-static HRESULT Date_setUTCHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setUTCHours(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1509,7 +1510,7 @@ static HRESULT Date_setUTCHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1554,7 +1555,7 @@ static HRESULT Date_setUTCHours(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
}
/* ECMA-262 3rd Edition 15.9.5.36 */
-static HRESULT Date_setDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setDate(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1563,7 +1564,7 @@ static HRESULT Date_setDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1583,7 +1584,7 @@ static HRESULT Date_setDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
}
/* ECMA-262 3rd Edition 15.9.5.37 */
-static HRESULT Date_setUTCDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setUTCDate(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1592,7 +1593,7 @@ static HRESULT Date_setUTCDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1612,7 +1613,7 @@ static HRESULT Date_setUTCDate(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
}
/* ECMA-262 3rd Edition 15.9.5.38 */
-static HRESULT Date_setMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setMonth(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1621,7 +1622,7 @@ static HRESULT Date_setMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1651,7 +1652,7 @@ static HRESULT Date_setMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
}
/* ECMA-262 3rd Edition 15.9.5.39 */
-static HRESULT Date_setUTCMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setUTCMonth(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1660,7 +1661,7 @@ static HRESULT Date_setUTCMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1690,7 +1691,7 @@ static HRESULT Date_setUTCMonth(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
}
/* ECMA-262 3rd Edition 15.9.5.40 */
-static HRESULT Date_setFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setFullYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1699,7 +1700,7 @@ static HRESULT Date_setFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1736,7 +1737,7 @@ static HRESULT Date_setFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
}
/* ECMA-262 3rd Edition 15.9.5.41 */
-static HRESULT Date_setUTCFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setUTCFullYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1745,7 +1746,7 @@ static HRESULT Date_setUTCFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -1782,7 +1783,7 @@ static HRESULT Date_setUTCFullYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag
}
/* ECMA-262 3rd Edition B2.4 */
-static HRESULT Date_getYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_getYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1790,7 +1791,7 @@ static HRESULT Date_getYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
t = local_time(date->time, date);
@@ -1807,7 +1808,7 @@ static HRESULT Date_getYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
}
/* ECMA-262 3rd Edition B2.5 */
-static HRESULT Date_setYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Date_setYear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
@@ -1816,7 +1817,7 @@ static HRESULT Date_setYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
TRACE("\n");
- if(!(date = date_this(jsthis)))
+ if(!(date = date_this(vthis)))
return JS_E_DATE_EXPECTED;
if(!argc)
@@ -2223,7 +2224,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) {
return S_OK;
}
-static HRESULT DateConstr_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT DateConstr_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsstr_t *parse_str;
@@ -2321,7 +2322,7 @@ static HRESULT date_utc(script_ctx_t *ctx, unsigned argc, jsval_t *argv, double
return S_OK;
}
-static HRESULT DateConstr_UTC(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT DateConstr_UTC(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double n;
@@ -2336,7 +2337,7 @@ static HRESULT DateConstr_UTC(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
}
/* ECMA-262 5.1 Edition 15.9.4.4 */
-static HRESULT DateConstr_now(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT DateConstr_now(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
TRACE("\n");
@@ -2344,7 +2345,7 @@ static HRESULT DateConstr_now(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
return S_OK;
}
-static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT DateConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DateInstance *date;
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index f8c3b55..e140010 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -550,7 +550,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t
switch(prop->type) {
case PROP_BUILTIN: {
- vdisp_t vthis;
+ jsval_t vthis;
if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) {
WARN("%s is not a constructor\n", debugstr_w(prop->name));
@@ -560,13 +560,10 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t
if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval)
flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK;
if(jsthis)
- set_disp(&vthis, jsthis);
+ vthis = jsval_disp(jsthis);
else
- set_jsdisp(&vthis, This);
- hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r);
- vdisp_release(&vthis);
-
- return hres;
+ vthis = jsval_obj(This);
+ return prop->u.p->invoke(This->ctx, vthis, flags, argc, argv, r);
}
case PROP_PROTREF:
return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface,
@@ -1979,17 +1976,13 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig
if(is_class(jsfunc, JSCLASS_FUNCTION)) {
hres = Function_invoke(jsfunc, jsthis, flags, argc, argv, r);
}else {
- vdisp_t vdisp;
-
if(!jsfunc->builtin_info->call) {
WARN("Not a function\n");
return JS_E_FUNCTION_EXPECTED;
}
- set_disp(&vdisp, jsthis);
flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK;
- hres = jsfunc->builtin_info->call(jsfunc->ctx, &vdisp, flags, argc, argv, r);
- vdisp_release(&vdisp);
+ hres = jsfunc->builtin_info->call(jsfunc->ctx, jsval_disp(jsthis), flags, argc, argv, r);
}
return hres;
}
diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c
index 038b474..0fc6750 100644
--- a/dlls/jscript/enumerator.c
+++ b/dlls/jscript/enumerator.c
@@ -38,14 +38,10 @@ static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp)
return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex);
}
-static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp)
+static inline EnumeratorInstance *enumerator_this(jsval_t vthis)
{
- return enumerator_from_jsdisp(vdisp->u.jsdisp);
-}
-
-static inline EnumeratorInstance *enumerator_this(vdisp_t *jsthis)
-{
- return is_vclass(jsthis, JSCLASS_ENUMERATOR) ? enumerator_from_vdisp(jsthis) : NULL;
+ jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL;
+ return (jsdisp && is_class(jsdisp, JSCLASS_ENUMERATOR)) ? enumerator_from_jsdisp(jsdisp) : NULL;
}
static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This)
@@ -92,12 +88,12 @@ static void Enumerator_destructor(jsdisp_t *dispex)
heap_free(dispex);
}
-static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Enumerator_atEnd(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
EnumeratorInstance *This;
- if (!(This = enumerator_this(jsthis)))
+ if (!(This = enumerator_this(vthis)))
return JS_E_ENUMERATOR_EXPECTED;
TRACE("%d\n", This->atend);
@@ -107,20 +103,20 @@ static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
return S_OK;
}
-static HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Enumerator_item(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
EnumeratorInstance *This;
TRACE("\n");
- if (!(This = enumerator_this(jsthis)))
+ if (!(This = enumerator_this(vthis)))
return JS_E_ENUMERATOR_EXPECTED;
return r ? jsval_copy(This->item, r) : S_OK;
}
-static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
EnumeratorInstance *This;
@@ -128,7 +124,7 @@ static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
TRACE("\n");
- if (!(This = enumerator_this(jsthis)))
+ if (!(This = enumerator_this(vthis)))
return JS_E_ENUMERATOR_EXPECTED;
if (This->enumvar)
@@ -148,7 +144,7 @@ static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
return S_OK;
}
-static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Enumerator_moveNext(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
EnumeratorInstance *This;
@@ -156,7 +152,7 @@ static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag
TRACE("\n");
- if (!(This = enumerator_this(jsthis)))
+ if (!(This = enumerator_this(vthis)))
return JS_E_ENUMERATOR_EXPECTED;
if (This->enumvar)
@@ -287,7 +283,7 @@ static HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **re
return S_OK;
}
-static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *obj;
diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c
index 26f41fd..6f17699 100644
--- a/dlls/jscript/error.c
+++ b/dlls/jscript/error.c
@@ -29,17 +29,21 @@
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
/* ECMA-262 3rd Edition 15.11.4.4 */
-static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
+static HRESULT Error_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
- jsdisp_t *jsthis;
jsstr_t *name = NULL, *msg = NULL, *ret = NULL;
+ jsdisp_t *jsthis = NULL;
jsval_t v;
HRESULT hres;
TRACE("\n");
- jsthis = get_jsdisp(vthis);
+ if(is_object_instance(vthis))
+ jsthis = to_jsdisp(get_object(vthis));
+ else if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5)
+ return JS_E_OBJECT_EXPECTED;
+
if(!jsthis || ctx->version < 2) {
if(r) {
jsstr_t *str;
@@ -114,7 +118,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
return S_OK;
}
-static HRESULT Error_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT Error_value(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
TRACE("\n");
@@ -260,56 +264,56 @@ static HRESULT error_constr(script_ctx_t *ctx, WORD flags, unsigned argc, jsval_
}
}
-static HRESULT ErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT ErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
TRACE("\n");
return error_constr(ctx, flags, argc, argv, r, ctx->error_constr);
}
-static HRESULT EvalErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT EvalErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
TRACE("\n");
return error_constr(ctx, flags, argc, argv, r, ctx->eval_error_constr);
}
-static HRESULT RangeErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT RangeErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
TRACE("\n");
return error_constr(ctx, flags, argc, argv, r, ctx->range_error_constr);
}
-static HRESULT ReferenceErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT ReferenceErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
TRACE("\n");
return error_constr(ctx, flags, argc, argv, r, ctx->reference_error_constr);
}
-static HRESULT RegExpErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT RegExpErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
TRACE("\n");
return error_constr(ctx, flags, argc, argv, r, ctx->regexp_error_constr);
}
-static HRESULT SyntaxErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT SyntaxErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
TRACE("\n");
return error_constr(ctx, flags, argc, argv, r, ctx->syntax_error_constr);
}
-static HRESULT TypeErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT TypeErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
TRACE("\n");
return error_constr(ctx, flags, argc, argv, r, ctx->type_error_constr);
}
-static HRESULT URIErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT URIErrorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
TRACE("\n");
diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c
index f24d539..fd1380d 100644
--- a/dlls/jscript/function.c
+++ b/dlls/jscript/function.c
@@ -77,14 +77,10 @@ static inline FunctionInstance *function_from_jsdisp(jsdisp_t *jsdisp)
return CONTAINING_RECORD(jsdisp, FunctionInstance, dispex);
}
-static inline FunctionInstance *function_from_vdisp(vdisp_t *vdisp)
+static inline FunctionInstance *function_this(jsval_t vthis)
{
- return function_from_jsdisp(vdisp->u.jsdisp);
-}
-
-static inline FunctionInstance *function_this(vdisp_t *jsthis)
-{
- return is_vclass(jsthis, JSCLASS_FUNCTION) ? function_from_vdisp(jsthis) : NULL;
+ jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL;
+ return (jsdisp && is_class(jsdisp, JSCLASS_FUNCTION)) ? function_from_jsdisp(jsdisp) : NULL;
}
static inline ArgumentsInstance *arguments_from_jsdisp(jsdisp_t *jsdisp)
@@ -92,7 +88,7 @@ static inline ArgumentsInstance *arguments_from_jsdisp(jsdisp_t *jsdisp)
return CONTAINING_RECORD(jsdisp, ArgumentsInstance, jsdisp);
}
-static HRESULT Arguments_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Arguments_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FIXME("\n");
@@ -271,7 +267,7 @@ static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t
return S_OK;
}
-static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Function_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FunctionInstance *function;
@@ -280,7 +276,7 @@ static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
TRACE("\n");
- if(!(function = function_this(jsthis)))
+ if(!(function = function_this(vthis)))
return JS_E_FUNCTION_EXPECTED;
hres = function->vtbl->toString(function, &str);
@@ -330,7 +326,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, unsigned *a
return S_OK;
}
-static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Function_apply(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
FunctionInstance *function;
jsval_t *args = NULL;
@@ -340,7 +336,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
TRACE("\n");
- if(!(function = function_this(jsthis)) && (jsthis->flags & VDISP_JSDISP))
+ if(!is_object_instance(vthis) || (!(function = function_this(vthis)) && to_jsdisp(get_object(vthis))))
return JS_E_FUNCTION_EXPECTED;
if(argc) {
@@ -377,7 +373,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
hres = function->vtbl->call(ctx, function, this_obj, flags, cnt, args, r);
}else {
jsval_t res;
- hres = disp_call_value(ctx, jsthis->u.disp, this_obj, DISPATCH_METHOD, cnt, args, &res);
+ hres = disp_call_value(ctx, get_object(vthis), this_obj, DISPATCH_METHOD, cnt, args, &res);
if(SUCCEEDED(hres)) {
if(r)
*r = res;
@@ -395,7 +391,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
return hres;
}
-static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Function_call(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FunctionInstance *function;
@@ -405,7 +401,7 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
TRACE("\n");
- if(!(function = function_this(jsthis)))
+ if(!(function = function_this(vthis)))
return JS_E_FUNCTION_EXPECTED;
if(argc) {
@@ -425,7 +421,7 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
return hres;
}
-static HRESULT Function_bind(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Function_bind(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
IDispatch *bound_this = NULL;
@@ -435,7 +431,7 @@ static HRESULT Function_bind(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
TRACE("\n");
- if(!(function = function_this(jsthis)))
+ if(!(function = function_this(vthis)))
return JS_E_FUNCTION_EXPECTED;
if(argc < 1) {
@@ -461,19 +457,18 @@ static HRESULT Function_bind(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
return S_OK;
}
-HRESULT Function_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+HRESULT Function_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FunctionInstance *function;
TRACE("\n");
- if(!is_vclass(jsthis, JSCLASS_FUNCTION)) {
+ if(!(function = function_this(vthis))) {
ERR("dispex is not a function\n");
return E_FAIL;
}
- function = function_from_jsdisp(jsthis->u.jsdisp);
return function->vtbl->call(ctx, function, NULL, flags, argc, argv, r);
}
@@ -599,18 +594,14 @@ static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, ID
unsigned argc, jsval_t *argv, jsval_t *r)
{
NativeFunction *function = (NativeFunction*)func;
- vdisp_t vthis;
- HRESULT hres;
+ jsval_t vthis;
if(this_disp)
- set_disp(&vthis, this_disp);
+ vthis = jsval_disp(this_disp);
else
- set_disp(&vthis, lookup_global_host(ctx));
-
- hres = function->proc(ctx, &vthis, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r);
+ vthis = jsval_disp(lookup_global_host(ctx));
- vdisp_release(&vthis);
- return hres;
+ return function->proc(ctx, vthis, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r);
}
static HRESULT NativeFunction_toString(FunctionInstance *func, jsstr_t **ret)
@@ -984,7 +975,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg
return S_OK;
}
-static HRESULT FunctionConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT FunctionConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
HRESULT hres;
@@ -1011,7 +1002,7 @@ static HRESULT FunctionConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
return S_OK;
}
-static HRESULT FunctionProt_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT FunctionProt_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FIXME("\n");
diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c
index d425c88..b9e3d89 100644
--- a/dlls/jscript/global.c
+++ b/dlls/jscript/global.c
@@ -65,7 +65,7 @@ static WCHAR int_to_char(int i)
return 'A'+i-10;
}
-static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_escape(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsstr_t *ret_str, *str;
@@ -130,7 +130,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
}
/* ECMA-262 3rd Edition 15.1.2.1 */
-HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+HRESULT JSGlobal_eval(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
call_frame_t *frame = ctx->call_ctx;
@@ -174,7 +174,7 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a
return hres;
}
-static HRESULT JSGlobal_isNaN(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_isNaN(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
BOOL ret = TRUE;
@@ -197,7 +197,7 @@ static HRESULT JSGlobal_isNaN(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
return S_OK;
}
-static HRESULT JSGlobal_isFinite(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_isFinite(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
BOOL ret = FALSE;
@@ -231,7 +231,7 @@ static INT char_to_int(WCHAR c)
return 100;
}
-static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
BOOL neg = FALSE, empty = TRUE;
@@ -314,7 +314,7 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
return S_OK;
}
-static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
LONGLONG d = 0, hlp;
@@ -421,7 +421,7 @@ static inline int hex_to_int(const WCHAR wch) {
return -1;
}
-static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_unescape(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsstr_t *ret_str, *str;
@@ -491,14 +491,14 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
return S_OK;
}
-static HRESULT JSGlobal_GetObject(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_GetObject(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FIXME("\n");
return E_NOTIMPL;
}
-static HRESULT JSGlobal_ScriptEngine(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_ScriptEngine(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
@@ -516,7 +516,7 @@ static HRESULT JSGlobal_ScriptEngine(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
return S_OK;
}
-static HRESULT JSGlobal_ScriptEngineMajorVersion(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_ScriptEngineMajorVersion(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
@@ -526,7 +526,7 @@ static HRESULT JSGlobal_ScriptEngineMajorVersion(script_ctx_t *ctx, vdisp_t *jst
return S_OK;
}
-static HRESULT JSGlobal_ScriptEngineMinorVersion(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_ScriptEngineMinorVersion(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
@@ -536,7 +536,7 @@ static HRESULT JSGlobal_ScriptEngineMinorVersion(script_ctx_t *ctx, vdisp_t *jst
return S_OK;
}
-static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
@@ -546,7 +546,7 @@ static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, vdisp_t *jst
return S_OK;
}
-static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
static int once = 0;
@@ -555,7 +555,7 @@ static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, vdisp_t *jsthis, WORD
return S_OK;
}
-static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
const WCHAR *ptr, *uri;
@@ -620,7 +620,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
return S_OK;
}
-static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
const WCHAR *ptr, *uri;
@@ -706,7 +706,7 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
return S_OK;
}
-static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsstr_t *str, *ret_str;
@@ -770,7 +770,7 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W
}
/* ECMA-262 3rd Edition 15.1.3.2 */
-static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
const WCHAR *ptr, *uri;
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index 8ca2ea9..41b6c01 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -138,71 +138,7 @@ typedef enum {
jsdisp_t *iface_to_jsdisp(IDispatch*) DECLSPEC_HIDDEN;
-typedef struct {
- union {
- IDispatch *disp;
- IDispatchEx *dispex;
- jsdisp_t *jsdisp;
- } u;
- DWORD flags;
-} vdisp_t;
-
-#define VDISP_DISPEX 0x0001
-#define VDISP_JSDISP 0x0002
-
-static inline void vdisp_release(vdisp_t *vdisp)
-{
- IDispatch_Release(vdisp->u.disp);
-}
-
-static inline BOOL is_jsdisp(vdisp_t *vdisp)
-{
- return (vdisp->flags & VDISP_JSDISP) != 0;
-}
-
-static inline BOOL is_dispex(vdisp_t *vdisp)
-{
- return (vdisp->flags & VDISP_DISPEX) != 0;
-}
-
-static inline void set_jsdisp(vdisp_t *vdisp, jsdisp_t *jsdisp)
-{
- vdisp->u.jsdisp = jsdisp;
- vdisp->flags = VDISP_JSDISP | VDISP_DISPEX;
- IDispatch_AddRef(vdisp->u.disp);
-}
-
-static inline void set_disp(vdisp_t *vdisp, IDispatch *disp)
-{
- IDispatchEx *dispex;
- jsdisp_t *jsdisp;
- HRESULT hres;
-
- jsdisp = iface_to_jsdisp(disp);
- if(jsdisp) {
- vdisp->u.jsdisp = jsdisp;
- vdisp->flags = VDISP_JSDISP | VDISP_DISPEX;
- return;
- }
-
- hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex);
- if(SUCCEEDED(hres)) {
- vdisp->u.dispex = dispex;
- vdisp->flags = VDISP_DISPEX;
- return;
- }
-
- IDispatch_AddRef(disp);
- vdisp->u.disp = disp;
- vdisp->flags = 0;
-}
-
-static inline jsdisp_t *get_jsdisp(vdisp_t *vdisp)
-{
- return is_jsdisp(vdisp) ? vdisp->u.jsdisp : NULL;
-}
-
-typedef HRESULT (*builtin_invoke_t)(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*);
+typedef HRESULT (*builtin_invoke_t)(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*);
typedef HRESULT (*builtin_getter_t)(script_ctx_t*,jsdisp_t*,jsval_t*);
typedef HRESULT (*builtin_setter_t)(script_ctx_t*,jsdisp_t*,jsval_t);
@@ -337,7 +273,7 @@ HRESULT create_builtin_constructor(script_ctx_t*,builtin_invoke_t,const WCHAR*,c
jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN;
HRESULT Function_invoke(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN;
-HRESULT Function_value(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN;
+HRESULT Function_value(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN;
HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN;
struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN;
@@ -514,18 +450,13 @@ HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,jsstr_t*,jsval_t*) DECLSPEC_
BOOL bool_obj_value(jsdisp_t*) DECLSPEC_HIDDEN;
unsigned array_get_length(jsdisp_t*) DECLSPEC_HIDDEN;
-HRESULT JSGlobal_eval(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN;
+HRESULT JSGlobal_eval(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN;
static inline BOOL is_class(jsdisp_t *jsdisp, jsclass_t class)
{
return jsdisp->builtin_info->class == class;
}
-static inline BOOL is_vclass(vdisp_t *vdisp, jsclass_t class)
-{
- return is_jsdisp(vdisp) && is_class(vdisp->u.jsdisp, class);
-}
-
static inline BOOL is_int32(double d)
{
return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d;
diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c
index d3896ca..e0867eb 100644
--- a/dlls/jscript/json.c
+++ b/dlls/jscript/json.c
@@ -268,7 +268,7 @@ static HRESULT parse_json_value(json_parse_ctx_t *ctx, jsval_t *r)
}
/* ECMA-262 5.1 Edition 15.12.2 */
-static HRESULT JSON_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT JSON_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
json_parse_ctx_t parse_ctx;
const WCHAR *buf;
@@ -749,7 +749,7 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *na
}
/* ECMA-262 5.1 Edition 15.12.3 */
-static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT JSON_stringify(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
stringify_ctx_t stringify_ctx = { ctx };
jsdisp_t *obj = NULL, *replacer;
diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c
index 90663d3..15ebb11 100644
--- a/dlls/jscript/jsregexp.c
+++ b/dlls/jscript/jsregexp.c
@@ -39,9 +39,10 @@ static inline RegExpInstance *regexp_from_jsdisp(jsdisp_t *jsdisp)
return CONTAINING_RECORD(jsdisp, RegExpInstance, dispex);
}
-static inline RegExpInstance *regexp_from_vdisp(vdisp_t *vdisp)
+static inline RegExpInstance *regexp_this(jsval_t vthis)
{
- return regexp_from_jsdisp(vdisp->u.jsdisp);
+ jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL;
+ return (jsdisp && is_class(jsdisp, JSCLASS_REGEXP)) ? regexp_from_jsdisp(jsdisp) : NULL;
}
static void set_last_index(RegExpInstance *This, DWORD last_index)
@@ -294,7 +295,7 @@ static HRESULT RegExp_set_lastIndex(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t
return S_OK;
}
-static HRESULT RegExp_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT RegExp_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
RegExpInstance *regexp;
@@ -304,12 +305,11 @@ static HRESULT RegExp_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
TRACE("\n");
- if(!is_vclass(jsthis, JSCLASS_REGEXP)) {
+ if(!(regexp = regexp_this(vthis))) {
WARN("Not a RegExp\n");
return JS_E_REGEXP_EXPECTED;
}
- regexp = regexp_from_vdisp(jsthis);
if(!r)
return S_OK;
@@ -408,7 +408,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input_str,
return S_OK;
}
-static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg,
+static HRESULT run_exec(script_ctx_t *ctx, jsval_t vthis, jsval_t arg,
jsstr_t **input, match_state_t **result, BOOL *ret)
{
RegExpInstance *regexp;
@@ -418,13 +418,11 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg,
jsstr_t *jsstr;
HRESULT hres;
- if(!is_vclass(jsthis, JSCLASS_REGEXP)) {
- FIXME("Not a RegExp\n");
- return E_NOTIMPL;
+ if(!(regexp = regexp_this(vthis))) {
+ WARN("Not a RegExp\n");
+ return JS_E_REGEXP_EXPECTED;
}
- regexp = regexp_from_vdisp(jsthis);
-
hres = to_flat_string(ctx, arg, &jsstr, &string);
if(FAILED(hres))
return hres;
@@ -463,7 +461,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg,
return S_OK;
}
-static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT RegExp_exec(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
match_state_t *match;
@@ -476,7 +474,7 @@ static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
mark = heap_pool_mark(&ctx->tmp_heap);
- hres = run_exec(ctx, jsthis, argc ? argv[0] : jsval_string(jsstr_empty()), &string, &match, &b);
+ hres = run_exec(ctx, vthis, argc ? argv[0] : jsval_string(jsstr_empty()), &string, &match, &b);
if(FAILED(hres)) {
heap_pool_clear(mark);
return hres;
@@ -499,7 +497,7 @@ static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
return hres;
}
-static HRESULT RegExp_test(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT RegExp_test(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
match_state_t *match;
@@ -511,7 +509,7 @@ static HRESULT RegExp_test(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
TRACE("\n");
mark = heap_pool_mark(&ctx->tmp_heap);
- hres = run_exec(ctx, jsthis, argc ? argv[0] : jsval_string(undef_str = jsstr_undefined()), NULL, &match, &b);
+ hres = run_exec(ctx, vthis, argc ? argv[0] : jsval_string(undef_str = jsstr_undefined()), NULL, &match, &b);
heap_pool_clear(mark);
if(!argc)
jsstr_release(undef_str);
@@ -523,7 +521,7 @@ static HRESULT RegExp_test(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
return S_OK;
}
-static HRESULT RegExp_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT RegExp_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
@@ -886,7 +884,7 @@ static HRESULT RegExpConstr_get_rightContext(script_ctx_t *ctx, jsdisp_t *jsthis
return S_OK;
}
-static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT RegExpConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c
index c65bbaf..46dd58c 100644
--- a/dlls/jscript/math.c
+++ b/dlls/jscript/math.c
@@ -29,7 +29,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
/* ECMA-262 3rd Edition 15.8.2.12 */
-static HRESULT Math_abs(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_abs(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double d;
@@ -52,7 +52,7 @@ static HRESULT Math_abs(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
return S_OK;
}
-static HRESULT Math_acos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_acos(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
@@ -75,7 +75,7 @@ static HRESULT Math_acos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne
return S_OK;
}
-static HRESULT Math_asin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_asin(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
@@ -98,7 +98,7 @@ static HRESULT Math_asin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne
return S_OK;
}
-static HRESULT Math_atan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_atan(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
@@ -121,7 +121,7 @@ static HRESULT Math_atan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne
return S_OK;
}
-static HRESULT Math_atan2(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_atan2(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x, y;
@@ -149,7 +149,7 @@ static HRESULT Math_atan2(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign
}
/* ECMA-262 3rd Edition 15.8.2.6 */
-static HRESULT Math_ceil(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_ceil(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
@@ -172,7 +172,7 @@ static HRESULT Math_ceil(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne
return S_OK;
}
-static HRESULT Math_cos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_cos(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
@@ -195,7 +195,7 @@ static HRESULT Math_cos(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
return S_OK;
}
-static HRESULT Math_exp(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_exp(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
@@ -218,7 +218,7 @@ static HRESULT Math_exp(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
return S_OK;
}
-static HRESULT Math_floor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_floor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
@@ -241,7 +241,7 @@ static HRESULT Math_floor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign
return S_OK;
}
-static HRESULT Math_log(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_log(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
@@ -265,7 +265,7 @@ static HRESULT Math_log(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
}
/* ECMA-262 3rd Edition 15.8.2.11 */
-static HRESULT Math_max(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_max(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DOUBLE max, d;
@@ -299,7 +299,7 @@ static HRESULT Math_max(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
}
/* ECMA-262 3rd Edition 15.8.2.12 */
-static HRESULT Math_min(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_min(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
DOUBLE min, d;
@@ -333,7 +333,7 @@ static HRESULT Math_min(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
}
/* ECMA-262 3rd Edition 15.8.2.13 */
-static HRESULT Math_pow(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_pow(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x, y;
@@ -361,7 +361,7 @@ static HRESULT Math_pow(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
}
/* ECMA-262 3rd Edition 15.8.2.14 */
-static HRESULT Math_random(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_random(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
UINT x;
@@ -377,7 +377,7 @@ static HRESULT Math_random(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
}
/* ECMA-262 3rd Edition 15.8.2.15 */
-static HRESULT Math_round(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_round(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
@@ -400,7 +400,7 @@ static HRESULT Math_round(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign
return S_OK;
}
-static HRESULT Math_sin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_sin(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
@@ -423,7 +423,7 @@ static HRESULT Math_sin(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
return S_OK;
}
-static HRESULT Math_sqrt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_sqrt(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
@@ -446,7 +446,7 @@ static HRESULT Math_sqrt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne
return S_OK;
}
-static HRESULT Math_tan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Math_tan(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double x;
diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c
index 410f27b..472acd0 100644
--- a/dlls/jscript/number.c
+++ b/dlls/jscript/number.c
@@ -39,14 +39,16 @@ static inline NumberInstance *number_from_jsdisp(jsdisp_t *jsdisp)
return CONTAINING_RECORD(jsdisp, NumberInstance, dispex);
}
-static inline NumberInstance *number_from_vdisp(vdisp_t *vdisp)
+static inline HRESULT numberval_this(jsval_t vthis, DOUBLE *ret)
{
- return number_from_jsdisp(vdisp->u.jsdisp);
-}
-
-static inline NumberInstance *number_this(vdisp_t *jsthis)
-{
- return is_vclass(jsthis, JSCLASS_NUMBER) ? number_from_vdisp(jsthis) : NULL;
+ jsdisp_t *jsdisp;
+ if(is_number(vthis))
+ *ret = get_number(vthis);
+ else if(is_object_instance(vthis) && (jsdisp = to_jsdisp(get_object(vthis))) && is_class(jsdisp, JSCLASS_NUMBER))
+ *ret = number_from_jsdisp(jsdisp)->value;
+ else
+ return JS_E_NUMBER_EXPECTED;
+ return S_OK;
}
static inline void number_to_str(double d, WCHAR *buf, int size, int *dec_point)
@@ -222,10 +224,9 @@ static inline jsstr_t *number_to_exponential(double val, int prec)
}
/* ECMA-262 3rd Edition 15.7.4.2 */
-static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Number_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- NumberInstance *number;
INT radix = 10;
DOUBLE val;
jsstr_t *str;
@@ -233,8 +234,9 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
TRACE("\n");
- if(!(number = number_this(jsthis)))
- return JS_E_NUMBER_EXPECTED;
+ hres = numberval_this(vthis, &val);
+ if(FAILED(hres))
+ return hres;
if(argc) {
hres = to_int32(ctx, argv[0], &radix);
@@ -245,8 +247,6 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
return JS_E_INVALIDARG;
}
- val = number->value;
-
if(radix==10 || !isfinite(val)) {
hres = to_string(ctx, jsval_number(val), &str);
if(FAILED(hres))
@@ -341,17 +341,16 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
return S_OK;
}
-static HRESULT Number_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Number_toLocaleString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FIXME("\n");
return E_NOTIMPL;
}
-static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Number_toFixed(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- NumberInstance *number;
DOUBLE val;
INT prec = 0;
jsstr_t *str;
@@ -359,8 +358,9 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
TRACE("\n");
- if(!(number = number_this(jsthis)))
- return JS_E_NUMBER_EXPECTED;
+ hres = numberval_this(vthis, &val);
+ if(FAILED(hres))
+ return hres;
if(argc) {
hres = to_int32(ctx, argv[0], &prec);
@@ -371,7 +371,6 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
return JS_E_FRACTION_DIGITS_OUT_OF_RANGE;
}
- val = number->value;
if(!isfinite(val)) {
hres = to_string(ctx, jsval_number(val), &str);
if(FAILED(hres))
@@ -389,10 +388,9 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
return S_OK;
}
-static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Number_toExponential(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- NumberInstance *number;
DOUBLE val;
INT prec = 0;
jsstr_t *str;
@@ -400,8 +398,9 @@ static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
TRACE("\n");
- if(!(number = number_this(jsthis)))
- return JS_E_NUMBER_EXPECTED;
+ hres = numberval_this(vthis, &val);
+ if(FAILED(hres))
+ return hres;
if(argc) {
hres = to_int32(ctx, argv[0], &prec);
@@ -412,7 +411,6 @@ static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
return JS_E_FRACTION_DIGITS_OUT_OF_RANGE;
}
- val = number->value;
if(!isfinite(val)) {
hres = to_string(ctx, jsval_number(val), &str);
if(FAILED(hres))
@@ -432,17 +430,17 @@ static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
return S_OK;
}
-static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Number_toPrecision(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- NumberInstance *number;
INT prec = 0, size;
jsstr_t *str;
DOUBLE val;
HRESULT hres;
- if(!(number = number_this(jsthis)))
- return JS_E_NUMBER_EXPECTED;
+ hres = numberval_this(vthis, &val);
+ if(FAILED(hres))
+ return hres;
if(argc) {
hres = to_int32(ctx, argv[0], &prec);
@@ -453,7 +451,6 @@ static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
return JS_E_PRECISION_OUT_OF_RANGE;
}
- val = number->value;
if(!isfinite(val) || !prec) {
hres = to_string(ctx, jsval_number(val), &str);
if(FAILED(hres))
@@ -479,18 +476,20 @@ static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
return S_OK;
}
-static HRESULT Number_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Number_valueOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- NumberInstance *number;
+ HRESULT hres;
+ DOUBLE val;
TRACE("\n");
- if(!(number = number_this(jsthis)))
- return JS_E_NUMBER_EXPECTED;
+ hres = numberval_this(vthis, &val);
+ if(FAILED(hres))
+ return hres;
if(r)
- *r = jsval_number(number->value);
+ *r = jsval_number(val);
return S_OK;
}
@@ -520,7 +519,7 @@ static const builtin_info_t NumberInst_info = {
NULL
};
-static HRESULT NumberConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT NumberConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
double n;
diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c
index 24692f8..3b5a1f8 100644
--- a/dlls/jscript/object.c
+++ b/dlls/jscript/object.c
@@ -24,11 +24,13 @@
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *jsdisp;
const WCHAR *str;
+ IDispatch *disp;
+ HRESULT hres;
/* Keep in sync with jsclass_t enum */
static const WCHAR *names[] = {
@@ -54,7 +56,16 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
TRACE("\n");
- jsdisp = get_jsdisp(jsthis);
+ if(is_undefined(vthis) || is_null(vthis)) {
+ str = L"[object Object]";
+ goto set_output;
+ }
+
+ hres = to_object(ctx, vthis, &disp);
+ if(FAILED(hres))
+ return hres;
+
+ jsdisp = to_jsdisp(disp);
if(!jsdisp) {
str = L"[object Object]";
}else if(names[jsdisp->builtin_info->class]) {
@@ -62,9 +73,13 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
}else {
assert(jsdisp->builtin_info->class != JSCLASS_NONE);
FIXME("jsdisp->builtin_info->class = %d\n", jsdisp->builtin_info->class);
- return E_FAIL;
+ hres = E_FAIL;
}
+ IDispatch_Release(disp);
+ if(FAILED(hres))
+ return hres;
+set_output:
if(r) {
jsstr_t *ret;
ret = jsstr_alloc(str);
@@ -76,34 +91,56 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
return S_OK;
}
-static HRESULT Object_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Object_toLocaleString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
+ jsdisp_t *jsdisp;
+ IDispatch *disp;
+ HRESULT hres;
+
TRACE("\n");
- if(!is_jsdisp(jsthis)) {
+ hres = to_object(ctx, vthis, &disp);
+ if(FAILED(hres))
+ return hres;
+
+ if(!(jsdisp = to_jsdisp(disp))) {
FIXME("Host object this\n");
- return E_FAIL;
+ hres = E_FAIL;
+ goto done;
}
- return jsdisp_call_name(jsthis->u.jsdisp, L"toString", DISPATCH_METHOD, 0, NULL, r);
+ hres = jsdisp_call_name(jsdisp, L"toString", DISPATCH_METHOD, 0, NULL, r);
+done:
+ IDispatch_Release(disp);
+ return hres;
}
-static HRESULT Object_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Object_valueOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
+ IDispatch *disp;
+ HRESULT hres;
+
TRACE("\n");
- if(r) {
- IDispatch_AddRef(jsthis->u.disp);
- *r = jsval_disp(jsthis->u.disp);
- }
+ hres = to_object(ctx, vthis, &disp);
+ if(FAILED(hres))
+ return hres;
+
+ if(r)
+ *r = jsval_disp(disp);
+ else
+ IDispatch_Release(disp);
return S_OK;
}
-static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
+ IDispatchEx *dispex;
+ jsdisp_t *jsdisp;
+ IDispatch *disp;
jsstr_t *name;
DISPID id;
BSTR bstr;
@@ -111,33 +148,39 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
TRACE("\n");
+ hres = to_object(ctx, vthis, &disp);
+ if(FAILED(hres))
+ return hres;
+
if(!argc) {
if(r)
*r = jsval_bool(FALSE);
- return S_OK;
+ goto done;
}
hres = to_string(ctx, argv[0], &name);
if(FAILED(hres))
- return hres;
+ goto done;
- if(is_jsdisp(jsthis)) {
+ if((jsdisp = to_jsdisp(disp))) {
property_desc_t prop_desc;
const WCHAR *name_str;
name_str = jsstr_flatten(name);
if(!name_str) {
jsstr_release(name);
- return E_OUTOFMEMORY;
+ hres = E_OUTOFMEMORY;
+ goto done;
}
- hres = jsdisp_get_own_property(jsthis->u.jsdisp, name_str, TRUE, &prop_desc);
+ hres = jsdisp_get_own_property(jsdisp, name_str, TRUE, &prop_desc);
jsstr_release(name);
if(FAILED(hres) && hres != DISP_E_UNKNOWNNAME)
- return hres;
+ goto done;
if(r) *r = jsval_bool(hres == S_OK);
- return S_OK;
+ hres = S_OK;
+ goto done;
}
@@ -145,66 +188,91 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
if(bstr)
jsstr_flush(name, bstr);
jsstr_release(name);
- if(!bstr)
- return E_OUTOFMEMORY;
-
- if(is_dispex(jsthis))
- hres = IDispatchEx_GetDispID(jsthis->u.dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive), &id);
- else
- hres = IDispatch_GetIDsOfNames(jsthis->u.disp, &IID_NULL, &bstr, 1, ctx->lcid, &id);
+ if(!bstr) {
+ hres = E_OUTOFMEMORY;
+ goto done;
+ }
+ hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex);
+ if(SUCCEEDED(hres)) {
+ hres = IDispatchEx_GetDispID(dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive), &id);
+ IDispatchEx_Release(dispex);
+ }else {
+ hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &bstr, 1, ctx->lcid, &id);
+ }
SysFreeString(bstr);
if(r)
*r = jsval_bool(SUCCEEDED(hres));
- return S_OK;
+ hres = S_OK;
+done:
+ IDispatch_Release(disp);
+ return hres;
}
-static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
property_desc_t prop_desc;
const WCHAR *name;
jsstr_t *name_str;
+ jsdisp_t *jsdisp;
+ IDispatch *disp;
HRESULT hres;
TRACE("\n");
+ hres = to_object(ctx, vthis, &disp);
+ if(FAILED(hres))
+ return hres;
+
if(argc != 1) {
FIXME("argc %d not supported\n", argc);
- return E_NOTIMPL;
+ hres = E_NOTIMPL;
+ goto done;
}
- if(!is_jsdisp(jsthis)) {
+ if(!(jsdisp = to_jsdisp(disp))) {
FIXME("Host object this\n");
- return E_FAIL;
+ hres = E_FAIL;
+ goto done;
}
hres = to_flat_string(ctx, argv[0], &name_str, &name);
if(FAILED(hres))
- return hres;
+ goto done;
- hres = jsdisp_get_own_property(jsthis->u.jsdisp, name, TRUE, &prop_desc);
+ hres = jsdisp_get_own_property(jsdisp, name, TRUE, &prop_desc);
jsstr_release(name_str);
if(FAILED(hres) && hres != DISP_E_UNKNOWNNAME)
- return hres;
+ goto done;
if(r)
*r = jsval_bool(hres == S_OK && (prop_desc.flags & PROPF_ENUMERABLE) != 0);
- return S_OK;
+ hres = S_OK;
+done:
+ IDispatch_Release(disp);
+ return hres;
}
-static HRESULT Object_isPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Object_isPrototypeOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- jsdisp_t *jsdisp;
+ jsdisp_t *jsthis, *jsdisp;
+ IDispatch *disp;
BOOL ret = FALSE;
+ HRESULT hres;
+
+ hres = to_object(ctx, vthis, &disp);
+ if(FAILED(hres))
+ return hres;
if(!r)
- return S_OK;
+ goto done;
- if(argc && is_jsdisp(jsthis) && is_object_instance(argv[0]) && (jsdisp = to_jsdisp(get_object(argv[0])))) {
+ if(argc && (jsthis = to_jsdisp(disp)) && is_object_instance(argv[0]) &&
+ (jsdisp = to_jsdisp(get_object(argv[0])))) {
while(jsdisp->prototype) {
- if(jsdisp->prototype == jsthis->u.jsdisp) {
+ if(jsdisp->prototype == jsthis) {
ret = TRUE;
break;
}
@@ -213,7 +281,9 @@ static HRESULT Object_isPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
}
*r = jsval_bool(ret);
- return S_OK;
+done:
+ IDispatch_Release(disp);
+ return hres;
}
static HRESULT Object_get_proto_(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
@@ -466,7 +536,7 @@ static HRESULT jsdisp_define_properties(script_ctx_t *ctx, jsdisp_t *obj, jsval_
return FAILED(hres) ? hres : S_OK;
}
-static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT Object_defineProperty(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
property_desc_t prop_desc;
@@ -515,7 +585,7 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
return hres;
}
-static HRESULT Object_defineProperties(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT Object_defineProperties(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
jsdisp_t *obj;
@@ -534,7 +604,7 @@ static HRESULT Object_defineProperties(script_ctx_t *ctx, vdisp_t *jsthis, WORD
return hres;
}
-static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
property_desc_t prop_desc;
@@ -597,7 +667,7 @@ static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthi
return hres;
}
-static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT Object_create(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
jsdisp_t *proto = NULL, *obj;
@@ -636,7 +706,7 @@ static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
return hres;
}
-static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
jsdisp_t *obj;
@@ -704,7 +774,7 @@ static HRESULT object_keys(script_ctx_t *ctx, jsval_t arg, enum jsdisp_enum_type
return hres;
}
-static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT Object_keys(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
jsval_t arg = argc ? argv[0] : jsval_undefined();
@@ -714,7 +784,7 @@ static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
return object_keys(ctx, arg, JSDISP_ENUM_OWN_ENUMERABLE, r);
}
-static HRESULT Object_getOwnPropertyNames(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT Object_getOwnPropertyNames(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
jsval_t arg = argc ? argv[0] : jsval_undefined();
@@ -724,7 +794,7 @@ static HRESULT Object_getOwnPropertyNames(script_ctx_t *ctx, vdisp_t *jsthis, WO
return object_keys(ctx, arg, JSDISP_ENUM_OWN, r);
}
-static HRESULT Object_preventExtensions(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Object_preventExtensions(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
jsdisp_t *obj;
@@ -746,7 +816,7 @@ static HRESULT Object_preventExtensions(script_ctx_t *ctx, vdisp_t *jsthis, WORD
return S_OK;
}
-static HRESULT Object_freeze(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc,
+static HRESULT Object_freeze(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc,
jsval_t *argv, jsval_t *r)
{
jsdisp_t *obj;
@@ -769,7 +839,7 @@ static HRESULT Object_freeze(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
return S_OK;
}
-static HRESULT Object_seal(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc,
+static HRESULT Object_seal(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc,
jsval_t *argv, jsval_t *r)
{
jsdisp_t *obj;
@@ -792,7 +862,7 @@ static HRESULT Object_seal(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
return S_OK;
}
-static HRESULT Object_isExtensible(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
+static HRESULT Object_isExtensible(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
jsdisp_t *obj;
@@ -813,7 +883,7 @@ static HRESULT Object_isExtensible(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag
return S_OK;
}
-static HRESULT Object_isFrozen(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc,
+static HRESULT Object_isFrozen(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc,
jsval_t *argv, jsval_t *r)
{
jsdisp_t *obj;
@@ -835,7 +905,7 @@ static HRESULT Object_isFrozen(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
return S_OK;
}
-static HRESULT Object_isSealed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc,
+static HRESULT Object_isSealed(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc,
jsval_t *argv, jsval_t *r)
{
jsdisp_t *obj;
@@ -882,7 +952,7 @@ static const builtin_info_t ObjectConstr_info = {
NULL
};
-static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT ObjectConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
HRESULT hres;
diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c
index 5ae41d8..35edcf8 100644
--- a/dlls/jscript/set.c
+++ b/dlls/jscript/set.c
@@ -37,42 +37,42 @@ typedef struct {
size_t size;
} MapInstance;
-static HRESULT Set_add(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Set_add(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- FIXME("%p\n", jsthis);
+ FIXME("%p\n", debugstr_jsval(vthis));
return E_NOTIMPL;
}
-static HRESULT Set_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- FIXME("%p\n", jsthis);
+ FIXME("%p\n", debugstr_jsval(vthis));
return E_NOTIMPL;
}
-static HRESULT Set_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Set_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- FIXME("%p\n", jsthis);
+ FIXME("%p\n", debugstr_jsval(vthis));
return E_NOTIMPL;
}
-static HRESULT Set_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Set_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- FIXME("%p\n", jsthis);
+ FIXME("%p\n", debugstr_jsval(vthis));
return E_NOTIMPL;
}
-static HRESULT Set_has(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Set_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- FIXME("%p\n", jsthis);
+ FIXME("%p\n", debugstr_jsval(vthis));
return E_NOTIMPL;
}
-static HRESULT Set_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Set_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FIXME("\n");
@@ -104,7 +104,7 @@ static const builtin_info_t Set_info = {
NULL
};
-static HRESULT Set_constructor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
SetInstance *set;
@@ -176,14 +176,19 @@ static int jsval_map_compare(const void *k, const struct wine_rb_entry *e)
}
}
-static MapInstance *get_map_this(vdisp_t *jsthis)
+static HRESULT get_map_this(jsval_t vthis, MapInstance **ret)
{
- if(!(jsthis->flags & VDISP_JSDISP) || !is_class(jsthis->u.jsdisp, JSCLASS_MAP)) {
+ jsdisp_t *jsdisp;
+
+ if(!is_object_instance(vthis))
+ return JS_E_OBJECT_EXPECTED;
+ if(!(jsdisp = to_jsdisp(get_object(vthis))) || !is_class(jsdisp, JSCLASS_MAP)) {
WARN("not a Map object passed as 'this'\n");
- return NULL;
+ return JS_E_MAP_EXPECTED;
}
- return CONTAINING_RECORD(jsthis->u.jsdisp, MapInstance, dispex);
+ *ret = CONTAINING_RECORD(jsdisp, MapInstance, dispex);
+ return S_OK;
}
static struct jsval_map_entry *get_map_entry(MapInstance *map, jsval_t key)
@@ -215,12 +220,15 @@ static void delete_map_entry(MapInstance *map, struct jsval_map_entry *entry)
release_map_entry(entry);
}
-static HRESULT Map_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
MapInstance *map;
+ HRESULT hres;
- if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED;
+ hres = get_map_this(vthis, &map);
+ if(FAILED(hres))
+ return hres;
TRACE("%p\n", map);
@@ -233,14 +241,17 @@ static HRESULT Map_clear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne
return S_OK;
}
-static HRESULT Map_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Map_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsval_t key = argc >= 1 ? argv[0] : jsval_undefined();
struct jsval_map_entry *entry;
MapInstance *map;
+ HRESULT hres;
- if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED;
+ hres = get_map_this(vthis, &map);
+ if(FAILED(hres))
+ return hres;
TRACE("%p (%s)\n", map, debugstr_jsval(key));
@@ -249,7 +260,7 @@ static HRESULT Map_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign
return S_OK;
}
-static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Map_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsval_t callback = argc ? argv[0] : jsval_undefined();
@@ -257,7 +268,9 @@ static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
MapInstance *map;
HRESULT hres;
- if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED;
+ hres = get_map_this(vthis, &map);
+ if(FAILED(hres))
+ return hres;
TRACE("%p (%s)\n", map, debugstr_jsval(argc >= 1 ? argv[0] : jsval_undefined()));
@@ -290,14 +303,17 @@ static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
return S_OK;
}
-static HRESULT Map_get(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Map_get(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsval_t key = argc >= 1 ? argv[0] : jsval_undefined();
struct jsval_map_entry *entry;
MapInstance *map;
+ HRESULT hres;
- if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED;
+ hres = get_map_this(vthis, &map);
+ if(FAILED(hres))
+ return hres;
TRACE("%p (%s)\n", map, debugstr_jsval(key));
@@ -309,7 +325,7 @@ static HRESULT Map_get(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
return r ? jsval_copy(entry->value, r) : S_OK;
}
-static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Map_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsval_t key = argc >= 1 ? argv[0] : jsval_undefined();
@@ -318,7 +334,9 @@ static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
MapInstance *map;
HRESULT hres;
- if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED;
+ hres = get_map_this(vthis, &map);
+ if(FAILED(hres))
+ return hres;
TRACE("%p (%s %s)\n", map, debugstr_jsval(key), debugstr_jsval(value));
@@ -353,14 +371,17 @@ static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
return S_OK;
}
-static HRESULT Map_has(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Map_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsval_t key = argc >= 1 ? argv[0] : jsval_undefined();
struct jsval_map_entry *entry;
MapInstance *map;
+ HRESULT hres;
- if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED;
+ hres = get_map_this(vthis, &map);
+ if(FAILED(hres))
+ return hres;
TRACE("%p (%s)\n", map, debugstr_jsval(key));
@@ -379,7 +400,7 @@ static HRESULT Map_get_size(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
return S_OK;
}
-static HRESULT Map_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Map_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FIXME("\n");
@@ -430,7 +451,7 @@ static const builtin_info_t Map_info = {
NULL
};
-static HRESULT Map_constructor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT Map_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
MapInstance *map;
diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index 4d65d6b..0b2e695 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -36,33 +36,32 @@ static inline StringInstance *string_from_jsdisp(jsdisp_t *jsdisp)
return CONTAINING_RECORD(jsdisp, StringInstance, dispex);
}
-static inline StringInstance *string_from_vdisp(vdisp_t *vdisp)
+static inline StringInstance *string_this(jsval_t vthis)
{
- return string_from_jsdisp(vdisp->u.jsdisp);
+ jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL;
+ return (jsdisp && is_class(jsdisp, JSCLASS_STRING)) ? string_from_jsdisp(jsdisp) : NULL;
}
-static inline StringInstance *string_this(vdisp_t *jsthis)
-{
- return is_vclass(jsthis, JSCLASS_STRING) ? string_from_vdisp(jsthis) : NULL;
-}
-
-static HRESULT get_string_val(script_ctx_t *ctx, vdisp_t *jsthis, jsstr_t **val)
+static HRESULT get_string_val(script_ctx_t *ctx, jsval_t vthis, jsstr_t **val)
{
StringInstance *string;
- if((string = string_this(jsthis))) {
+ if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && (is_undefined(vthis) || is_null(vthis)))
+ return JS_E_OBJECT_EXPECTED;
+
+ if((string = string_this(vthis))) {
*val = jsstr_addref(string->str);
return S_OK;
}
- return to_string(ctx, jsval_disp(jsthis->u.disp), val);
+ return to_string(ctx, vthis, val);
}
-static HRESULT get_string_flat_val(script_ctx_t *ctx, vdisp_t *jsthis, jsstr_t **jsval, const WCHAR **val)
+static HRESULT get_string_flat_val(script_ctx_t *ctx, jsval_t vthis, jsstr_t **jsval, const WCHAR **val)
{
HRESULT hres;
- hres = get_string_val(ctx, jsthis, jsval);
+ hres = get_string_val(ctx, vthis, jsval);
if(FAILED(hres))
return hres;
@@ -84,11 +83,11 @@ static HRESULT String_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r
return S_OK;
}
-static HRESULT stringobj_to_string(vdisp_t *jsthis, jsval_t *r)
+static HRESULT stringobj_to_string(jsval_t vthis, jsval_t *r)
{
StringInstance *string;
- if(!(string = string_this(jsthis))) {
+ if(!(string = string_this(vthis))) {
WARN("this is not a string object\n");
return E_FAIL;
}
@@ -99,31 +98,31 @@ static HRESULT stringobj_to_string(vdisp_t *jsthis, jsval_t *r)
}
/* ECMA-262 3rd Edition 15.5.4.2 */
-static HRESULT String_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
- return stringobj_to_string(jsthis, r);
+ return stringobj_to_string(vthis, r);
}
/* ECMA-262 3rd Edition 15.5.4.2 */
-static HRESULT String_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_valueOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
- return stringobj_to_string(jsthis, r);
+ return stringobj_to_string(vthis, r);
}
-static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r, const WCHAR *tagname)
+static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, jsval_t vthis, jsval_t *r, const WCHAR *tagname)
{
unsigned tagname_len;
jsstr_t *str, *ret;
WCHAR *ptr;
HRESULT hres;
- hres = get_string_val(ctx, jsthis, &str);
+ hres = get_string_val(ctx, vthis, &str);
if(FAILED(hres))
return hres;
@@ -158,13 +157,13 @@ static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, j
return S_OK;
}
-static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsigned argc, jsval_t *argv, jsval_t *r,
+static HRESULT do_attribute_tag_format(script_ctx_t *ctx, jsval_t vthis, unsigned argc, jsval_t *argv, jsval_t *r,
const WCHAR *tagname, const WCHAR *attrname)
{
jsstr_t *str, *attr_value = NULL;
HRESULT hres;
- hres = get_string_val(ctx, jsthis, &str);
+ hres = get_string_val(ctx, vthis, &str);
if(FAILED(hres))
return hres;
@@ -216,32 +215,32 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig
return hres;
}
-static HRESULT String_anchor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_anchor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"A", L"NAME");
+ return do_attribute_tag_format(ctx, vthis, argc, argv, r, L"A", L"NAME");
}
-static HRESULT String_big(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_big(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attributeless_tag_format(ctx, jsthis, r, L"BIG");
+ return do_attributeless_tag_format(ctx, vthis, r, L"BIG");
}
-static HRESULT String_blink(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_blink(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attributeless_tag_format(ctx, jsthis, r, L"BLINK");
+ return do_attributeless_tag_format(ctx, vthis, r, L"BLINK");
}
-static HRESULT String_bold(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_bold(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attributeless_tag_format(ctx, jsthis, r, L"B");
+ return do_attributeless_tag_format(ctx, vthis, r, L"B");
}
/* ECMA-262 3rd Edition 15.5.4.5 */
-static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_charAt(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsstr_t *str, *ret;
@@ -250,7 +249,7 @@ static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
TRACE("\n");
- hres = get_string_val(ctx, jsthis, &str);
+ hres = get_string_val(ctx, vthis, &str);
if(FAILED(hres))
return hres;
@@ -283,7 +282,7 @@ static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
}
/* ECMA-262 3rd Edition 15.5.4.5 */
-static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_charCodeAt(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsstr_t *str;
@@ -292,7 +291,7 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
TRACE("\n");
- hres = get_string_val(ctx, jsthis, &str);
+ hres = get_string_val(ctx, vthis, &str);
if(FAILED(hres))
return hres;
@@ -326,7 +325,7 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
}
/* ECMA-262 3rd Edition 15.5.4.6 */
-static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_concat(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsstr_t *ret = NULL, *str;
@@ -334,7 +333,7 @@ static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
TRACE("\n");
- hres = get_string_val(ctx, jsthis, &str);
+ hres = get_string_val(ctx, vthis, &str);
if(FAILED(hres))
return hres;
@@ -411,25 +410,25 @@ static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
return S_OK;
}
-static HRESULT String_fixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_fixed(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attributeless_tag_format(ctx, jsthis, r, L"TT");
+ return do_attributeless_tag_format(ctx, vthis, r, L"TT");
}
-static HRESULT String_fontcolor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_fontcolor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"FONT", L"COLOR");
+ return do_attribute_tag_format(ctx, vthis, argc, argv, r, L"FONT", L"COLOR");
}
-static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_fontsize(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"FONT", L"SIZE");
+ return do_attribute_tag_format(ctx, vthis, argc, argv, r, L"FONT", L"SIZE");
}
-static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_indexOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
unsigned pos = 0, search_len, length;
@@ -440,7 +439,7 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
TRACE("\n");
- hres = get_string_flat_val(ctx, jsthis, &jsstr, &str);
+ hres = get_string_flat_val(ctx, vthis, &jsstr, &str);
if(FAILED(hres))
return hres;
@@ -490,14 +489,14 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
return S_OK;
}
-static HRESULT String_italics(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_italics(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attributeless_tag_format(ctx, jsthis, r, L"I");
+ return do_attributeless_tag_format(ctx, vthis, r, L"I");
}
/* ECMA-262 3rd Edition 15.5.4.8 */
-static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_lastIndexOf(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
unsigned pos = 0, search_len, length;
@@ -508,7 +507,7 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
TRACE("\n");
- hres = get_string_flat_val(ctx, jsthis, &jsstr, &str);
+ hres = get_string_flat_val(ctx, vthis, &jsstr, &str);
if(FAILED(hres))
return hres;
@@ -559,14 +558,14 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
return S_OK;
}
-static HRESULT String_link(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_link(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"A", L"HREF");
+ return do_attribute_tag_format(ctx, vthis, argc, argv, r, L"A", L"HREF");
}
/* ECMA-262 3rd Edition 15.5.4.10 */
-static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_match(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *regexp = NULL;
@@ -602,7 +601,7 @@ static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
return hres;
}
- hres = get_string_val(ctx, jsthis, &str);
+ hres = get_string_val(ctx, vthis, &str);
if(SUCCEEDED(hres))
hres = regexp_string_match(ctx, regexp, str, r);
@@ -718,7 +717,7 @@ static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func,
}
/* ECMA-262 3rd Edition 15.5.4.11 */
-static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_replace(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
const WCHAR *str, *match_str = NULL, *rep_str = NULL;
@@ -732,7 +731,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
TRACE("\n");
- hres = get_string_flat_val(ctx, jsthis, &jsstr, &str);
+ hres = get_string_flat_val(ctx, vthis, &jsstr, &str);
if(FAILED(hres))
return hres;
@@ -938,7 +937,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
return hres;
}
-static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_search(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
jsdisp_t *regexp = NULL;
@@ -949,7 +948,7 @@ static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
TRACE("\n");
- hres = get_string_flat_val(ctx, jsthis, &jsstr, &str);
+ hres = get_string_flat_val(ctx, vthis, &jsstr, &str);
if(FAILED(hres))
return hres;
@@ -989,7 +988,7 @@ static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
}
/* ECMA-262 3rd Edition 15.5.4.13 */
-static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_slice(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
int start=0, end, length;
@@ -999,7 +998,7 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
TRACE("\n");
- hres = get_string_val(ctx, jsthis, &str);
+ hres = get_string_val(ctx, vthis, &str);
if(FAILED(hres))
return hres;
@@ -1065,13 +1064,13 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
return S_OK;
}
-static HRESULT String_small(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_small(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attributeless_tag_format(ctx, jsthis, r, L"SMALL");
+ return do_attributeless_tag_format(ctx, vthis, r, L"SMALL");
}
-static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_split(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
match_state_t match_result, *match_ptr = &match_result;
@@ -1082,7 +1081,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
jsstr_t *jsstr, *match_jsstr, *tmp_str;
HRESULT hres;
- hres = get_string_flat_val(ctx, jsthis, &jsstr, &str);
+ hres = get_string_flat_val(ctx, vthis, &jsstr, &str);
if(FAILED(hres))
return hres;
length = jsstr_length(jsstr);
@@ -1231,20 +1230,20 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
return hres;
}
-static HRESULT String_strike(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_strike(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attributeless_tag_format(ctx, jsthis, r, L"STRIKE");
+ return do_attributeless_tag_format(ctx, vthis, r, L"STRIKE");
}
-static HRESULT String_sub(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_sub(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attributeless_tag_format(ctx, jsthis, r, L"SUB");
+ return do_attributeless_tag_format(ctx, vthis, r, L"SUB");
}
/* ECMA-262 3rd Edition 15.5.4.15 */
-static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_substring(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
INT start=0, end, length;
@@ -1254,7 +1253,7 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
TRACE("\n");
- hres = get_string_val(ctx, jsthis, &str);
+ hres = get_string_val(ctx, vthis, &str);
if(FAILED(hres))
return hres;
@@ -1303,7 +1302,7 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
}
/* ECMA-262 3rd Edition B.2.3 */
-static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_substr(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
int start=0, len, length;
@@ -1313,7 +1312,7 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
TRACE("\n");
- hres = get_string_val(ctx, jsthis, &str);
+ hres = get_string_val(ctx, vthis, &str);
if(FAILED(hres))
return hres;
@@ -1357,19 +1356,19 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
return hres;
}
-static HRESULT String_sup(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_sup(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- return do_attributeless_tag_format(ctx, jsthis, r, L"SUP");
+ return do_attributeless_tag_format(ctx, vthis, r, L"SUP");
}
-static HRESULT to_upper_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r)
+static HRESULT to_upper_case(script_ctx_t *ctx, jsval_t vthis, jsval_t *r)
{
jsstr_t *str;
HRESULT hres;
- hres = get_string_val(ctx, jsthis, &str);
+ hres = get_string_val(ctx, vthis, &str);
if(FAILED(hres))
return hres;
@@ -1393,13 +1392,13 @@ static HRESULT to_upper_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r)
return S_OK;
}
-static HRESULT to_lower_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r)
+static HRESULT to_lower_case(script_ctx_t *ctx, jsval_t vthis, jsval_t *r)
{
jsstr_t *str;
HRESULT hres;
- hres = get_string_val(ctx, jsthis, &str);
+ hres = get_string_val(ctx, vthis, &str);
if(FAILED(hres))
return hres;
@@ -1423,35 +1422,35 @@ static HRESULT to_lower_case(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r)
return S_OK;
}
-static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_toLowerCase(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
- return to_lower_case(ctx, jsthis, r);
+ return to_lower_case(ctx, vthis, r);
}
-static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_toUpperCase(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
- return to_upper_case(ctx, jsthis, r);
+ return to_upper_case(ctx, vthis, r);
}
-static HRESULT String_toLocaleLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_toLocaleLowerCase(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
- return to_lower_case(ctx, jsthis, r);
+ return to_lower_case(ctx, vthis, r);
}
-static HRESULT String_toLocaleUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_toLocaleUpperCase(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
TRACE("\n");
- return to_upper_case(ctx, jsthis, r);
+ return to_upper_case(ctx, vthis, r);
}
-static HRESULT String_trim(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc,
+static HRESULT String_trim(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc,
jsval_t *argv, jsval_t *r)
{
const WCHAR *str, *begin, *end;
@@ -1459,7 +1458,10 @@ static HRESULT String_trim(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
unsigned len;
HRESULT hres;
- hres = to_flat_string(ctx, jsval_disp(jsthis->u.disp), &jsstr, &str);
+ if(is_undefined(vthis) || is_null(vthis))
+ return JS_E_OBJECT_EXPECTED;
+
+ hres = to_flat_string(ctx, vthis, &jsstr, &str);
if(FAILED(hres)) {
WARN("to_flat_string failed: %08lx\n", hres);
return hres;
@@ -1486,7 +1488,7 @@ static HRESULT String_trim(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig
return hres;
}
-static HRESULT String_localeCompare(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT String_localeCompare(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FIXME("\n");
@@ -1592,7 +1594,7 @@ static const builtin_info_t StringInst_info = {
};
/* ECMA-262 3rd Edition 15.5.3.2 */
-static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
+static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, jsval_t vthis, WORD flags,
unsigned argc, jsval_t *argv, jsval_t *r)
{
WCHAR *ret_str;
@@ -1623,7 +1625,7 @@ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WOR
return S_OK;
}
-static HRESULT StringConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT StringConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
HRESULT hres;
diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c
index 74b9a29..881c45e 100644
--- a/dlls/jscript/vbarray.c
+++ b/dlls/jscript/vbarray.c
@@ -33,17 +33,13 @@ static inline VBArrayInstance *vbarray_from_jsdisp(jsdisp_t *jsdisp)
return CONTAINING_RECORD(jsdisp, VBArrayInstance, dispex);
}
-static inline VBArrayInstance *vbarray_from_vdisp(vdisp_t *vdisp)
+static inline VBArrayInstance *vbarray_this(jsval_t vthis)
{
- return vbarray_from_jsdisp(vdisp->u.jsdisp);
+ jsdisp_t *jsdisp = is_object_instance(vthis) ? to_jsdisp(get_object(vthis)) : NULL;
+ return (jsdisp && is_class(jsdisp, JSCLASS_VBARRAY)) ? vbarray_from_jsdisp(jsdisp) : NULL;
}
-static inline VBArrayInstance *vbarray_this(vdisp_t *jsthis)
-{
- return is_vclass(jsthis, JSCLASS_VBARRAY) ? vbarray_from_vdisp(jsthis) : NULL;
-}
-
-static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT VBArray_dimensions(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
VBArrayInstance *vbarray;
@@ -59,7 +55,7 @@ static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
return S_OK;
}
-static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT VBArray_getItem(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
VBArrayInstance *vbarray;
@@ -103,7 +99,7 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un
return hres;
}
-static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT VBArray_lbound(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
VBArrayInstance *vbarray;
@@ -134,7 +130,7 @@ static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns
return S_OK;
}
-static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT VBArray_toArray(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
VBArrayInstance *vbarray;
@@ -189,7 +185,7 @@ static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un
return S_OK;
}
-static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT VBArray_ubound(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
VBArrayInstance *vbarray;
@@ -220,7 +216,7 @@ static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns
return S_OK;
}
-static HRESULT VBArray_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT VBArray_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
FIXME("\n");
@@ -282,7 +278,7 @@ static HRESULT alloc_vbarray(script_ctx_t *ctx, jsdisp_t *object_prototype, VBAr
return S_OK;
}
-static HRESULT VBArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
+static HRESULT VBArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
VBArrayInstance *vbarray;
--
2.34.1
4
12
[PATCH 2/2] sc: Don't silently fail when something doesn't work as expected.
by Dmitry Timoshkov 18 Mar '22
by Dmitry Timoshkov 18 Mar '22
18 Mar '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
programs/sc/sc.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/programs/sc/sc.c b/programs/sc/sc.c
index bd3064da2d8..4e642874237 100644
--- a/programs/sc/sc.c
+++ b/programs/sc/sc.c
@@ -207,7 +207,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] )
}
if (!parse_create_params( argc - 3, argv + 3, &cp ))
{
- WINE_WARN("failed to parse create parameters\n");
+ WINE_ERR("failed to parse create parameters\n");
CloseServiceHandle( manager );
return 1;
}
@@ -219,7 +219,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] )
CloseServiceHandle( service );
ret = TRUE;
}
- else WINE_TRACE("failed to create service %lu\n", GetLastError());
+ else WINE_ERR("failed to create service %lu\n", GetLastError());
}
else if (!wcsicmp( argv[1], L"description" ))
{
@@ -229,10 +229,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] )
SERVICE_DESCRIPTIONW sd;
sd.lpDescription = argc > 3 ? (WCHAR *)argv[3] : NULL;
ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_DESCRIPTION, &sd );
- if (!ret) WINE_TRACE("failed to set service description %lu\n", GetLastError());
+ if (!ret) WINE_ERR("failed to set service description %lu\n", GetLastError());
CloseServiceHandle( service );
}
- else WINE_TRACE("failed to open service %lu\n", GetLastError());
+ else WINE_ERR("failed to open service %lu\n", GetLastError());
}
else if (!wcsicmp( argv[1], L"failure" ))
{
@@ -247,10 +247,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] )
HeapFree( GetProcessHeap(), 0, sfa.lpsaActions );
}
else
- WINE_WARN("failed to parse failure parameters\n");
+ WINE_ERR("failed to parse failure parameters\n");
CloseServiceHandle( service );
}
- else WINE_TRACE("failed to open service %lu\n", GetLastError());
+ else WINE_ERR("failed to open service %lu\n", GetLastError());
}
else if (!wcsicmp( argv[1], L"delete" ))
{
@@ -261,7 +261,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] )
if (!ret) WINE_TRACE("failed to delete service %lu\n", GetLastError());
CloseServiceHandle( service );
}
- else WINE_TRACE("failed to open service %lu\n", GetLastError());
+ else WINE_ERR("failed to open service %lu\n", GetLastError());
}
else if (!wcsicmp( argv[1], L"start" ))
{
@@ -272,7 +272,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] )
if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError());
CloseServiceHandle( service );
}
- else WINE_TRACE("failed to open service %lu\n", GetLastError());
+ else WINE_ERR("failed to open service %lu\n", GetLastError());
}
else if (!wcsicmp( argv[1], L"stop" ))
{
@@ -283,7 +283,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] )
if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError());
CloseServiceHandle( service );
}
- else WINE_TRACE("failed to open service %lu\n", GetLastError());
+ else WINE_ERR("failed to open service %lu\n", GetLastError());
}
else if (!wcsicmp( argv[1], L"sdset" ))
{
--
2.35.1
1
0
[PATCH vkd3d v2] vkd3d-shader/hlsl: Correctly calculate offsets for array elements.
by Matteo Bruni 18 Mar '22
by Matteo Bruni 18 Mar '22
18 Mar '22
From: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
v2: Improve comment in the shader test.
Makefile.am | 2 +-
libs/vkd3d-shader/hlsl.c | 7 +++++++
libs/vkd3d-shader/hlsl.h | 1 +
libs/vkd3d-shader/hlsl.y | 2 +-
libs/vkd3d-shader/hlsl_codegen.c | 2 +-
tests/hlsl-struct-array.shader_test | 19 +++++++++++++++++++
6 files changed, 30 insertions(+), 3 deletions(-)
create mode 100644 tests/hlsl-struct-array.shader_test
diff --git a/Makefile.am b/Makefile.am
index 79aacfcd..f2c8440c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -96,6 +96,7 @@ vkd3d_shader_tests = \
tests/hlsl-state-block-syntax.shader_test \
tests/hlsl-static-initializer.shader_test \
tests/hlsl-storage-qualifiers.shader_test \
+ tests/hlsl-struct-array.shader_test \
tests/hlsl-struct-assignment.shader_test \
tests/hlsl-struct-semantics.shader_test \
tests/hlsl-vector-indexing.shader_test \
@@ -339,7 +340,6 @@ XFAIL_TESTS = \
tests/hlsl-majority-pragma.shader_test \
tests/hlsl-majority-typedef.shader_test \
tests/hlsl-mul.shader_test \
- tests/hlsl-nested-arrays.shader_test \
tests/hlsl-numeric-constructor-truncation.shader_test \
tests/hlsl-numeric-types.shader_test \
tests/hlsl-return-implicit-conversion.shader_test \
diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index ea5e35d2..d88b0b6d 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -202,6 +202,13 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type
}
}
+/* Returns the size of a type, considered as part of an array of that type.
+ * As such it includes padding after the type. */
+unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type)
+{
+ return align(type->reg_size, 4);
+}
+
static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class,
enum hlsl_base_type base_type, unsigned dimx, unsigned dimy)
{
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 243ed72b..2e8ba4af 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -783,6 +783,7 @@ bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type);
struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old,
unsigned int default_majority, unsigned int modifiers);
unsigned int hlsl_type_component_count(struct hlsl_type *type);
+unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type);
unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int offset);
bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2);
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 92dcb3f2..521ca0a7 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -607,7 +607,7 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in
return NULL;
}
- if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size, loc)))
+ if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), loc)))
return NULL;
list_add_tail(instrs, &c->node.entry);
if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, index, &c->node)))
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 62dbce5e..ca3acba0 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -621,7 +621,7 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
if (type->type != HLSL_CLASS_ARRAY)
return false;
element_type = type->e.array.type;
- element_size = element_type->reg_size;
+ element_size = hlsl_type_get_array_element_reg_size(element_type);
for (i = 0; i < type->e.array.elements_count; ++i)
{
diff --git a/tests/hlsl-struct-array.shader_test b/tests/hlsl-struct-array.shader_test
new file mode 100644
index 00000000..a5df9cdb
--- /dev/null
+++ b/tests/hlsl-struct-array.shader_test
@@ -0,0 +1,19 @@
+% In SM4, array elements are always aligned to the next vec4, although structs are not.
+
+[pixel shader]
+uniform struct
+{
+ float p, q;
+} colours[3];
+
+float4 main() : sv_target
+{
+ return float4(colours[0].q, colours[1].p, colours[2].q, colours[2].p);
+}
+
+[test]
+uniform 0 float4 0.1 0.2 0.0 0.0
+uniform 4 float4 0.3 0.4 0.0 0.0
+uniform 8 float4 0.5 0.6 0.0 0.0
+draw quad
+probe all rgba (0.2, 0.3, 0.6, 0.5)
--
2.34.1
3
2
18 Mar '22
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/kernel32/tests/heap.c | 61 ++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c
index bc573050d16..f09b5eace21 100644
--- a/dlls/kernel32/tests/heap.c
+++ b/dlls/kernel32/tests/heap.c
@@ -1264,6 +1264,66 @@ static void test_GlobalMemoryStatus(void)
wine_dbgstr_longlong(mem.dwAvailVirtual), wine_dbgstr_longlong(memex.ullAvailVirtual));
}
+static void test_GlobalMemoryStatusEx(void)
+{
+ char buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 16]; /* some Win 7 versions need a larger info */
+ SYSTEM_PERFORMANCE_INFORMATION *perf_info = (void *)buffer;
+ SYSTEM_BASIC_INFORMATION basic_info;
+ MEMORYSTATUSEX memex = {0}, expect;
+ VM_COUNTERS_EX vmc;
+ NTSTATUS status;
+ BOOL ret;
+
+ SetLastError( 0xdeadbeef );
+ ret = GlobalMemoryStatusEx( &memex );
+ ok( !ret, "GlobalMemoryStatusEx succeeded\n" );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() );
+
+ do
+ {
+ status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL );
+ ok( !status, "NtQuerySystemInformation returned %#lx\n", status );
+ status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL );
+ ok( !status, "NtQuerySystemInformation returned %#lx\n", status );
+ status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL );
+ ok( !status, "NtQueryInformationProcess returned %#lx\n", status );
+ memex.dwLength = sizeof(MEMORYSTATUSEX);
+ ret = GlobalMemoryStatusEx( &memex );
+ ok( ret, "GlobalMemoryStatusEx succeeded\n" );
+ } while (memex.ullAvailPhys != (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize);
+
+ ok( basic_info.PageSize, "got 0 PageSize\n" );
+ ok( basic_info.MmNumberOfPhysicalPages, "got 0 MmNumberOfPhysicalPages\n" );
+ ok( !!basic_info.HighestUserAddress, "got 0 HighestUserAddress\n" );
+ ok( !!basic_info.LowestUserAddress, "got 0 LowestUserAddress\n" );
+ ok( perf_info->TotalCommittedPages, "got 0 TotalCommittedPages\n" );
+ ok( perf_info->TotalCommitLimit, "got 0 TotalCommitLimit\n" );
+ ok( perf_info->AvailablePages, "got 0 AvailablePages\n" );
+
+ expect.dwMemoryLoad = (memex.ullTotalPhys - memex.ullAvailPhys) / (memex.ullTotalPhys / 100);
+ expect.ullTotalPhys = (ULONGLONG)basic_info.MmNumberOfPhysicalPages * basic_info.PageSize;
+ expect.ullAvailPhys = (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize;
+ expect.ullTotalPageFile = (ULONGLONG)perf_info->TotalCommitLimit * basic_info.PageSize;
+ expect.ullAvailPageFile = (ULONGLONG)(perf_info->TotalCommitLimit - perf_info->TotalCommittedPages) * basic_info.PageSize;
+ expect.ullTotalVirtual = (ULONG_PTR)basic_info.HighestUserAddress - (ULONG_PTR)basic_info.LowestUserAddress + 1;
+ expect.ullAvailVirtual = expect.ullTotalVirtual - (ULONGLONG)vmc.WorkingSetSize /* approximate */;
+ expect.ullAvailExtendedVirtual = 0;
+
+ ok( memex.dwMemoryLoad == expect.dwMemoryLoad, "got dwMemoryLoad %lu\n", memex.dwMemoryLoad );
+ todo_wine
+ ok( memex.ullTotalPhys == expect.ullTotalPhys, "got ullTotalPhys %#I64x\n", memex.ullTotalPhys );
+ ok( memex.ullAvailPhys == expect.ullAvailPhys, "got ullAvailPhys %#I64x\n", memex.ullAvailPhys );
+ todo_wine
+ ok( memex.ullTotalPageFile == expect.ullTotalPageFile, "got ullTotalPageFile %#I64x\n", memex.ullTotalPageFile );
+ todo_wine
+ ok( memex.ullAvailPageFile == expect.ullAvailPageFile, "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile );
+ todo_wine
+ ok( memex.ullTotalVirtual == expect.ullTotalVirtual, "got ullTotalVirtual %#I64x\n", memex.ullTotalVirtual );
+ todo_wine
+ ok( memex.ullAvailVirtual <= expect.ullAvailVirtual, "got ullAvailVirtual %#I64x\n", memex.ullAvailVirtual );
+ ok( memex.ullAvailExtendedVirtual == 0, "got ullAvailExtendedVirtual %#I64x\n", memex.ullAvailExtendedVirtual );
+}
+
START_TEST(heap)
{
int argc;
@@ -1298,6 +1358,7 @@ START_TEST(heap)
test_HeapQueryInformation();
test_GetPhysicallyInstalledSystemMemory();
test_GlobalMemoryStatus();
+ test_GlobalMemoryStatusEx();
if (pRtlGetNtGlobalFlags)
{
--
2.35.1
2
3
[PATCH 1/2] kernelbase: Query FileStandardInformation instead of FileEndOfFileInformation in SetFilePointerEx().
by Paul Gofman 18 Mar '22
by Paul Gofman 18 Mar '22
18 Mar '22
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
---
These patches fix Fall in Labirinth game which is using VX Ace RPG Maker and Enigma2 (not sure if and
how those two are related). The engine introduces a virtual file system by hotpatching a number of functions.
The issues preventing game start are which these patches are fixing:
- Hooked NtQueryInformationFile doesn't understand FileEndOfFileInformation and returns success while leaving
the output data unitialized;
- Hooked NtQueryDirectoryFile gets confused by the access mask given to NtOpenFile for directory file (patch 2).
dlls/kernelbase/file.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
index 15bfe89df7a..cd6b62409ff 100644
--- a/dlls/kernelbase/file.c
+++ b/dlls/kernelbase/file.c
@@ -3629,7 +3629,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFilePointerEx( HANDLE file, LARGE_INTEGER dista
LONGLONG pos;
IO_STATUS_BLOCK io;
FILE_POSITION_INFORMATION info;
- FILE_END_OF_FILE_INFORMATION eof;
+ FILE_STANDARD_INFORMATION eof;
switch(method)
{
@@ -3642,7 +3642,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFilePointerEx( HANDLE file, LARGE_INTEGER dista
pos = info.CurrentByteOffset.QuadPart + distance.QuadPart;
break;
case FILE_END:
- if (NtQueryInformationFile( file, &io, &eof, sizeof(eof), FileEndOfFileInformation ))
+ if (NtQueryInformationFile( file, &io, &eof, sizeof(eof), FileStandardInformation ))
goto error;
pos = eof.EndOfFile.QuadPart + distance.QuadPart;
break;
--
2.35.1
1
1
[PATCH vkd3d v5 7/8] vkd3d-shader/hlsl: Remove redundant type check in declare_vars().
by Francisco Casas 18 Mar '22
by Francisco Casas 18 Mar '22
18 Mar '22
Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
v5:
- No changes from v4.
Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
---
libs/vkd3d-shader/hlsl.y | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 0b6093ba..d6ba2c12 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1623,23 +1623,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t
continue;
}
- if (type->type == HLSL_CLASS_STRUCT)
- {
- struct_var_initializer(ctx, statements_list, var, &v->initializer);
- vkd3d_free(v);
- continue;
- }
- if (type->type > HLSL_CLASS_LAST_NUMERIC)
+ if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT)
{
FIXME("Initializers for non scalar/struct variables not supported yet.\n");
free_parse_initializer(&v->initializer);
vkd3d_free(v);
continue;
}
- if (v->arrays.count)
+
+ if (type->type == HLSL_CLASS_STRUCT)
{
- hlsl_fixme(ctx, &v->loc, "Array initializer.");
- free_parse_initializer(&v->initializer);
+ struct_var_initializer(ctx, statements_list, var, &v->initializer);
vkd3d_free(v);
continue;
}
--
2.25.1
4
3
[PATCH vkd3d v5 1/8] vkd3d-shader/hlsl: Allow offsets for scalar and vector variables.
by Francisco Casas 18 Mar '22
by Francisco Casas 18 Mar '22
18 Mar '22
From: Giovanni Mascellani <gmascellani(a)codeweavers.com>
Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
v5:
- No changes from v4.
Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
---
libs/vkd3d-shader/hlsl.h | 3 +--
libs/vkd3d-shader/hlsl_codegen.c | 22 +++++-----------------
libs/vkd3d-shader/hlsl_sm1.c | 4 ++--
libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++++-----
4 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 243ed72b..1fd5dc58 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -793,8 +793,7 @@ unsigned int hlsl_swizzle_from_writemask(unsigned int writemask);
bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset);
unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref);
-struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref,
- const struct hlsl_type *type);
+struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref);
bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context);
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 62dbce5e..6da2b3a9 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -1542,11 +1542,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type)
}
}
-static bool type_is_single_reg(const struct hlsl_type *type)
-{
- return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR;
-}
-
bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset)
{
struct hlsl_ir_node *offset_node = deref->offset.node;
@@ -1589,8 +1584,7 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl
return 0;
}
-struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref,
- const struct hlsl_type *type)
+struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref)
{
const struct hlsl_ir_var *var = deref->var;
struct hlsl_reg ret = var->reg;
@@ -1598,16 +1592,10 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere
ret.id += offset / 4;
- if (type_is_single_reg(var->data_type))
- {
- assert(!offset);
- ret.writemask = var->reg.writemask;
- }
- else
- {
- assert(type_is_single_reg(type));
- ret.writemask = ((1 << type->dimx) - 1) << (offset % 4);
- }
+ ret.writemask = 0xf & (0xf << (offset % 4));
+ if (var->reg.writemask)
+ ret.writemask = hlsl_combine_writemasks(var->reg.writemask, ret.writemask);
+
return ret;
}
diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c
index 90ec6058..f661dbc2 100644
--- a/libs/vkd3d-shader/hlsl_sm1.c
+++ b/libs/vkd3d-shader/hlsl_sm1.c
@@ -663,7 +663,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b
static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr)
{
const struct hlsl_ir_load *load = hlsl_ir_load(instr);
- const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src, instr->data_type);
+ const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src);
struct sm1_instruction sm1_instr =
{
.opcode = D3DSIO_MOV,
@@ -707,7 +707,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *
{
const struct hlsl_ir_store *store = hlsl_ir_store(instr);
const struct hlsl_ir_node *rhs = store->rhs.node;
- const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs, rhs->data_type);
+ const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs);
struct sm1_instruction sm1_instr =
{
.opcode = D3DSIO_MOV,
diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
index 6996bb2d..802db3c1 100644
--- a/libs/vkd3d-shader/hlsl_sm4.c
+++ b/libs/vkd3d-shader/hlsl_sm4.c
@@ -870,6 +870,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r
if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, ®->type, swizzle_type, &has_idx))
{
+ unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref);
+
if (has_idx)
{
reg->idx[0] = var->semantic.index;
@@ -877,11 +879,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r
}
reg->dim = VKD3D_SM4_DIMENSION_VEC4;
- *writemask = (1u << data_type->dimx) - 1;
+ *writemask = ((1u << data_type->dimx) - 1) << (offset % 4);
}
else
{
- struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type);
+ struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref);
assert(hlsl_reg.allocated);
reg->type = VKD3D_SM4_RT_INPUT;
@@ -899,6 +901,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r
if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, ®->type, swizzle_type, &has_idx))
{
+ unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref);
+
if (has_idx)
{
reg->idx[0] = var->semantic.index;
@@ -909,11 +913,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r
reg->dim = VKD3D_SM4_DIMENSION_SCALAR;
else
reg->dim = VKD3D_SM4_DIMENSION_VEC4;
- *writemask = (1u << data_type->dimx) - 1;
+ *writemask = ((1u << data_type->dimx) - 1) << (offset % 4);
}
else
{
- struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type);
+ struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref);
assert(hlsl_reg.allocated);
reg->type = VKD3D_SM4_RT_OUTPUT;
@@ -925,7 +929,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r
}
else
{
- struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type);
+ struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref);
assert(hlsl_reg.allocated);
reg->type = VKD3D_SM4_RT_TEMP;
--
2.25.1
4
3
18 Mar '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
libs/vkd3d-shader/hlsl.y | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 92dcb3f2a..1e85e390c 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -1806,10 +1806,13 @@ static bool intrinsic_min(struct hlsl_ctx *ctx,
static bool intrinsic_pow(struct hlsl_ctx *ctx,
const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
{
- struct hlsl_ir_node *log, *exp;
+ struct hlsl_ir_node *log, *exp, *arg;
struct hlsl_ir_expr *mul;
- if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, params->args[0], *loc)))
+ if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc)))
+ return false;
+
+ if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, arg, *loc)))
return false;
list_add_tail(params->instrs, &log->entry);
--
2.35.1
5
29
18 Mar '22
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
---
dlls/win32u/freetype.c | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c
index 77f4ef8eab3..b6063a14570 100644
--- a/dlls/win32u/freetype.c
+++ b/dlls/win32u/freetype.c
@@ -1773,35 +1773,7 @@ static void load_mac_fonts(void)
CFStringRef path;
desc = CFArrayGetValueAtIndex(descs, i);
-
-#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
url = CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute);
-#else
- /* CTFontDescriptor doesn't support kCTFontURLAttribute prior to 10.6, so
- we have to go CFFontDescriptor -> CTFont -> ATSFont -> FSRef -> CFURL. */
- {
- CTFontRef font;
- ATSFontRef atsFont;
- OSStatus status;
- FSRef fsref;
-
- font = CTFontCreateWithFontDescriptor(desc, 0, NULL);
- if (!font) continue;
-
- atsFont = CTFontGetPlatformFont(font, NULL);
- if (!atsFont)
- {
- CFRelease(font);
- continue;
- }
-
- status = ATSFontGetFileReference(atsFont, &fsref);
- CFRelease(font);
- if (status != noErr) continue;
-
- url = CFURLCreateFromFSRef(NULL, &fsref);
- }
-#endif
if (!url) continue;
ext = CFURLCopyPathExtension(url);
--
2.32.0 (Apple Git-132)
2
1
[PATCH 6/6] winealsa: Pass the time relative to the start time to the callback.
by Huw Davies 18 Mar '22
by Huw Davies 18 Mar '22
18 Mar '22
This is equivalent to commit 01ad503004cf8ea6b0bd8f544ee131fc86abc580
in the coreaudio driver.
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/midi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 3665b557d03..72649eca89c 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -477,7 +477,7 @@ static DWORD midReset(WORD wDevID)
MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext;
lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
lpMidiHdr->dwFlags |= MHDR_DONE;
- MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime);
+ MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime);
}
in_buffer_unlock();
--
2.25.1
1
0
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsamidi.c | 35 +++++++++++++++++++++++++++++++++
dlls/winealsa.drv/midi.c | 38 ------------------------------------
2 files changed, 35 insertions(+), 38 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index 1ba674c234f..4e048f3d5b4 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -852,6 +852,38 @@ static UINT midi_out_reset(WORD dev_id)
return MMSYSERR_NOERROR;
}
+static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size)
+{
+ struct midi_src *src;
+ MIDIHDR **next;
+
+ TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size);
+
+ if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID;
+ src = srcs + dev_id;
+ if (src->state == -1) return MIDIERR_NODEVICE;
+
+ if (!hdr || hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr->dwBufferLength)
+ return MMSYSERR_INVALPARAM;
+ if (hdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING;
+ if (!(hdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED;
+
+ hdr->dwFlags &= ~WHDR_DONE;
+ hdr->dwFlags |= MHDR_INQUEUE;
+ hdr->dwBytesRecorded = 0;
+ hdr->lpNext = NULL;
+
+ in_buffer_lock();
+
+ next = &src->lpQueueHdr;
+ while (*next) next = &(*next)->lpNext;
+ *next = hdr;
+
+ in_buffer_unlock();
+
+ return MMSYSERR_NOERROR;
+}
+
static UINT midi_in_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size)
{
TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size);
@@ -963,6 +995,9 @@ NTSTATUS midi_in_message(void *args)
/* FIXME: Pretend this is supported */
*params->err = MMSYSERR_NOERROR;
break;
+ case MIDM_ADDBUFFER:
+ *params->err = midi_in_add_buffer(params->dev_id, (MIDIHDR *)params->param_1, params->param_2);
+ break;
case MIDM_PREPARE:
*params->err = midi_in_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2);
break;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 70e6caebfc7..3665b557d03 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -459,42 +459,6 @@ static DWORD midClose(WORD wDevID)
return ret;
}
-
-/**************************************************************************
- * midAddBuffer [internal]
- */
-static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
-{
- TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize);
-
- if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID;
- if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE;
-
- if (lpMidiHdr == NULL) return MMSYSERR_INVALPARAM;
- if (dwSize < offsetof(MIDIHDR,dwOffset)) return MMSYSERR_INVALPARAM;
- if (lpMidiHdr->dwBufferLength == 0) return MMSYSERR_INVALPARAM;
- if (lpMidiHdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING;
- if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED;
-
- in_buffer_lock();
- lpMidiHdr->dwFlags &= ~WHDR_DONE;
- lpMidiHdr->dwFlags |= MHDR_INQUEUE;
- lpMidiHdr->dwBytesRecorded = 0;
- lpMidiHdr->lpNext = 0;
- if (MidiInDev[wDevID].lpQueueHdr == 0) {
- MidiInDev[wDevID].lpQueueHdr = lpMidiHdr;
- } else {
- LPMIDIHDR ptr;
-
- for (ptr = MidiInDev[wDevID].lpQueueHdr; ptr->lpNext != 0;
- ptr = ptr->lpNext);
- ptr->lpNext = lpMidiHdr;
- }
- in_buffer_unlock();
-
- return MMSYSERR_NOERROR;
-}
-
/**************************************************************************
* midReset [internal]
*/
@@ -593,8 +557,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2);
case MIDM_CLOSE:
return midClose(wDevID);
- case MIDM_ADDBUFFER:
- return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
case MIDM_RESET:
return midReset(wDevID);
case MIDM_START:
--
2.25.1
1
0
18 Mar '22
The syscall itself is temporary.
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsa.c | 1 +
dlls/winealsa.drv/alsamidi.c | 19 +++++++++++++++++++
dlls/winealsa.drv/midi.c | 31 ++++++++++++++++---------------
dlls/winealsa.drv/unixlib.h | 2 ++
4 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index b629cd8317a..eb16203dbf9 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -2449,5 +2449,6 @@ unixlib_entry_t __wine_unix_call_funcs[] =
midi_in_message,
midi_seq_lock, /* temporary */
+ midi_in_lock,
midi_seq_open,
};
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index 27ee17caa24..1ba674c234f 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -60,6 +60,7 @@ struct midi_dest
};
static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t in_buffer_mutex = PTHREAD_MUTEX_INITIALIZER;
static unsigned int num_dests, num_srcs;
static struct midi_dest dests[MAX_MIDIOUTDRV];
@@ -86,6 +87,24 @@ NTSTATUS midi_seq_lock(void *args)
return STATUS_SUCCESS;
}
+static void in_buffer_lock(void)
+{
+ pthread_mutex_lock(&in_buffer_mutex);
+}
+
+static void in_buffer_unlock(void)
+{
+ pthread_mutex_unlock(&in_buffer_mutex);
+}
+
+NTSTATUS midi_in_lock(void *args)
+{
+ if (args) in_buffer_lock();
+ else in_buffer_unlock();
+
+ return STATUS_SUCCESS;
+}
+
static snd_seq_t *seq_open(int *port_in_ret)
{
static int midi_warn;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index bd73c1f5db2..70e6caebfc7 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -54,15 +54,6 @@ static int MIDM_NumDevs = 0;
static int numStartedMidiIn = 0;
-static CRITICAL_SECTION crit_sect; /* protects all MidiIn buffer queues */
-static CRITICAL_SECTION_DEBUG critsect_debug =
-{
- 0, 0, &crit_sect,
- { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
- 0, 0, { (DWORD_PTR)(__FILE__ ": crit_sect") }
-};
-static CRITICAL_SECTION crit_sect = { &critsect_debug, -1, 0, 0, 0, 0 };
-
static int end_thread;
static HANDLE hThread;
@@ -76,6 +67,16 @@ static void seq_unlock(void)
ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)0);
}
+static void in_buffer_lock(void)
+{
+ ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)1);
+}
+
+static void in_buffer_unlock(void)
+{
+ ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)0);
+}
+
static void notify_client(struct notify_context *notify)
{
TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2);
@@ -240,7 +241,7 @@ static void handle_midi_event(snd_seq_event_t *ev)
LPBYTE ptr = ev->data.ext.ptr;
LPMIDIHDR lpMidiHdr;
- EnterCriticalSection(&crit_sect);
+ in_buffer_lock();
while (len) {
if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) {
int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded);
@@ -262,7 +263,7 @@ static void handle_midi_event(snd_seq_event_t *ev)
break;
}
}
- LeaveCriticalSection(&crit_sect);
+ in_buffer_unlock();
}
break;
case SND_SEQ_EVENT_SENSING:
@@ -475,7 +476,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
if (lpMidiHdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING;
if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED;
- EnterCriticalSection(&crit_sect);
+ in_buffer_lock();
lpMidiHdr->dwFlags &= ~WHDR_DONE;
lpMidiHdr->dwFlags |= MHDR_INQUEUE;
lpMidiHdr->dwBytesRecorded = 0;
@@ -489,7 +490,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
ptr = ptr->lpNext);
ptr->lpNext = lpMidiHdr;
}
- LeaveCriticalSection(&crit_sect);
+ in_buffer_unlock();
return MMSYSERR_NOERROR;
}
@@ -506,7 +507,7 @@ static DWORD midReset(WORD wDevID)
if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID;
if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE;
- EnterCriticalSection(&crit_sect);
+ in_buffer_lock();
while (MidiInDev[wDevID].lpQueueHdr) {
LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr;
MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext;
@@ -514,7 +515,7 @@ static DWORD midReset(WORD wDevID)
lpMidiHdr->dwFlags |= MHDR_DONE;
MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime);
}
- LeaveCriticalSection(&crit_sect);
+ in_buffer_unlock();
return MMSYSERR_NOERROR;
}
diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h
index 7907ad24efa..263e83eda57 100644
--- a/dlls/winealsa.drv/unixlib.h
+++ b/dlls/winealsa.drv/unixlib.h
@@ -301,6 +301,7 @@ enum alsa_funcs
alsa_midi_in_message,
alsa_midi_seq_lock, /* temporary */
+ alsa_midi_in_lock,
alsa_midi_seq_open,
};
@@ -309,6 +310,7 @@ NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN;
NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN;
NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN;
+NTSTATUS midi_in_lock(void *args) DECLSPEC_HIDDEN;
NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN;
extern unixlib_handle_t alsa_handle;
--
2.25.1
1
0
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsamidi.c | 3 +++
dlls/winealsa.drv/midi.c | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index 550362a95ce..27ee17caa24 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -953,6 +953,9 @@ NTSTATUS midi_in_message(void *args)
case MIDM_GETDEVCAPS:
*params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2);
break;
+ case MIDM_GETNUMDEVS:
+ *params->err = num_srcs;
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 4903b46089d..bd73c1f5db2 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -594,8 +594,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return midClose(wDevID);
case MIDM_ADDBUFFER:
return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
- case MIDM_GETNUMDEVS:
- return MIDM_NumDevs;
case MIDM_RESET:
return midReset(wDevID);
case MIDM_START:
--
2.25.1
1
0
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsamidi.c | 15 +++++++++++++++
dlls/winealsa.drv/midi.c | 18 ------------------
2 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index 1eb5d7db33f..550362a95ce 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -865,6 +865,18 @@ static UINT midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size)
return MMSYSERR_NOERROR;
}
+static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size)
+{
+ TRACE("(%04X, %p, %08X);\n", dev_id, caps, size);
+
+ if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID;
+ if (!caps) return MMSYSERR_INVALPARAM;
+
+ memcpy(caps, &srcs[dev_id].caps, min(size, sizeof(*caps)));
+
+ return MMSYSERR_NOERROR;
+}
+
NTSTATUS midi_out_message(void *args)
{
struct midi_out_message_params *params = args;
@@ -938,6 +950,9 @@ NTSTATUS midi_in_message(void *args)
case MIDM_UNPREPARE:
*params->err = midi_in_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2);
break;
+ case MIDM_GETDEVCAPS:
+ *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2);
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 94de37d6176..4903b46089d 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -332,22 +332,6 @@ static DWORD WINAPI midRecThread(void *arg)
return 0;
}
-/**************************************************************************
- * midGetDevCaps [internal]
- */
-static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize)
-{
- TRACE("(%04X, %p, %08X);\n", wDevID, lpCaps, dwSize);
-
- if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID;
- if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
-
- memcpy(lpCaps, &MidiInDev[wDevID].caps, min(dwSize, sizeof(*lpCaps)));
-
- return MMSYSERR_NOERROR;
-}
-
-
/**************************************************************************
* midOpen [internal]
*/
@@ -610,8 +594,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return midClose(wDevID);
case MIDM_ADDBUFFER:
return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
- case MIDM_GETDEVCAPS:
- return midGetDevCaps(wDevID, (LPMIDIINCAPSW)dwParam1,dwParam2);
case MIDM_GETNUMDEVS:
return MIDM_NumDevs;
case MIDM_RESET:
--
2.25.1
1
0
18 Mar '22
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsa.c | 1 +
dlls/winealsa.drv/alsamidi.c | 57 ++++++++++++++++++++++++++++++++
dlls/winealsa.drv/midi.c | 64 ++++++++----------------------------
dlls/winealsa.drv/unixlib.h | 12 +++++++
4 files changed, 84 insertions(+), 50 deletions(-)
diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 6d307eb84bf..b629cd8317a 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -2446,6 +2446,7 @@ unixlib_entry_t __wine_unix_call_funcs[] =
get_prop_value,
midi_init,
midi_out_message,
+ midi_in_message,
midi_seq_lock, /* temporary */
midi_seq_open,
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index b99c3aedd33..1eb5d7db33f 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -833,6 +833,37 @@ static UINT midi_out_reset(WORD dev_id)
return MMSYSERR_NOERROR;
}
+static UINT midi_in_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size)
+{
+ TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size);
+
+ if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData)
+ return MMSYSERR_INVALPARAM;
+ if (hdr->dwFlags & MHDR_PREPARED)
+ return MMSYSERR_NOERROR;
+
+ hdr->lpNext = 0;
+ hdr->dwFlags |= MHDR_PREPARED;
+ hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE);
+
+ return MMSYSERR_NOERROR;
+}
+
+static UINT midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size)
+{
+ TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size);
+
+ if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr == 0 || !hdr->lpData)
+ return MMSYSERR_INVALPARAM;
+ if (!(hdr->dwFlags & MHDR_PREPARED))
+ return MMSYSERR_NOERROR;
+ if (hdr->dwFlags & MHDR_INQUEUE)
+ return MIDIERR_STILLPLAYING;
+
+ hdr->dwFlags &= ~MHDR_PREPARED;
+
+ return MMSYSERR_NOERROR;
+}
NTSTATUS midi_out_message(void *args)
{
@@ -888,3 +919,29 @@ NTSTATUS midi_out_message(void *args)
return STATUS_SUCCESS;
}
+
+NTSTATUS midi_in_message(void *args)
+{
+ struct midi_in_message_params *params = args;
+
+ switch (params->msg)
+ {
+ case DRVM_EXIT:
+ case DRVM_ENABLE:
+ case DRVM_DISABLE:
+ /* FIXME: Pretend this is supported */
+ *params->err = MMSYSERR_NOERROR;
+ break;
+ case MIDM_PREPARE:
+ *params->err = midi_in_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2);
+ break;
+ case MIDM_UNPREPARE:
+ *params->err = midi_in_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2);
+ break;
+ default:
+ TRACE("Unsupported message\n");
+ *params->err = MMSYSERR_NOTSUPPORTED;
+ }
+
+ return STATUS_SUCCESS;
+}
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 53b683f59c8..94de37d6176 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -510,44 +510,6 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
return MMSYSERR_NOERROR;
}
-/**************************************************************************
- * midPrepare [internal]
- */
-static DWORD midPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
-{
- TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize);
-
- if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0)
- return MMSYSERR_INVALPARAM;
- if (lpMidiHdr->dwFlags & MHDR_PREPARED)
- return MMSYSERR_NOERROR;
-
- lpMidiHdr->lpNext = 0;
- lpMidiHdr->dwFlags |= MHDR_PREPARED;
- lpMidiHdr->dwFlags &= ~(MHDR_DONE|MHDR_INQUEUE); /* flags cleared since w2k */
-
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * midUnprepare [internal]
- */
-static DWORD midUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
-{
- TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize);
-
- if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0)
- return MMSYSERR_INVALPARAM;
- if (!(lpMidiHdr->dwFlags & MHDR_PREPARED))
- return MMSYSERR_NOERROR;
- if (lpMidiHdr->dwFlags & MHDR_INQUEUE)
- return MIDIERR_STILLPLAYING;
-
- lpMidiHdr->dwFlags &= ~MHDR_PREPARED;
-
- return MMSYSERR_NOERROR;
-}
-
/**************************************************************************
* midReset [internal]
*/
@@ -633,27 +595,21 @@ static BOOL ALSA_MidiInit(void)
DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
+ struct midi_in_message_params params;
+ UINT err;
+
TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2);
switch (wMsg) {
case DRVM_INIT:
ALSA_MidiInit();
return 0;
- case DRVM_EXIT:
- case DRVM_ENABLE:
- case DRVM_DISABLE:
- /* FIXME: Pretend this is supported */
- return 0;
case MIDM_OPEN:
return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2);
case MIDM_CLOSE:
return midClose(wDevID);
case MIDM_ADDBUFFER:
return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
- case MIDM_PREPARE:
- return midPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
- case MIDM_UNPREPARE:
- return midUnprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
case MIDM_GETDEVCAPS:
return midGetDevCaps(wDevID, (LPMIDIINCAPSW)dwParam1,dwParam2);
case MIDM_GETNUMDEVS:
@@ -664,10 +620,18 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return midStart(wDevID);
case MIDM_STOP:
return midStop(wDevID);
- default:
- TRACE("Unsupported message\n");
}
- return MMSYSERR_NOTSUPPORTED;
+
+ params.dev_id = wDevID;
+ params.msg = wMsg;
+ params.user = dwUser;
+ params.param_1 = dwParam1;
+ params.param_2 = dwParam2;
+ params.err = &err;
+
+ ALSA_CALL(midi_in_message, ¶ms);
+
+ return err;
}
/**************************************************************************
diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h
index c1dbd83b84e..7907ad24efa 100644
--- a/dlls/winealsa.drv/unixlib.h
+++ b/dlls/winealsa.drv/unixlib.h
@@ -254,6 +254,16 @@ struct midi_out_message_params
struct notify_context *notify;
};
+struct midi_in_message_params
+{
+ UINT dev_id;
+ UINT msg;
+ UINT_PTR user;
+ UINT_PTR param_1;
+ UINT_PTR param_2;
+ UINT *err;
+};
+
struct midi_seq_open_params
{
int close;
@@ -288,6 +298,7 @@ enum alsa_funcs
alsa_get_prop_value,
alsa_midi_init,
alsa_midi_out_message,
+ alsa_midi_in_message,
alsa_midi_seq_lock, /* temporary */
alsa_midi_seq_open,
@@ -295,6 +306,7 @@ enum alsa_funcs
NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN;
NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN;
+NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN;
NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN;
NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN;
--
2.25.1
1
0
18 Mar '22
If we cannot read their status with SDL_HapticGetEffectStatus.
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/winebus.sys/bus_sdl.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index 07fdd9d3fa2..a1e7942fe59 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -752,12 +752,13 @@ static void check_device_effects_state(struct sdl_device *impl)
unsigned int i, ret;
if (!impl->sdl_haptic) return;
- if (!(impl->effect_support & SDL_HAPTIC_STATUS)) return;
+ if (!(impl->effect_support & EFFECT_SUPPORT_PHYSICAL)) return;
for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i)
{
if (impl->effect_ids[i] == -1) continue;
- ret = pSDL_HapticGetEffectStatus(impl->sdl_haptic, impl->effect_ids[i]);
+ if (!(impl->effect_support & SDL_HAPTIC_STATUS)) ret = 1;
+ else ret = pSDL_HapticGetEffectStatus(impl->sdl_haptic, impl->effect_ids[i]);
if (impl->effect_state[i] == ret) continue;
impl->effect_state[i] = ret;
hid_device_set_effect_state(iface, i, effect_flags | (ret == 1 ? EFFECT_STATE_EFFECT_PLAYING : 0));
--
2.35.1
1
0
[PATCH] dinput: Allow setting DIPROP_AUTOCENTER when exclusively acquired.
by Rémi Bernon 18 Mar '22
by Rémi Bernon 18 Mar '22
18 Mar '22
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/dinput/device.c | 2 ++
dlls/dinput/tests/force_feedback.c | 3 +++
2 files changed, 5 insertions(+)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 6cc190ee7fb..d881669c06f 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -1009,6 +1009,8 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con
switch (LOWORD( guid ))
{
case (DWORD_PTR)DIPROP_AUTOCENTER:
+ if (impl->status == STATUS_ACQUIRED && !is_exclusively_acquired( impl )) return DIERR_ACQUIRED;
+ break;
case (DWORD_PTR)DIPROP_AXISMODE:
case (DWORD_PTR)DIPROP_BUFFERSIZE:
case (DWORD_PTR)DIPROP_PHYSICALRANGE:
diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c
index 97aed4c993b..ce460147f9d 100644
--- a/dlls/dinput/tests/force_feedback.c
+++ b/dlls/dinput/tests/force_feedback.c
@@ -2924,6 +2924,9 @@ static BOOL test_force_feedback_joystick( DWORD version )
ok( hr == DI_OK, "Unacquire returned: %#lx\n", hr );
hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE );
ok( hr == DI_OK, "SetCooperativeLevel returned: %#lx\n", hr );
+ prop_dword.dwData = DIPROPAUTOCENTER_ON;
+ hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph );
+ ok( hr == DI_OK, "SetProperty DIPROP_AUTOCENTER returned %#lx\n", hr );
set_hid_expect( file, expect_acquire, sizeof(expect_acquire) );
hr = IDirectInputDevice8_Acquire( device );
--
2.35.1
1
0
18 Mar '22
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/windows.gaming.input/vector.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c
index c98c89195d1..db1a9057682 100644
--- a/dlls/windows.gaming.input/vector.c
+++ b/dlls/windows.gaming.input/vector.c
@@ -515,7 +515,7 @@ static HRESULT WINAPI vector_InsertAt( IVector_IInspectable *iface, UINT32 index
}
}
- memmove( impl->elements + index + 1, impl->elements + index, impl->size++ * sizeof(*impl->elements) );
+ memmove( impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements) );
IInspectable_AddRef( (impl->elements[index] = value) );
return S_OK;
}
@@ -528,7 +528,7 @@ static HRESULT WINAPI vector_RemoveAt( IVector_IInspectable *iface, UINT32 index
if (index >= impl->size) return E_BOUNDS;
IInspectable_Release( impl->elements[index] );
- memmove( impl->elements + index, impl->elements + index + 1, --impl->size * sizeof(*impl->elements) );
+ memmove( impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements) );
return S_OK;
}
--
2.35.1
1
0
18 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/exception.c | 1307 +++++++++++++++++++++---------------------
1 file changed, 654 insertions(+), 653 deletions(-)
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 442aadfd784..c4413d4d66e 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -17,6 +17,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include <stdarg.h>
#include <stdio.h>
@@ -217,19 +218,19 @@ static void test_debugger_xstate(HANDLE thread, CONTEXT *ctx, int stage)
length = sizeof(context_buffer);
bret = pInitializeContext(context_buffer, ctx->ContextFlags | CONTEXT_XSTATE, &xctx, &length);
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
ymm = pLocateXStateFeature(xctx, XSTATE_AVX, &length);
ok(!!ymm, "Got zero ymm.\n");
memset(ymm, 0xcc, sizeof(*ymm));
xmm = pLocateXStateFeature(xctx, XSTATE_LEGACY_SSE, &length);
- ok(length == sizeof(*xmm) * (sizeof(void *) == 8 ? 16 : 8), "Got unexpected length %#x.\n", length);
+ ok(length == sizeof(*xmm) * (sizeof(void *) == 8 ? 16 : 8), "Got unexpected length %#lx.\n", length);
ok(!!xmm, "Got zero xmm.\n");
memset(xmm, 0xcc, length);
status = pNtGetContextThread(thread, xctx);
- ok(!status, "NtSetContextThread failed with 0x%x\n", status);
+ ok(!status, "NtSetContextThread failed with 0x%lx\n", status);
c_ex = (CONTEXT_EX *)(xctx + 1);
xs = (XSTATE *)((char *)c_ex + c_ex->XState.Offset);
@@ -253,7 +254,7 @@ static void test_debugger_xstate(HANDLE thread, CONTEXT *ctx, int stage)
ymm->Ymm0.High = ymm->Ymm0.Low;
status = pNtSetContextThread(thread, xctx);
- ok(!status, "NtSetContextThread failed with 0x%x\n", status);
+ ok(!status, "NtSetContextThread failed with 0x%lx\n", status);
}
#endif
@@ -451,7 +452,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce
{
PCONTEXT context = ExceptionInfo->ContextRecord;
PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord;
- trace("vect. handler %08x addr:%p context.Eip:%x\n", rec->ExceptionCode,
+ trace("vect. handler %08lx addr:%p context.Eip:%lx\n", rec->ExceptionCode,
rec->ExceptionAddress, context->Eip);
ok(rec->ExceptionAddress == (char *)code_mem + 0xb
@@ -461,7 +462,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce
if (NtCurrentTeb()->Peb->BeingDebugged)
ok((void *)context->Eax == pRtlRaiseException ||
broken( is_wow64 && context->Eax == 0xf00f00f1 ), /* broken on vista */
- "debugger managed to modify Eax to %x should be %p\n",
+ "debugger managed to modify Eax to %lx should be %p\n",
context->Eax, pRtlRaiseException);
/* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT
@@ -472,14 +473,14 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce
ok(context->Eip == (DWORD)code_mem + 0xa ||
(is_wow64 && context->Eip == (DWORD)code_mem + 0xb) ||
broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */,
- "Eip at %x instead of %x or %x\n", context->Eip,
+ "Eip at %lx instead of %lx or %lx\n", context->Eip,
(DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb);
}
else
{
ok(context->Eip == (DWORD)code_mem + 0xb ||
broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */,
- "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xb);
+ "Eip at %lx instead of %lx\n", context->Eip, (DWORD)code_mem + 0xb);
}
/* test if context change is preserved from vectored handler to stack handlers */
@@ -490,7 +491,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce
static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher )
{
- trace( "exception: %08x flags:%x addr:%p context: Eip:%x\n",
+ trace( "exception: %08lx flags:%lx addr:%p context: Eip:%lx\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip );
ok(rec->ExceptionAddress == (char *)code_mem + 0xb
@@ -499,7 +500,7 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR
ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE) ||
broken(context->ContextFlags == CONTEXT_FULL), /* win2003 */
- "wrong context flags %x\n", context->ContextFlags );
+ "wrong context flags %lx\n", context->ContextFlags );
/* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT
* even if raised by RtlRaiseException
@@ -509,18 +510,18 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR
ok(context->Eip == (DWORD)code_mem + 0xa ||
(is_wow64 && context->Eip == (DWORD)code_mem + 0xb) ||
broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */,
- "Eip at %x instead of %x or %x\n", context->Eip,
+ "Eip at %lx instead of %lx or %lx\n", context->Eip,
(DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb);
}
else
{
ok(context->Eip == (DWORD)code_mem + 0xb ||
broken(context->Eip == (DWORD)code_mem + 0xd) /* w2008 */,
- "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xb);
+ "Eip at %lx instead of %lx\n", context->Eip, (DWORD)code_mem + 0xb);
}
if(have_vectored_api)
- ok(context->Eax == 0xf00f00f0, "Eax is %x, should have been set to 0xf00f00f0 in vectored handler\n",
+ ok(context->Eax == 0xf00f00f0, "Eax is %lx, should have been set to 0xf00f00f0 in vectored handler\n",
context->Eax);
/* give the debugger a chance to examine the state a second time */
@@ -603,16 +604,16 @@ static DWORD unwind_expected_eax;
static DWORD unwind_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher )
{
- trace("exception: %08x flags:%x addr:%p context: Eip:%x\n",
+ trace("exception: %08lx flags:%lx addr:%p context: Eip:%lx\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip);
- ok(rec->ExceptionCode == STATUS_UNWIND, "ExceptionCode is %08x instead of %08x\n",
+ ok(rec->ExceptionCode == STATUS_UNWIND, "ExceptionCode is %08lx instead of %08lx\n",
rec->ExceptionCode, STATUS_UNWIND);
ok(rec->ExceptionAddress == (char *)code_mem + 0x22 || broken(TRUE) /* Win10 1709 */,
"ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0x22);
- ok(context->Eip == (DWORD)code_mem + 0x22, "context->Eip is %08x instead of %08x\n",
+ ok(context->Eip == (DWORD)code_mem + 0x22, "context->Eip is %08lx instead of %08lx\n",
context->Eip, (DWORD)code_mem + 0x22);
- ok(context->Eax == unwind_expected_eax, "context->Eax is %08x instead of %08x\n",
+ ok(context->Eax == unwind_expected_eax, "context->Eax is %08lx instead of %08lx\n",
context->Eax, unwind_expected_eax);
context->Eax += 1;
@@ -662,14 +663,14 @@ static void test_unwind(void)
/* test unwind to current frame */
unwind_expected_eax = 0xDEAD0000;
retval = func(pRtlUnwind, frame2, NULL, 0xDEAD0000);
- ok(retval == 0xDEAD0000, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0000);
+ ok(retval == 0xDEAD0000, "RtlUnwind returned eax %08lx instead of %08x\n", retval, 0xDEAD0000);
ok(NtCurrentTeb()->Tib.ExceptionList == frame2, "Exception record points to %p instead of %p\n",
NtCurrentTeb()->Tib.ExceptionList, frame2);
/* unwind to frame1 */
unwind_expected_eax = 0xDEAD0000;
retval = func(pRtlUnwind, frame1, NULL, 0xDEAD0000);
- ok(retval == 0xDEAD0001, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0001);
+ ok(retval == 0xDEAD0001, "RtlUnwind returned eax %08lx instead of %08x\n", retval, 0xDEAD0001);
ok(NtCurrentTeb()->Tib.ExceptionList == frame1, "Exception record points to %p instead of %p\n",
NtCurrentTeb()->Tib.ExceptionList, frame1);
@@ -684,14 +685,14 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram
unsigned int i, parameter_count, entry = except - exceptions;
got_exception++;
- trace( "exception %u: %x flags:%x addr:%p\n",
+ trace( "exception %u: %lx flags:%lx addr:%p\n",
entry, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress );
ok( rec->ExceptionCode == except->status ||
(except->alt_status != 0 && rec->ExceptionCode == except->alt_status),
- "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status );
+ "%u: Wrong exception code %lx/%lx\n", entry, rec->ExceptionCode, except->status );
ok( context->Eip == (DWORD_PTR)code_mem + except->offset,
- "%u: Unexpected eip %#x/%#lx\n", entry,
+ "%u: Unexpected eip %#lx/%#lx\n", entry,
context->Eip, (DWORD_PTR)code_mem + except->offset );
ok( rec->ExceptionAddress == (char*)context->Eip ||
(rec->ExceptionCode == STATUS_BREAKPOINT && rec->ExceptionAddress == (char*)context->Eip + 1),
@@ -706,7 +707,7 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram
parameter_count = except->alt_nb_params;
ok( rec->NumberParameters == parameter_count,
- "%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count );
+ "%u: Unexpected parameter count %lu/%u\n", entry, rec->NumberParameters, parameter_count );
/* Most CPUs (except Intel Core apparently) report a segment limit violation */
/* instead of page faults for accesses beyond 0xffffffff */
@@ -728,14 +729,14 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram
{
for (i = 0; i < rec->NumberParameters; i++)
ok( rec->ExceptionInformation[i] == except->params[i],
- "%u: Wrong parameter %d: %lx/%x\n",
+ "%u: Wrong parameter %d: %lx/%lx\n",
entry, i, rec->ExceptionInformation[i], except->params[i] );
}
else
{
for (i = 0; i < rec->NumberParameters; i++)
ok( rec->ExceptionInformation[i] == except->alt_params[i],
- "%u: Wrong parameter %d: %lx/%x\n",
+ "%u: Wrong parameter %d: %lx/%lx\n",
entry, i, rec->ExceptionInformation[i], except->alt_params[i] );
}
@@ -792,7 +793,7 @@ static DWORD dreg_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD
}
#define CHECK_DEBUG_REG(n, m) \
- ok((ctx.Dr##n & m) == test->dr##n, "(%d) failed to set debug register " #n " to %x, got %x\n", \
+ ok((ctx.Dr##n & m) == test->dr##n, "(%d) failed to set debug register " #n " to %lx, got %lx\n", \
test_num, test->dr##n, ctx.Dr##n)
static void check_debug_registers(int test_num, const struct dbgreg_test *test)
@@ -802,7 +803,7 @@ static void check_debug_registers(int test_num, const struct dbgreg_test *test)
ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS;
status = pNtGetContextThread(GetCurrentThread(), &ctx);
- ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status);
CHECK_DEBUG_REG(0, ~0);
CHECK_DEBUG_REG(1, ~0);
@@ -831,7 +832,7 @@ static DWORD single_step_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_
/* show that the last single step exception on the popf instruction
* (which removed the TF bit), still is a EXCEPTION_SINGLE_STEP exception */
ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP,
- "exception is not EXCEPTION_SINGLE_STEP: %x\n", rec->ExceptionCode);
+ "exception is not EXCEPTION_SINGLE_STEP: %lx\n", rec->ExceptionCode);
}
return ExceptionContinueExecution;
@@ -906,11 +907,11 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *
{
got_exception++;
ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP,
- "wrong exception code: %x\n", rec->ExceptionCode);
+ "wrong exception code: %lx\n", rec->ExceptionCode);
if(got_exception == 1) {
/* hw bp exception on first nop */
- ok( context->Eip == (DWORD)code_mem, "eip is wrong: %x instead of %x\n",
+ ok( context->Eip == (DWORD)code_mem, "eip is wrong: %lx instead of %lx\n",
context->Eip, (DWORD)code_mem);
ok( (context->Dr6 & 0xf) == 1, "B0 flag is not set in Dr6\n");
ok( !(context->Dr6 & 0x4000), "BS flag is set in Dr6\n");
@@ -918,7 +919,7 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *
context->EFlags |= 0x100; /* enable single stepping */
} else if( got_exception == 2) {
/* single step exception on second nop */
- ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %x instead of %x\n",
+ ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %lx instead of %lx\n",
context->Eip, (DWORD)code_mem + 1);
ok( (context->Dr6 & 0x4000), "BS flag is not set in Dr6\n");
/* depending on the win version the B0 bit is already set here as well
@@ -926,7 +927,7 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *
context->EFlags |= 0x100;
} else if( got_exception == 3) {
/* hw bp exception on second nop */
- ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %x instead of %x\n",
+ ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %lx instead of %lx\n",
context->Eip, (DWORD)code_mem + 1);
ok( (context->Dr6 & 0xf) == 1, "B0 flag is not set in Dr6\n");
ok( !(context->Dr6 & 0x4000), "BS flag is set in Dr6\n");
@@ -934,7 +935,7 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *
context->EFlags |= 0x100;
} else {
/* single step exception on ret */
- ok( context->Eip == (DWORD)code_mem + 2, "eip is wrong: %x instead of %x\n",
+ ok( context->Eip == (DWORD)code_mem + 2, "eip is wrong: %lx instead of %lx\n",
context->Eip, (DWORD)code_mem + 2);
ok( (context->Dr6 & 0xf) == 0, "B0...3 flags in Dr6 shouldn't be set\n");
ok( (context->Dr6 & 0x4000), "BS flag is not set in Dr6\n");
@@ -952,7 +953,7 @@ static DWORD int3_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD
{
ok( rec->ExceptionAddress == code_mem, "exception address not at: %p, but at %p\n",
code_mem, rec->ExceptionAddress);
- ok( context->Eip == (DWORD)code_mem, "eip not at: %p, but at %#x\n", code_mem, context->Eip);
+ ok( context->Eip == (DWORD)code_mem, "eip not at: %p, but at %#lx\n", code_mem, context->Eip);
if(context->Eip == (DWORD)code_mem) context->Eip++; /* skip breakpoint */
return ExceptionContinueExecution;
@@ -1020,7 +1021,7 @@ static void test_exceptions(void)
ctx.Dr7 = 3;
ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS;
res = pNtSetContextThread( GetCurrentThread(), &ctx);
- ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res);
+ ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", res);
got_exception = 0;
run_exception_test(bpx_handler, NULL, dummy_code, sizeof(dummy_code), 0);
@@ -1031,7 +1032,7 @@ static void test_exceptions(void)
/* test that hardware breakpoints are not inherited by created threads */
res = pNtSetContextThread( GetCurrentThread(), &ctx );
- ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res );
+ ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", res );
h = CreateThread( NULL, 0, hw_reg_exception_thread, 0, 0, NULL );
WaitForSingleObject( h, 10000 );
@@ -1040,13 +1041,13 @@ static void test_exceptions(void)
h = CreateThread( NULL, 0, hw_reg_exception_thread, (void *)4, CREATE_SUSPENDED, NULL );
ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS;
res = pNtGetContextThread( h, &ctx );
- ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", res );
- ok( ctx.Dr0 == 0, "dr0 %x\n", ctx.Dr0 );
- ok( ctx.Dr7 == 0, "dr7 %x\n", ctx.Dr7 );
+ ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", res );
+ ok( ctx.Dr0 == 0, "dr0 %lx\n", ctx.Dr0 );
+ ok( ctx.Dr7 == 0, "dr7 %lx\n", ctx.Dr7 );
ctx.Dr0 = (DWORD)code_mem;
ctx.Dr7 = 3;
res = pNtSetContextThread( h, &ctx );
- ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res );
+ ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", res );
ResumeThread( h );
WaitForSingleObject( h, 10000 );
CloseHandle( h );
@@ -1054,7 +1055,7 @@ static void test_exceptions(void)
ctx.Dr0 = 0;
ctx.Dr7 = 0;
res = pNtSetContextThread( GetCurrentThread(), &ctx );
- ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res );
+ ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", res );
}
static void test_debugger(DWORD cont_status)
@@ -1079,7 +1080,7 @@ static void test_debugger(DWORD cont_status)
sprintf(cmdline, "%s %s %s %p", my_argv[0], my_argv[1], "debuggee", &test_stage);
ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi);
- ok(ret, "could not create child process error: %u\n", GetLastError());
+ ok(ret, "could not create child process error: %lu\n", GetLastError());
if (!ret)
return;
@@ -1090,11 +1091,11 @@ static void test_debugger(DWORD cont_status)
ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef);
ok(!ret, "ContinueDebugEvent unexpectedly succeeded\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected last error: %u\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected last error: %lu\n", GetLastError());
if (de.dwThreadId != pi.dwThreadId)
{
- trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode);
+ trace("event %ld not coming from main thread, ignoring\n", de.dwDebugEventCode);
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status);
continue;
}
@@ -1115,16 +1116,16 @@ static void test_debugger(DWORD cont_status)
counter++;
status = pNtReadVirtualMemory(pi.hProcess, &code_mem, &code_mem_address,
sizeof(code_mem_address), &size_read);
- ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status);
+ ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage,
sizeof(stage), &size_read);
- ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status);
+ ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
ctx.ContextFlags = CONTEXT_FULL | CONTEXT_EXTENDED_REGISTERS;
status = pNtGetContextThread(pi.hThread, &ctx);
- ok(!status, "NtGetContextThread failed with 0x%x\n", status);
+ ok(!status, "NtGetContextThread failed with 0x%lx\n", status);
- trace("exception 0x%x at %p firstchance=%d Eip=0x%x, Eax=0x%x\n",
+ trace("exception 0x%lx at %p firstchance=%ld Eip=0x%lx, Eax=0x%lx\n",
de.u.Exception.ExceptionRecord.ExceptionCode,
de.u.Exception.ExceptionRecord.ExceptionAddress, de.u.Exception.dwFirstChance, ctx.Eip, ctx.Eax);
@@ -1148,7 +1149,7 @@ static void test_debugger(DWORD cont_status)
{
if (stage == 1)
{
- ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at %x instead of %p\n",
+ ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at %lx instead of %p\n",
ctx.Eip, (char *)code_mem_address + 0xb);
/* setting the context from debugger does not affect the context that the
* exception handler gets, except on w2008 */
@@ -1162,7 +1163,7 @@ static void test_debugger(DWORD cont_status)
if (de.u.Exception.dwFirstChance)
{
/* debugger gets first chance exception with unmodified ctx.Eip */
- ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%x instead of %p\n",
+ ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%lx instead of %p\n",
ctx.Eip, (char *)code_mem_address + 0xb);
ctx.Eip = (UINT_PTR)code_mem_address + 0xd;
ctx.Eax = 0xf00f00f1;
@@ -1179,7 +1180,7 @@ static void test_debugger(DWORD cont_status)
ok((char *)ctx.Eip == (char *)code_mem_address + 0xa ||
(is_wow64 && (char *)ctx.Eip == (char *)code_mem_address + 0xb) ||
broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */,
- "Eip at 0x%x instead of %p\n",
+ "Eip at 0x%lx instead of %p\n",
ctx.Eip, (char *)code_mem_address + 0xa);
/* need to fixup Eip for debuggee */
if ((char *)ctx.Eip == (char *)code_mem_address + 0xa)
@@ -1188,7 +1189,7 @@ static void test_debugger(DWORD cont_status)
else
ok((char *)ctx.Eip == (char *)code_mem_address + 0xb ||
broken((char *)ctx.Eip == (char *)code_mem_address + 0xd) /* w2008 */,
- "Eip at 0x%x instead of %p\n",
+ "Eip at 0x%lx instead of %p\n",
ctx.Eip, (char *)code_mem_address + 0xb);
/* here we handle exception */
}
@@ -1196,28 +1197,28 @@ static void test_debugger(DWORD cont_status)
else if (stage == 7 || stage == 8)
{
ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT,
- "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode);
+ "expected EXCEPTION_BREAKPOINT, got %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode);
ok((char *)ctx.Eip == (char *)code_mem_address + 0x1d,
- "expected Eip = %p, got 0x%x\n", (char *)code_mem_address + 0x1d, ctx.Eip);
+ "expected Eip = %p, got 0x%lx\n", (char *)code_mem_address + 0x1d, ctx.Eip);
if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
}
else if (stage == 9 || stage == 10)
{
ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT,
- "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode);
+ "expected EXCEPTION_BREAKPOINT, got %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode);
ok((char *)ctx.Eip == (char *)code_mem_address + 2,
- "expected Eip = %p, got 0x%x\n", (char *)code_mem_address + 2, ctx.Eip);
+ "expected Eip = %p, got 0x%lx\n", (char *)code_mem_address + 2, ctx.Eip);
if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
}
else if (stage == 11 || stage == 12 || stage == 13)
{
ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE,
- "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode,
+ "unexpected exception code %08lx, expected %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode,
EXCEPTION_INVALID_HANDLE);
ok(de.u.Exception.ExceptionRecord.NumberParameters == 0,
- "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters);
+ "unexpected number of parameters %ld, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters);
if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
}
@@ -1229,26 +1230,26 @@ static void test_debugger(DWORD cont_status)
{
USHORT ss;
__asm__( "movw %%ss,%0" : "=r" (ss) );
- ok( ctx.SegSs == ss, "wrong ss %04x / %04x\n", ctx.SegSs, ss );
- ok( ctx.SegFs != ctx.SegSs, "wrong fs %04x / %04x\n", ctx.SegFs, ctx.SegSs );
+ ok( ctx.SegSs == ss, "wrong ss %04lx / %04x\n", ctx.SegSs, ss );
+ ok( ctx.SegFs != ctx.SegSs, "wrong fs %04lx / %04lx\n", ctx.SegFs, ctx.SegSs );
if (is_wow64) todo_wine
{
- ok( ctx.SegDs == ctx.SegSs, "wrong ds %04x / %04x\n", ctx.SegDs, ctx.SegSs );
- ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs );
- ok( ctx.SegGs == ctx.SegSs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs );
+ ok( ctx.SegDs == ctx.SegSs, "wrong ds %04lx / %04lx\n", ctx.SegDs, ctx.SegSs );
+ ok( ctx.SegEs == ctx.SegSs, "wrong es %04lx / %04lx\n", ctx.SegEs, ctx.SegSs );
+ ok( ctx.SegGs == ctx.SegSs, "wrong gs %04lx / %04lx\n", ctx.SegGs, ctx.SegSs );
}
else
{
- ok( !ctx.SegDs, "wrong ds %04x / %04x\n", ctx.SegDs, ctx.SegSs );
- ok( !ctx.SegEs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs );
- ok( !ctx.SegGs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs );
+ ok( !ctx.SegDs, "wrong ds %04lx / %04lx\n", ctx.SegDs, ctx.SegSs );
+ ok( !ctx.SegEs, "wrong es %04lx / %04lx\n", ctx.SegEs, ctx.SegSs );
+ ok( !ctx.SegGs, "wrong gs %04lx / %04lx\n", ctx.SegGs, ctx.SegSs );
}
}
else
ok(FALSE, "unexpected stage %u\n", stage);
status = pNtSetContextThread(pi.hThread, &ctx);
- ok(!status, "NtSetContextThread failed with 0x%x\n", status);
+ ok(!status, "NtSetContextThread failed with 0x%lx\n", status);
}
}
else if (de.dwDebugEventCode == OUTPUT_DEBUG_STRING_EVENT)
@@ -1258,7 +1259,7 @@ static void test_debugger(DWORD cont_status)
status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage,
sizeof(stage), &size_read);
- ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status);
+ ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
ok(!de.u.DebugString.fUnicode, "unexpected unicode debug string event\n");
ok(de.u.DebugString.nDebugStringLength < sizeof(buffer) - 1, "buffer not large enough to hold %d bytes\n",
@@ -1267,7 +1268,7 @@ static void test_debugger(DWORD cont_status)
memset(buffer, 0, sizeof(buffer));
status = pNtReadVirtualMemory(pi.hProcess, de.u.DebugString.lpDebugStringData, buffer,
de.u.DebugString.nDebugStringLength, &size_read);
- ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status);
+ ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
if (stage == 3 || stage == 4)
ok(!strcmp(buffer, "Hello World"), "got unexpected debug string '%s'\n", buffer);
@@ -1282,13 +1283,13 @@ static void test_debugger(DWORD cont_status)
status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage,
sizeof(stage), &size_read);
- ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status);
+ ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
if (stage == 5 || stage == 6)
{
- ok(de.u.RipInfo.dwError == 0x11223344, "got unexpected rip error code %08x, expected %08x\n",
+ ok(de.u.RipInfo.dwError == 0x11223344, "got unexpected rip error code %08lx, expected %08x\n",
de.u.RipInfo.dwError, 0x11223344);
- ok(de.u.RipInfo.dwType == 0x55667788, "got unexpected rip type %08x, expected %08x\n",
+ ok(de.u.RipInfo.dwType == 0x55667788, "got unexpected rip type %08lx, expected %08x\n",
de.u.RipInfo.dwType, 0x55667788);
}
else
@@ -1303,9 +1304,9 @@ static void test_debugger(DWORD cont_status)
wait_child_process( pi.hProcess );
ret = CloseHandle(pi.hThread);
- ok(ret, "error %u\n", GetLastError());
+ ok(ret, "error %lu\n", GetLastError());
ret = CloseHandle(pi.hProcess);
- ok(ret, "error %u\n", GetLastError());
+ ok(ret, "error %lu\n", GetLastError());
return;
}
@@ -1329,13 +1330,13 @@ static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R
skip("system doesn't support SIMD exceptions\n");
else {
ok( rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS,
- "exception code: %#x, should be %#x\n",
+ "exception code: %#lx, should be %#lx\n",
rec->ExceptionCode, STATUS_FLOAT_MULTIPLE_TRAPS);
- ok( rec->NumberParameters == is_wow64 ? 2 : 1, "# of params: %i\n", rec->NumberParameters);
+ ok( rec->NumberParameters == is_wow64 ? 2 : 1, "# of params: %li\n", rec->NumberParameters);
ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]);
if (rec->NumberParameters == 2)
ok( rec->ExceptionInformation[1] == ((XSAVE_FORMAT *)context->ExtendedRegisters)->MxCsr,
- "param #1: %lx / %x\n", rec->ExceptionInformation[1],
+ "param #1: %lx / %lx\n", rec->ExceptionInformation[1],
((XSAVE_FORMAT *)context->ExtendedRegisters)->MxCsr);
}
context->Eip += 3; /* skip divps */
@@ -1478,18 +1479,18 @@ static void test_fpu_exceptions(void)
memset(&info, 0, sizeof(info));
run_exception_test(fpu_exception_handler, &info, fpu_exception_test_ie, sizeof(fpu_exception_test_ie), 0);
ok(info.exception_code == EXCEPTION_FLT_STACK_CHECK,
- "Got exception code %#x, expected EXCEPTION_FLT_STACK_CHECK\n", info.exception_code);
+ "Got exception code %#lx, expected EXCEPTION_FLT_STACK_CHECK\n", info.exception_code);
ok(info.exception_offset == 0x19 || info.exception_offset == info.eip_offset,
- "Got exception offset %#x, expected 0x19\n", info.exception_offset);
- ok(info.eip_offset == 0x1b, "Got EIP offset %#x, expected 0x1b\n", info.eip_offset);
+ "Got exception offset %#lx, expected 0x19\n", info.exception_offset);
+ ok(info.eip_offset == 0x1b, "Got EIP offset %#lx, expected 0x1b\n", info.eip_offset);
memset(&info, 0, sizeof(info));
run_exception_test(fpu_exception_handler, &info, fpu_exception_test_de, sizeof(fpu_exception_test_de), 0);
ok(info.exception_code == EXCEPTION_FLT_DIVIDE_BY_ZERO,
- "Got exception code %#x, expected EXCEPTION_FLT_DIVIDE_BY_ZERO\n", info.exception_code);
+ "Got exception code %#lx, expected EXCEPTION_FLT_DIVIDE_BY_ZERO\n", info.exception_code);
ok(info.exception_offset == 0x17 || info.exception_offset == info.eip_offset,
- "Got exception offset %#x, expected 0x17\n", info.exception_offset);
- ok(info.eip_offset == 0x19, "Got EIP offset %#x, expected 0x19\n", info.eip_offset);
+ "Got exception offset %#lx, expected 0x17\n", info.exception_offset);
+ ok(info.eip_offset == 0x19, "Got EIP offset %#lx, expected 0x19\n", info.eip_offset);
}
struct dpe_exception_info {
@@ -1504,9 +1505,9 @@ static DWORD dpe_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION
struct dpe_exception_info *info = *(struct dpe_exception_info **)(frame + 1);
ok(rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION,
- "Exception code %08x\n", rec->ExceptionCode);
+ "Exception code %08lx\n", rec->ExceptionCode);
ok(rec->NumberParameters == 2,
- "Parameter count: %d\n", rec->NumberParameters);
+ "Parameter count: %ld\n", rec->NumberParameters);
ok((LPVOID)rec->ExceptionInformation[1] == code_mem,
"Exception address: %p, expected %p\n",
(LPVOID)rec->ExceptionInformation[1], code_mem);
@@ -1535,14 +1536,14 @@ static void test_dpe_exceptions(void)
skip("This software platform does not support DEP\n");
return;
}
- ok(stat == STATUS_INFO_LENGTH_MISMATCH, "buffer too small: %08x\n", stat);
+ ok(stat == STATUS_INFO_LENGTH_MISMATCH, "buffer too small: %08lx\n", stat);
/* Query DEP */
stat = pNtQueryInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val, &len);
- ok(stat == STATUS_SUCCESS, "querying DEP: status %08x\n", stat);
+ ok(stat == STATUS_SUCCESS, "querying DEP: status %08lx\n", stat);
if(stat == STATUS_SUCCESS)
{
- ok(len == sizeof val, "returned length: %d\n", len);
+ ok(len == sizeof val, "returned length: %ld\n", len);
if(val & MEM_EXECUTE_OPTION_PERMANENT)
{
skip("toggling DEP impossible - status locked\n");
@@ -1559,7 +1560,7 @@ static void test_dpe_exceptions(void)
/* Enable DEP */
val = MEM_EXECUTE_OPTION_DISABLE;
stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val);
- ok(stat == STATUS_SUCCESS, "enabling DEP: status %08x\n", stat);
+ ok(stat == STATUS_SUCCESS, "enabling DEP: status %08lx\n", stat);
}
if(can_test_with)
@@ -1594,7 +1595,7 @@ static void test_dpe_exceptions(void)
/* Disable DEP */
val = MEM_EXECUTE_OPTION_ENABLE;
stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val);
- ok(stat == STATUS_SUCCESS, "disabling DEP: status %08x\n", stat);
+ ok(stat == STATUS_SUCCESS, "disabling DEP: status %08lx\n", stat);
}
/* page is read without exec here */
@@ -1621,18 +1622,18 @@ static void test_dpe_exceptions(void)
/* Turn off DEP permanently */
val = MEM_EXECUTE_OPTION_ENABLE | MEM_EXECUTE_OPTION_PERMANENT;
stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val);
- ok(stat == STATUS_SUCCESS, "disabling DEP permanently: status %08x\n", stat);
+ ok(stat == STATUS_SUCCESS, "disabling DEP permanently: status %08lx\n", stat);
}
/* Try to turn off DEP */
val = MEM_EXECUTE_OPTION_ENABLE;
stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val);
- ok(stat == STATUS_ACCESS_DENIED, "disabling DEP while permanent: status %08x\n", stat);
+ ok(stat == STATUS_ACCESS_DENIED, "disabling DEP while permanent: status %08lx\n", stat);
/* Try to turn on DEP */
val = MEM_EXECUTE_OPTION_DISABLE;
stat = pNtSetInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val);
- ok(stat == STATUS_ACCESS_DENIED, "enabling DEP while permanent: status %08x\n", stat);
+ ok(stat == STATUS_ACCESS_DENIED, "enabling DEP while permanent: status %08lx\n", stat);
}
static void test_thread_context(void)
@@ -1699,25 +1700,25 @@ static void test_thread_context(void)
memcpy( func_ptr, call_func, sizeof(call_func) );
#define COMPARE(reg) \
- ok( context.reg == expect.reg, "wrong " #reg " %08x/%08x\n", context.reg, expect.reg )
+ ok( context.reg == expect.reg, "wrong " #reg " %08lx/%08lx\n", context.reg, expect.reg )
memset( &context, 0xcc, sizeof(context) );
memset( &expect, 0xcc, sizeof(expect) );
func_ptr( &expect, pRtlCaptureContext, &context, 0, &new_x87_control );
- trace( "expect: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x "
- "eip=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n",
+ trace( "expect: eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx "
+ "eip=%08lx cs=%04lx ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx prev=%08lx\n",
expect.Eax, expect.Ebx, expect.Ecx, expect.Edx, expect.Esi, expect.Edi,
expect.Ebp, expect.Esp, expect.Eip, expect.SegCs, expect.SegDs, expect.SegEs,
expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, expect.prev_frame );
- trace( "actual: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x "
- "eip=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n",
+ trace( "actual: eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx "
+ "eip=%08lx cs=%04lx ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx\n",
context.Eax, context.Ebx, context.Ecx, context.Edx, context.Esi, context.Edi,
context.Ebp, context.Esp, context.Eip, context.SegCs, context.SegDs, context.SegEs,
context.SegFs, context.SegGs, context.SegSs, context.EFlags );
ok( context.ContextFlags == (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS) ||
broken( context.ContextFlags == 0xcccccccc ), /* <= vista */
- "wrong flags %08x\n", context.ContextFlags );
+ "wrong flags %08lx\n", context.ContextFlags );
COMPARE( Eax );
COMPARE( Ebx );
COMPARE( Ecx );
@@ -1733,23 +1734,23 @@ static void test_thread_context(void)
COMPARE( SegSs );
COMPARE( EFlags );
/* Ebp is from the previous stackframe */
- ok( context.Ebp == expect.prev_frame, "wrong Ebp %08x/%08x\n", context.Ebp, expect.prev_frame );
+ ok( context.Ebp == expect.prev_frame, "wrong Ebp %08lx/%08lx\n", context.Ebp, expect.prev_frame );
/* Esp is the value on entry to the previous stackframe */
- ok( context.Esp == expect.Ebp + 8, "wrong Esp %08x/%08x\n", context.Esp, expect.Ebp + 8 );
+ ok( context.Esp == expect.Ebp + 8, "wrong Esp %08lx/%08lx\n", context.Esp, expect.Ebp + 8 );
memset( &context, 0xcc, sizeof(context) );
memset( &expect, 0xcc, sizeof(expect) );
context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT;
status = func_ptr( &expect, pNtGetContextThread, (void *)GetCurrentThread(), &context, &new_x87_control );
- ok( status == STATUS_SUCCESS, "NtGetContextThread failed %08x\n", status );
- trace( "expect: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x "
- "eip=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n",
+ ok( status == STATUS_SUCCESS, "NtGetContextThread failed %08lx\n", status );
+ trace( "expect: eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx "
+ "eip=%08lx cs=%04lx ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx prev=%08lx\n",
expect.Eax, expect.Ebx, expect.Ecx, expect.Edx, expect.Esi, expect.Edi,
expect.Ebp, expect.Esp, expect.Eip, expect.SegCs, expect.SegDs, expect.SegEs,
expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, expect.prev_frame );
- trace( "actual: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x "
- "eip=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n",
+ trace( "actual: eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx "
+ "eip=%08lx cs=%04lx ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx\n",
context.Eax, context.Ebx, context.Ecx, context.Edx, context.Esi, context.Edi,
context.Ebp, context.Esp, context.Eip, context.SegCs, context.SegDs, context.SegEs,
context.SegFs, context.SegGs, context.SegSs, context.EFlags );
@@ -1760,21 +1761,21 @@ static void test_thread_context(void)
COMPARE( Ebp );
/* Esp is the stack upon entry to NtGetContextThread */
ok( context.Esp == expect.Esp - 12 || context.Esp == expect.Esp - 16,
- "wrong Esp %08x/%08x\n", context.Esp, expect.Esp );
+ "wrong Esp %08lx/%08lx\n", context.Esp, expect.Esp );
/* Eip is somewhere close to the NtGetContextThread implementation */
ok( (char *)context.Eip >= (char *)pNtGetContextThread - 0x40000 &&
(char *)context.Eip <= (char *)pNtGetContextThread + 0x40000,
- "wrong Eip %08x/%08x\n", context.Eip, (DWORD)pNtGetContextThread );
+ "wrong Eip %08lx/%08lx\n", context.Eip, (DWORD)pNtGetContextThread );
/* segment registers clear the high word */
- ok( context.SegCs == LOWORD(expect.SegCs), "wrong SegCs %08x/%08x\n", context.SegCs, expect.SegCs );
- ok( context.SegDs == LOWORD(expect.SegDs), "wrong SegDs %08x/%08x\n", context.SegDs, expect.SegDs );
- ok( context.SegEs == LOWORD(expect.SegEs), "wrong SegEs %08x/%08x\n", context.SegEs, expect.SegEs );
- ok( context.SegFs == LOWORD(expect.SegFs), "wrong SegFs %08x/%08x\n", context.SegFs, expect.SegFs );
- ok( context.SegGs == LOWORD(expect.SegGs), "wrong SegGs %08x/%08x\n", context.SegGs, expect.SegGs );
- ok( context.SegSs == LOWORD(expect.SegSs), "wrong SegSs %08x/%08x\n", context.SegSs, expect.SegGs );
+ ok( context.SegCs == LOWORD(expect.SegCs), "wrong SegCs %08lx/%08lx\n", context.SegCs, expect.SegCs );
+ ok( context.SegDs == LOWORD(expect.SegDs), "wrong SegDs %08lx/%08lx\n", context.SegDs, expect.SegDs );
+ ok( context.SegEs == LOWORD(expect.SegEs), "wrong SegEs %08lx/%08lx\n", context.SegEs, expect.SegEs );
+ ok( context.SegFs == LOWORD(expect.SegFs), "wrong SegFs %08lx/%08lx\n", context.SegFs, expect.SegFs );
+ ok( context.SegGs == LOWORD(expect.SegGs), "wrong SegGs %08lx/%08lx\n", context.SegGs, expect.SegGs );
+ ok( context.SegSs == LOWORD(expect.SegSs), "wrong SegSs %08lx/%08lx\n", context.SegSs, expect.SegGs );
ok( LOWORD(context.FloatSave.ControlWord) == LOWORD(expect.x87_control),
- "wrong x87 control word %#x/%#x.\n", context.FloatSave.ControlWord, expect.x87_control );
+ "wrong x87 control word %#lx/%#lx.\n", context.FloatSave.ControlWord, expect.x87_control );
ok( LOWORD(expect.x87_control) == LOWORD(new_x87_control),
"x87 control word changed in NtGetContextThread() %#x/%#x.\n",
LOWORD(expect.x87_control), LOWORD(new_x87_control) );
@@ -1811,7 +1812,7 @@ static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGIST
{
ok(hook_called, "Hook was not called.\n");
- ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode);
+ ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#lx.\n", rec->ExceptionCode);
got_exception = 1;
dbg_except_continue_handler_eip = (void *)context->Eip;
@@ -1829,10 +1830,10 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE
EXCEPTION_RECORD *rec = e->ExceptionRecord;
CONTEXT *context = e->ContextRecord;
- trace("dbg_except_continue_vectored_handler, code %#x, eip %#x, ExceptionAddress %p.\n",
+ trace("dbg_except_continue_vectored_handler, code %#lx, eip %#lx, ExceptionAddress %p.\n",
rec->ExceptionCode, context->Eip, rec->ExceptionAddress);
- ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode);
+ ok(rec->ExceptionCode == 0x80000003, "Got unexpected ExceptionCode %#lx.\n", rec->ExceptionCode);
got_exception = 1;
@@ -1853,13 +1854,13 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE
static void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context)
{
trace("rec %p, context %p.\n", rec, context);
- trace("context->Eip %#x, context->Esp %#x, ContextFlags %#x.\n",
+ trace("context->Eip %#lx, context->Esp %#lx, ContextFlags %#lx.\n",
context->Eip, context->Esp, context->ContextFlags);
hook_called = TRUE;
/* Broken on Win2008, probably rec offset in stack is different. */
ok(rec->ExceptionCode == 0x80000003 || broken(!rec->ExceptionCode),
- "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode);
+ "Got unexpected ExceptionCode %#lx.\n", rec->ExceptionCode);
hook_KiUserExceptionDispatcher_eip = (void *)context->Eip;
hook_exception_address = rec->ExceptionAddress;
@@ -1945,11 +1946,11 @@ static void test_kiuserexceptiondispatcher(void)
*(unsigned int *)(hook_trampoline + 8) = (ULONG_PTR)&pKiUserExceptionDispatcher;
ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1);
- ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());
+ ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError());
ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes),
PAGE_EXECUTE_READWRITE, &old_protect2);
- ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());
+ ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError());
memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher,
sizeof(saved_KiUserExceptionDispatcher_bytes));
@@ -1972,9 +1973,9 @@ static void test_kiuserexceptiondispatcher(void)
ok(got_exception, "Handler was not called.\n");
ok(hook_called, "Hook was not called.\n");
- ok(test_kiuserexceptiondispatcher_regs.new_eax == 0xdeadbeef, "Got unexpected eax %#x.\n",
+ ok(test_kiuserexceptiondispatcher_regs.new_eax == 0xdeadbeef, "Got unexpected eax %#lx.\n",
test_kiuserexceptiondispatcher_regs.new_eax);
- ok(test_kiuserexceptiondispatcher_regs.new_esi == 0xdeadbeef, "Got unexpected esi %#x.\n",
+ ok(test_kiuserexceptiondispatcher_regs.new_esi == 0xdeadbeef, "Got unexpected esi %#lx.\n",
test_kiuserexceptiondispatcher_regs.new_esi);
ok(test_kiuserexceptiondispatcher_regs.old_edi
== test_kiuserexceptiondispatcher_regs.new_edi, "edi does not match.\n");
@@ -2015,9 +2016,9 @@ static void test_kiuserexceptiondispatcher(void)
RemoveVectoredExceptionHandler(vectored_handler);
ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes),
old_protect2, &old_protect2);
- ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());
+ ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError());
ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), old_protect1, &old_protect1);
- ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());
+ ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError());
}
#elif defined(__x86_64__)
@@ -2186,7 +2187,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test )
if (ctx_ptr.IntegerContext[j])
{
- ok( k < nb_regs || broken( broken_k < nb_regs ), "%u/%u: register %s should not be set to %lx\n",
+ ok( k < nb_regs || broken( broken_k < nb_regs ), "%u/%u: register %s should not be set to %Ix\n",
testnum, i, reg_names[j], *(&context.Rax + j) );
ok( k == nb_regs || *(&context.Rax + j) == test->results[i].regs[k][1]
|| broken( broken_k == nb_regs || *(&context.Rax + j)
@@ -2415,7 +2416,7 @@ static PVOID CALLBACK test_consolidate_dummy(EXCEPTION_RECORD *rec)
{
CONTEXT *ctx = (CONTEXT *)rec->ExceptionInformation[1];
consolidate_dummy_called = 1;
- ok(ctx->Rip == 0xdeadbeef, "test_consolidate_dummy failed for Rip, expected: 0xdeadbeef, got: %lx\n", ctx->Rip);
+ ok(ctx->Rip == 0xdeadbeef, "test_consolidate_dummy failed for Rip, expected: 0xdeadbeef, got: %Ix\n", ctx->Rip);
return (PVOID)rec->ExceptionInformation[2];
}
@@ -2446,7 +2447,7 @@ static void test_restore_context(void)
ok(0, "shouldn't be reached\n");
}
else
- ok(pass < 4, "unexpected pass %d\n", pass);
+ ok(pass < 4, "unexpected pass %ld\n", pass);
/* test with jmp using RltRestoreContext */
pass = 0;
@@ -2461,7 +2462,7 @@ static void test_restore_context(void)
rec.NumberParameters = 1;
rec.ExceptionInformation[0] = (DWORD64)&buf;
- ok(buf.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", buf.MxCsr);
+ ok(buf.MxCsr == 0x1f80, "Got unexpected MxCsr %#lx.\n", buf.MxCsr);
ok(buf.FpCsr == 0x27f, "Got unexpected FpCsr %#x.\n", buf.FpCsr);
buf.FpCsr = 0x7f;
buf.MxCsr = 0x3f80;
@@ -2471,30 +2472,30 @@ static void test_restore_context(void)
}
else if (pass == 4)
{
- ok(buf.Rbx == ctx.Rbx, "longjmp failed for Rbx, expected: %lx, got: %lx\n", buf.Rbx, ctx.Rbx);
- ok(buf.Rsp == ctx.Rsp, "longjmp failed for Rsp, expected: %lx, got: %lx\n", buf.Rsp, ctx.Rsp);
- ok(buf.Rbp == ctx.Rbp, "longjmp failed for Rbp, expected: %lx, got: %lx\n", buf.Rbp, ctx.Rbp);
- ok(buf.Rsi == ctx.Rsi, "longjmp failed for Rsi, expected: %lx, got: %lx\n", buf.Rsi, ctx.Rsi);
- ok(buf.Rdi == ctx.Rdi, "longjmp failed for Rdi, expected: %lx, got: %lx\n", buf.Rdi, ctx.Rdi);
- ok(buf.R12 == ctx.R12, "longjmp failed for R12, expected: %lx, got: %lx\n", buf.R12, ctx.R12);
- ok(buf.R13 == ctx.R13, "longjmp failed for R13, expected: %lx, got: %lx\n", buf.R13, ctx.R13);
- ok(buf.R14 == ctx.R14, "longjmp failed for R14, expected: %lx, got: %lx\n", buf.R14, ctx.R14);
- ok(buf.R15 == ctx.R15, "longjmp failed for R15, expected: %lx, got: %lx\n", buf.R15, ctx.R15);
+ ok(buf.Rbx == ctx.Rbx, "longjmp failed for Rbx, expected: %Ix, got: %Ix\n", buf.Rbx, ctx.Rbx);
+ ok(buf.Rsp == ctx.Rsp, "longjmp failed for Rsp, expected: %Ix, got: %Ix\n", buf.Rsp, ctx.Rsp);
+ ok(buf.Rbp == ctx.Rbp, "longjmp failed for Rbp, expected: %Ix, got: %Ix\n", buf.Rbp, ctx.Rbp);
+ ok(buf.Rsi == ctx.Rsi, "longjmp failed for Rsi, expected: %Ix, got: %Ix\n", buf.Rsi, ctx.Rsi);
+ ok(buf.Rdi == ctx.Rdi, "longjmp failed for Rdi, expected: %Ix, got: %Ix\n", buf.Rdi, ctx.Rdi);
+ ok(buf.R12 == ctx.R12, "longjmp failed for R12, expected: %Ix, got: %Ix\n", buf.R12, ctx.R12);
+ ok(buf.R13 == ctx.R13, "longjmp failed for R13, expected: %Ix, got: %Ix\n", buf.R13, ctx.R13);
+ ok(buf.R14 == ctx.R14, "longjmp failed for R14, expected: %Ix, got: %Ix\n", buf.R14, ctx.R14);
+ ok(buf.R15 == ctx.R15, "longjmp failed for R15, expected: %Ix, got: %Ix\n", buf.R15, ctx.R15);
fltsave = &buf.Xmm6;
for (i = 0; i < 10; i++)
{
ok(fltsave[i].Part[0] == ctx.FltSave.XmmRegisters[i + 6].Low,
- "longjmp failed for Xmm%d, expected %lx, got %lx\n", i + 6,
+ "longjmp failed for Xmm%d, expected %Ix, got %Ix\n", i + 6,
fltsave[i].Part[0], ctx.FltSave.XmmRegisters[i + 6].Low);
ok(fltsave[i].Part[1] == ctx.FltSave.XmmRegisters[i + 6].High,
- "longjmp failed for Xmm%d, expected %lx, got %lx\n", i + 6,
+ "longjmp failed for Xmm%d, expected %Ix, got %Ix\n", i + 6,
fltsave[i].Part[1], ctx.FltSave.XmmRegisters[i + 6].High);
}
ok(ctx.FltSave.ControlWord == 0x7f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord);
- ok(ctx.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr);
- ok(ctx.FltSave.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.FltSave.MxCsr);
+ ok(ctx.MxCsr == 0x3f80, "Got unexpected MxCsr %#lx.\n", ctx.MxCsr);
+ ok(ctx.FltSave.MxCsr == 0x3f80, "Got unexpected MxCsr %#lx.\n", ctx.FltSave.MxCsr);
buf.FpCsr = 0x27f;
buf.MxCsr = 0x1f80;
pRtlRestoreContext(&ctx, &rec);
@@ -2503,10 +2504,10 @@ static void test_restore_context(void)
else if (pass == 5)
{
ok(ctx.FltSave.ControlWord == 0x27f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord);
- ok(ctx.FltSave.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr);
+ ok(ctx.FltSave.MxCsr == 0x1f80, "Got unexpected MxCsr %#lx.\n", ctx.MxCsr);
}
else
- ok(0, "unexpected pass %d\n", pass);
+ ok(0, "unexpected pass %ld\n", pass);
/* test with jmp through RtlUnwindEx */
pass = 0;
@@ -2526,7 +2527,7 @@ static void test_restore_context(void)
ok(0, "shouldn't be reached\n");
}
else
- ok(pass == 4, "unexpected pass %d\n", pass);
+ ok(pass == 4, "unexpected pass %ld\n", pass);
/* test with consolidate */
@@ -2549,7 +2550,7 @@ static void test_restore_context(void)
else if (pass == 3)
ok(consolidate_dummy_called, "test_consolidate_dummy not called\n");
else
- ok(0, "unexpected pass %d\n", pass);
+ ok(0, "unexpected pass %ld\n", pass);
}
static RUNTIME_FUNCTION* CALLBACK dynamic_unwind_callback( DWORD64 pc, PVOID context )
@@ -2588,7 +2589,7 @@ static void test_dynamic_unwind(void)
ok( func == NULL,
"RtlLookupFunctionEntry returned unexpected function, expected: NULL, got: %p\n", func );
ok( !base || broken(base == 0xdeadbeef),
- "RtlLookupFunctionEntry modified base address, expected: 0, got: %lx\n", base );
+ "RtlLookupFunctionEntry modified base address, expected: 0, got: %Ix\n", base );
/* Test with pointer inside of our function */
base = 0xdeadbeef;
@@ -2596,7 +2597,7 @@ static void test_dynamic_unwind(void)
ok( func == runtime_func,
"RtlLookupFunctionEntry didn't return expected function, expected: %p, got: %p\n", runtime_func, func );
ok( base == (ULONG_PTR)code_mem,
- "RtlLookupFunctionEntry returned invalid base, expected: %lx, got: %lx\n", (ULONG_PTR)code_mem, base );
+ "RtlLookupFunctionEntry returned invalid base, expected: %Ix, got: %Ix\n", (ULONG_PTR)code_mem, base );
/* Test RtlDeleteFunctionTable */
ok( pRtlDeleteFunctionTable( runtime_func ),
@@ -2641,12 +2642,12 @@ static void test_dynamic_unwind(void)
/* Test RtlInstallFunctionTableCallback with both low bits unset */
table = (ULONG_PTR)code_mem;
ok( !pRtlInstallFunctionTableCallback( table, (ULONG_PTR)code_mem, code_offset + 32, &dynamic_unwind_callback, (PVOID*)&count, NULL ),
- "RtlInstallFunctionTableCallback returned success for table = %lx\n", table );
+ "RtlInstallFunctionTableCallback returned success for table = %Ix\n", table );
/* Test RtlInstallFunctionTableCallback with both low bits set */
table = (ULONG_PTR)code_mem | 0x3;
ok( pRtlInstallFunctionTableCallback( table, (ULONG_PTR)code_mem, code_offset + 32, &dynamic_unwind_callback, (PVOID*)&count, NULL ),
- "RtlInstallFunctionTableCallback failed for table = %lx\n", table );
+ "RtlInstallFunctionTableCallback failed for table = %Ix\n", table );
/* Lookup function outside of any function table */
count = 0;
@@ -2655,9 +2656,9 @@ static void test_dynamic_unwind(void)
ok( func == NULL,
"RtlLookupFunctionEntry returned unexpected function, expected: NULL, got: %p\n", func );
ok( !base || broken(base == 0xdeadbeef),
- "RtlLookupFunctionEntry modified base address, expected: 0, got: %lx\n", base );
+ "RtlLookupFunctionEntry modified base address, expected: 0, got: %Ix\n", base );
ok( !count,
- "RtlLookupFunctionEntry issued %d unexpected calls to dynamic_unwind_callback\n", count );
+ "RtlLookupFunctionEntry issued %ld unexpected calls to dynamic_unwind_callback\n", count );
/* Test with pointer inside of our function */
count = 0;
@@ -2666,9 +2667,9 @@ static void test_dynamic_unwind(void)
ok( func != NULL && func->BeginAddress == code_offset + 16 && func->EndAddress == code_offset + 32,
"RtlLookupFunctionEntry didn't return expected function, got: %p\n", func );
ok( base == (ULONG_PTR)code_mem,
- "RtlLookupFunctionEntry returned invalid base, expected: %lx, got: %lx\n", (ULONG_PTR)code_mem, base );
+ "RtlLookupFunctionEntry returned invalid base, expected: %Ix, got: %Ix\n", (ULONG_PTR)code_mem, base );
ok( count == 1,
- "RtlLookupFunctionEntry issued %d calls to dynamic_unwind_callback, expected: 1\n", count );
+ "RtlLookupFunctionEntry issued %ld calls to dynamic_unwind_callback, expected: 1\n", count );
/* Clean up again */
ok( pRtlDeleteFunctionTable( (PRUNTIME_FUNCTION)table ),
@@ -2694,26 +2695,26 @@ static void test_dynamic_unwind(void)
growable_table = NULL;
status = pRtlAddGrowableFunctionTable( &growable_table, runtime_func, 1, 1, (ULONG_PTR)code_mem, (ULONG_PTR)code_mem + 64 );
- ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#x.\n", runtime_func, status );
+ ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#lx.\n", runtime_func, status );
ok(growable_table != 0, "Unexpected table value.\n");
pRtlDeleteGrowableFunctionTable( growable_table );
growable_table = NULL;
status = pRtlAddGrowableFunctionTable( &growable_table, runtime_func, 2, 2, (ULONG_PTR)code_mem, (ULONG_PTR)code_mem + 64 );
- ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#x.\n", runtime_func, status );
+ ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#lx.\n", runtime_func, status );
ok(growable_table != 0, "Unexpected table value.\n");
pRtlDeleteGrowableFunctionTable( growable_table );
growable_table = NULL;
status = pRtlAddGrowableFunctionTable( &growable_table, runtime_func, 1, 2, (ULONG_PTR)code_mem, (ULONG_PTR)code_mem + 64 );
- ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#x.\n", runtime_func, status );
+ ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#lx.\n", runtime_func, status );
ok(growable_table != 0, "Unexpected table value.\n");
pRtlDeleteGrowableFunctionTable( growable_table );
growable_table = NULL;
status = pRtlAddGrowableFunctionTable( &growable_table, runtime_func, 0, 2, (ULONG_PTR)code_mem,
(ULONG_PTR)code_mem + code_offset + 64 );
- ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#x.\n", runtime_func, status );
+ ok(!status, "RtlAddGrowableFunctionTable failed for runtime_func = %p (aligned), %#lx.\n", runtime_func, status );
ok(growable_table != 0, "Unexpected table value.\n");
/* Current count is 0. */
@@ -2728,7 +2729,7 @@ static void test_dynamic_unwind(void)
ok( func == runtime_func,
"RtlLookupFunctionEntry didn't return expected function, expected: %p, got: %p\n", runtime_func, func );
ok( base == (ULONG_PTR)code_mem,
- "RtlLookupFunctionEntry returned invalid base, expected: %lx, got: %lx\n", (ULONG_PTR)code_mem, base );
+ "RtlLookupFunctionEntry returned invalid base, expected: %Ix, got: %Ix\n", (ULONG_PTR)code_mem, base );
/* Second function is inaccessible yet. */
base = 0xdeadbeef;
@@ -2743,7 +2744,7 @@ static void test_dynamic_unwind(void)
ok( func == runtime_func + 1,
"RtlLookupFunctionEntry didn't return expected function, expected: %p, got: %p\n", runtime_func, func );
ok( base == (ULONG_PTR)code_mem,
- "RtlLookupFunctionEntry returned invalid base, expected: %lx, got: %lx\n", (ULONG_PTR)code_mem, base );
+ "RtlLookupFunctionEntry returned invalid base, expected: %Ix, got: %Ix\n", (ULONG_PTR)code_mem, base );
pRtlDeleteGrowableFunctionTable( growable_table );
}
@@ -2753,7 +2754,7 @@ static void WINAPI termination_handler(ULONG flags, ULONG64 frame)
{
termination_handler_called++;
- ok(flags == 1 || broken(flags == 0x401), "flags = %x\n", flags);
+ ok(flags == 1 || broken(flags == 0x401), "flags = %lx\n", flags);
ok(frame == 0x1234, "frame = %p\n", (void*)frame);
}
@@ -2792,13 +2793,13 @@ static void test___C_specific_handler(void)
ok(ret == ExceptionContinueSearch, "__C_specific_handler returned %x\n", ret);
ok(termination_handler_called == 1, "termination_handler_called = %d\n",
termination_handler_called);
- ok(dispatch.ScopeIndex == 1, "dispatch.ScopeIndex = %d\n", dispatch.ScopeIndex);
+ ok(dispatch.ScopeIndex == 1, "dispatch.ScopeIndex = %ld\n", dispatch.ScopeIndex);
ret = p__C_specific_handler(&rec, frame, &context, &dispatch);
ok(ret == ExceptionContinueSearch, "__C_specific_handler returned %x\n", ret);
ok(termination_handler_called == 1, "termination_handler_called = %d\n",
termination_handler_called);
- ok(dispatch.ScopeIndex == 1, "dispatch.ScopeIndex = %d\n", dispatch.ScopeIndex);
+ ok(dispatch.ScopeIndex == 1, "dispatch.ScopeIndex = %ld\n", dispatch.ScopeIndex);
}
/* This is heavily based on the i386 exception tests. */
@@ -3016,14 +3017,14 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame,
USHORT ds, es, fs, gs, ss;
got_exception++;
- trace( "exception %u: %x flags:%x addr:%p\n",
+ trace( "exception %u: %lx flags:%lx addr:%p\n",
entry, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress );
ok( rec->ExceptionCode == except->status ||
(except->alt_status != 0 && rec->ExceptionCode == except->alt_status),
- "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status );
+ "%u: Wrong exception code %lx/%lx\n", entry, rec->ExceptionCode, except->status );
ok( context->Rip == (DWORD_PTR)code_mem + except->offset,
- "%u: Unexpected eip %#lx/%#lx\n", entry,
+ "%u: Unexpected eip %#Ix/%#Ix\n", entry,
context->Rip, (DWORD_PTR)code_mem + except->offset );
ok( rec->ExceptionAddress == (char*)context->Rip ||
(rec->ExceptionCode == STATUS_BREAKPOINT && rec->ExceptionAddress == (char*)context->Rip + 1),
@@ -3057,7 +3058,7 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame,
parameter_count = except->alt_nb_params;
ok( rec->NumberParameters == parameter_count,
- "%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count );
+ "%u: Unexpected parameter count %lu/%u\n", entry, rec->NumberParameters, parameter_count );
/* Most CPUs (except Intel Core apparently) report a segment limit violation */
/* instead of page faults for accesses beyond 0xffffffffffffffff */
@@ -3079,14 +3080,14 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame,
{
for (i = 0; i < rec->NumberParameters; i++)
ok( rec->ExceptionInformation[i] == except->params[i],
- "%u: Wrong parameter %d: %lx/%lx\n",
+ "%u: Wrong parameter %d: %Ix/%Ix\n",
entry, i, rec->ExceptionInformation[i], except->params[i] );
}
else
{
for (i = 0; i < rec->NumberParameters; i++)
ok( rec->ExceptionInformation[i] == except->alt_params[i],
- "%u: Wrong parameter %d: %lx/%lx\n",
+ "%u: Wrong parameter %d: %Ix/%Ix\n",
entry, i, rec->ExceptionInformation[i], except->alt_params[i] );
}
@@ -3136,7 +3137,7 @@ static int check_debug_registers(int test_num, const struct dbgreg_test *test)
ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS;
status = pNtGetContextThread(GetCurrentThread(), &ctx);
- ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status);
if (!ctx.Dr0 && !ctx.Dr1 && !ctx.Dr2 && !ctx.Dr3 && !ctx.Dr6 && !ctx.Dr7)
{
@@ -3179,7 +3180,7 @@ static DWORD WINAPI single_step_handler( EXCEPTION_RECORD *rec, ULONG64 frame,
/* show that the last single step exception on the popf instruction
* (which removed the TF bit), still is a EXCEPTION_SINGLE_STEP exception */
ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP,
- "exception is not EXCEPTION_SINGLE_STEP: %x\n", rec->ExceptionCode);
+ "exception is not EXCEPTION_SINGLE_STEP: %lx\n", rec->ExceptionCode);
}
return ExceptionContinueExecution;
}
@@ -3245,7 +3246,7 @@ static DWORD WINAPI bpx_handler( EXCEPTION_RECORD *rec, ULONG64 frame,
{
got_exception++;
ok( rec->ExceptionCode == EXCEPTION_SINGLE_STEP,
- "wrong exception code: %x\n", rec->ExceptionCode);
+ "wrong exception code: %lx\n", rec->ExceptionCode);
if(got_exception == 1) {
/* hw bp exception on first nop */
@@ -3298,7 +3299,7 @@ static DWORD WINAPI int3_handler( EXCEPTION_RECORD *rec, ULONG64 frame,
/* trap unhandled exceptions */
static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs )
{
- printf( "%04x unhandled exception %08x at %p rip %p eflags %x\n",
+ printf( "%04lx unhandled exception %08lx at %p rip %p eflags %lx\n",
GetCurrentProcessId(),
ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress,
(void *)ptrs->ContextRecord->Rip, ptrs->ContextRecord->EFlags );
@@ -3336,7 +3337,7 @@ static void test_exceptions(void)
ctx.Dr7 = 1;
ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS;
res = pNtSetContextThread( GetCurrentThread(), &ctx );
- ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res);
+ ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", res);
got_exception = 0;
run_exception_test(bpx_handler, NULL, dummy_code, sizeof(dummy_code), 0);
@@ -3368,7 +3369,7 @@ static void test_exceptions(void)
/* test segment registers */
ctx.ContextFlags = CONTEXT_CONTROL | CONTEXT_SEGMENTS;
res = pNtGetContextThread( GetCurrentThread(), &ctx );
- ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", res );
+ ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", res );
__asm__ volatile( "movw %%ds,%0" : "=g" (ds) );
__asm__ volatile( "movw %%es,%0" : "=g" (es) );
__asm__ volatile( "movw %%fs,%0" : "=g" (fs) );
@@ -3389,14 +3390,14 @@ static void test_exceptions(void)
ctx.SegEs = ctx.SegFs;
ctx.SegFs = ctx.SegSs;
res = pNtSetContextThread( GetCurrentThread(), &ctx );
- ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", res );
+ ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", res );
__asm__ volatile( "movw %%ds,%0" : "=g" (ds) );
__asm__ volatile( "movw %%es,%0" : "=g" (es) );
__asm__ volatile( "movw %%fs,%0" : "=g" (fs) );
__asm__ volatile( "movw %%gs,%0" : "=g" (gs) );
__asm__ volatile( "movw %%ss,%0" : "=g" (ss) );
res = pNtGetContextThread( GetCurrentThread(), &ctx );
- ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", res );
+ ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", res );
ok( ctx.SegDs == ds, "wrong ds %04x / %04x\n", ctx.SegDs, ds );
ok( ctx.SegEs == es, "wrong es %04x / %04x\n", ctx.SegEs, es );
ok( ctx.SegFs == fs, "wrong fs %04x / %04x\n", ctx.SegFs, fs );
@@ -3431,11 +3432,11 @@ static DWORD WINAPI simd_fault_handler( EXCEPTION_RECORD *rec, ULONG64 frame,
else
{
ULONG expect = *stage == 2 ? EXCEPTION_FLT_DIVIDE_BY_ZERO : EXCEPTION_FLT_INVALID_OPERATION;
- ok( rec->ExceptionCode == expect, "exception code: %#x, should be %#x\n",
+ ok( rec->ExceptionCode == expect, "exception code: %#lx, should be %#lx\n",
rec->ExceptionCode, expect );
- ok( rec->NumberParameters == 2, "# of params: %i, should be 2\n", rec->NumberParameters);
- ok( rec->ExceptionInformation[0] == 0, "param #0: %lx\n", rec->ExceptionInformation[0]);
- ok( rec->ExceptionInformation[1] == context->MxCsr, "param #1: %lx / %lx\n",
+ ok( rec->NumberParameters == 2, "# of params: %li, should be 2\n", rec->NumberParameters);
+ ok( rec->ExceptionInformation[0] == 0, "param #0: %Ix\n", rec->ExceptionInformation[0]);
+ ok( rec->ExceptionInformation[1] == context->MxCsr, "param #1: %Ix / %lx\n",
rec->ExceptionInformation[1], context->MxCsr);
}
context->Rip += 3; /* skip divps */
@@ -3532,15 +3533,15 @@ static LONG CALLBACK dpe_handler(EXCEPTION_POINTERS *info)
EXCEPTION_RECORD *rec = info->ExceptionRecord;
DWORD old_prot;
- trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
+ trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
got_exception++;
ok(rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION,
- "got %#x\n", rec->ExceptionCode);
- ok(rec->NumberParameters == 2, "got %u params\n", rec->NumberParameters);
+ "got %#lx\n", rec->ExceptionCode);
+ ok(rec->NumberParameters == 2, "got %lu params\n", rec->NumberParameters);
ok(rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT,
- "got %#lx\n", rec->ExceptionInformation[0]);
+ "got %#Ix\n", rec->ExceptionInformation[0]);
ok((void *)rec->ExceptionInformation[1] == code_mem,
"got %p\n", (void *)rec->ExceptionInformation[1]);
@@ -3558,19 +3559,19 @@ static void test_dpe_exceptions(void)
void *handler;
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val, &len );
- ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "got status %08x\n", status );
+ ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "got status %08lx\n", status );
if (!status)
{
- ok( len == sizeof(val), "wrong len %u\n", len );
+ ok( len == sizeof(val), "wrong len %lu\n", len );
ok( val == (MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_PERMANENT |
MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION),
- "wrong val %08x\n", val );
+ "wrong val %08lx\n", val );
}
- else ok( len == 0xdeadbeef, "wrong len %u\n", len );
+ else ok( len == 0xdeadbeef, "wrong len %lu\n", len );
val = MEM_EXECUTE_OPTION_DISABLE;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val );
- ok( status == STATUS_INVALID_PARAMETER, "got status %08x\n", status );
+ ok( status == STATUS_INVALID_PARAMETER, "got status %08lx\n", status );
memcpy(code_mem, ret, sizeof(ret));
@@ -3622,7 +3623,7 @@ static void rtlraiseexception_handler_( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR
if (unhandled_handler) rtlraiseexception_unhandled_handler_called = 1;
else rtlraiseexception_handler_called = 1;
- trace( "exception: %08x flags:%x addr:%p context: Rip:%p\n",
+ trace( "exception: %08lx flags:%lx addr:%p context: Rip:%p\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, (void *)context->Rip );
ok( rec->ExceptionAddress == (char *)code_mem + 0x10
@@ -3632,7 +3633,7 @@ static void rtlraiseexception_handler_( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR
ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE)
|| context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS)
|| context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS | CONTEXT_XSTATE),
- "wrong context flags %x\n", context->ContextFlags );
+ "wrong context flags %lx\n", context->ContextFlags );
/* check that pc is fixed up only for EXCEPTION_BREAKPOINT
* even if raised by RtlRaiseException
@@ -3679,7 +3680,7 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce
PCONTEXT context = ExceptionInfo->ContextRecord;
PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord;
- trace( "vect. handler %08x addr:%p Rip:%p\n", rec->ExceptionCode, rec->ExceptionAddress, (void *)context->Rip );
+ trace( "vect. handler %08lx addr:%p Rip:%p\n", rec->ExceptionCode, rec->ExceptionAddress, (void *)context->Rip );
ok( rec->ExceptionAddress == (char *)code_mem + 0x10
|| broken(rec->ExceptionAddress == code_mem || !rec->ExceptionAddress ) /* 2008 */,
@@ -3782,7 +3783,7 @@ static void test_debugger(DWORD cont_status)
sprintf(cmdline, "%s %s %s %p", my_argv[0], my_argv[1], "debuggee", &test_stage);
ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi);
- ok(ret, "could not create child process error: %u\n", GetLastError());
+ ok(ret, "could not create child process error: %lu\n", GetLastError());
if (!ret)
return;
@@ -3793,11 +3794,11 @@ static void test_debugger(DWORD cont_status)
ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef);
ok(!ret, "ContinueDebugEvent unexpectedly succeeded\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected last error: %u\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected last error: %lu\n", GetLastError());
if (de.dwThreadId != pi.dwThreadId)
{
- trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode);
+ trace("event %ld not coming from main thread, ignoring\n", de.dwDebugEventCode);
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status);
continue;
}
@@ -3818,16 +3819,16 @@ static void test_debugger(DWORD cont_status)
counter++;
status = pNtReadVirtualMemory(pi.hProcess, &code_mem, &code_mem_address,
sizeof(code_mem_address), &size_read);
- ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status);
+ ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage,
sizeof(stage), &size_read);
- ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status);
+ ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
ctx.ContextFlags = CONTEXT_FULL | CONTEXT_SEGMENTS;
status = pNtGetContextThread(pi.hThread, &ctx);
- ok(!status, "NtGetContextThread failed with 0x%x\n", status);
+ ok(!status, "NtGetContextThread failed with 0x%lx\n", status);
- trace("exception 0x%x at %p firstchance=%d Rip=%p, Rax=%p\n",
+ trace("exception 0x%lx at %p firstchance=%ld Rip=%p, Rax=%p\n",
de.u.Exception.ExceptionRecord.ExceptionCode,
de.u.Exception.ExceptionRecord.ExceptionAddress,
de.u.Exception.dwFirstChance, (char *)ctx.Rip, (char *)ctx.Rax);
@@ -3884,7 +3885,7 @@ static void test_debugger(DWORD cont_status)
(char *)ctx.Rip, (char *)code_mem_address + 0xf);
ctx.Rip += 1;
}
- else ok((char *)ctx.Rip == (char *)code_mem_address + 0x10, "Rip at 0x%x instead of %p\n",
+ else ok((char *)ctx.Rip == (char *)code_mem_address + 0x10, "Rip at 0x%I64x instead of %p\n",
ctx.Rip, (char *)code_mem_address + 0x10);
/* here we handle exception */
}
@@ -3892,7 +3893,7 @@ static void test_debugger(DWORD cont_status)
else if (stage == 7 || stage == 8)
{
ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT,
- "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode);
+ "expected EXCEPTION_BREAKPOINT, got %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode);
ok((char *)ctx.Rip == (char *)code_mem_address + 0x30,
"expected Rip = %p, got %p\n", (char *)code_mem_address + 0x30, (char *)ctx.Rip);
if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
@@ -3900,7 +3901,7 @@ static void test_debugger(DWORD cont_status)
else if (stage == 9 || stage == 10)
{
ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT,
- "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode);
+ "expected EXCEPTION_BREAKPOINT, got %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode);
ok((char *)ctx.Rip == (char *)code_mem_address + 2,
"expected Rip = %p, got %p\n", (char *)code_mem_address + 2, (char *)ctx.Rip);
if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
@@ -3908,10 +3909,10 @@ static void test_debugger(DWORD cont_status)
else if (stage == 11 || stage == 12 || stage == 13)
{
ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE,
- "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode,
+ "unexpected exception code %08lx, expected %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode,
EXCEPTION_INVALID_HANDLE);
ok(de.u.Exception.ExceptionRecord.NumberParameters == 0,
- "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters);
+ "unexpected number of parameters %ld, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters);
if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
}
@@ -3933,9 +3934,9 @@ static void test_debugger(DWORD cont_status)
ctx.SegEs = ctx.SegFs;
ctx.SegGs = 0;
status = pNtSetContextThread( pi.hThread, &ctx );
- ok( status == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", status );
+ ok( status == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", status );
status = pNtGetContextThread( pi.hThread, &ctx );
- ok( status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status );
+ ok( status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status );
todo_wine ok( ctx.SegSs == ss, "wrong ss %04x / %04x\n", ctx.SegSs, ss );
ok( ctx.SegDs == ctx.SegSs, "wrong ds %04x / %04x\n", ctx.SegDs, ctx.SegSs );
ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs );
@@ -3946,7 +3947,7 @@ static void test_debugger(DWORD cont_status)
ok(FALSE, "unexpected stage %u\n", stage);
status = pNtSetContextThread(pi.hThread, &ctx);
- ok(!status, "NtSetContextThread failed with 0x%x\n", status);
+ ok(!status, "NtSetContextThread failed with 0x%lx\n", status);
}
}
else if (de.dwDebugEventCode == OUTPUT_DEBUG_STRING_EVENT)
@@ -3956,7 +3957,7 @@ static void test_debugger(DWORD cont_status)
status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage,
sizeof(stage), &size_read);
- ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status);
+ ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
ok(!de.u.DebugString.fUnicode, "unexpected unicode debug string event\n");
ok(de.u.DebugString.nDebugStringLength < sizeof(buffer) - 1, "buffer not large enough to hold %d bytes\n",
@@ -3965,7 +3966,7 @@ static void test_debugger(DWORD cont_status)
memset(buffer, 0, sizeof(buffer));
status = pNtReadVirtualMemory(pi.hProcess, de.u.DebugString.lpDebugStringData, buffer,
de.u.DebugString.nDebugStringLength, &size_read);
- ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status);
+ ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
if (stage == 3 || stage == 4)
ok(!strcmp(buffer, "Hello World"), "got unexpected debug string '%s'\n", buffer);
@@ -3980,13 +3981,13 @@ static void test_debugger(DWORD cont_status)
status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage,
sizeof(stage), &size_read);
- ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status);
+ ok(!status,"NtReadVirtualMemory failed with 0x%lx\n", status);
if (stage == 5 || stage == 6)
{
- ok(de.u.RipInfo.dwError == 0x11223344, "got unexpected rip error code %08x, expected %08x\n",
+ ok(de.u.RipInfo.dwError == 0x11223344, "got unexpected rip error code %08lx, expected %08x\n",
de.u.RipInfo.dwError, 0x11223344);
- ok(de.u.RipInfo.dwType == 0x55667788, "got unexpected rip type %08x, expected %08x\n",
+ ok(de.u.RipInfo.dwType == 0x55667788, "got unexpected rip type %08lx, expected %08x\n",
de.u.RipInfo.dwType, 0x55667788);
}
else
@@ -4001,9 +4002,9 @@ static void test_debugger(DWORD cont_status)
wait_child_process( pi.hProcess );
ret = CloseHandle(pi.hThread);
- ok(ret, "error %u\n", GetLastError());
+ ok(ret, "error %lu\n", GetLastError());
ret = CloseHandle(pi.hProcess);
- ok(ret, "error %u\n", GetLastError());
+ ok(ret, "error %lu\n", GetLastError());
}
static void test_thread_context(void)
@@ -4087,16 +4088,16 @@ static void test_thread_context(void)
func_ptr( &context, 0, &expect, pRtlCaptureContext );
trace( "expect: rax=%p rbx=%p rcx=%p rdx=%p rsi=%p rdi=%p "
"r8=%p r9=%p r10=%p r11=%p r12=%p r13=%p r14=%p r15=%p "
- "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n",
+ "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08I64x prev=%p\n",
(void *)expect.Rax, (void *)expect.Rbx, (void *)expect.Rcx, (void *)expect.Rdx,
(void *)expect.Rsi, (void *)expect.Rdi, (void *)expect.R8, (void *)expect.R9,
(void *)expect.R10, (void *)expect.R11, (void *)expect.R12, (void *)expect.R13,
(void *)expect.R14, (void *)expect.R15, (void *)expect.Rbp, (void *)expect.Rsp,
(void *)expect.Rip, expect.SegCs, expect.SegDs, expect.SegEs,
- expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, expect.prev_frame );
+ expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, (void*)expect.prev_frame );
trace( "actual: rax=%p rbx=%p rcx=%p rdx=%p rsi=%p rdi=%p "
"r8=%p r9=%p r10=%p r11=%p r12=%p r13=%p r14=%p r15=%p "
- "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n",
+ "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08lx\n",
(void *)context.Rax, (void *)context.Rbx, (void *)context.Rcx, (void *)context.Rdx,
(void *)context.Rsi, (void *)context.Rdi, (void *)context.R8, (void *)context.R9,
(void *)context.R10, (void *)context.R11, (void *)context.R12, (void *)context.R13,
@@ -4105,7 +4106,7 @@ static void test_thread_context(void)
context.SegFs, context.SegGs, context.SegSs, context.EFlags );
ok( context.ContextFlags == (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT),
- "wrong flags %08x\n", context.ContextFlags );
+ "wrong flags %08lx\n", context.ContextFlags );
COMPARE( Rax );
COMPARE( Rbx );
COMPARE( Rcx );
@@ -4144,19 +4145,19 @@ static void test_thread_context(void)
context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT;
status = func_ptr( GetCurrentThread(), &context, &expect, pNtGetContextThread );
- ok( status == STATUS_SUCCESS, "NtGetContextThread failed %08x\n", status );
+ ok( status == STATUS_SUCCESS, "NtGetContextThread failed %08lx\n", status );
trace( "expect: rax=%p rbx=%p rcx=%p rdx=%p rsi=%p rdi=%p "
"r8=%p r9=%p r10=%p r11=%p r12=%p r13=%p r14=%p r15=%p "
- "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n",
+ "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08I64x prev=%p\n",
(void *)expect.Rax, (void *)expect.Rbx, (void *)expect.Rcx, (void *)expect.Rdx,
(void *)expect.Rsi, (void *)expect.Rdi, (void *)expect.R8, (void *)expect.R9,
(void *)expect.R10, (void *)expect.R11, (void *)expect.R12, (void *)expect.R13,
(void *)expect.R14, (void *)expect.R15, (void *)expect.Rbp, (void *)expect.Rsp,
(void *)expect.Rip, expect.SegCs, expect.SegDs, expect.SegEs,
- expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, expect.prev_frame );
+ expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, (void*)expect.prev_frame );
trace( "actual: rax=%p rbx=%p rcx=%p rdx=%p rsi=%p rdi=%p "
"r8=%p r9=%p r10=%p r11=%p r12=%p r13=%p r14=%p r15=%p "
- "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n",
+ "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08lx\n",
(void *)context.Rax, (void *)context.Rbx, (void *)context.Rcx, (void *)context.Rdx,
(void *)context.Rsi, (void *)context.Rdi, (void *)context.R8, (void *)context.R9,
(void *)context.R10, (void *)context.R11, (void *)context.R12, (void *)context.R13,
@@ -4221,45 +4222,45 @@ static void test_wow64_context(void)
memset(&ctx, 0x55, sizeof(ctx));
ctx.ContextFlags = WOW64_CONTEXT_ALL;
ret = pRtlWow64GetThreadContext( GetCurrentThread(), &ctx );
- ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_PARTIAL_COPY), "got %#x\n", ret);
+ ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_PARTIAL_COPY), "got %#lx\n", ret);
sprintf( cmdline, "\"%s\" /c for /l %%n in () do @echo >nul", appname );
r = CreateProcessA( appname, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi);
- ok( r, "failed to start %s err %u\n", appname, GetLastError() );
+ ok( r, "failed to start %s err %lu\n", appname, GetLastError() );
ret = pRtlWow64GetThreadContext( pi.hThread, &ctx );
- ok(ret == STATUS_SUCCESS, "got %#x\n", ret);
- ok(ctx.ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#x\n", ctx.ContextFlags);
- ok(!ctx.Ebp, "got ebp %08x\n", ctx.Ebp);
- ok(!ctx.Ecx, "got ecx %08x\n", ctx.Ecx);
- ok(!ctx.Edx, "got edx %08x\n", ctx.Edx);
- ok(!ctx.Esi, "got esi %08x\n", ctx.Esi);
- ok(!ctx.Edi, "got edi %08x\n", ctx.Edi);
- ok((ctx.EFlags & ~2) == 0x200, "got eflags %08x\n", ctx.EFlags);
- ok((WORD) ctx.FloatSave.ControlWord == 0x27f, "got control word %08x\n",
+ ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
+ ok(ctx.ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#lx\n", ctx.ContextFlags);
+ ok(!ctx.Ebp, "got ebp %08lx\n", ctx.Ebp);
+ ok(!ctx.Ecx, "got ecx %08lx\n", ctx.Ecx);
+ ok(!ctx.Edx, "got edx %08lx\n", ctx.Edx);
+ ok(!ctx.Esi, "got esi %08lx\n", ctx.Esi);
+ ok(!ctx.Edi, "got edi %08lx\n", ctx.Edi);
+ ok((ctx.EFlags & ~2) == 0x200, "got eflags %08lx\n", ctx.EFlags);
+ ok((WORD) ctx.FloatSave.ControlWord == 0x27f, "got control word %08lx\n",
ctx.FloatSave.ControlWord);
ok(*(WORD *)ctx.ExtendedRegisters == 0x27f, "got SSE control word %04x\n",
*(WORD *)ctx.ExtendedRegisters);
ret = pRtlWow64SetThreadContext( pi.hThread, &ctx );
- ok(ret == STATUS_SUCCESS, "got %#x\n", ret);
+ ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
pNtQueryInformationThread( pi.hThread, ThreadBasicInformation, &info, sizeof(info), NULL );
if (!ReadProcessMemory( pi.hProcess, info.TebBaseAddress, &teb, sizeof(teb), &res )) res = 0;
- ok( res == sizeof(teb), "wrong len %lx\n", res );
+ ok( res == sizeof(teb), "wrong len %Ix\n", res );
memset( &teb32, 0, sizeof(teb32) );
if (teb.WowTebOffset > 1)
{
if (!ReadProcessMemory( pi.hProcess, (char *)info.TebBaseAddress + teb.WowTebOffset,
&teb32, sizeof(teb32), &res )) res = 0;
- ok( res == sizeof(teb32), "wrong len %lx\n", res );
+ ok( res == sizeof(teb32), "wrong len %Ix\n", res );
ok( ((ctx.Esp + 0xfff) & ~0xfff) == teb32.Tib.StackBase,
- "esp is not at top of stack: %08x / %08x\n", ctx.Esp, teb32.Tib.StackBase );
+ "esp is not at top of stack: %08lx / %08lx\n", ctx.Esp, teb32.Tib.StackBase );
ok( ULongToPtr( teb32.Tib.StackBase ) <= teb.DeallocationStack ||
ULongToPtr( teb32.DeallocationStack ) >= teb.Tib.StackBase,
- "stacks overlap %08x-%08x / %p-%p\n", teb32.DeallocationStack, teb32.Tib.StackBase,
+ "stacks overlap %08lx-%08lx / %p-%p\n", teb32.DeallocationStack, teb32.Tib.StackBase,
teb.DeallocationStack, teb.Tib.StackBase );
}
@@ -4270,29 +4271,29 @@ static void test_wow64_context(void)
cpu_size = 0x1000 - ((ULONG_PTR)teb.TlsSlots[WOW64_TLS_CPURESERVED] & 0xfff);
cpu = malloc( cpu_size );
if (!ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res )) res = 0;
- ok( res == cpu_size, "wrong len %lx\n", res );
+ ok( res == cpu_size, "wrong len %Ix\n", res );
ok( cpu->Machine == IMAGE_FILE_MACHINE_I386, "wrong machine %04x\n", cpu->Machine );
ret = pRtlWow64GetCpuAreaInfo( cpu, 0, &cpu_info );
- ok( !ret, "RtlWow64GetCpuAreaInfo failed %x\n", ret );
+ ok( !ret, "RtlWow64GetCpuAreaInfo failed %lx\n", ret );
ctx_ptr = (WOW64_CONTEXT *)cpu_info.Context;
ok(!*(void **)cpu_info.ContextEx, "got context_ex %p\n", *(void **)cpu_info.ContextEx);
- ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#x\n", ctx_ptr->ContextFlags);
- ok(ctx_ptr->Eax == ctx.Eax, "got eax %08x / %08x\n", ctx_ptr->Eax, ctx.Eax);
- ok(ctx_ptr->Ebx == ctx.Ebx, "got ebx %08x / %08x\n", ctx_ptr->Ebx, ctx.Ebx);
- ok(ctx_ptr->Ecx == ctx.Ecx, "got ecx %08x / %08x\n", ctx_ptr->Ecx, ctx.Ecx);
- ok(ctx_ptr->Edx == ctx.Edx, "got edx %08x / %08x\n", ctx_ptr->Edx, ctx.Edx);
- ok(ctx_ptr->Ebp == ctx.Ebp, "got ebp %08x / %08x\n", ctx_ptr->Ebp, ctx.Ebp);
- ok(ctx_ptr->Esi == ctx.Esi, "got esi %08x / %08x\n", ctx_ptr->Esi, ctx.Esi);
- ok(ctx_ptr->Edi == ctx.Edi, "got edi %08x / %08x\n", ctx_ptr->Edi, ctx.Edi);
- ok(ctx_ptr->SegCs == ctx.SegCs, "got cs %04x / %04x\n", ctx_ptr->SegCs, ctx.SegCs);
- ok(ctx_ptr->SegDs == ctx.SegDs, "got ds %04x / %04x\n", ctx_ptr->SegDs, ctx.SegDs);
- ok(ctx_ptr->SegEs == ctx.SegEs, "got es %04x / %04x\n", ctx_ptr->SegEs, ctx.SegEs);
- ok(ctx_ptr->SegFs == ctx.SegFs, "got fs %04x / %04x\n", ctx_ptr->SegFs, ctx.SegFs);
- ok(ctx_ptr->SegGs == ctx.SegGs, "got gs %04x / %04x\n", ctx_ptr->SegGs, ctx.SegGs);
- ok(ctx_ptr->SegSs == ctx.SegSs, "got ss %04x / %04x\n", ctx_ptr->SegSs, ctx.SegSs);
- ok(ctx_ptr->EFlags == ctx.EFlags, "got eflags %08x / %08x\n", ctx_ptr->EFlags, ctx.EFlags);
+ ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#lx\n", ctx_ptr->ContextFlags);
+ ok(ctx_ptr->Eax == ctx.Eax, "got eax %08lx / %08lx\n", ctx_ptr->Eax, ctx.Eax);
+ ok(ctx_ptr->Ebx == ctx.Ebx, "got ebx %08lx / %08lx\n", ctx_ptr->Ebx, ctx.Ebx);
+ ok(ctx_ptr->Ecx == ctx.Ecx, "got ecx %08lx / %08lx\n", ctx_ptr->Ecx, ctx.Ecx);
+ ok(ctx_ptr->Edx == ctx.Edx, "got edx %08lx / %08lx\n", ctx_ptr->Edx, ctx.Edx);
+ ok(ctx_ptr->Ebp == ctx.Ebp, "got ebp %08lx / %08lx\n", ctx_ptr->Ebp, ctx.Ebp);
+ ok(ctx_ptr->Esi == ctx.Esi, "got esi %08lx / %08lx\n", ctx_ptr->Esi, ctx.Esi);
+ ok(ctx_ptr->Edi == ctx.Edi, "got edi %08lx / %08lx\n", ctx_ptr->Edi, ctx.Edi);
+ ok(ctx_ptr->SegCs == ctx.SegCs, "got cs %04lx / %04lx\n", ctx_ptr->SegCs, ctx.SegCs);
+ ok(ctx_ptr->SegDs == ctx.SegDs, "got ds %04lx / %04lx\n", ctx_ptr->SegDs, ctx.SegDs);
+ ok(ctx_ptr->SegEs == ctx.SegEs, "got es %04lx / %04lx\n", ctx_ptr->SegEs, ctx.SegEs);
+ ok(ctx_ptr->SegFs == ctx.SegFs, "got fs %04lx / %04lx\n", ctx_ptr->SegFs, ctx.SegFs);
+ ok(ctx_ptr->SegGs == ctx.SegGs, "got gs %04lx / %04lx\n", ctx_ptr->SegGs, ctx.SegGs);
+ ok(ctx_ptr->SegSs == ctx.SegSs, "got ss %04lx / %04lx\n", ctx_ptr->SegSs, ctx.SegSs);
+ ok(ctx_ptr->EFlags == ctx.EFlags, "got eflags %08lx / %08lx\n", ctx_ptr->EFlags, ctx.EFlags);
ok((WORD)ctx_ptr->FloatSave.ControlWord == ctx.FloatSave.ControlWord,
- "got control word %08x / %08x\n", ctx_ptr->FloatSave.ControlWord, ctx.FloatSave.ControlWord);
+ "got control word %08lx / %08lx\n", ctx_ptr->FloatSave.ControlWord, ctx.FloatSave.ControlWord);
ok(*(WORD *)ctx_ptr->ExtendedRegisters == *(WORD *)ctx.ExtendedRegisters,
"got SSE control word %04x / %04x\n", *(WORD *)ctx_ptr->ExtendedRegisters,
*(WORD *)ctx.ExtendedRegisters);
@@ -4300,11 +4301,11 @@ static void test_wow64_context(void)
ecx = ctx.Ecx;
ctx.Ecx = 0x12345678;
ret = pRtlWow64SetThreadContext( pi.hThread, &ctx );
- ok(ret == STATUS_SUCCESS, "got %#x\n", ret);
+ ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
if (!ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res )) res = 0;
- ok( res == cpu_size, "wrong len %lx\n", res );
+ ok( res == cpu_size, "wrong len %Ix\n", res );
todo_wine
- ok( ctx_ptr->Ecx == 0x12345678, "got ecx %08x\n", ctx_ptr->Ecx );
+ ok( ctx_ptr->Ecx == 0x12345678, "got ecx %08lx\n", ctx_ptr->Ecx );
ctx.Ecx = ecx;
pRtlWow64SetThreadContext( pi.hThread, &ctx );
}
@@ -4313,37 +4314,37 @@ static void test_wow64_context(void)
memset( &context, 0x55, sizeof(context) );
context.ContextFlags = CONTEXT_ALL;
ret = pNtGetContextThread( pi.hThread, &context );
- ok(ret == STATUS_SUCCESS, "got %#x\n", ret);
- ok( context.ContextFlags == CONTEXT_ALL, "got context flags %#x\n", context.ContextFlags );
+ ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
+ ok( context.ContextFlags == CONTEXT_ALL, "got context flags %#lx\n", context.ContextFlags );
todo_wine
- ok( !context.Rax, "rax is not zero %lx\n", context.Rax );
+ ok( !context.Rax, "rax is not zero %Ix\n", context.Rax );
todo_wine
- ok( !context.Rbx, "rbx is not zero %lx\n", context.Rbx );
- ok( !context.Rsi, "rsi is not zero %lx\n", context.Rsi );
- ok( !context.Rdi, "rdi is not zero %lx\n", context.Rdi );
- ok( !context.Rbp, "rbp is not zero %lx\n", context.Rbp );
- ok( !context.R8, "r8 is not zero %lx\n", context.R8 );
- ok( !context.R9, "r9 is not zero %lx\n", context.R9 );
- ok( !context.R10, "r10 is not zero %lx\n", context.R10 );
- ok( !context.R11, "r11 is not zero %lx\n", context.R11 );
- ok( !context.R12, "r12 is not zero %lx\n", context.R12 );
- ok( !context.R13, "r13 is not zero %lx\n", context.R13 );
- ok( !context.R14, "r14 is not zero %lx\n", context.R14 );
- ok( !context.R15, "r15 is not zero %lx\n", context.R15 );
+ ok( !context.Rbx, "rbx is not zero %Ix\n", context.Rbx );
+ ok( !context.Rsi, "rsi is not zero %Ix\n", context.Rsi );
+ ok( !context.Rdi, "rdi is not zero %Ix\n", context.Rdi );
+ ok( !context.Rbp, "rbp is not zero %Ix\n", context.Rbp );
+ ok( !context.R8, "r8 is not zero %Ix\n", context.R8 );
+ ok( !context.R9, "r9 is not zero %Ix\n", context.R9 );
+ ok( !context.R10, "r10 is not zero %Ix\n", context.R10 );
+ ok( !context.R11, "r11 is not zero %Ix\n", context.R11 );
+ ok( !context.R12, "r12 is not zero %Ix\n", context.R12 );
+ ok( !context.R13, "r13 is not zero %Ix\n", context.R13 );
+ ok( !context.R14, "r14 is not zero %Ix\n", context.R14 );
+ ok( !context.R15, "r15 is not zero %Ix\n", context.R15 );
todo_wine
ok( ((ULONG_PTR)context.Rsp & ~0xfff) == ((ULONG_PTR)teb.Tib.StackBase & ~0xfff),
"rsp is not at top of stack %p / %p\n", (void *)context.Rsp, teb.Tib.StackBase );
todo_wine
- ok( context.EFlags == 0x200, "wrong flags %08x\n", context.EFlags );
- ok( context.MxCsr == 0x1f80, "wrong mxcsr %08x\n", context.MxCsr );
+ ok( context.EFlags == 0x200, "wrong flags %08lx\n", context.EFlags );
+ ok( context.MxCsr == 0x1f80, "wrong mxcsr %08lx\n", context.MxCsr );
ok( context.FltSave.ControlWord == 0x27f, "wrong control %08x\n", context.FltSave.ControlWord );
todo_wine
ok( context.SegCs != ctx.SegCs, "wrong cs %04x\n", context.SegCs );
- ok( context.SegDs == ctx.SegDs, "wrong ds %04x / %04x\n", context.SegDs, ctx.SegDs );
- ok( context.SegEs == ctx.SegEs, "wrong es %04x / %04x\n", context.SegEs, ctx.SegEs );
- ok( context.SegFs == ctx.SegFs, "wrong fs %04x / %04x\n", context.SegFs, ctx.SegFs );
- ok( context.SegGs == ctx.SegGs, "wrong gs %04x / %04x\n", context.SegGs, ctx.SegGs );
- ok( context.SegSs == ctx.SegSs, "wrong ss %04x / %04x\n", context.SegSs, ctx.SegSs );
+ ok( context.SegDs == ctx.SegDs, "wrong ds %04x / %04lx\n", context.SegDs, ctx.SegDs );
+ ok( context.SegEs == ctx.SegEs, "wrong es %04x / %04lx\n", context.SegEs, ctx.SegEs );
+ ok( context.SegFs == ctx.SegFs, "wrong fs %04x / %04lx\n", context.SegFs, ctx.SegFs );
+ ok( context.SegGs == ctx.SegGs, "wrong gs %04x / %04lx\n", context.SegGs, ctx.SegGs );
+ ok( context.SegSs == ctx.SegSs, "wrong ss %04x / %04lx\n", context.SegSs, ctx.SegSs );
cs32 = ctx.SegCs;
cs64 = context.SegCs;
@@ -4361,7 +4362,7 @@ static void test_wow64_context(void)
memset( &context, 0x55, sizeof(context) );
context.ContextFlags = CONTEXT_ALL;
ret = pNtGetContextThread( pi.hThread, &context );
- ok( ret == STATUS_SUCCESS, "got %#x\n", ret );
+ ok( ret == STATUS_SUCCESS, "got %#lx\n", ret );
if (ret) break;
if (context.SegCs == cs32 && got32) continue;
if (context.SegCs == cs64 && got64) continue;
@@ -4374,30 +4375,30 @@ static void test_wow64_context(void)
memset( &ctx, 0x55, sizeof(ctx) );
ctx.ContextFlags = WOW64_CONTEXT_ALL;
ret = pRtlWow64GetThreadContext( pi.hThread, &ctx );
- ok(ret == STATUS_SUCCESS, "got %#x\n", ret);
- ok( ctx.ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#x\n", ctx.ContextFlags );
+ ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
+ ok( ctx.ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#lx\n", ctx.ContextFlags );
if (context.SegCs == cs32)
{
trace( "in 32-bit mode %04x\n", context.SegCs );
- ok( ctx.Eip == context.Rip, "cs32: eip %08x / %p\n", ctx.Eip, (void *)context.Rip );
- ok( ctx.Ebp == context.Rbp, "cs32: ebp %08x / %p\n", ctx.Ebp, (void *)context.Rbp );
- ok( ctx.Esp == context.Rsp, "cs32: esp %08x / %p\n", ctx.Esp, (void *)context.Rsp );
- ok( ctx.Eax == context.Rax, "cs32: eax %08x / %p\n", ctx.Eax, (void *)context.Rax );
- ok( ctx.Ebx == context.Rbx, "cs32: ebx %08x / %p\n", ctx.Ebx, (void *)context.Rbx );
+ ok( ctx.Eip == context.Rip, "cs32: eip %08lx / %p\n", ctx.Eip, (void *)context.Rip );
+ ok( ctx.Ebp == context.Rbp, "cs32: ebp %08lx / %p\n", ctx.Ebp, (void *)context.Rbp );
+ ok( ctx.Esp == context.Rsp, "cs32: esp %08lx / %p\n", ctx.Esp, (void *)context.Rsp );
+ ok( ctx.Eax == context.Rax, "cs32: eax %08lx / %p\n", ctx.Eax, (void *)context.Rax );
+ ok( ctx.Ebx == context.Rbx, "cs32: ebx %08lx / %p\n", ctx.Ebx, (void *)context.Rbx );
ok( ctx.Ecx == context.Rcx || broken(ctx.Ecx == (ULONG)context.Rcx),
- "cs32: ecx %08x / %p\n", ctx.Ecx, (void *)context.Rcx );
- ok( ctx.Edx == context.Rdx, "cs32: edx %08x / %p\n", ctx.Edx, (void *)context.Rdx );
- ok( ctx.Esi == context.Rsi, "cs32: esi %08x / %p\n", ctx.Esi, (void *)context.Rsi );
- ok( ctx.Edi == context.Rdi, "cs32: edi %08x / %p\n", ctx.Edi, (void *)context.Rdi );
- ok( ctx.SegCs == cs32, "cs32: wrong cs %04x / %04x\n", ctx.SegCs, cs32 );
- ok( ctx.SegDs == context.SegDs, "cs32: wrong ds %04x / %04x\n", ctx.SegDs, context.SegDs );
- ok( ctx.SegEs == context.SegEs, "cs32: wrong es %04x / %04x\n", ctx.SegEs, context.SegEs );
- ok( ctx.SegFs == context.SegFs, "cs32: wrong fs %04x / %04x\n", ctx.SegFs, context.SegFs );
- ok( ctx.SegGs == context.SegGs, "cs32: wrong gs %04x / %04x\n", ctx.SegGs, context.SegGs );
- ok( ctx.SegSs == context.SegSs, "cs32: wrong ss %04x / %04x\n", ctx.SegSs, context.SegSs );
+ "cs32: ecx %08lx / %p\n", ctx.Ecx, (void *)context.Rcx );
+ ok( ctx.Edx == context.Rdx, "cs32: edx %08lx / %p\n", ctx.Edx, (void *)context.Rdx );
+ ok( ctx.Esi == context.Rsi, "cs32: esi %08lx / %p\n", ctx.Esi, (void *)context.Rsi );
+ ok( ctx.Edi == context.Rdi, "cs32: edi %08lx / %p\n", ctx.Edi, (void *)context.Rdi );
+ ok( ctx.SegCs == cs32, "cs32: wrong cs %04lx / %04x\n", ctx.SegCs, cs32 );
+ ok( ctx.SegDs == context.SegDs, "cs32: wrong ds %04lx / %04x\n", ctx.SegDs, context.SegDs );
+ ok( ctx.SegEs == context.SegEs, "cs32: wrong es %04lx / %04x\n", ctx.SegEs, context.SegEs );
+ ok( ctx.SegFs == context.SegFs, "cs32: wrong fs %04lx / %04x\n", ctx.SegFs, context.SegFs );
+ ok( ctx.SegGs == context.SegGs, "cs32: wrong gs %04lx / %04x\n", ctx.SegGs, context.SegGs );
+ ok( ctx.SegSs == context.SegSs, "cs32: wrong ss %04lx / %04x\n", ctx.SegSs, context.SegSs );
if (teb32.DeallocationStack)
ok( ctx.Esp >= teb32.DeallocationStack && ctx.Esp <= teb32.Tib.StackBase,
- "cs32: esp not inside 32-bit stack %08x / %08x-%08x\n", ctx.Esp,
+ "cs32: esp not inside 32-bit stack %08lx / %08lx-%08lx\n", ctx.Esp,
teb32.DeallocationStack, teb32.Tib.StackBase );
/* r12 points to the TEB */
ok( (void *)context.R12 == info.TebBaseAddress,
@@ -4417,9 +4418,9 @@ static void test_wow64_context(void)
/* in 32-bit mode, the 32-bit context is the current cpu context, not the stored one */
if (!ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED],
cpu, cpu_size, &res )) res = 0;
- ok( res == cpu_size, "wrong len %lx\n", res );
+ ok( res == cpu_size, "wrong len %Ix\n", res );
ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL,
- "cs32: got context flags %#x\n", ctx_ptr->ContextFlags);
+ "cs32: got context flags %#lx\n", ctx_ptr->ContextFlags);
/* changing either context changes the actual cpu context */
rcx = context.Rcx;
@@ -4429,17 +4430,17 @@ static void test_wow64_context(void)
memset( &ctx, 0x55, sizeof(ctx) );
ctx.ContextFlags = WOW64_CONTEXT_ALL;
pRtlWow64GetThreadContext( pi.hThread, &ctx );
- ok( ctx.Ecx == 0x87654321, "cs64: ecx set to %08x\n", ctx.Ecx );
+ ok( ctx.Ecx == 0x87654321, "cs64: ecx set to %08lx\n", ctx.Ecx );
ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res );
- ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08x\n", ctx_ptr->Ecx );
+ ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08lx\n", ctx_ptr->Ecx );
ctx.Ecx = 0x33334444;
pRtlWow64SetThreadContext( pi.hThread, &ctx );
memset( &ctx, 0x55, sizeof(ctx) );
ctx.ContextFlags = WOW64_CONTEXT_ALL;
pRtlWow64GetThreadContext( pi.hThread, &ctx );
- ok( ctx.Ecx == 0x33334444, "cs64: ecx set to %08x\n", ctx.Ecx );
+ ok( ctx.Ecx == 0x33334444, "cs64: ecx set to %08lx\n", ctx.Ecx );
ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res );
- ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08x\n", ctx_ptr->Ecx );
+ ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08lx\n", ctx_ptr->Ecx );
memset( &context, 0x55, sizeof(context) );
context.ContextFlags = CONTEXT_ALL;
pNtGetContextThread( pi.hThread, &context );
@@ -4453,16 +4454,16 @@ static void test_wow64_context(void)
else
{
trace( "in 64-bit mode %04x\n", context.SegCs );
- ok( ctx.Eip != context.Rip, "cs64: eip %08x / %p\n", ctx.Eip, (void *)context.Rip);
- ok( ctx.SegCs == cs32, "cs64: wrong cs %04x / %04x\n", ctx.SegCs, cs32 );
- ok( ctx.SegDs == context.SegDs, "cs64: wrong ds %04x / %04x\n", ctx.SegDs, context.SegDs );
- ok( ctx.SegEs == context.SegEs, "cs64: wrong es %04x / %04x\n", ctx.SegEs, context.SegEs );
- ok( ctx.SegFs == context.SegFs, "cs64: wrong fs %04x / %04x\n", ctx.SegFs, context.SegFs );
- ok( ctx.SegGs == context.SegGs, "cs64: wrong gs %04x / %04x\n", ctx.SegGs, context.SegGs );
- ok( ctx.SegSs == context.SegSs, "cs64: wrong ss %04x / %04x\n", ctx.SegSs, context.SegSs );
+ ok( ctx.Eip != context.Rip, "cs64: eip %08lx / %p\n", ctx.Eip, (void *)context.Rip);
+ ok( ctx.SegCs == cs32, "cs64: wrong cs %04lx / %04x\n", ctx.SegCs, cs32 );
+ ok( ctx.SegDs == context.SegDs, "cs64: wrong ds %04lx / %04x\n", ctx.SegDs, context.SegDs );
+ ok( ctx.SegEs == context.SegEs, "cs64: wrong es %04lx / %04x\n", ctx.SegEs, context.SegEs );
+ ok( ctx.SegFs == context.SegFs, "cs64: wrong fs %04lx / %04x\n", ctx.SegFs, context.SegFs );
+ ok( ctx.SegGs == context.SegGs, "cs64: wrong gs %04lx / %04x\n", ctx.SegGs, context.SegGs );
+ ok( ctx.SegSs == context.SegSs, "cs64: wrong ss %04lx / %04x\n", ctx.SegSs, context.SegSs );
if (teb32.DeallocationStack)
ok( ctx.Esp >= teb32.DeallocationStack && ctx.Esp <= teb32.Tib.StackBase,
- "cs64: esp not inside 32-bit stack %08x / %08x-%08x\n", ctx.Esp,
+ "cs64: esp not inside 32-bit stack %08lx / %08lx-%08lx\n", ctx.Esp,
teb32.DeallocationStack, teb32.Tib.StackBase );
ok( ((void *)context.Rsp >= teb.DeallocationStack && (void *)context.Rsp <= teb.Tib.StackBase) ||
(context.Rsp >= teb32.DeallocationStack && context.Rsp <= teb32.Tib.StackBase),
@@ -4475,18 +4476,18 @@ static void test_wow64_context(void)
/* in 64-bit mode, the 32-bit context is stored in the cpu area */
if (!ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED],
cpu, cpu_size, &res )) res = 0;
- ok( res == cpu_size, "wrong len %lx\n", res );
+ ok( res == cpu_size, "wrong len %Ix\n", res );
ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL,
- "cs64: got context flags %#x\n", ctx_ptr->ContextFlags);
- ok(ctx_ptr->Eip == ctx.Eip, "cs64: got eip %08x / %08x\n", ctx_ptr->Eip, ctx.Eip);
- ok(ctx_ptr->Eax == ctx.Eax, "cs64: got eax %08x / %08x\n", ctx_ptr->Eax, ctx.Eax);
- ok(ctx_ptr->Ebx == ctx.Ebx, "cs64: got ebx %08x / %08x\n", ctx_ptr->Ebx, ctx.Ebx);
- ok(ctx_ptr->Ecx == ctx.Ecx, "cs64: got ecx %08x / %08x\n", ctx_ptr->Ecx, ctx.Ecx);
- ok(ctx_ptr->Edx == ctx.Edx, "cs64: got edx %08x / %08x\n", ctx_ptr->Edx, ctx.Edx);
- ok(ctx_ptr->Ebp == ctx.Ebp, "cs64: got ebp %08x / %08x\n", ctx_ptr->Ebp, ctx.Ebp);
- ok(ctx_ptr->Esi == ctx.Esi, "cs64: got esi %08x / %08x\n", ctx_ptr->Esi, ctx.Esi);
- ok(ctx_ptr->Edi == ctx.Edi, "cs64: got edi %08x / %08x\n", ctx_ptr->Edi, ctx.Edi);
- ok(ctx_ptr->EFlags == ctx.EFlags, "cs64: got eflags %08x / %08x\n", ctx_ptr->EFlags, ctx.EFlags);
+ "cs64: got context flags %#lx\n", ctx_ptr->ContextFlags);
+ ok(ctx_ptr->Eip == ctx.Eip, "cs64: got eip %08lx / %08lx\n", ctx_ptr->Eip, ctx.Eip);
+ ok(ctx_ptr->Eax == ctx.Eax, "cs64: got eax %08lx / %08lx\n", ctx_ptr->Eax, ctx.Eax);
+ ok(ctx_ptr->Ebx == ctx.Ebx, "cs64: got ebx %08lx / %08lx\n", ctx_ptr->Ebx, ctx.Ebx);
+ ok(ctx_ptr->Ecx == ctx.Ecx, "cs64: got ecx %08lx / %08lx\n", ctx_ptr->Ecx, ctx.Ecx);
+ ok(ctx_ptr->Edx == ctx.Edx, "cs64: got edx %08lx / %08lx\n", ctx_ptr->Edx, ctx.Edx);
+ ok(ctx_ptr->Ebp == ctx.Ebp, "cs64: got ebp %08lx / %08lx\n", ctx_ptr->Ebp, ctx.Ebp);
+ ok(ctx_ptr->Esi == ctx.Esi, "cs64: got esi %08lx / %08lx\n", ctx_ptr->Esi, ctx.Esi);
+ ok(ctx_ptr->Edi == ctx.Edi, "cs64: got edi %08lx / %08lx\n", ctx_ptr->Edi, ctx.Edi);
+ ok(ctx_ptr->EFlags == ctx.EFlags, "cs64: got eflags %08lx / %08lx\n", ctx_ptr->EFlags, ctx.EFlags);
/* changing one context doesn't change the other one */
rcx = context.Rcx;
@@ -4496,17 +4497,17 @@ static void test_wow64_context(void)
memset( &ctx, 0x55, sizeof(ctx) );
ctx.ContextFlags = WOW64_CONTEXT_ALL;
pRtlWow64GetThreadContext( pi.hThread, &ctx );
- ok( ctx.Ecx == ecx, "cs64: ecx set to %08x\n", ctx.Ecx );
+ ok( ctx.Ecx == ecx, "cs64: ecx set to %08lx\n", ctx.Ecx );
ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res );
- ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08x\n", ctx_ptr->Ecx );
+ ok( ctx_ptr->Ecx == ecx, "cs64: ecx set to %08lx\n", ctx_ptr->Ecx );
ctx.Ecx = 0x22223333;
pRtlWow64SetThreadContext( pi.hThread, &ctx );
memset( &ctx, 0x55, sizeof(ctx) );
ctx.ContextFlags = WOW64_CONTEXT_ALL;
pRtlWow64GetThreadContext( pi.hThread, &ctx );
- ok( ctx.Ecx == 0x22223333, "cs64: ecx set to %08x\n", ctx.Ecx );
+ ok( ctx.Ecx == 0x22223333, "cs64: ecx set to %08lx\n", ctx.Ecx );
ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res );
- ok( ctx_ptr->Ecx == 0x22223333, "cs64: ecx set to %08x\n", ctx_ptr->Ecx );
+ ok( ctx_ptr->Ecx == 0x22223333, "cs64: ecx set to %08lx\n", ctx_ptr->Ecx );
memset( &context, 0x55, sizeof(context) );
context.ContextFlags = CONTEXT_ALL;
pNtGetContextThread( pi.hThread, &context );
@@ -4556,7 +4557,7 @@ static ULONG64 test_kiuserexceptiondispatcher_saved_r12;
static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher)
{
- trace("handler context->Rip %#lx, codemem %p.\n", context->Rip, code_mem);
+ trace("handler context->Rip %#Ix, codemem %p.\n", context->Rip, code_mem);
got_exception = 1;
dbg_except_continue_handler_rip = (void *)context->Rip;
++context->Rip;
@@ -4573,16 +4574,16 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE
EXCEPTION_RECORD *rec = e->ExceptionRecord;
CONTEXT *context = e->ContextRecord;
- trace("dbg_except_continue_vectored_handler, code %#x, Rip %#lx.\n", rec->ExceptionCode, context->Rip);
+ trace("dbg_except_continue_vectored_handler, code %#lx, Rip %#Ix.\n", rec->ExceptionCode, context->Rip);
if (rec->ExceptionCode == 0xceadbeef)
{
- ok(context->P1Home == (ULONG64)0xdeadbeeffeedcafe, "Got unexpected context->P1Home %#lx.\n", context->P1Home);
+ ok(context->P1Home == (ULONG64)0xdeadbeeffeedcafe, "Got unexpected context->P1Home %#Ix.\n", context->P1Home);
context->R12 = test_kiuserexceptiondispatcher_saved_r12;
return EXCEPTION_CONTINUE_EXECUTION;
}
- ok(rec->ExceptionCode == 0x80000003, "Got unexpected exception code %#x.\n", rec->ExceptionCode);
+ ok(rec->ExceptionCode == 0x80000003, "Got unexpected exception code %#lx.\n", rec->ExceptionCode);
got_exception = 1;
dbg_except_continue_handler_rip = (void *)context->Rip;
@@ -4599,13 +4600,13 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE
static void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context)
{
trace("rec %p, context %p.\n", rec, context);
- trace("context->Rip %#lx, context->Rsp %#lx, ContextFlags %#lx.\n",
+ trace("context->Rip %#Ix, context->Rsp %#Ix, ContextFlags %#lx.\n",
context->Rip, context->Rsp, context->ContextFlags);
hook_called = TRUE;
/* Broken on Win2008, probably rec offset in stack is different. */
ok(rec->ExceptionCode == 0x80000003 || rec->ExceptionCode == 0xceadbeef || broken(!rec->ExceptionCode),
- "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode);
+ "Got unexpected ExceptionCode %#lx.\n", rec->ExceptionCode);
hook_KiUserExceptionDispatcher_rip = (void *)context->Rip;
hook_exception_address = rec->ExceptionAddress;
@@ -4691,7 +4692,7 @@ static void test_kiuserexceptiondispatcher(void)
ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes),
PAGE_EXECUTE_READWRITE, &old_protect);
- ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());
+ ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError());
memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher,
sizeof(saved_KiUserExceptionDispatcher_bytes));
@@ -4712,7 +4713,7 @@ static void test_kiuserexceptiondispatcher(void)
ok(got_exception, "Handler was not called.\n");
ok(hook_called, "Hook was not called.\n");
- ok(test_kiuserexceptiondispatcher_regs.new_rax == 0xdeadbeef, "Got unexpected rax %#lx.\n",
+ ok(test_kiuserexceptiondispatcher_regs.new_rax == 0xdeadbeef, "Got unexpected rax %#Ix.\n",
test_kiuserexceptiondispatcher_regs.new_rax);
ok(test_kiuserexceptiondispatcher_regs.old_rsi
== test_kiuserexceptiondispatcher_regs.new_rsi, "rsi does not match.\n");
@@ -4781,7 +4782,7 @@ static void test_kiuserexceptiondispatcher(void)
ok(dbg_except_continue_handler_rip == bpt_address, "Got unexpected exception address %p, expected %p.\n",
dbg_except_continue_handler_rip, bpt_address);
- ok(test_kiuserexceptiondispatcher_regs.new_rax == 0xdeadbeef, "Got unexpected rax %#lx.\n",
+ ok(test_kiuserexceptiondispatcher_regs.new_rax == 0xdeadbeef, "Got unexpected rax %#Ix.\n",
test_kiuserexceptiondispatcher_regs.new_rax);
ok(test_kiuserexceptiondispatcher_regs.old_rsi
== test_kiuserexceptiondispatcher_regs.new_rsi, "rsi does not match.\n");
@@ -4816,14 +4817,14 @@ static void test_kiuserexceptiondispatcher(void)
}
else
{
- ok(pass == 3, "Got unexpected pass %d.\n", pass);
+ ok(pass == 3, "Got unexpected pass %ld.\n", pass);
}
ok(hook_called, "Hook was not called.\n");
RemoveVectoredExceptionHandler(vectored_handler);
ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes),
old_protect, &old_protect);
- ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError());
+ ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError());
}
static BOOL got_nested_exception, got_prev_frame_exception;
@@ -4832,16 +4833,16 @@ static void *nested_exception_initial_frame;
static DWORD nested_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher)
{
- trace("nested_exception_handler Rip %p, Rsp %p, code %#x, flags %#x, ExceptionAddress %p.\n",
+ trace("nested_exception_handler Rip %p, Rsp %p, code %#lx, flags %#lx, ExceptionAddress %p.\n",
(void *)context->Rip, (void *)context->Rsp, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress);
if (rec->ExceptionCode == 0x80000003
&& !(rec->ExceptionFlags & EH_NESTED_CALL))
{
- ok(rec->NumberParameters == 1, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters);
+ ok(rec->NumberParameters == 1, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters);
ok((void *)context->Rsp == frame, "Got unexpected frame %p.\n", frame);
ok(*(void **)frame == (char *)code_mem + 5, "Got unexpected *frame %p.\n", *(void **)frame);
- ok(context->Rip == (ULONG_PTR)((char *)code_mem + 7), "Got unexpected Rip %#lx.\n", context->Rip);
+ ok(context->Rip == (ULONG_PTR)((char *)code_mem + 7), "Got unexpected Rip %#Ix.\n", context->Rip);
nested_exception_initial_frame = frame;
RaiseException(0xdeadbeef, 0, 0, 0);
@@ -4851,15 +4852,15 @@ static DWORD nested_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRAT
if (rec->ExceptionCode == 0xdeadbeef && rec->ExceptionFlags == EH_NESTED_CALL)
{
- ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters);
+ ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters);
got_nested_exception = TRUE;
ok(frame == nested_exception_initial_frame, "Got unexpected frame %p.\n", frame);
return ExceptionContinueSearch;
}
ok(rec->ExceptionCode == 0xdeadbeef && !rec->ExceptionFlags,
- "Got unexpected exception code %#x, flags %#x.\n", rec->ExceptionCode, rec->ExceptionFlags);
- ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters);
+ "Got unexpected exception code %#lx, flags %#lx.\n", rec->ExceptionCode, rec->ExceptionFlags);
+ ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %lu.\n", rec->NumberParameters);
ok(frame == (void *)((BYTE *)nested_exception_initial_frame + 8),
"Got unexpected frame %p.\n", frame);
got_prev_frame_exception = TRUE;
@@ -4918,7 +4919,7 @@ static void test_unwind_from_apc(void)
{
test_unwind_apc_called = FALSE;
status = pNtQueueApcThread(GetCurrentThread(), test_unwind_apc, 0, 0, 0);
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
SleepEx(0, TRUE);
ok(0, "Should not get here.\n");
}
@@ -4927,11 +4928,11 @@ static void test_unwind_from_apc(void)
ok(test_unwind_apc_called, "Test user APC was not called.\n");
test_unwind_apc_called = FALSE;
status = pNtQueueApcThread(GetCurrentThread(), test_unwind_apc, 0, 0, 0);
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
NtContinue(&test_unwind_apc_context, TRUE );
ok(0, "Should not get here.\n");
}
- ok(pass == 4, "Got unexpected pass %d.\n", pass);
+ ok(pass == 4, "Got unexpected pass %ld.\n", pass);
ok(test_unwind_apc_called, "Test user APC was not called.\n");
}
@@ -4975,36 +4976,36 @@ static void test_syscall_clobbered_regs(void)
func = code_mem;
memset(®s, 0, sizeof(regs));
status = func((HANDLE)0xdeadbeef, NULL, ®s, pNtCancelTimer);
- ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#lx.\n", status);
/* After the syscall instruction rcx contains the address of the instruction next after syscall. */
ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20,
"Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer);
status = func((HANDLE)0xdeadbeef, (BOOLEAN *)0xdeadbeef, ®s, pNtCancelTimer);
- ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#lx.\n", status);
ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20,
"Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer);
context.ContextFlags = CONTEXT_CONTROL;
status = func(GetCurrentThread(), &context, ®s, pNtGetContextThread);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20,
"Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread);
status = func(GetCurrentThread(), &context, ®s, pNtSetContextThread);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20,
"Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread);
context.ContextFlags = CONTEXT_INTEGER;
status = func(GetCurrentThread(), &context, ®s, pNtGetContextThread);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20,
"Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread);
status = func(GetCurrentThread(), &context, ®s, pNtSetContextThread);
- ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status);
+ ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
ok((BYTE *)regs.rcx > (BYTE *)pNtSetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtSetContextThread + 0x20,
"Got unexpected rcx %s, pNtSetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtSetContextThread);
@@ -7944,13 +7945,13 @@ static DWORD WINAPI register_check_thread(void *arg)
ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS;
status = pNtGetContextThread(GetCurrentThread(), &ctx);
- ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status);
- ok(!ctx.Dr0, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr0);
- ok(!ctx.Dr1, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr1);
- ok(!ctx.Dr2, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr2);
- ok(!ctx.Dr3, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr3);
- ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6);
- ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7);
+ ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status);
+ ok(!ctx.Dr0, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr0);
+ ok(!ctx.Dr1, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr1);
+ ok(!ctx.Dr2, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr2);
+ ok(!ctx.Dr3, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr3);
+ ok(!ctx.Dr6, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr6);
+ ok(!ctx.Dr7, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr7);
return 0;
}
@@ -7983,19 +7984,19 @@ static void test_debug_registers(void)
ctx.Dr7 = tests[i].dr7;
status = pNtSetContextThread(GetCurrentThread(), &ctx);
- ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %08x\n", status);
+ ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %08lx\n", status);
memset(&ctx, 0, sizeof(ctx));
ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS;
status = pNtGetContextThread(GetCurrentThread(), &ctx);
- ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %08x\n", status);
- ok(ctx.Dr0 == tests[i].dr0, "test %d: expected %lx, got %lx\n", i, tests[i].dr0, (DWORD_PTR)ctx.Dr0);
- ok(ctx.Dr1 == tests[i].dr1, "test %d: expected %lx, got %lx\n", i, tests[i].dr1, (DWORD_PTR)ctx.Dr1);
- ok(ctx.Dr2 == tests[i].dr2, "test %d: expected %lx, got %lx\n", i, tests[i].dr2, (DWORD_PTR)ctx.Dr2);
- ok(ctx.Dr3 == tests[i].dr3, "test %d: expected %lx, got %lx\n", i, tests[i].dr3, (DWORD_PTR)ctx.Dr3);
- ok((ctx.Dr6 & 0xf00f) == tests[i].dr6, "test %d: expected %lx, got %lx\n", i, tests[i].dr6, (DWORD_PTR)ctx.Dr6);
- ok((ctx.Dr7 & ~0xdc00) == tests[i].dr7, "test %d: expected %lx, got %lx\n", i, tests[i].dr7, (DWORD_PTR)ctx.Dr7);
+ ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %08lx\n", status);
+ ok(ctx.Dr0 == tests[i].dr0, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr0, (DWORD_PTR)ctx.Dr0);
+ ok(ctx.Dr1 == tests[i].dr1, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr1, (DWORD_PTR)ctx.Dr1);
+ ok(ctx.Dr2 == tests[i].dr2, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr2, (DWORD_PTR)ctx.Dr2);
+ ok(ctx.Dr3 == tests[i].dr3, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr3, (DWORD_PTR)ctx.Dr3);
+ ok((ctx.Dr6 & 0xf00f) == tests[i].dr6, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr6, (DWORD_PTR)ctx.Dr6);
+ ok((ctx.Dr7 & ~0xdc00) == tests[i].dr7, "test %d: expected %Ix, got %Ix\n", i, tests[i].dr7, (DWORD_PTR)ctx.Dr7);
}
memset(&ctx, 0, sizeof(ctx));
@@ -8007,20 +8008,20 @@ static void test_debug_registers(void)
ctx.Dr6 = 0xffffffff;
ctx.Dr7 = 0x00000400;
status = pNtSetContextThread(GetCurrentThread(), &ctx);
- ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", status);
+ ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %lx\n", status);
thread = CreateThread(NULL, 0, register_check_thread, NULL, CREATE_SUSPENDED, NULL);
- ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError());
+ ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %ld\n", GetLastError());
ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS;
status = pNtGetContextThread(thread, &ctx);
- ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status);
- ok(!ctx.Dr0, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr0);
- ok(!ctx.Dr1, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr1);
- ok(!ctx.Dr2, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr2);
- ok(!ctx.Dr3, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr3);
- ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6);
- ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7);
+ ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %lx\n", status);
+ ok(!ctx.Dr0, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr0);
+ ok(!ctx.Dr1, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr1);
+ ok(!ctx.Dr2, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr2);
+ ok(!ctx.Dr3, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr3);
+ ok(!ctx.Dr6, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr6);
+ ok(!ctx.Dr7, "expected 0, got %Ix\n", (DWORD_PTR)ctx.Dr7);
ResumeThread(thread);
WaitForSingleObject(thread, 10000);
@@ -8069,11 +8070,11 @@ static void test_debug_registers_wow64(void)
ok(bret, "GetThreadContext failed\n");
if (bret)
{
- ok(ctx.Dr0 == 0x12340000, "expected 0x12340000, got %lx\n", ctx.Dr0);
- ok(ctx.Dr1 == 0x12340001, "expected 0x12340001, got %lx\n", ctx.Dr1);
- ok(ctx.Dr2 == 0x12340002, "expected 0x12340002, got %lx\n", ctx.Dr2);
- ok(ctx.Dr3 == 0x12340003, "expected 0x12340003, got %lx\n", ctx.Dr3);
- ok(ctx.Dr7 == 0x155, "expected 0x155, got %lx\n", ctx.Dr7);
+ ok(ctx.Dr0 == 0x12340000, "expected 0x12340000, got %Ix\n", ctx.Dr0);
+ ok(ctx.Dr1 == 0x12340001, "expected 0x12340001, got %Ix\n", ctx.Dr1);
+ ok(ctx.Dr2 == 0x12340002, "expected 0x12340002, got %Ix\n", ctx.Dr2);
+ ok(ctx.Dr3 == 0x12340003, "expected 0x12340003, got %Ix\n", ctx.Dr3);
+ ok(ctx.Dr7 == 0x155, "expected 0x155, got %Ix\n", ctx.Dr7);
}
ZeroMemory(&wow64_ctx, sizeof(wow64_ctx));
@@ -8117,11 +8118,11 @@ static void test_debug_registers_wow64(void)
ok(bret, "GetThreadContext failed\n");
if (bret)
{
- ok(ctx.Dr0 == 0x56780000, "expected 0x56780000, got %lx\n", ctx.Dr0);
- ok(ctx.Dr1 == 0x56780001, "expected 0x56780001, got %lx\n", ctx.Dr1);
- ok(ctx.Dr2 == 0x56780002, "expected 0x56780002, got %lx\n", ctx.Dr2);
- ok(ctx.Dr3 == 0x56780003, "expected 0x56780003, got %lx\n", ctx.Dr3);
- ok(ctx.Dr7 == 0x101, "expected 0x101, got %lx\n", ctx.Dr7);
+ ok(ctx.Dr0 == 0x56780000, "expected 0x56780000, got %Ix\n", ctx.Dr0);
+ ok(ctx.Dr1 == 0x56780001, "expected 0x56780001, got %Ix\n", ctx.Dr1);
+ ok(ctx.Dr2 == 0x56780002, "expected 0x56780002, got %Ix\n", ctx.Dr2);
+ ok(ctx.Dr3 == 0x56780003, "expected 0x56780003, got %Ix\n", ctx.Dr3);
+ ok(ctx.Dr7 == 0x101, "expected 0x101, got %Ix\n", ctx.Dr7);
}
ResumeThread(pi.hThread);
@@ -8137,18 +8138,18 @@ static DWORD debug_service_exceptions;
static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo)
{
EXCEPTION_RECORD *rec = ExceptionInfo->ExceptionRecord;
- trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
+ trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
- ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08x instead of %08x\n",
+ ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08lx instead of %08lx\n",
rec->ExceptionCode, EXCEPTION_BREAKPOINT);
#ifdef __i386__
ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 0x1c,
- "expected Eip = %x, got %x\n", (DWORD)code_mem + 0x1c, ExceptionInfo->ContextRecord->Eip);
+ "expected Eip = %lx, got %lx\n", (DWORD)code_mem + 0x1c, ExceptionInfo->ContextRecord->Eip);
ok(rec->NumberParameters == (is_wow64 ? 1 : 3),
- "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3);
+ "ExceptionParameters is %ld instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3);
ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Eax,
- "expected ExceptionInformation[0] = %x, got %lx\n",
+ "expected ExceptionInformation[0] = %lx, got %lx\n",
ExceptionInfo->ContextRecord->Eax, rec->ExceptionInformation[0]);
if (!is_wow64)
{
@@ -8159,11 +8160,11 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo)
}
#else
ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 0x2f,
- "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 0x2f, ExceptionInfo->ContextRecord->Rip);
+ "expected Rip = %Ix, got %Ix\n", (DWORD_PTR)code_mem + 0x2f, ExceptionInfo->ContextRecord->Rip);
ok(rec->NumberParameters == 1,
- "ExceptionParameters is %d instead of 1\n", rec->NumberParameters);
+ "ExceptionParameters is %ld instead of 1\n", rec->NumberParameters);
ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Rax,
- "expected ExceptionInformation[0] = %lx, got %lx\n",
+ "expected ExceptionInformation[0] = %Ix, got %Ix\n",
ExceptionInfo->ContextRecord->Rax, rec->ExceptionInformation[0]);
#endif
@@ -8242,28 +8243,28 @@ static void test_debug_service(DWORD numexc)
debug_service_exceptions = 0;
ret = func(0);
ok(debug_service_exceptions == expected_exc,
- "BREAKPOINT_BREAK generated %u exceptions, expected %u\n",
+ "BREAKPOINT_BREAK generated %lu exceptions, expected %lu\n",
debug_service_exceptions, expected_exc);
ok(ret == expected_ret,
- "BREAKPOINT_BREAK returned %u, expected %u\n", ret, expected_ret);
+ "BREAKPOINT_BREAK returned %lu, expected %lu\n", ret, expected_ret);
/* BREAKPOINT_PROMPT */
debug_service_exceptions = 0;
ret = func(2);
ok(debug_service_exceptions == expected_exc,
- "BREAKPOINT_PROMPT generated %u exceptions, expected %u\n",
+ "BREAKPOINT_PROMPT generated %lu exceptions, expected %lu\n",
debug_service_exceptions, expected_exc);
ok(ret == expected_ret,
- "BREAKPOINT_PROMPT returned %u, expected %u\n", ret, expected_ret);
+ "BREAKPOINT_PROMPT returned %lu, expected %lu\n", ret, expected_ret);
/* invalid debug service */
debug_service_exceptions = 0;
ret = func(6);
ok(debug_service_exceptions == expected_exc,
- "invalid debug service generated %u exceptions, expected %u\n",
+ "invalid debug service generated %lu exceptions, expected %lu\n",
debug_service_exceptions, expected_exc);
ok(ret == expected_ret,
- "invalid debug service returned %u, expected %u\n", ret, expected_ret);
+ "invalid debug service returned %lu, expected %lu\n", ret, expected_ret);
expected_exc = (is_wow64 ? numexc : 0);
expected_ret = (is_wow64 && numexc);
@@ -8272,37 +8273,37 @@ static void test_debug_service(DWORD numexc)
debug_service_exceptions = 0;
ret = func(1);
ok(debug_service_exceptions == expected_exc,
- "BREAKPOINT_PRINT generated %u exceptions, expected %u\n",
+ "BREAKPOINT_PRINT generated %lu exceptions, expected %lu\n",
debug_service_exceptions, expected_exc);
ok(ret == expected_ret,
- "BREAKPOINT_PRINT returned %u, expected %u\n", ret, expected_ret);
+ "BREAKPOINT_PRINT returned %lu, expected %lu\n", ret, expected_ret);
/* BREAKPOINT_LOAD_SYMBOLS */
debug_service_exceptions = 0;
ret = func(3);
ok(debug_service_exceptions == expected_exc,
- "BREAKPOINT_LOAD_SYMBOLS generated %u exceptions, expected %u\n",
+ "BREAKPOINT_LOAD_SYMBOLS generated %lu exceptions, expected %lu\n",
debug_service_exceptions, expected_exc);
ok(ret == expected_ret,
- "BREAKPOINT_LOAD_SYMBOLS returned %u, expected %u\n", ret, expected_ret);
+ "BREAKPOINT_LOAD_SYMBOLS returned %lu, expected %lu\n", ret, expected_ret);
/* BREAKPOINT_UNLOAD_SYMBOLS */
debug_service_exceptions = 0;
ret = func(4);
ok(debug_service_exceptions == expected_exc,
- "BREAKPOINT_UNLOAD_SYMBOLS generated %u exceptions, expected %u\n",
+ "BREAKPOINT_UNLOAD_SYMBOLS generated %lu exceptions, expected %lu\n",
debug_service_exceptions, expected_exc);
ok(ret == expected_ret,
- "BREAKPOINT_UNLOAD_SYMBOLS returned %u, expected %u\n", ret, expected_ret);
+ "BREAKPOINT_UNLOAD_SYMBOLS returned %lu, expected %lu\n", ret, expected_ret);
/* BREAKPOINT_COMMAND_STRING */
debug_service_exceptions = 0;
ret = func(5);
ok(debug_service_exceptions == expected_exc || broken(debug_service_exceptions == numexc),
- "BREAKPOINT_COMMAND_STRING generated %u exceptions, expected %u\n",
+ "BREAKPOINT_COMMAND_STRING generated %lu exceptions, expected %lu\n",
debug_service_exceptions, expected_exc);
ok(ret == expected_ret || broken(ret == (numexc != 0)),
- "BREAKPOINT_COMMAND_STRING returned %u, expected %u\n", ret, expected_ret);
+ "BREAKPOINT_COMMAND_STRING returned %lu, expected %lu\n", ret, expected_ret);
pRtlRemoveVectoredExceptionHandler(vectored_handler);
}
@@ -8313,12 +8314,12 @@ static DWORD outputdebugstring_exceptions;
static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo)
{
PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord;
- trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
+ trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
- ok(rec->ExceptionCode == DBG_PRINTEXCEPTION_C, "ExceptionCode is %08x instead of %08x\n",
+ ok(rec->ExceptionCode == DBG_PRINTEXCEPTION_C, "ExceptionCode is %08lx instead of %08lx\n",
rec->ExceptionCode, DBG_PRINTEXCEPTION_C);
- ok(rec->NumberParameters == 2, "ExceptionParameters is %d instead of 2\n", rec->NumberParameters);
- ok(rec->ExceptionInformation[0] == 12, "ExceptionInformation[0] = %d instead of 12\n", (DWORD)rec->ExceptionInformation[0]);
+ ok(rec->NumberParameters == 2, "ExceptionParameters is %ld instead of 2\n", rec->NumberParameters);
+ ok(rec->ExceptionInformation[0] == 12, "ExceptionInformation[0] = %ld instead of 12\n", (DWORD)rec->ExceptionInformation[0]);
ok(!strcmp((char *)rec->ExceptionInformation[1], "Hello World"),
"ExceptionInformation[1] = '%s' instead of 'Hello World'\n", (char *)rec->ExceptionInformation[1]);
@@ -8343,7 +8344,7 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
OutputDebugStringA("Hello World");
todo_wine_if(todo)
- ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n",
+ ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %ld exceptions, expected %ld\n",
outputdebugstring_exceptions, numexc);
pRtlRemoveVectoredExceptionHandler(vectored_handler);
@@ -8354,14 +8355,14 @@ static DWORD ripevent_exceptions;
static LONG CALLBACK ripevent_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo)
{
PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord;
- trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
+ trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
- ok(rec->ExceptionCode == DBG_RIPEXCEPTION, "ExceptionCode is %08x instead of %08x\n",
+ ok(rec->ExceptionCode == DBG_RIPEXCEPTION, "ExceptionCode is %08lx instead of %08lx\n",
rec->ExceptionCode, DBG_RIPEXCEPTION);
- ok(rec->NumberParameters == 2, "ExceptionParameters is %d instead of 2\n", rec->NumberParameters);
- ok(rec->ExceptionInformation[0] == 0x11223344, "ExceptionInformation[0] = %08x instead of %08x\n",
+ ok(rec->NumberParameters == 2, "ExceptionParameters is %ld instead of 2\n", rec->NumberParameters);
+ ok(rec->ExceptionInformation[0] == 0x11223344, "ExceptionInformation[0] = %08lx instead of %08x\n",
(NTSTATUS)rec->ExceptionInformation[0], 0x11223344);
- ok(rec->ExceptionInformation[1] == 0x55667788, "ExceptionInformation[1] = %08x instead of %08x\n",
+ ok(rec->ExceptionInformation[1] == 0x55667788, "ExceptionInformation[1] = %08lx instead of %08x\n",
(NTSTATUS)rec->ExceptionInformation[1], 0x55667788);
ripevent_exceptions++;
@@ -8392,7 +8393,7 @@ static void test_ripevent(DWORD numexc)
ripevent_exceptions = 0;
pRtlRaiseException(&record);
- ok(ripevent_exceptions == numexc, "RtlRaiseException generated %d exceptions, expected %d\n",
+ ok(ripevent_exceptions == numexc, "RtlRaiseException generated %ld exceptions, expected %ld\n",
ripevent_exceptions, numexc);
pRtlRemoveVectoredExceptionHandler(vectored_handler);
@@ -8403,26 +8404,26 @@ static DWORD breakpoint_exceptions;
static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo)
{
EXCEPTION_RECORD *rec = ExceptionInfo->ExceptionRecord;
- trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
+ trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
- ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08x instead of %08x\n",
+ ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08lx instead of %08lx\n",
rec->ExceptionCode, EXCEPTION_BREAKPOINT);
#ifdef __i386__
ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 1,
- "expected Eip = %x, got %x\n", (DWORD)code_mem + 1, ExceptionInfo->ContextRecord->Eip);
+ "expected Eip = %lx, got %lx\n", (DWORD)code_mem + 1, ExceptionInfo->ContextRecord->Eip);
ok(rec->NumberParameters == (is_wow64 ? 1 : 3),
- "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3);
+ "ExceptionParameters is %ld instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3);
ok(rec->ExceptionInformation[0] == 0,
"got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]);
ExceptionInfo->ContextRecord->Eip = (DWORD)code_mem + 2;
#elif defined(__x86_64__)
ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 1,
- "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip);
+ "expected Rip = %Ix, got %Ix\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip);
ok(rec->NumberParameters == 1,
- "ExceptionParameters is %d instead of 1\n", rec->NumberParameters);
+ "ExceptionParameters is %ld instead of 1\n", rec->NumberParameters);
ok(rec->ExceptionInformation[0] == 0,
- "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]);
+ "got ExceptionInformation[0] = %Ix\n", rec->ExceptionInformation[0]);
ExceptionInfo->ContextRecord->Rip = (DWORD_PTR)code_mem + 2;
#elif defined(__arm__)
ok(ExceptionInfo->ContextRecord->Pc == (DWORD)code_mem + 1,
@@ -8468,7 +8469,7 @@ static void test_breakpoint(DWORD numexc)
breakpoint_exceptions = 0;
func();
- ok(breakpoint_exceptions == numexc, "int $0x3 generated %u exceptions, expected %u\n",
+ ok(breakpoint_exceptions == numexc, "int $0x3 generated %lu exceptions, expected %lu\n",
breakpoint_exceptions, numexc);
pRtlRemoveVectoredExceptionHandler(vectored_handler);
@@ -8565,11 +8566,11 @@ static DWORD invalid_handle_exceptions;
static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo)
{
PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord;
- trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
+ trace("vect. handler %08lx addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress);
- ok(rec->ExceptionCode == EXCEPTION_INVALID_HANDLE, "ExceptionCode is %08x instead of %08x\n",
+ ok(rec->ExceptionCode == EXCEPTION_INVALID_HANDLE, "ExceptionCode is %08lx instead of %08lx\n",
rec->ExceptionCode, EXCEPTION_INVALID_HANDLE);
- ok(rec->NumberParameters == 0, "ExceptionParameters is %d instead of 0\n", rec->NumberParameters);
+ ok(rec->NumberParameters == 0, "ExceptionParameters is %ld instead of 0\n", rec->NumberParameters);
invalid_handle_exceptions++;
return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH;
@@ -8590,12 +8591,12 @@ static void test_closehandle(DWORD numexc, HANDLE handle)
invalid_handle_exceptions = 0;
CloseHandle(handle);
- ok(invalid_handle_exceptions == numexc, "CloseHandle generated %d exceptions, expected %d\n",
+ ok(invalid_handle_exceptions == numexc, "CloseHandle generated %ld exceptions, expected %ld\n",
invalid_handle_exceptions, numexc);
invalid_handle_exceptions = 0;
pNtClose(handle);
- ok(invalid_handle_exceptions == numexc, "NtClose generated %d exceptions, expected %d\n",
+ ok(invalid_handle_exceptions == numexc, "NtClose generated %ld exceptions, expected %ld\n",
invalid_handle_exceptions, numexc);
pRtlRemoveVectoredExceptionHandler(vectored_handler);
@@ -8671,26 +8672,26 @@ static void test_user_apc(void)
test_apc_called = FALSE;
status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0);
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
SleepEx(0, TRUE);
ok(test_apc_called, "Test user APC was not called.\n");
test_apc_called = FALSE;
status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0);
- ok(!status, "Got unexpected status %#x.\n", status);
+ ok(!status, "Got unexpected status %#lx.\n", status);
status = NtContinue(&c[0], TRUE );
/* Broken before Win7, in that case NtContinue returns here instead of restoring context after calling APC. */
- ok(broken(TRUE), "Should not get here, status %#x.\n", status);
+ ok(broken(TRUE), "Should not get here, status %#lx.\n", status);
return;
}
- ok(pass == 3, "Got unexpected pass %d.\n", pass);
+ ok(pass == 3, "Got unexpected pass %ld.\n", pass);
ok(test_apc_called, "Test user APC was not called.\n");
}
static void test_user_callback(void)
{
NTSTATUS status = pNtCallbackReturn( NULL, 0, STATUS_SUCCESS );
- ok( status == STATUS_NO_CALLBACK_ACTIVE, "failed %x\n", status );
+ ok( status == STATUS_NO_CALLBACK_ACTIVE, "failed %lx\n", status );
}
static DWORD WINAPI suspend_thread_test( void *arg )
@@ -8718,8 +8719,8 @@ static void test_suspend_count(HANDLE hthread, ULONG expected_count, int line)
return;
}
- ok_(__FILE__, line)(!status, "Failed to get suspend count, status %#x.\n", status);
- ok_(__FILE__, line)(count == expected_count, "Unexpected suspend count %u.\n", count);
+ ok_(__FILE__, line)(!status, "Failed to get suspend count, status %#lx.\n", status);
+ ok_(__FILE__, line)(count == expected_count, "Unexpected suspend count %lu.\n", count);
}
static void test_suspend_thread(void)
@@ -8731,10 +8732,10 @@ static void test_suspend_thread(void)
DWORD ret;
status = NtSuspendThread(0, NULL);
- ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#lx.\n", status);
status = NtResumeThread(0, NULL);
- ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#lx.\n", status);
event = CreateEventW(NULL, FALSE, FALSE, NULL);
@@ -8742,61 +8743,61 @@ static void test_suspend_thread(void)
ok(thread != NULL, "Failed to create a thread.\n");
ret = WaitForSingleObject(thread, 0);
- ok(ret == WAIT_TIMEOUT, "Unexpected status %d.\n", ret);
+ ok(ret == WAIT_TIMEOUT, "Unexpected status %ld.\n", ret);
status = pNtQueryInformationThread(thread, ThreadSuspendCount, &count, sizeof(count), NULL);
if (!status)
{
status = pNtQueryInformationThread(thread, ThreadSuspendCount, NULL, sizeof(count), NULL);
- ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status);
+ ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#lx.\n", status);
status = pNtQueryInformationThread(thread, ThreadSuspendCount, &count, sizeof(count) / 2, NULL);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#lx.\n", status);
len = 123;
status = pNtQueryInformationThread(thread, ThreadSuspendCount, &count, sizeof(count) / 2, &len);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status);
- ok(len == 123, "Unexpected info length %u.\n", len);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#lx.\n", status);
+ ok(len == 123, "Unexpected info length %lu.\n", len);
len = 123;
status = pNtQueryInformationThread(thread, ThreadSuspendCount, NULL, 0, &len);
- ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status);
- ok(len == 123, "Unexpected info length %u.\n", len);
+ ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#lx.\n", status);
+ ok(len == 123, "Unexpected info length %lu.\n", len);
count = 10;
status = pNtQueryInformationThread(0, ThreadSuspendCount, &count, sizeof(count), NULL);
- ok(status, "Unexpected status %#x.\n", status);
- ok(count == 10, "Unexpected suspend count %u.\n", count);
+ ok(status, "Unexpected status %#lx.\n", status);
+ ok(count == 10, "Unexpected suspend count %lu.\n", count);
}
status = NtResumeThread(thread, NULL);
- ok(!status, "Unexpected status %#x.\n", status);
+ ok(!status, "Unexpected status %#lx.\n", status);
status = NtResumeThread(thread, &count);
- ok(!status, "Unexpected status %#x.\n", status);
- ok(count == 0, "Unexpected suspended count %u.\n", count);
+ ok(!status, "Unexpected status %#lx.\n", status);
+ ok(count == 0, "Unexpected suspended count %lu.\n", count);
TEST_SUSPEND_COUNT(thread, 0);
status = NtSuspendThread(thread, NULL);
- ok(!status, "Failed to suspend a thread, status %#x.\n", status);
+ ok(!status, "Failed to suspend a thread, status %#lx.\n", status);
TEST_SUSPEND_COUNT(thread, 1);
status = NtSuspendThread(thread, &count);
- ok(!status, "Failed to suspend a thread, status %#x.\n", status);
- ok(count == 1, "Unexpected suspended count %u.\n", count);
+ ok(!status, "Failed to suspend a thread, status %#lx.\n", status);
+ ok(count == 1, "Unexpected suspended count %lu.\n", count);
TEST_SUSPEND_COUNT(thread, 2);
status = NtResumeThread(thread, &count);
- ok(!status, "Failed to resume a thread, status %#x.\n", status);
- ok(count == 2, "Unexpected suspended count %u.\n", count);
+ ok(!status, "Failed to resume a thread, status %#lx.\n", status);
+ ok(count == 2, "Unexpected suspended count %lu.\n", count);
TEST_SUSPEND_COUNT(thread, 1);
status = NtResumeThread(thread, NULL);
- ok(!status, "Failed to resume a thread, status %#x.\n", status);
+ ok(!status, "Failed to resume a thread, status %#lx.\n", status);
TEST_SUSPEND_COUNT(thread, 0);
@@ -8832,7 +8833,7 @@ static void suspend_process_proc(void)
/* Suspend up to limit. */
while (!(status = NtSuspendThread(thread, NULL)))
;
- ok(status == STATUS_SUSPEND_COUNT_EXCEEDED, "Unexpected status %#x.\n", status);
+ ok(status == STATUS_SUSPEND_COUNT_EXCEEDED, "Unexpected status %#lx.\n", status);
for (;;)
{
@@ -8842,11 +8843,11 @@ static void suspend_process_proc(void)
}
status = NtSuspendThread(thread, &count);
- ok(!status, "Failed to suspend a thread, status %#x.\n", status);
- ok(count == 125, "Unexpected suspend count %u.\n", count);
+ ok(!status, "Failed to suspend a thread, status %#lx.\n", status);
+ ok(count == 125, "Unexpected suspend count %lu.\n", count);
status = NtResumeThread(thread, NULL);
- ok(!status, "Failed to resume a thread, status %#x.\n", status);
+ ok(!status, "Failed to resume a thread, status %#lx.\n", status);
CloseHandle(event);
CloseHandle(event2);
@@ -8879,50 +8880,50 @@ static void test_suspend_process(void)
/* New process signals this event. */
ResetEvent(event2);
ret = WaitForSingleObject(event2, INFINITE);
- ok(ret == WAIT_OBJECT_0, "Wait failed, %#x.\n", ret);
+ ok(ret == WAIT_OBJECT_0, "Wait failed, %#lx.\n", ret);
/* Suspend main thread */
status = NtSuspendThread(info.hThread, &ret);
- ok(!status && !ret, "Failed to suspend main thread, status %#x.\n", status);
+ ok(!status && !ret, "Failed to suspend main thread, status %#lx.\n", status);
/* Process wasn't suspended yet. */
status = pNtResumeProcess(info.hProcess);
- ok(!status, "Failed to resume a process, status %#x.\n", status);
+ ok(!status, "Failed to resume a process, status %#lx.\n", status);
status = pNtSuspendProcess(0);
- ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status);
+ ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#lx.\n", status);
status = pNtResumeProcess(info.hProcess);
- ok(!status, "Failed to resume a process, status %#x.\n", status);
+ ok(!status, "Failed to resume a process, status %#lx.\n", status);
ResetEvent(event2);
ret = WaitForSingleObject(event2, 200);
ok(ret == WAIT_OBJECT_0, "Wait failed.\n");
status = pNtSuspendProcess(info.hProcess);
- ok(!status, "Failed to suspend a process, status %#x.\n", status);
+ ok(!status, "Failed to suspend a process, status %#lx.\n", status);
status = NtSuspendThread(info.hThread, &ret);
- ok(!status && ret == 1, "Failed to suspend main thread, status %#x.\n", status);
+ ok(!status && ret == 1, "Failed to suspend main thread, status %#lx.\n", status);
status = NtResumeThread(info.hThread, &ret);
- ok(!status && ret == 2, "Failed to resume main thread, status %#x.\n", status);
+ ok(!status && ret == 2, "Failed to resume main thread, status %#lx.\n", status);
ResetEvent(event2);
ret = WaitForSingleObject(event2, 200);
ok(ret == WAIT_TIMEOUT, "Wait failed.\n");
status = pNtSuspendProcess(info.hProcess);
- ok(!status, "Failed to suspend a process, status %#x.\n", status);
+ ok(!status, "Failed to suspend a process, status %#lx.\n", status);
status = pNtResumeProcess(info.hProcess);
- ok(!status, "Failed to resume a process, status %#x.\n", status);
+ ok(!status, "Failed to resume a process, status %#lx.\n", status);
ResetEvent(event2);
ret = WaitForSingleObject(event2, 200);
ok(ret == WAIT_TIMEOUT, "Wait failed.\n");
status = pNtResumeProcess(info.hProcess);
- ok(!status, "Failed to resume a process, status %#x.\n", status);
+ ok(!status, "Failed to resume a process, status %#lx.\n", status);
ResetEvent(event2);
ret = WaitForSingleObject(event2, 1000);
@@ -8954,7 +8955,7 @@ static void test_unload_trace(void)
{
pRtlGetUnloadEventTraceEx(&element_size, &element_count, (void **)&unload_trace_ex);
ok(*element_size >= sizeof(*ptr), "Unexpected element size.\n");
- ok(*element_count == RTL_UNLOAD_EVENT_TRACE_NUMBER, "Unexpected trace element count %u.\n", *element_count);
+ ok(*element_count == RTL_UNLOAD_EVENT_TRACE_NUMBER, "Unexpected trace element count %lu.\n", *element_count);
ok(unload_trace_ex != NULL, "Unexpected pointer %p.\n", unload_trace_ex);
size = *element_size;
}
@@ -9014,7 +9015,7 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI
XSTATE *xs;
ok((context->ContextFlags & (CONTEXT_FULL | CONTEXT_XSTATE)) == (CONTEXT_FULL | CONTEXT_XSTATE),
- "Got unexpected ContextFlags %#x.\n", context->ContextFlags);
+ "Got unexpected ContextFlags %#lx.\n", context->ContextFlags);
if ((context->ContextFlags & (CONTEXT_FULL | CONTEXT_XSTATE)) != (CONTEXT_FULL | CONTEXT_XSTATE))
goto done;
@@ -9024,20 +9025,20 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI
/* Unwind contexts do not inherit xstate information. */
DISPATCHER_CONTEXT *dispatch = (DISPATCHER_CONTEXT *)dispatcher;
- ok(!(dispatch->ContextRecord->ContextFlags & 0x40), "Got unexpected ContextRecord->ContextFlags %#x.\n",
+ ok(!(dispatch->ContextRecord->ContextFlags & 0x40), "Got unexpected ContextRecord->ContextFlags %#lx.\n",
dispatch->ContextRecord->ContextFlags);
}
#endif
- ok(xctx->Legacy.Offset == -(int)(sizeof(CONTEXT)), "Got unexpected Legacy.Offset %d.\n", xctx->Legacy.Offset);
- ok(xctx->Legacy.Length == sizeof(CONTEXT), "Got unexpected Legacy.Length %d.\n", xctx->Legacy.Length);
- ok(xctx->All.Offset == -(int)sizeof(CONTEXT), "Got unexpected All.Offset %d.\n", xctx->All.Offset);
+ ok(xctx->Legacy.Offset == -(int)(sizeof(CONTEXT)), "Got unexpected Legacy.Offset %ld.\n", xctx->Legacy.Offset);
+ ok(xctx->Legacy.Length == sizeof(CONTEXT), "Got unexpected Legacy.Length %ld.\n", xctx->Legacy.Length);
+ ok(xctx->All.Offset == -(int)sizeof(CONTEXT), "Got unexpected All.Offset %ld.\n", xctx->All.Offset);
ok(xctx->All.Length == sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length,
- "Got unexpected All.Offset %d.\n", xctx->All.Offset);
+ "Got unexpected All.Offset %ld.\n", xctx->All.Offset);
expected_min_offset = sizeof(void *) == 8 ? sizeof(CONTEXT_EX) + sizeof(EXCEPTION_RECORD) : sizeof(CONTEXT_EX);
ok(xctx->XState.Offset >= expected_min_offset,
- "Got unexpected XState.Offset %d.\n", xctx->XState.Offset);
- ok(xctx->XState.Length >= sizeof(XSTATE), "Got unexpected XState.Length %d.\n", xctx->XState.Length);
+ "Got unexpected XState.Offset %ld.\n", xctx->XState.Offset);
+ ok(xctx->XState.Length >= sizeof(XSTATE), "Got unexpected XState.Length %ld.\n", xctx->XState.Length);
xs = (XSTATE *)((char *)xctx + xctx->XState.Offset);
context_ymm_data = (unsigned int *)&xs->YmmContext;
@@ -9233,7 +9234,7 @@ static void wait_for_thread_next_suspend(HANDLE thread)
DWORD result;
result = ResumeThread(thread);
- ok(result == 1, "Got unexpexted suspend count %u.\n", result);
+ ok(result == 1, "Got unexpexted suspend count %lu.\n", result);
/* NtQueryInformationThread(ThreadSuspendCount, ...) is not supported on older Windows. */
while (!(result = SuspendThread(thread)))
@@ -9241,9 +9242,9 @@ static void wait_for_thread_next_suspend(HANDLE thread)
ResumeThread(thread);
Sleep(1);
}
- ok(result == 1, "Got unexpexted suspend count %u.\n", result);
+ ok(result == 1, "Got unexpexted suspend count %lu.\n", result);
result = ResumeThread(thread);
- ok(result == 2, "Got unexpexted suspend count %u.\n", result);
+ ok(result == 2, "Got unexpexted suspend count %lu.\n", result);
}
#define CONTEXT_NATIVE (CONTEXT_XSTATE & CONTEXT_CONTROL)
@@ -9350,7 +9351,7 @@ static void test_extended_context(void)
/* Test context manipulation functions. */
length = 0xdeadbeef;
ret = pRtlGetExtendedContextLength(0, &length);
- ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#x, length %#x.\n",
+ ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#lx, length %#lx.\n",
ret, length);
for (test = 0; test < ARRAY_SIZE(context_arch); ++test)
@@ -9362,7 +9363,7 @@ static void test_extended_context(void)
length = 0xdeadbeef;
ret = pRtlGetExtendedContextLength(context_arch[test].flag, &length);
- ok(!ret && length == expected_length, "Got unexpected result ret %#x, length %#x.\n",
+ ok(!ret && length == expected_length, "Got unexpected result ret %#lx, length %#lx.\n",
ret, length);
for (i = 0; i < 32; ++i)
@@ -9379,20 +9380,20 @@ static void test_extended_context(void)
ok((!ret && length == expected_length)
|| broken((context_arch[test].broken_flags & (1 << i))
&& ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef),
- "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n",
+ "Got unexpected result ret %#lx, length %#lx, flags 0x%08lx.\n",
ret, length, flags);
}
else
{
ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef,
- "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", ret, length, flags);
+ "Got unexpected result ret %#lx, length %#lx, flags 0x%08lx.\n", ret, length, flags);
}
SetLastError(0xdeadbeef);
bret = pInitializeContext(NULL, flags, NULL, &length2);
ok(!bret && length2 == length && GetLastError()
== (!ret ? ERROR_INSUFFICIENT_BUFFER : ERROR_INVALID_PARAMETER),
- "Got unexpected bret %#x, length2 %#x, GetLastError() %u, flags %#x.\n",
+ "Got unexpected bret %#x, length2 %#lx, GetLastError() %lu, flags %#lx.\n",
bret, length2, GetLastError(), flags);
if (GetLastError() == ERROR_INVALID_PARAMETER)
@@ -9403,7 +9404,7 @@ static void test_extended_context(void)
length2 = expected_length - 1;
bret = pInitializeContext(context_buffer, flags, &context, &length2);
ok(!bret && GetLastError() == ERROR_INSUFFICIENT_BUFFER,
- "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags);
+ "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags);
ok(context == (void *)0xdeadbeef, "Got unexpected context %p.\n", context);
SetLastError(0xdeadbeef);
@@ -9411,30 +9412,30 @@ static void test_extended_context(void)
length2 = expected_length;
bret = pInitializeContext(context_buffer, flags, &context, &length2);
ok(bret && GetLastError() == 0xdeadbeef,
- "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags);
- ok(length2 == expected_length, "Got unexpexted length %#x.\n", length);
- ok((BYTE *)context == context_buffer, "Got unexpected context %p, flags %#x.\n", context, flags);
+ "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags);
+ ok(length2 == expected_length, "Got unexpexted length %#lx.\n", length);
+ ok((BYTE *)context == context_buffer, "Got unexpected context %p, flags %#lx.\n", context, flags);
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
- ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags);
+ ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags);
context_ex = (CONTEXT_EX *)(context_buffer + context_arch[test].context_length);
ok(context_ex->Legacy.Offset == -(int)context_arch[test].context_length,
- "Got unexpected Offset %d, flags %#x.\n", context_ex->Legacy.Offset, flags);
+ "Got unexpected Offset %ld, flags %#lx.\n", context_ex->Legacy.Offset, flags);
ok(context_ex->Legacy.Length == ((flags & 0x20) ? context_arch[test].context_length
: context_arch[test].legacy_length),
- "Got unexpected Length %#x, flags %#x.\n", context_ex->Legacy.Length, flags);
+ "Got unexpected Length %#lx, flags %#lx.\n", context_ex->Legacy.Length, flags);
ok(context_ex->All.Offset == -(int)context_arch[test].context_length,
- "Got unexpected Offset %d, flags %#x.\n", context_ex->All.Offset, flags);
+ "Got unexpected Offset %ld, flags %#lx.\n", context_ex->All.Offset, flags);
/* No extra 8 bytes in x64 CONTEXT_EX here. */
ok(context_ex->All.Length == context_arch[test].context_length + context_arch[1].context_ex_length,
- "Got unexpected Length %#x, flags %#x.\n", context_ex->All.Length, flags);
+ "Got unexpected Length %#lx, flags %#lx.\n", context_ex->All.Length, flags);
ok(context_ex->XState.Offset == 25,
- "Got unexpected Offset %d, flags %#x.\n", context_ex->XState.Offset, flags);
+ "Got unexpected Offset %ld, flags %#lx.\n", context_ex->XState.Offset, flags);
ok(!context_ex->XState.Length,
- "Got unexpected Length %#x, flags %#x.\n", context_ex->XState.Length, flags);
+ "Got unexpected Length %#lx, flags %#lx.\n", context_ex->XState.Length, flags);
if (0)
{
@@ -9442,11 +9443,11 @@ static void test_extended_context(void)
pRtlLocateLegacyContext(NULL, NULL);
}
p = pRtlLocateLegacyContext(context_ex, NULL);
- ok(p == context, "Got unexpected p %p, flags %#x.\n", p, flags);
+ ok(p == context, "Got unexpected p %p, flags %#lx.\n", p, flags);
length2 = 0xdeadbeef;
p = pRtlLocateLegacyContext(context_ex, &length2);
ok(p == context && length2 == context_ex->Legacy.Length,
- "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
length2 = expected_length;
if (0)
@@ -9464,34 +9465,34 @@ static void test_extended_context(void)
SetLastError(0xdeadbeef);
if (flags & CONTEXT_NATIVE)
ok(bret && mask == ((flags & flags_fpx) == flags_fpx ? 0x3 : 0),
- "Got unexpected bret %#x, mask %s, flags %#x.\n", bret, wine_dbgstr_longlong(mask), flags);
+ "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags);
else
ok(!bret && mask == 0xdeadbeef && GetLastError() == 0xdeadbeef,
- "Got unexpected bret %#x, mask %s, GetLastError() %#x, flags %#x.\n",
+ "Got unexpected bret %#x, mask %s, GetLastError() %#lx, flags %#lx.\n",
bret, wine_dbgstr_longlong(mask), GetLastError(), flags);
bret = pSetXStateFeaturesMask(context, 0);
- ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#x.\n", bret, flags);
+ ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#lx.\n", bret, flags);
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
- ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags);
+ ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags);
bret = pSetXStateFeaturesMask(context, 1);
- ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#x.\n", bret, flags);
+ ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#lx.\n", bret, flags);
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
ok(context_flags == (bret ? flags_fpx : flags),
- "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags);
+ "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags);
bret = pSetXStateFeaturesMask(context, 2);
- ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#x.\n", bret, flags);
+ ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x, flags %#lx.\n", bret, flags);
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
ok(context_flags == (bret ? flags_fpx : flags),
- "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags);
+ "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags);
bret = pSetXStateFeaturesMask(context, 4);
ok(!bret, "Got unexpected bret %#x.\n", bret);
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
ok(context_flags == (flags & CONTEXT_NATIVE ? flags_fpx : flags),
- "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags);
+ "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags);
*(DWORD *)(context_buffer + context_arch[test].flags_offset) = flags;
for (j = 0; j < context_arch[test].flags_offset; ++j)
@@ -9523,49 +9524,49 @@ static void test_extended_context(void)
memset(context_buffer2, 0xcc, sizeof(context_buffer2));
ret2 = pRtlInitializeExtendedContext(context_buffer2, flags, &context_ex);
- ok(!ret2, "Got unexpected ret2 %#x, flags %#x.\n", ret2, flags);
+ ok(!ret2, "Got unexpected ret2 %#lx, flags %#lx.\n", ret2, flags);
ok(!memcmp(context_buffer2, context_buffer, sizeof(context_buffer2)),
- "Context data do not match, flags %#x.\n", flags);
+ "Context data do not match, flags %#lx.\n", flags);
memset(context_buffer2, 0xcc, sizeof(context_buffer2));
ret2 = pRtlInitializeExtendedContext(context_buffer2 + 2, flags, &context_ex);
- ok(!ret2, "Got unexpected ret2 %#x, flags %#x.\n", ret2, flags);
+ ok(!ret2, "Got unexpected ret2 %#lx, flags %#lx.\n", ret2, flags);
/* Buffer gets aligned to 16 bytes on x64, while returned context length suggests it should be 8. */
align = test ? 4 : 16;
ok(!memcmp(context_buffer2 + align, context_buffer,
sizeof(context_buffer2) - align),
- "Context data do not match, flags %#x.\n", flags);
+ "Context data do not match, flags %#lx.\n", flags);
SetLastError(0xdeadbeef);
memset(context_buffer2, 0xcc, sizeof(context_buffer2));
bret = pInitializeContext(context_buffer2 + 2, flags, &context, &length2);
ok(bret && GetLastError() == 0xdeadbeef,
- "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags);
- ok(length2 == expected_length, "Got unexpexted length %#x.\n", length);
+ "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags);
+ ok(length2 == expected_length, "Got unexpexted length %#lx.\n", length);
ok(!memcmp(context_buffer2 + align, context_buffer,
sizeof(context_buffer2) - align),
- "Context data do not match, flags %#x.\n", flags);
+ "Context data do not match, flags %#lx.\n", flags);
length2 = 0xdeadbeef;
p = pLocateXStateFeature(context, 0, &length2);
if (flags & CONTEXT_NATIVE)
ok(p == (BYTE *)context + context_arch[test].xsavearea_offset
&& length2 == offsetof(XSAVE_FORMAT, XmmRegisters),
- "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
else
- ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
length2 = 0xdeadbeef;
p = pLocateXStateFeature(context, 1, &length2);
if (flags & CONTEXT_NATIVE)
ok(p == (BYTE *)context + context_arch[test].xsavearea_offset + offsetof(XSAVE_FORMAT, XmmRegisters)
&& length2 == sizeof(M128A) * context_arch[test].vector_reg_count,
- "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
else
- ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
length2 = 0xdeadbeef;
p = pLocateXStateFeature(context, 2, &length2);
- ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
if (!pRtlInitializeExtendedContext2 || !pInitializeContext2)
{
@@ -9579,28 +9580,28 @@ static void test_extended_context(void)
length2 = expected_length;
memset(context_buffer2, 0xcc, sizeof(context_buffer2));
ret2 = pRtlInitializeExtendedContext2(context_buffer2 + 2, flags, &context_ex, ~(ULONG64)0);
- ok(!ret2, "Got unexpected ret2 %#x, flags %#x.\n", ret2, flags);
+ ok(!ret2, "Got unexpected ret2 %#lx, flags %#lx.\n", ret2, flags);
ok(!memcmp(context_buffer2 + align, context_buffer,
sizeof(context_buffer2) - align),
- "Context data do not match, flags %#x.\n", flags);
+ "Context data do not match, flags %#lx.\n", flags);
memset(context_buffer2, 0xcc, sizeof(context_buffer2));
bret = pInitializeContext2(context_buffer2 + 2, flags, &context, &length2, 0);
ok(bret && GetLastError() == 0xdeadbeef,
- "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags);
- ok(length2 == expected_length, "Got unexpexted length %#x.\n", length);
+ "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags);
+ ok(length2 == expected_length, "Got unexpexted length %#lx.\n", length);
ok(!memcmp(context_buffer2 + align, context_buffer,
sizeof(context_buffer2) - align),
- "Context data do not match, flags %#x.\n", flags);
+ "Context data do not match, flags %#lx.\n", flags);
length2 = 0xdeadbeef;
p = pLocateXStateFeature(context, 0, &length2);
if (flags & CONTEXT_NATIVE)
ok(p == (BYTE *)context + context_arch[test].xsavearea_offset
&& length2 == offsetof(XSAVE_FORMAT, XmmRegisters),
- "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
else
- ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
}
flags = context_arch[test].flag | 0x40;
@@ -9612,19 +9613,19 @@ static void test_extended_context(void)
if (!enabled_features)
{
ok(ret == STATUS_NOT_SUPPORTED && length == 0xdeadbeef,
- "Got unexpected result ret %#x, length %#x.\n", ret, length);
+ "Got unexpected result ret %#lx, length %#lx.\n", ret, length);
context_ex = (void *)0xdeadbeef;
ret2 = pRtlInitializeExtendedContext(context_buffer, flags, &context_ex);
- ok(ret2 == STATUS_NOT_SUPPORTED, "Got unexpected result ret %#x, test %u.\n", ret2, test);
+ ok(ret2 == STATUS_NOT_SUPPORTED, "Got unexpected result ret %#lx, test %u.\n", ret2, test);
SetLastError(0xdeadbeef);
length2 = sizeof(context_buffer);
bret = pInitializeContext(context_buffer, flags, &context, &length2);
ok(bret && GetLastError() == 0xdeadbeef,
- "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags);
+ "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags);
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
- ok(context_flags == (flags & ~0x40), "Got unexpected ContextFlags %#x, flags %#x.\n",
+ ok(context_flags == (flags & ~0x40), "Got unexpected ContextFlags %#lx, flags %#lx.\n",
context_flags, flags);
if (pInitializeContext2)
@@ -9633,16 +9634,16 @@ static void test_extended_context(void)
length2 = sizeof(context_buffer);
bret = pInitializeContext2(context_buffer, flags, &context, &length2, ~(ULONG64)0);
ok(bret && GetLastError() == 0xdeadbeef,
- "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags);
+ "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags);
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
- ok(context_flags == (flags & ~0x40), "Got unexpected ContextFlags %#x, flags %#x.\n",
+ ok(context_flags == (flags & ~0x40), "Got unexpected ContextFlags %#lx, flags %#lx.\n",
context_flags, flags);
}
continue;
}
ok(!ret && length >= expected_length_xstate,
- "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+ "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test);
if (!pRtlGetExtendedContextLength2)
{
@@ -9653,36 +9654,36 @@ static void test_extended_context(void)
length = 0xdeadbeef;
ret = pRtlGetExtendedContextLength2(flags, &length, 7);
ok(!ret && length == expected_length_xstate,
- "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+ "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test);
length = 0xdeadbeef;
ret = pRtlGetExtendedContextLength2(flags, &length, ~0);
ok(!ret && length >= expected_length_xstate,
- "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+ "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test);
length = 0xdeadbeef;
ret = pRtlGetExtendedContextLength2(flags, &length, 0);
ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT))
|| broken(!ret && length == expected_length_xstate) /* win10pro */,
- "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+ "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test);
length = 0xdeadbeef;
ret = pRtlGetExtendedContextLength2(flags, &length, 3);
ok((!ret && length == expected_length_xstate - sizeof(YMMCONTEXT))
|| broken(!ret && length == expected_length_xstate) /* win10pro */,
- "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+ "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test);
length = 0xdeadbeef;
ret = pRtlGetExtendedContextLength2(flags, &length, 4);
ok(!ret && length == expected_length_xstate,
- "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+ "Got unexpected result ret %#lx, length %#lx, test %u.\n", ret, length, test);
}
pRtlGetExtendedContextLength(flags, &length);
SetLastError(0xdeadbeef);
bret = pInitializeContext(NULL, flags, NULL, &length2);
ok(!bret && length2 == length && GetLastError() == ERROR_INSUFFICIENT_BUFFER,
- "Got unexpected bret %#x, length2 %#x, GetLastError() %u, flags %#x.\n",
+ "Got unexpected bret %#x, length2 %#lx, GetLastError() %lu, flags %#lx.\n",
bret, length2, GetLastError(), flags);
SetLastError(0xdeadbeef);
@@ -9690,7 +9691,7 @@ static void test_extended_context(void)
length2 = length - 1;
bret = pInitializeContext(context_buffer, flags, &context, &length2);
ok(!bret && GetLastError() == ERROR_INSUFFICIENT_BUFFER && length2 == length && context == (void *)0xdeadbeef,
- "Got unexpected bret %#x, GetLastError() %u, length2 %#x, flags %#x.\n",
+ "Got unexpected bret %#x, GetLastError() %lu, length2 %#lx, flags %#lx.\n",
bret, GetLastError(), length2, flags);
SetLastError(0xdeadbeef);
@@ -9698,45 +9699,45 @@ static void test_extended_context(void)
length2 = length + 1;
bret = pInitializeContext(context_buffer, flags, &context, &length2);
ok(bret && GetLastError() == 0xdeadbeef,
- "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags);
- ok(length2 == length, "Got unexpexted length %#x.\n", length);
+ "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags);
+ ok(length2 == length, "Got unexpexted length %#lx.\n", length);
ok((BYTE *)context == context_buffer, "Got unexpected context %p.\n", context);
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
- ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags);
+ ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags);
context_ex = (CONTEXT_EX *)(context_buffer + context_arch[test].context_length);
ok(context_ex->Legacy.Offset == -(int)context_arch[test].context_length,
- "Got unexpected Offset %d, flags %#x.\n", context_ex->Legacy.Offset, flags);
+ "Got unexpected Offset %ld, flags %#lx.\n", context_ex->Legacy.Offset, flags);
ok(context_ex->Legacy.Length == ((flags & 0x20) ? context_arch[test].context_length
: context_arch[test].legacy_length),
- "Got unexpected Length %#x, flags %#x.\n", context_ex->Legacy.Length, flags);
+ "Got unexpected Length %#lx, flags %#lx.\n", context_ex->Legacy.Length, flags);
expected_offset = (((ULONG_PTR)context + context_arch[test].context_length
+ context_arch[test].context_ex_length + 63) & ~(ULONG64)63) - (ULONG_PTR)context
- context_arch[test].context_length;
ok(context_ex->XState.Offset == expected_offset,
- "Got unexpected Offset %d, flags %#x.\n", context_ex->XState.Offset, flags);
+ "Got unexpected Offset %ld, flags %#lx.\n", context_ex->XState.Offset, flags);
ok(context_ex->XState.Length >= sizeof(XSTATE),
- "Got unexpected Length %#x, flags %#x.\n", context_ex->XState.Length, flags);
+ "Got unexpected Length %#lx, flags %#lx.\n", context_ex->XState.Length, flags);
ok(context_ex->All.Offset == -(int)context_arch[test].context_length,
- "Got unexpected Offset %d, flags %#x.\n", context_ex->All.Offset, flags);
+ "Got unexpected Offset %ld, flags %#lx.\n", context_ex->All.Offset, flags);
/* No extra 8 bytes in x64 CONTEXT_EX here. */
ok(context_ex->All.Length == context_arch[test].context_length
+ context_ex->XState.Offset + context_ex->XState.Length,
- "Got unexpected Length %#x, flags %#x.\n", context_ex->All.Length, flags);
+ "Got unexpected Length %#lx, flags %#lx.\n", context_ex->All.Length, flags);
xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset);
length2 = 0xdeadbeef;
for (i = 0; i < 2; ++i)
{
p = pRtlLocateExtendedFeature(context_ex, i, &length2);
- ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x.\n", p, length2);
+ ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx.\n", p, length2);
}
p = pRtlLocateExtendedFeature(context_ex, XSTATE_AVX, &length2);
- ok(length2 == sizeof(YMMCONTEXT), "Got unexpected length %#x.\n", length2);
+ ok(length2 == sizeof(YMMCONTEXT), "Got unexpected length %#lx.\n", length2);
ok(p == &xs->YmmContext, "Got unexpected p %p.\n", p);
p = pRtlLocateExtendedFeature(context_ex, XSTATE_AVX, NULL);
ok(p == &xs->YmmContext, "Got unexpected p %p.\n", p);
@@ -9746,35 +9747,35 @@ static void test_extended_context(void)
if (flags & CONTEXT_NATIVE)
ok(p == (BYTE *)context + context_arch[test].xsavearea_offset
&& length2 == offsetof(XSAVE_FORMAT, XmmRegisters),
- "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
else
- ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
length2 = 0xdeadbeef;
p = pLocateXStateFeature(context, 1, &length2);
if (flags & CONTEXT_NATIVE)
ok(p == (BYTE *)context + context_arch[test].xsavearea_offset + offsetof(XSAVE_FORMAT, XmmRegisters)
&& length2 == sizeof(M128A) * context_arch[test].vector_reg_count,
- "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
else
- ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
length2 = 0xdeadbeef;
p = pLocateXStateFeature(context, 2, &length2);
if (flags & CONTEXT_NATIVE)
ok(p == &xs->YmmContext && length2 == sizeof(YMMCONTEXT),
- "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
else
- ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
mask = 0xdeadbeef;
bret = pGetXStateFeaturesMask(context, &mask);
if (flags & CONTEXT_NATIVE)
ok(bret && !mask,
- "Got unexpected bret %#x, mask %s, flags %#x.\n", bret, wine_dbgstr_longlong(mask), flags);
+ "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags);
else
ok(!bret && mask == 0xdeadbeef,
- "Got unexpected bret %#x, mask %s, flags %#x.\n", bret, wine_dbgstr_longlong(mask), flags);
+ "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags);
expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | enabled_features : 0;
ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask));
@@ -9792,7 +9793,7 @@ static void test_extended_context(void)
ok(mask == (xs->Mask & ~(ULONG64)3), "Got unexpected mask %s.\n", wine_dbgstr_longlong(mask));
ok(xs->CompactionMask == 0xdeadbeef, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask));
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
- ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context->ContextFlags, flags);
+ ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context->ContextFlags, flags);
xs->Mask = 0xdeadbeef;
xs->CompactionMask = 0;
@@ -9803,7 +9804,7 @@ static void test_extended_context(void)
ok(!xs->CompactionMask, "Got unexpected CompactionMask %s.\n",
wine_dbgstr_longlong(xs->CompactionMask));
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
- ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context->ContextFlags, flags);
+ ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context->ContextFlags, flags);
xs->Mask = 0xdeadbeef;
xs->CompactionMask = 0xdeadbeef;
@@ -9811,7 +9812,7 @@ static void test_extended_context(void)
ok(bret == !!(flags & CONTEXT_NATIVE), "Got unexpected bret %#x.\n", bret);
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
ok(context_flags == (bret ? flags_fpx : flags),
- "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags);
+ "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags);
ok(xs->Mask == bret ? 4 : 0xdeadbeef, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask));
mask = pRtlGetExtendedFeaturesMask(context_ex);
ok(mask == (xs->Mask & ~(ULONG64)3), "Got unexpected mask %s.\n", wine_dbgstr_longlong(mask));
@@ -9822,10 +9823,10 @@ static void test_extended_context(void)
bret = pGetXStateFeaturesMask(context, &mask);
if (flags & CONTEXT_NATIVE)
ok(bret && mask == enabled_features,
- "Got unexpected bret %#x, mask %s, flags %#x.\n", bret, wine_dbgstr_longlong(mask), flags);
+ "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags);
else
ok(!bret && mask == 0xdeadbeef,
- "Got unexpected bret %#x, mask %s, flags %#x.\n", bret, wine_dbgstr_longlong(mask), flags);
+ "Got unexpected bret %#x, mask %s, flags %#lx.\n", bret, wine_dbgstr_longlong(mask), flags);
if (pRtlGetExtendedContextLength2)
{
@@ -9836,8 +9837,8 @@ static void test_extended_context(void)
length2 = length;
bret = pInitializeContext2(context_buffer, flags, &context, &length2, 0);
ok(bret && GetLastError() == 0xdeadbeef,
- "Got unexpected bret %#x, GetLastError() %u, flags %#x.\n", bret, GetLastError(), flags);
- ok(length2 == length, "Got unexpexted length %#x.\n", length);
+ "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags);
+ ok(length2 == length, "Got unexpexted length %#lx.\n", length);
ok((BYTE *)context == context_buffer, "Got unexpected context %p.\n", context);
length2 = 0xdeadbeef;
@@ -9845,46 +9846,46 @@ static void test_extended_context(void)
if (flags & CONTEXT_NATIVE)
ok(p == (BYTE *)context + context_arch[test].xsavearea_offset
&& length2 == offsetof(XSAVE_FORMAT, XmmRegisters),
- "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
else
- ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ ok(!p && length2 == 0xdeadbeef, "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
length2 = 0xdeadbeef;
p = pRtlLocateExtendedFeature(context_ex, 2, &length2);
ok((!p && length2 == sizeof(YMMCONTEXT))
|| broken(p && length2 == sizeof(YMMCONTEXT)) /* win10pro */,
- "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
length2 = 0xdeadbeef;
p = pLocateXStateFeature(context, 2, &length2);
ok(!p && length2 == (flags & CONTEXT_NATIVE) ? sizeof(YMMCONTEXT) : 0xdeadbeef,
- "Got unexpected p %p, length %#x, flags %#x.\n", p, length2, flags);
+ "Got unexpected p %p, length %#lx, flags %#lx.\n", p, length2, flags);
context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset);
- ok(context_flags == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", context_flags, flags);
+ ok(context_flags == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n", context_flags, flags);
context_ex = (CONTEXT_EX *)(context_buffer + context_arch[test].context_length);
ok(context_ex->Legacy.Offset == -(int)context_arch[test].context_length,
- "Got unexpected Offset %d, flags %#x.\n", context_ex->Legacy.Offset, flags);
+ "Got unexpected Offset %ld, flags %#lx.\n", context_ex->Legacy.Offset, flags);
ok(context_ex->Legacy.Length == ((flags & 0x20) ? context_arch[test].context_length
: context_arch[test].legacy_length),
- "Got unexpected Length %#x, flags %#x.\n", context_ex->Legacy.Length, flags);
+ "Got unexpected Length %#lx, flags %#lx.\n", context_ex->Legacy.Length, flags);
expected_offset = (((ULONG_PTR)context + context_arch[test].context_length
+ context_arch[test].context_ex_length + 63) & ~(ULONG64)63) - (ULONG_PTR)context
- context_arch[test].context_length;
ok(context_ex->XState.Offset == expected_offset,
- "Got unexpected Offset %d, flags %#x.\n", context_ex->XState.Offset, flags);
+ "Got unexpected Offset %ld, flags %#lx.\n", context_ex->XState.Offset, flags);
ok(context_ex->XState.Length == sizeof(XSTATE) - sizeof(YMMCONTEXT)
|| broken(context_ex->XState.Length == sizeof(XSTATE)) /* win10pro */,
- "Got unexpected Length %#x, flags %#x.\n", context_ex->XState.Length, flags);
+ "Got unexpected Length %#lx, flags %#lx.\n", context_ex->XState.Length, flags);
ok(context_ex->All.Offset == -(int)context_arch[test].context_length,
- "Got unexpected Offset %d, flags %#x.\n", context_ex->All.Offset, flags);
+ "Got unexpected Offset %ld, flags %#lx.\n", context_ex->All.Offset, flags);
/* No extra 8 bytes in x64 CONTEXT_EX here. */
ok(context_ex->All.Length == context_arch[test].context_length
+ context_ex->XState.Offset + context_ex->XState.Length,
- "Got unexpected Length %#x, flags %#x.\n", context_ex->All.Length, flags);
+ "Got unexpected Length %#lx, flags %#lx.\n", context_ex->All.Length, flags);
expected_compaction = compaction_enabled ? (ULONG64)1 << 63 : 0;
xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset);
@@ -9901,7 +9902,7 @@ static void test_extended_context(void)
length = 0xdeadbeef;
ret = pRtlGetExtendedContextLength(context_arch[0].flag | context_arch[1].flag, &length);
- ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#x, length %#x.\n",
+ ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#lx, length %#lx.\n",
ret, length);
if (0)
@@ -9935,7 +9936,7 @@ static void test_extended_context(void)
memcpy(data, test_extended_context_data, sizeof(data));
func();
- ok(context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS), "Got unexpected ContextFlags %#x.\n",
+ ok(context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS), "Got unexpected ContextFlags %#lx.\n",
context->ContextFlags);
for (i = 0; i < 8; ++i)
ok(data[i] == test_extended_context_data[i], "Got unexpected data %#x, i %u.\n", data[i], i);
@@ -9953,7 +9954,7 @@ static void test_extended_context(void)
expected_flags |= CONTEXT_EXTENDED_REGISTERS;
#endif
pSetXStateFeaturesMask(context, ~(ULONG64)0);
- ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n",
+ ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n",
context->ContextFlags);
*(void **)(call_func_code_set_ymm0 + call_func_offsets.func_addr) = GetThreadContext;
*(void **)(call_func_code_set_ymm0 + call_func_offsets.func_param1) = (void *)GetCurrentThread();
@@ -9966,9 +9967,9 @@ static void test_extended_context(void)
context_ex->XState.Length = sizeof(XSTATE);
bret = func();
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
- ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n",
+ ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n",
context->ContextFlags);
expected_compaction = compaction_enabled ? (ULONG64)1 << 63 : 0;
@@ -9982,7 +9983,7 @@ static void test_extended_context(void)
for (i = 0; i < 4; ++i)
ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask == 4 ? test_extended_context_data[i + 4] : 0xcccccccc),
- "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
+ "Got unexpected data %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0;
@@ -9991,8 +9992,8 @@ static void test_extended_context(void)
context_ex->XState.Length = sizeof(XSTATE) + 64;
bret = func();
ok(!bret && GetLastError() == ERROR_INVALID_PARAMETER,
- "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
- ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n",
+ "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
+ ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n",
context->ContextFlags);
ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask);
ok(xs->CompactionMask == 4, "Got unexpected CompactionMask %s.\n",
@@ -10000,31 +10001,31 @@ static void test_extended_context(void)
for (i = 0; i < 4; ++i)
ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc
|| broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */,
- "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
+ "Got unexpected data %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
xs->CompactionMask = 4;
xs->Mask = compaction_enabled ? 0 : 4;
context_ex->XState.Length = offsetof(XSTATE, YmmContext);
bret = func();
- ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n",
+ ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n",
context->ContextFlags);
ok(!bret && GetLastError() == ERROR_MORE_DATA,
- "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
ok(xs->Mask == 4, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask));
ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n",
wine_dbgstr_longlong(xs->CompactionMask));
for (i = 0; i < 4; ++i)
ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc
|| broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]) /* win10pro */,
- "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
+ "Got unexpected data %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
context_ex->XState.Length = sizeof(XSTATE);
xs->CompactionMask = 4;
xs->Mask = compaction_enabled ? 0 : 4;
bret = func();
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
- ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n",
+ ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n",
context->ContextFlags);
ok(xs->Mask == 4, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask));
@@ -10036,7 +10037,7 @@ static void test_extended_context(void)
for (i = 0; i < 4; ++i)
ok(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4],
- "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
+ "Got unexpected data %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
/* Test GetThreadContext (current thread, ymm state cleared). */
length = sizeof(context_buffer);
@@ -10053,13 +10054,13 @@ static void test_extended_context(void)
memcpy(code_mem, call_func_code_reset_ymm_state, sizeof(call_func_code_reset_ymm_state));
bret = func();
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
expected_flags = CONTEXT_FULL | CONTEXT_XSTATE | CONTEXT_FLOATING_POINT;
#ifdef __i386__
expected_flags |= CONTEXT_EXTENDED_REGISTERS;
#endif
- ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n",
+ ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#lx.\n",
context->ContextFlags);
expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0;
@@ -10075,7 +10076,7 @@ static void test_extended_context(void)
for (i = 0; i < 4; ++i)
ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc)
|| broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]),
- "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
+ "Got unexpected data %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
/* Test fault exception context. */
memset(data, 0xff, sizeof(data));
@@ -10111,69 +10112,69 @@ static void test_extended_context(void)
pSetXStateFeaturesMask(context, 4);
bret = GetThreadContext(thread, context);
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
todo_wine_if (!xsaveopt_enabled)
ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask);
ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n",
wine_dbgstr_longlong(xs->CompactionMask));
for (i = 0; i < 16 * 4; ++i)
ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc),
- "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
+ "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
pSetXStateFeaturesMask(context, 4);
memset(&xs->YmmContext, 0, sizeof(xs->YmmContext));
bret = SetThreadContext(thread, context);
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext));
bret = GetThreadContext(thread, context);
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
ok(!xs->Mask || broken(xs->Mask == 4), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask));
ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n",
wine_dbgstr_longlong(xs->CompactionMask));
for (i = 0; i < 16 * 4; ++i)
ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc || broken(xs->Mask == 4 && !((ULONG *)&xs->YmmContext)[i]),
- "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
+ "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
pSetXStateFeaturesMask(context, 4);
memset(&xs->YmmContext, 0x28, sizeof(xs->YmmContext));
bret = SetThreadContext(thread, context);
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext));
bret = GetThreadContext(thread, context);
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
ok(xs->Mask == 4, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask));
ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n",
wine_dbgstr_longlong(xs->CompactionMask));
for (i = 0; i < 16 * 4; ++i)
- ok(((ULONG *)&xs->YmmContext)[i] == 0x28282828, "Got unexpected value %#x, i %u.\n",
+ ok(((ULONG *)&xs->YmmContext)[i] == 0x28282828, "Got unexpected value %#lx, i %u.\n",
((ULONG *)&xs->YmmContext)[i], i);
wait_for_thread_next_suspend(thread);
bret = GetThreadContext(thread, context);
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
pSetXStateFeaturesMask(context, 4);
memset(&xs->YmmContext, 0x48, sizeof(xs->YmmContext));
bret = SetThreadContext(thread, context);
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
wait_for_thread_next_suspend(thread);
memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext));
bret = GetThreadContext(thread, context);
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
ok(xs->Mask == 4, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask));
for (i = 0; i < 4; ++i)
- ok(((ULONG *)&xs->YmmContext)[i] == 0x68686868, "Got unexpected value %#x, i %u.\n",
+ ok(((ULONG *)&xs->YmmContext)[i] == 0x68686868, "Got unexpected value %#lx, i %u.\n",
((ULONG *)&xs->YmmContext)[i], i);
wait_for_thread_next_suspend(thread);
memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext));
bret = GetThreadContext(thread, context);
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
todo_wine_if (!xsaveopt_enabled && sizeof(void *) != 4)
ok(xs->Mask == (xsaveopt_enabled ? 0 : 4) || (sizeof(void *) == 4 && xs->Mask == 4),
"Got unexpected Mask %#I64x.\n", xs->Mask);
@@ -10181,20 +10182,20 @@ static void test_extended_context(void)
{
for (i = 0; i < 8 * sizeof(void *); ++i)
ok(((ULONG *)&xs->YmmContext)[i] == 0,
- "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
+ "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
for (; i < 16 * 4; ++i)
ok(((ULONG *)&xs->YmmContext)[i] == 0x48484848,
- "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
+ "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
}
else
{
for (i = 0; i < 16 * 4; ++i)
ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc,
- "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
+ "Got unexpected value %#lx, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i);
}
bret = ResumeThread(thread);
- ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());
+ ok(bret, "Got unexpected bret %#x, GetLastError() %lu.\n", bret, GetLastError());
WaitForSingleObject(thread, INFINITE);
CloseHandle(thread);
@@ -10231,7 +10232,7 @@ static void check_changes_in_range_(const char *file, unsigned int line, const B
if (flag & flags && p[i] == 0xcc)
{
if (!once++)
- ok(broken(1), "Matched broken result at %#x, flags %#x.\n", i, flags);
+ ok(broken(1), "Matched broken result at %#x, flags %#lx.\n", i, flags);
continue;
}
flag = 0;
@@ -10239,12 +10240,12 @@ static void check_changes_in_range_(const char *file, unsigned int line, const B
if (flag & flags && p[i] != 0xcc)
{
- ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags);
+ ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#lx.\n", p[i], i, flags);
return;
}
else if (!(flag & flags) && p[i] != 0xdd)
{
- ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags);
+ ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#lx.\n", p[i], i, flags);
return;
}
}
@@ -10330,15 +10331,15 @@ static void test_copy_context(void)
status = pRtlInitializeExtendedContext(src_context_buffer, flags, &src_ex);
if (enabled_features || !(flags & 0x40))
{
- ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags);
+ ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags);
}
else
{
- ok(status == STATUS_NOT_SUPPORTED, "Got unexpected status %#x, flags %#x.\n", status, flags);
+ ok(status == STATUS_NOT_SUPPORTED, "Got unexpected status %#lx, flags %#lx.\n", status, flags);
continue;
}
status = pRtlInitializeExtendedContext(dst_context_buffer, flags, &dst_ex);
- ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags);
+ ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags);
src = pRtlLocateLegacyContext(src_ex, NULL);
dst = pRtlLocateLegacyContext(dst_ex, NULL);
@@ -10352,26 +10353,26 @@ static void test_copy_context(void)
src_xs->CompactionMask = ~(ULONG64)0;
status = pRtlCopyExtendedContext(dst_ex, flags, src_ex);
- ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags);
+ ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags);
context_length = (BYTE *)dst_ex - (BYTE *)dst + dst_ex->All.Length;
check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0],
flags, context_length);
- ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n",
+ ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n",
*(DWORD *)((BYTE *)dst + flags_offset), flags);
memset(dst_context_buffer, 0xdd, sizeof(dst_context_buffer));
status = pRtlInitializeExtendedContext(dst_context_buffer, flags, &dst_ex);
- ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags);
+ ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags);
*(DWORD *)((BYTE *)src + flags_offset) = 0;
*(DWORD *)((BYTE *)dst + flags_offset) = 0;
SetLastError(0xdeadbeef);
status = pRtlCopyContext(dst, flags | 0x40, src);
ok(status == (enabled_features ? STATUS_INVALID_PARAMETER : STATUS_NOT_SUPPORTED)
|| broken(status == STATUS_INVALID_PARAMETER),
- "Got unexpected status %#x, flags %#x.\n", status, flags);
- ok(*(DWORD *)((BYTE *)dst + flags_offset) == 0, "Got unexpected ContextFlags %#x, flags %#x.\n",
+ "Got unexpected status %#lx, flags %#lx.\n", status, flags);
+ ok(*(DWORD *)((BYTE *)dst + flags_offset) == 0, "Got unexpected ContextFlags %#lx, flags %#lx.\n",
*(DWORD *)((BYTE *)dst + flags_offset), flags);
check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0],
0, context_length);
@@ -10382,13 +10383,13 @@ static void test_copy_context(void)
if (flags & 0x40)
ok((status == STATUS_BUFFER_OVERFLOW)
|| broken(!(flags & CONTEXT_NATIVE) && status == STATUS_INVALID_PARAMETER),
- "Got unexpected status %#x, flags %#x.\n", status, flags);
+ "Got unexpected status %#lx, flags %#lx.\n", status, flags);
else
ok(!status || broken(!(flags & CONTEXT_NATIVE) && status == STATUS_INVALID_PARAMETER),
- "Got unexpected status %#x, flags %#x.\n", status, flags);
+ "Got unexpected status %#lx, flags %#lx.\n", status, flags);
if (!status)
{
- ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n",
+ ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n",
*(DWORD *)((BYTE *)dst + flags_offset), flags);
check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0],
flags, context_length);
@@ -10396,7 +10397,7 @@ static void test_copy_context(void)
else
{
ok(*(DWORD *)((BYTE *)dst + flags_offset) == (flags & 0x110000),
- "Got unexpected ContextFlags %#x, flags %#x.\n",
+ "Got unexpected ContextFlags %#lx, flags %#lx.\n",
*(DWORD *)((BYTE *)dst + flags_offset), flags);
check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0],
0, context_length);
@@ -10414,11 +10415,11 @@ static void test_copy_context(void)
memset(src_context_buffer, 0xcc, sizeof(src_context_buffer));
length = sizeof(src_context_buffer);
bret = pInitializeContext(src_context_buffer, flags, &src, &length);
- ok(bret, "Got unexpected bret %#x, flags %#x.\n", bret, flags);
+ ok(bret, "Got unexpected bret %#x, flags %#lx.\n", bret, flags);
length = sizeof(dst_context_buffer);
bret = pInitializeContext(dst_context_buffer, flags, &dst, &length);
- ok(bret, "Got unexpected bret %#x, flags %#x.\n", bret, flags);
+ ok(bret, "Got unexpected bret %#x, flags %#lx.\n", bret, flags);
dst_ex = (CONTEXT_EX *)((BYTE *)dst + context_length);
src_ex = (CONTEXT_EX *)((BYTE *)src + context_length);
@@ -10442,12 +10443,12 @@ static void test_copy_context(void)
dst_ex->XState.Length = 0;
status = pRtlCopyExtendedContext(dst_ex, flags, src_ex);
ok(status == (enabled_features ? STATUS_BUFFER_OVERFLOW : STATUS_NOT_SUPPORTED),
- "Got unexpected status %#x, flags %#x.\n", status, flags);
+ "Got unexpected status %#lx, flags %#lx.\n", status, flags);
if (!enabled_features)
continue;
- ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n",
+ ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n",
*(DWORD *)((BYTE *)dst + flags_offset), flags);
src_xs->Mask = ~(ULONG64)0;
@@ -10457,8 +10458,8 @@ static void test_copy_context(void)
dst_xs->Mask = 0xdddddddddddddddd;
dst_ex->XState.Length = 0;
status = pRtlCopyExtendedContext(dst_ex, flags, src_ex);
- ok(status == STATUS_BUFFER_OVERFLOW, "Got unexpected status %#x, flags %#x.\n", status, flags);
- ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n",
+ ok(status == STATUS_BUFFER_OVERFLOW, "Got unexpected status %#lx, flags %#lx.\n", status, flags);
+ ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n",
*(DWORD *)((BYTE *)dst + flags_offset), flags);
ok(dst_xs->Mask == 0xdddddddddddddddd, "Got unexpected Mask %s.\n",
@@ -10473,8 +10474,8 @@ static void test_copy_context(void)
dst_xs->Mask = 0xdddddddddddddddd;
dst_ex->XState.Length = offsetof(XSTATE, YmmContext);
status = pRtlCopyExtendedContext(dst_ex, flags, src_ex);
- ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags);
- ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n",
+ ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags);
+ ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#lx, flags %#lx.\n",
*(DWORD *)((BYTE *)dst + flags_offset), flags);
ok(dst_xs->Mask == 0, "Got unexpected Mask %s.\n",
wine_dbgstr_longlong(dst_xs->Mask));
@@ -10487,7 +10488,7 @@ static void test_copy_context(void)
dst_xs->Mask = 0xdddddddddddddddd;
dst_ex->XState.Length = sizeof(XSTATE);
status = pRtlCopyExtendedContext(dst_ex, flags, src_ex);
- ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags);
+ ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags);
ok(dst_xs->Mask == 0, "Got unexpected Mask %s.\n",
wine_dbgstr_longlong(dst_xs->Mask));
ok(dst_xs->CompactionMask == expected_compaction,
@@ -10499,7 +10500,7 @@ static void test_copy_context(void)
dst_xs->CompactionMask = 0xdddddddddddddddd;
dst_xs->Mask = 0xdddddddddddddddd;
status = pRtlCopyExtendedContext(dst_ex, flags, src_ex);
- ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags);
+ ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags);
ok(dst_xs->Mask == 4, "Got unexpected Mask %s.\n",
wine_dbgstr_longlong(dst_xs->Mask));
ok(dst_xs->CompactionMask == expected_compaction,
@@ -10511,7 +10512,7 @@ static void test_copy_context(void)
dst_xs->CompactionMask = 0xdddddddddddddddd;
dst_xs->Mask = 0xdddddddddddddddd;
status = pRtlCopyExtendedContext(dst_ex, flags, src_ex);
- ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags);
+ ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags);
ok(dst_xs->Mask == 0, "Got unexpected Mask %s.\n",
wine_dbgstr_longlong(dst_xs->Mask));
ok(dst_xs->CompactionMask == expected_compaction,
@@ -10526,7 +10527,7 @@ static void test_copy_context(void)
dst_xs->CompactionMask = 0xdddddddddddddddd;
dst_xs->Mask = 0xdddddddddddddddd;
status = pRtlCopyExtendedContext(dst_ex, flags, src_ex);
- ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags);
+ ok(!status, "Got unexpected status %#lx, flags %#lx.\n", status, flags);
ok(dst_xs->Mask == 4, "Got unexpected Mask %s.\n",
wine_dbgstr_longlong(dst_xs->Mask));
ok(dst_xs->CompactionMask == expected_compaction,
@@ -10539,11 +10540,11 @@ static void test_copy_context(void)
dst_xs->Mask = 0xdddddddddddddddd;
status = pRtlCopyContext(dst, flags, src);
ok(!status || broken(!(flags & CONTEXT_NATIVE) && status == STATUS_INVALID_PARAMETER),
- "Got unexpected status %#x, flags %#x.\n", status, flags);
- ok(dst_xs->Mask == 0xdddddddddddddddd || broken(dst_xs->Mask == 4), "Got unexpected Mask %s, flags %#x.\n",
+ "Got unexpected status %#lx, flags %#lx.\n", status, flags);
+ ok(dst_xs->Mask == 0xdddddddddddddddd || broken(dst_xs->Mask == 4), "Got unexpected Mask %s, flags %#lx.\n",
wine_dbgstr_longlong(dst_xs->Mask), flags);
ok(dst_xs->CompactionMask == 0xdddddddddddddddd || broken(dst_xs->CompactionMask == expected_compaction),
- "Got unexpected CompactionMask %s, flags %#x.\n", wine_dbgstr_longlong(dst_xs->CompactionMask), flags);
+ "Got unexpected CompactionMask %s, flags %#lx.\n", wine_dbgstr_longlong(dst_xs->CompactionMask), flags);
check_changes_in_range((BYTE *)&dst_xs->YmmContext, single_range,
dst_xs->Mask == 4, sizeof(dst_xs->YmmContext));
}
1
0
18 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/error.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c
index 8f099e6903a..7784886c79b 100644
--- a/dlls/ntdll/tests/error.c
+++ b/dlls/ntdll/tests/error.c
@@ -18,6 +18,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include <stdarg.h>
#include <stdio.h>
@@ -75,7 +76,7 @@ static void cmp_call(NTSTATUS win_nt, ULONG win32, const char* message)
err = pRtlNtStatusToDosError(win_nt);
ok(err == win32,
- "%s (%x): got %u, expected %u\n",
+ "%s (%lx): got %lu, expected %lu\n",
message, win_nt, err, win32);
}
@@ -86,7 +87,7 @@ static void cmp_call2(NTSTATUS win_nt, ULONG win32, const char* message)
err = pRtlNtStatusToDosError(win_nt);
ok(err == win32 ||
(!strict && err == ERROR_MR_MID_NOT_FOUND),
- "%s (%x): got %u, expected %u (or MID_NOT_FOUND)\n",
+ "%s (%lx): got %lu, expected %lu (or MID_NOT_FOUND)\n",
message, win_nt, err, win32);
}
@@ -96,7 +97,7 @@ static void cmp_call3(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char*
err = pRtlNtStatusToDosError(win_nt);
ok(err == win32_1 || (!strict && err == win32_2),
- "%s (%x): got %u, expected %u or %u\n",
+ "%s (%lx): got %lu, expected %lu or %lu\n",
message, win_nt, err, win32_1, win32_2);
}
@@ -107,7 +108,7 @@ static void cmp_call4(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char*
err = pRtlNtStatusToDosError(win_nt);
ok(err == win32_1 ||
(!strict && (err == win32_2 || err == ERROR_MR_MID_NOT_FOUND)),
- "%s (%x): got %u, expected %u or %u\n",
+ "%s (%lx): got %lu, expected %lu or %lu\n",
message, win_nt, err, win32_1, win32_2);
}
1
0
18 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/env.c | 161 ++++++++++++++++++++++++------------------------
1 file changed, 81 insertions(+), 80 deletions(-)
diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c
index 9cfbf9eb435..09a91d35807 100644
--- a/dlls/ntdll/tests/env.c
+++ b/dlls/ntdll/tests/env.c
@@ -17,6 +17,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include <stdio.h>
@@ -111,7 +112,7 @@ static void testQuery(void)
pRtlMultiByteToUnicodeN( bn, sizeof(bn), NULL, test->var, strlen(test->var)+1 );
nts = pRtlQueryEnvironmentVariable_U(small_env, &name, &value);
ok( nts == test->status || (test->alt && nts == test->alt),
- "[%d]: Wrong status for '%s', expecting %x got %x\n",
+ "[%d]: Wrong status for '%s', expecting %lx got %lx\n",
i, test->var, test->status, nts );
if (nts == test->status) switch (nts)
{
@@ -144,20 +145,20 @@ static void testQuery(void)
pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->var, strlen(test->var) + 1);
nts = pRtlQueryEnvironmentVariable(small_env, bn, name_length, bv, value_length, &return_length);
ok(nts == test->status || (test->alt && nts == test->alt),
- "[%d]: Wrong status for '%s', expecting %x got %x\n",
+ "[%d]: Wrong status for '%s', expecting %lx got %lx\n",
i, test->var, test->status, nts);
if (nts == test->status) switch (nts)
{
case STATUS_SUCCESS:
pRtlMultiByteToUnicodeN(bn, sizeof(bn), NULL, test->val, strlen(test->val) + 1);
- ok(return_length == strlen(test->val), "Wrong length %ld for %s\n",
+ ok(return_length == strlen(test->val), "Wrong length %Id for %s\n",
return_length, test->var);
ok(!memcmp(bv, bn, return_length), "Wrong result for %s/%d\n", test->var, test->len);
ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len);
break;
case STATUS_BUFFER_TOO_SMALL:
ok(return_length == (strlen(test->val) + 1),
- "Wrong returned length %ld (too small buffer) for %s\n", return_length, test->var);
+ "Wrong returned length %Id (too small buffer) for %s\n", return_length, test->var);
break;
}
}
@@ -207,20 +208,20 @@ static void testExpand(void)
us_dst.Buffer = NULL;
nts = pRtlExpandEnvironmentStrings_U(small_env, &us_src, &us_dst, &ul);
- ok(nts == STATUS_BUFFER_TOO_SMALL, "Call failed (%u)\n", nts);
+ ok(nts == STATUS_BUFFER_TOO_SMALL, "Call failed (%lu)\n", nts);
ok(ul == strlen(test->dst) * sizeof(WCHAR) + sizeof(WCHAR),
- "Wrong returned length for %s: %u\n", test->src, ul );
+ "Wrong returned length for %s: %lu\n", test->src, ul );
us_dst.Length = 0;
us_dst.MaximumLength = sizeof(dst);
us_dst.Buffer = dst;
nts = pRtlExpandEnvironmentStrings_U(small_env, &us_src, &us_dst, &ul);
- ok(nts == STATUS_SUCCESS, "Call failed (%u)\n", nts);
+ ok(nts == STATUS_SUCCESS, "Call failed (%lu)\n", nts);
ok(ul == us_dst.Length + sizeof(WCHAR),
- "Wrong returned length for %s: %u\n", test->src, ul);
+ "Wrong returned length for %s: %lu\n", test->src, ul);
ok(ul == strlen(test->dst) * sizeof(WCHAR) + sizeof(WCHAR),
- "Wrong returned length for %s: %u\n", test->src, ul);
+ "Wrong returned length for %s: %lu\n", test->src, ul);
ok(lstrcmpW(dst, rst) == 0, "Wrong result for %s: expecting %s\n",
test->src, test->dst);
@@ -229,9 +230,9 @@ static void testExpand(void)
us_dst.Buffer = dst;
dst[8] = '-';
nts = pRtlExpandEnvironmentStrings_U(small_env, &us_src, &us_dst, &ul);
- ok(nts == STATUS_BUFFER_TOO_SMALL, "Call failed (%u)\n", nts);
+ ok(nts == STATUS_BUFFER_TOO_SMALL, "Call failed (%lu)\n", nts);
ok(ul == strlen(test->dst) * sizeof(WCHAR) + sizeof(WCHAR),
- "Wrong returned length for %s (with buffer too small): %u\n", test->src, ul);
+ "Wrong returned length for %s (with buffer too small): %lu\n", test->src, ul);
ok(dst[8] == '-', "Writing too far in buffer (got %c/%d)\n", dst[8], dst[8]);
}
@@ -273,7 +274,7 @@ static UINT_PTR check_string_( int line, RTL_USER_PROCESS_PARAMETERS *params, UN
}
ok_(__FILE__,line)( (UINT_PTR)str->Buffer == align(pos, sizeof(void *)) ||
(!expect && (UINT_PTR)str->Buffer == pos) || /* initial params are not aligned */
- broken( (UINT_PTR)str->Buffer == align(pos, 4) ), "wrong buffer %lx/%lx\n",
+ broken( (UINT_PTR)str->Buffer == align(pos, 4) ), "wrong buffer %Ix/%Ix\n",
(UINT_PTR)str->Buffer, pos );
if (str->Length < str->MaximumLength)
{
@@ -305,39 +306,39 @@ static void test_process_params(void)
MEMORY_BASIC_INFORMATION info;
NTSTATUS status = pRtlCreateProcessParameters( ¶ms, &image, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL );
- ok( !status, "failed %x\n", status );
+ ok( !status, "failed %lx\n", status );
if (VirtualQuery( params, &info, sizeof(info) ) && info.AllocationBase == params)
{
size = info.RegionSize;
ok( broken(TRUE), "not a heap block %p\n", params ); /* winxp */
ok( params->AllocationSize == info.RegionSize,
- "wrong AllocationSize %x/%lx\n", params->AllocationSize, info.RegionSize );
+ "wrong AllocationSize %lx/%Ix\n", params->AllocationSize, info.RegionSize );
}
else
{
size = HeapSize( GetProcessHeap(), 0, params );
ok( size != ~(SIZE_T)0, "not a heap block %p\n", params );
ok( params->AllocationSize == params->Size,
- "wrong AllocationSize %x/%x\n", params->AllocationSize, params->Size );
+ "wrong AllocationSize %lx/%lx\n", params->AllocationSize, params->Size );
}
ok( params->Size < size || broken(params->Size == size), /* <= win2k3 */
- "wrong Size %x/%lx\n", params->Size, size );
- ok( params->Flags == 0, "wrong Flags %u\n", params->Flags );
- ok( params->DebugFlags == 0, "wrong Flags %u\n", params->DebugFlags );
+ "wrong Size %lx/%Ix\n", params->Size, size );
+ ok( params->Flags == 0, "wrong Flags %lu\n", params->Flags );
+ ok( params->DebugFlags == 0, "wrong Flags %lu\n", params->DebugFlags );
ok( params->ConsoleHandle == 0, "wrong ConsoleHandle %p\n", params->ConsoleHandle );
- ok( params->ConsoleFlags == 0, "wrong ConsoleFlags %u\n", params->ConsoleFlags );
+ ok( params->ConsoleFlags == 0, "wrong ConsoleFlags %lu\n", params->ConsoleFlags );
ok( params->hStdInput == 0, "wrong hStdInput %p\n", params->hStdInput );
ok( params->hStdOutput == 0, "wrong hStdOutput %p\n", params->hStdOutput );
ok( params->hStdError == 0, "wrong hStdError %p\n", params->hStdError );
- ok( params->dwX == 0, "wrong dwX %u\n", params->dwX );
- ok( params->dwY == 0, "wrong dwY %u\n", params->dwY );
- ok( params->dwXSize == 0, "wrong dwXSize %u\n", params->dwXSize );
- ok( params->dwYSize == 0, "wrong dwYSize %u\n", params->dwYSize );
- ok( params->dwXCountChars == 0, "wrong dwXCountChars %u\n", params->dwXCountChars );
- ok( params->dwYCountChars == 0, "wrong dwYCountChars %u\n", params->dwYCountChars );
- ok( params->dwFillAttribute == 0, "wrong dwFillAttribute %u\n", params->dwFillAttribute );
- ok( params->dwFlags == 0, "wrong dwFlags %u\n", params->dwFlags );
- ok( params->wShowWindow == 0, "wrong wShowWindow %u\n", params->wShowWindow );
+ ok( params->dwX == 0, "wrong dwX %lu\n", params->dwX );
+ ok( params->dwY == 0, "wrong dwY %lu\n", params->dwY );
+ ok( params->dwXSize == 0, "wrong dwXSize %lu\n", params->dwXSize );
+ ok( params->dwYSize == 0, "wrong dwYSize %lu\n", params->dwYSize );
+ ok( params->dwXCountChars == 0, "wrong dwXCountChars %lu\n", params->dwXCountChars );
+ ok( params->dwYCountChars == 0, "wrong dwYCountChars %lu\n", params->dwYCountChars );
+ ok( params->dwFillAttribute == 0, "wrong dwFillAttribute %lu\n", params->dwFillAttribute );
+ ok( params->dwFlags == 0, "wrong dwFlags %lu\n", params->dwFlags );
+ ok( params->wShowWindow == 0, "wrong wShowWindow %lu\n", params->wShowWindow );
pos = (UINT_PTR)params->CurrentDirectory.DosPath.Buffer;
ok( params->CurrentDirectory.DosPath.MaximumLength == MAX_PATH * sizeof(WCHAR),
@@ -356,18 +357,18 @@ static void test_process_params(void)
pos = check_string( params, ¶ms->RuntimeInfo, &null_str, pos );
pos = align(pos, 4);
ok( pos == params->Size || pos + 4 == params->Size,
- "wrong pos %lx/%x\n", pos, params->Size );
+ "wrong pos %Ix/%lx\n", pos, params->Size );
pos = params->Size;
if ((char *)params->Environment > (char *)params &&
(char *)params->Environment < (char *)params + size)
{
ok( (char *)params->Environment - (char *)params == (UINT_PTR)pos,
- "wrong env %lx/%lx\n", (UINT_PTR)((char *)params->Environment - (char *)params), pos);
+ "wrong env %Ix/%Ix\n", (UINT_PTR)((char *)params->Environment - (char *)params), pos);
pos += get_env_length(params->Environment) * sizeof(WCHAR);
ok( align(pos, sizeof(void *)) == size ||
- broken( align(pos, 4) == size ), "wrong size %lx/%lx\n", pos, size );
+ broken( align(pos, 4) == size ), "wrong size %Ix/%Ix\n", pos, size );
ok( params->EnvironmentSize == size - ((char *)params->Environment - (char *)params),
- "wrong len %lx/%lx\n", params->EnvironmentSize,
+ "wrong len %Ix/%Ix\n", params->EnvironmentSize,
size - ((char *)params->Environment - (char *)params) );
}
else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */
@@ -375,23 +376,23 @@ static void test_process_params(void)
status = pRtlCreateProcessParameters( ¶ms, &image, &dummy, &dummy, &dummy, dummy_env,
&dummy, &dummy, &dummy, &dummy );
- ok( !status, "failed %x\n", status );
+ ok( !status, "failed %lx\n", status );
if (VirtualQuery( params, &info, sizeof(info) ) && info.AllocationBase == params)
{
size = info.RegionSize;
ok( broken(TRUE), "not a heap block %p\n", params ); /* winxp */
ok( params->AllocationSize == info.RegionSize,
- "wrong AllocationSize %x/%lx\n", params->AllocationSize, info.RegionSize );
+ "wrong AllocationSize %lx/%Ix\n", params->AllocationSize, info.RegionSize );
}
else
{
size = HeapSize( GetProcessHeap(), 0, params );
ok( size != ~(SIZE_T)0, "not a heap block %p\n", params );
ok( params->AllocationSize == params->Size,
- "wrong AllocationSize %x/%x\n", params->AllocationSize, params->Size );
+ "wrong AllocationSize %lx/%lx\n", params->AllocationSize, params->Size );
}
ok( params->Size < size || broken(params->Size == size), /* <= win2k3 */
- "wrong Size %x/%lx\n", params->Size, size );
+ "wrong Size %lx/%Ix\n", params->Size, size );
pos = (UINT_PTR)params->CurrentDirectory.DosPath.Buffer;
if (params->CurrentDirectory.DosPath.Length == dummy_dir.Length + sizeof(WCHAR))
@@ -410,18 +411,18 @@ static void test_process_params(void)
pos = check_string( params, ¶ms->RuntimeInfo, &dummy, pos );
pos = align(pos, 4);
ok( pos == params->Size || pos + 4 == params->Size,
- "wrong pos %lx/%x\n", pos, params->Size );
+ "wrong pos %Ix/%lx\n", pos, params->Size );
pos = params->Size;
if ((char *)params->Environment > (char *)params &&
(char *)params->Environment < (char *)params + size)
{
ok( (char *)params->Environment - (char *)params == pos,
- "wrong env %lx/%lx\n", (UINT_PTR)((char *)params->Environment - (char *)params), pos);
+ "wrong env %Ix/%Ix\n", (UINT_PTR)((char *)params->Environment - (char *)params), pos);
pos += get_env_length(params->Environment) * sizeof(WCHAR);
ok( align(pos, sizeof(void *)) == size ||
- broken( align(pos, 4) == size ), "wrong size %lx/%lx\n", pos, size );
+ broken( align(pos, 4) == size ), "wrong size %Ix/%Ix\n", pos, size );
ok( params->EnvironmentSize == size - ((char *)params->Environment - (char *)params),
- "wrong len %lx/%lx\n", params->EnvironmentSize,
+ "wrong len %Ix/%Ix\n", params->EnvironmentSize,
size - ((char *)params->Environment - (char *)params) );
}
else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */
@@ -434,15 +435,15 @@ static void test_process_params(void)
{
ok( broken(TRUE), "not a heap block %p\n", cur_params ); /* winxp */
ok( cur_params->AllocationSize == info.RegionSize,
- "wrong AllocationSize %x/%lx\n", cur_params->AllocationSize, info.RegionSize );
+ "wrong AllocationSize %lx/%Ix\n", cur_params->AllocationSize, info.RegionSize );
}
else
{
size = HeapSize( GetProcessHeap(), 0, cur_params );
ok( size != ~(SIZE_T)0, "not a heap block %p\n", cur_params );
ok( cur_params->AllocationSize == cur_params->Size,
- "wrong AllocationSize %x/%x\n", cur_params->AllocationSize, cur_params->Size );
- ok( cur_params->Size == size, "wrong Size %x/%lx\n", cur_params->Size, size );
+ "wrong AllocationSize %lx/%lx\n", cur_params->AllocationSize, cur_params->Size );
+ ok( cur_params->Size == size, "wrong Size %lx/%Ix\n", cur_params->Size, size );
}
/* CurrentDirectory points outside the params, and DllPath may be null */
@@ -475,7 +476,7 @@ static void test_process_params(void)
size = HeapSize( GetProcessHeap(), 0, initial_env );
ok( size != ~(SIZE_T)0, "env is not a heap block %p / %p\n", cur_params, initial_env );
ok( cur_params->EnvironmentSize == size,
- "wrong len %lx/%lx\n", cur_params->EnvironmentSize, size );
+ "wrong len %Ix/%Ix\n", cur_params->EnvironmentSize, size );
}
}
@@ -493,13 +494,13 @@ static void check_env_var_(int line, const char *var, const char *value)
DWORD size = GetEnvironmentVariableA(var, buffer, sizeof(buffer));
if (value)
{
- ok_(__FILE__, line)(size == strlen(value), "wrong size %u\n", size);
+ ok_(__FILE__, line)(size == strlen(value), "wrong size %lu\n", size);
ok_(__FILE__, line)(!strcmp(buffer, value), "wrong value %s\n", debugstr_a(buffer));
}
else
{
- ok_(__FILE__, line)(!size, "wrong size %u\n", size);
- ok_(__FILE__, line)(GetLastError() == ERROR_ENVVAR_NOT_FOUND, "got error %u\n", GetLastError());
+ ok_(__FILE__, line)(!size, "wrong size %lu\n", size);
+ ok_(__FILE__, line)(GetLastError() == ERROR_ENVVAR_NOT_FOUND, "got error %lu\n", GetLastError());
}
}
#define check_env_var(a, b) check_env_var_(__LINE__, a, b)
@@ -512,31 +513,31 @@ static void test_RtlSetCurrentEnvironment(void)
SIZE_T size;
status = RtlCreateEnvironment(FALSE, &env);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
ret = SetEnvironmentVariableA("testenv1", "heis");
- ok(ret, "got error %u\n", GetLastError());
+ ok(ret, "got error %lu\n", GetLastError());
ret = SetEnvironmentVariableA("testenv2", "dyo");
- ok(ret, "got error %u\n", GetLastError());
+ ok(ret, "got error %lu\n", GetLastError());
status = set_env_var(&env, L"testenv1", L"unus");
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
status = set_env_var(&env, L"testenv3", L"tres");
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
old_env = NtCurrentTeb()->Peb->ProcessParameters->Environment;
ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == get_env_length(old_env) * sizeof(WCHAR),
- "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
+ "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == HeapSize( GetProcessHeap(), 0, old_env ),
- "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
+ "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
RtlSetCurrentEnvironment(env, &prev);
ok(prev == old_env, "got wrong previous env %p\n", prev);
ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == env, "got wrong current env\n");
ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == get_env_length(env) * sizeof(WCHAR),
- "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
+ "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == HeapSize( GetProcessHeap(), 0, env ),
- "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
+ "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
check_env_var("testenv1", "unus");
check_env_var("testenv2", NULL);
@@ -546,14 +547,14 @@ static void test_RtlSetCurrentEnvironment(void)
env = HeapReAlloc( GetProcessHeap(), 0, env, HeapSize( GetProcessHeap(), 0, env) + 120 );
RtlSetCurrentEnvironment(env, &prev);
ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == HeapSize( GetProcessHeap(), 0, env ),
- "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
+ "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
RtlSetCurrentEnvironment(old_env, NULL);
ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == old_env, "got wrong current env\n");
ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == get_env_length(old_env) * sizeof(WCHAR),
- "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
+ "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
ok(NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == HeapSize( GetProcessHeap(), 0, old_env ),
- "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
+ "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize);
check_env_var("testenv1", "heis");
check_env_var("testenv2", "dyo");
@@ -562,19 +563,19 @@ static void test_RtlSetCurrentEnvironment(void)
env = NtCurrentTeb()->Peb->ProcessParameters->Environment;
size = get_env_length(env) * sizeof(WCHAR);
ok( NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == size,
- "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize );
+ "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize );
ok( size == HeapSize( GetProcessHeap(), 0, env ),
- "got wrong size %lu / %lu\n", size, HeapSize( GetProcessHeap(), 0, env ));
+ "got wrong size %Iu / %Iu\n", size, HeapSize( GetProcessHeap(), 0, env ));
SetEnvironmentVariableA("testenv1", NULL);
SetEnvironmentVariableA("testenv2", NULL);
env = NtCurrentTeb()->Peb->ProcessParameters->Environment;
ok( NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize == size,
- "got wrong size %lu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize );
+ "got wrong size %Iu\n", NtCurrentTeb()->Peb->ProcessParameters->EnvironmentSize );
ok( size == HeapSize( GetProcessHeap(), 0, env ),
- "got wrong size %lu / %lu\n", size, HeapSize( GetProcessHeap(), 0, env ));
- ok( size > get_env_length(env) * sizeof(WCHAR), "got wrong size %lu\n", size );
+ "got wrong size %Iu / %Iu\n", size, HeapSize( GetProcessHeap(), 0, env ));
+ ok( size > get_env_length(env) * sizeof(WCHAR), "got wrong size %Iu\n", size );
}
static void query_env_var_(int line, WCHAR *env, const WCHAR *var, const WCHAR *value)
@@ -590,13 +591,13 @@ static void query_env_var_(int line, WCHAR *env, const WCHAR *var, const WCHAR *
status = RtlQueryEnvironmentVariable_U(env, &var_string, &value_string);
if (value)
{
- ok_(__FILE__, line)(!status, "got %#x\n", status);
+ ok_(__FILE__, line)(!status, "got %#lx\n", status);
ok_(__FILE__, line)(value_string.Length/sizeof(WCHAR) == wcslen(value),
- "wrong size %u\n", value_string.Length/sizeof(WCHAR));
+ "wrong size %Iu\n", value_string.Length/sizeof(WCHAR));
ok_(__FILE__, line)(!wcscmp(value_string.Buffer, value), "wrong value %s\n", debugstr_w(value_string.Buffer));
}
else
- ok_(__FILE__, line)(status == STATUS_VARIABLE_NOT_FOUND, "got %#x\n", status);
+ ok_(__FILE__, line)(status == STATUS_VARIABLE_NOT_FOUND, "got %#lx\n", status);
}
#define query_env_var(a, b, c) query_env_var_(__LINE__, a, b, c)
@@ -606,52 +607,52 @@ static void test_RtlSetEnvironmentVariable(void)
WCHAR *env;
status = RtlCreateEnvironment(FALSE, &env);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
status = set_env_var(&env, L"cat", L"dog");
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
query_env_var(env, L"cat", L"dog");
status = set_env_var(&env, L"cat", L"horse");
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
query_env_var(env, L"cat", L"horse");
status = set_env_var(&env, L"cat", NULL);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
query_env_var(env, L"cat", NULL);
status = set_env_var(&env, L"cat", NULL);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
status = set_env_var(&env, L"foo", L"meouw");
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
query_env_var(env, L"foo", L"meouw");
status = set_env_var(&env, L"fOo", NULL);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
query_env_var(env, L"foo", NULL);
status = set_env_var(&env, L"horse", NULL);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
query_env_var(env, L"horse", NULL);
status = set_env_var(&env, L"me=too", L"also");
- ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status);
+ ok(status == STATUS_INVALID_PARAMETER, "got %#lx\n", status);
status = set_env_var(&env, L"me", L"too=also");
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
query_env_var(env, L"me", L"too=also");
status = set_env_var(&env, L"=too", L"also");
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
query_env_var(env, L"=too", L"also");
status = set_env_var(&env, L"=", L"also");
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
query_env_var(env, L"=", L"also");
status = RtlDestroyEnvironment(env);
- ok(!status, "got %#x\n", status);
+ ok(!status, "got %#lx\n", status);
}
START_TEST(env)
1
0
18 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/directory.c | 239 +++++++++++++++++++++---------------------
1 file changed, 120 insertions(+), 119 deletions(-)
diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c
index 8a8047c6392..77b17a50037 100644
--- a/dlls/ntdll/tests/directory.c
+++ b/dlls/ntdll/tests/directory.c
@@ -23,6 +23,7 @@
* We use function pointers here as there is no import library for NTDLL on
* windows.
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include <stdio.h>
#include <stdarg.h>
@@ -89,7 +90,7 @@ static void set_up_attribute_test(const WCHAR *testdir)
BOOL ret;
ret = CreateDirectoryW(testdir, NULL);
- ok(ret, "couldn't create dir %s, error %d\n", wine_dbgstr_w(testdir), GetLastError());
+ ok(ret, "couldn't create dir %s, error %ld\n", wine_dbgstr_w(testdir), GetLastError());
for (i=0; i < test_dir_count; i++) {
WCHAR buf[MAX_PATH];
@@ -101,7 +102,7 @@ static void set_up_attribute_test(const WCHAR *testdir)
lstrcatW( buf, testfiles[i].name );
if (testfiles[i].attr & FILE_ATTRIBUTE_DIRECTORY) {
ret = CreateDirectoryW(buf, NULL);
- ok(ret, "couldn't create dir %s, error %d\n", wine_dbgstr_w(buf), GetLastError());
+ ok(ret, "couldn't create dir %s, error %ld\n", wine_dbgstr_w(buf), GetLastError());
} else {
HANDLE h = CreateFileW(buf,
GENERIC_READ|GENERIC_WRITE,
@@ -137,11 +138,11 @@ static void tear_down_attribute_test(const WCHAR *testdir)
if (testfiles[i].attr & FILE_ATTRIBUTE_DIRECTORY) {
ret = RemoveDirectoryW(buf);
ok(ret || (GetLastError() == ERROR_PATH_NOT_FOUND),
- "Failed to rmdir %s, error %d\n", wine_dbgstr_w(buf), GetLastError());
+ "Failed to rmdir %s, error %ld\n", wine_dbgstr_w(buf), GetLastError());
} else {
ret = DeleteFileW(buf);
ok(ret || (GetLastError() == ERROR_PATH_NOT_FOUND),
- "Failed to rm %s, error %d\n", wine_dbgstr_w(buf), GetLastError());
+ "Failed to rm %s, error %ld\n", wine_dbgstr_w(buf), GetLastError());
}
}
RemoveDirectoryW(testdir);
@@ -163,7 +164,7 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info)
continue;
if (!testfiles[i].attr_done) {
todo_wine_if (testfiles[i].todo)
- ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", wine_dbgstr_w(testfiles[i].name), testfiles[i].description, testfiles[i].attr, attrib);
+ ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%lx), got %lx (is your linux new enough?)\n", wine_dbgstr_w(testfiles[i].name), testfiles[i].description, testfiles[i].attr, attrib);
testfiles[i].attr_done = TRUE;
}
testfiles[i].nfound++;
@@ -195,7 +196,7 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char
/* Read the directory and note which files are found */
status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, attr, &io, FILE_SHARE_READ,
FILE_SYNCHRONOUS_IO_NONALERT|FILE_OPEN_FOR_BACKUP_INTENT|FILE_DIRECTORY_FILE);
- ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%x, error %d\n", testdirA, status, GetLastError());
+ ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%lx, error %ld\n", testdirA, status, GetLastError());
if (status != STATUS_SUCCESS) {
skip("can't test if we can't open the directory\n");
return;
@@ -204,8 +205,8 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char
U(io).Status = 0xdeadbeef;
status = pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, single_entry, mask, restart_flag );
- ok (status == STATUS_SUCCESS, "failed to query directory; status %x\n", status);
- ok (U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status);
+ ok (status == STATUS_SUCCESS, "failed to query directory; status %lx\n", status);
+ ok (U(io).Status == STATUS_SUCCESS, "failed to query directory; status %lx\n", U(io).Status);
data_len = io.Information;
ok (data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n");
@@ -224,9 +225,9 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char
U(io).Status = 0xdeadbeef;
status = pNtQueryDirectoryFile( new_dirh, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, single_entry, &dummy_mask, FALSE );
- ok (U(io).Status == status, "wrong status %x / %x\n", status, U(io).Status);
+ ok (U(io).Status == status, "wrong status %lx / %lx\n", status, U(io).Status);
if (status == STATUS_NO_MORE_FILES) break;
- ok (status == STATUS_SUCCESS, "failed to query directory; status %x\n", status);
+ ok (status == STATUS_SUCCESS, "failed to query directory; status %lx\n", status);
data_len = io.Information;
if (data_len < sizeof(FILE_BOTH_DIRECTORY_INFORMATION))
break;
@@ -278,8 +279,8 @@ static void test_directory_sort( const WCHAR *testdir )
U(io).Status = 0xdeadbeef;
status = pNtQueryDirectoryFile( handle, NULL, NULL, NULL, &io, data, sizeof(data),
FileBothDirectoryInformation, FALSE, NULL, TRUE );
- ok( status == STATUS_SUCCESS, "failed to query directory; status %x\n", status );
- ok( U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status );
+ ok( status == STATUS_SUCCESS, "failed to query directory; status %lx\n", status );
+ ok( U(io).Status == STATUS_SUCCESS, "failed to query directory; status %lx\n", U(io).Status );
data_len = io.Information;
ok( data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n" );
data_pos = 0;
@@ -316,9 +317,9 @@ static void test_directory_sort( const WCHAR *testdir )
U(io).Status = 0xdeadbeef;
status = pNtQueryDirectoryFile( handle, 0, NULL, NULL, &io, data, sizeof(data),
FileBothDirectoryInformation, FALSE, NULL, FALSE );
- ok (U(io).Status == status, "wrong status %x / %x\n", status, U(io).Status);
+ ok (U(io).Status == status, "wrong status %lx / %lx\n", status, U(io).Status);
if (status == STATUS_NO_MORE_FILES) break;
- ok( status == STATUS_SUCCESS, "failed to query directory; status %x\n", status );
+ ok( status == STATUS_SUCCESS, "failed to query directory; status %lx\n", status );
data_len = io.Information;
data_pos = 0;
}
@@ -346,9 +347,9 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma
status = pNtQueryDirectoryFile( handle, 0, NULL, NULL, &io, data, data_size,
class, FALSE, mask, TRUE );
- ok( U(io).Status == 0xdeadbeef, "%u: wrong status %x\n", class, U(io).Status );
- ok( U(io).Information == 0xdeadbeef, "%u: wrong info %lx\n", class, U(io).Information );
- ok(data[0] == 0x55555555, "%u: wrong offset %x\n", class, data[0] );
+ ok( U(io).Status == 0xdeadbeef, "%u: wrong status %lx\n", class, U(io).Status );
+ ok( U(io).Information == 0xdeadbeef, "%u: wrong info %Ix\n", class, U(io).Information );
+ ok(data[0] == 0x55555555, "%u: wrong offset %lx\n", class, data[0] );
switch (class)
{
@@ -366,11 +367,11 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma
case FileObjectIdInformation:
case FileQuotaInformation:
case FileReparsePointInformation:
- ok( status == STATUS_INFO_LENGTH_MISMATCH, "%u: wrong status %x\n", class, status );
+ ok( status == STATUS_INFO_LENGTH_MISMATCH, "%u: wrong status %lx\n", class, status );
break;
default:
ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED,
- "%u: wrong status %x\n", class, status );
+ "%u: wrong status %lx\n", class, status );
continue;
}
@@ -380,16 +381,16 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma
class, FALSE, mask, TRUE );
if (status == STATUS_BUFFER_OVERFLOW)
{
- ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, U(io).Status );
+ ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, U(io).Status );
ok( U(io).Information == data_size || broken(!U(io).Information), /* win10 1709 */
- "%u: wrong info %lx\n", class, U(io).Information );
- if (U(io).Information) ok(data[0] == 0, "%u: wrong offset %x\n", class, data[0] );
+ "%u: wrong info %Ix\n", class, U(io).Information );
+ if (U(io).Information) ok(data[0] == 0, "%u: wrong offset %lx\n", class, data[0] );
}
else
{
- ok( U(io).Status == 0xdeadbeef, "%u: wrong status %x\n", class, U(io).Status );
- ok( U(io).Information == 0xdeadbeef, "%u: wrong info %lx\n", class, U(io).Information );
- ok(data[0] == 0x55555555, "%u: wrong offset %x\n", class, data[0] );
+ ok( U(io).Status == 0xdeadbeef, "%u: wrong status %lx\n", class, U(io).Status );
+ ok( U(io).Information == 0xdeadbeef, "%u: wrong info %Ix\n", class, U(io).Information );
+ ok(data[0] == 0x55555555, "%u: wrong offset %lx\n", class, data[0] );
}
if (status != STATUS_INFO_LENGTH_MISMATCH) break;
}
@@ -397,50 +398,50 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma
switch (class)
{
case FileDirectoryInformation:
- ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status );
+ ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status );
ok( data_size == ((offsetof( FILE_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7),
"%u: wrong size %u\n", class, data_size );
break;
case FileFullDirectoryInformation:
- ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status );
+ ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status );
ok( data_size == ((offsetof( FILE_FULL_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7),
"%u: wrong size %u\n", class, data_size );
break;
case FileBothDirectoryInformation:
- ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status );
+ ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status );
ok( data_size == ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7),
"%u: wrong size %u\n", class, data_size );
break;
case FileNamesInformation:
- ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status );
+ ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status );
ok( data_size == ((offsetof( FILE_NAMES_INFORMATION, FileName[1] ) + 7) & ~7),
"%u: wrong size %u\n", class, data_size );
break;
case FileIdBothDirectoryInformation:
- ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status );
+ ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status );
ok( data_size == ((offsetof( FILE_ID_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7),
"%u: wrong size %u\n", class, data_size );
break;
case FileIdFullDirectoryInformation:
- ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status );
+ ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status );
ok( data_size == ((offsetof( FILE_ID_FULL_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7),
"%u: wrong size %u\n", class, data_size );
break;
case FileIdGlobalTxDirectoryInformation:
- ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, status );
+ ok( status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %lx\n", class, status );
ok( data_size == ((offsetof( FILE_ID_GLOBAL_TX_DIR_INFORMATION, FileName[1] ) + 7) & ~7),
"%u: wrong size %u\n", class, data_size );
break;
case FileObjectIdInformation:
- ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %x\n", class, status );
+ ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %lx\n", class, status );
ok( data_size == sizeof(FILE_OBJECTID_INFORMATION), "%u: wrong size %u\n", class, data_size );
break;
case FileQuotaInformation:
- ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %x\n", class, status );
+ ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %lx\n", class, status );
ok( data_size == sizeof(FILE_QUOTA_INFORMATION), "%u: wrong size %u\n", class, data_size );
break;
case FileReparsePointInformation:
- ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %x\n", class, status );
+ ok( status == STATUS_INVALID_INFO_CLASS, "%u: wrong status %lx\n", class, status );
ok( data_size == sizeof(FILE_REPARSE_POINT_INFORMATION), "%u: wrong size %u\n", class, data_size );
break;
}
@@ -504,16 +505,16 @@ static void test_NtQueryDirectoryFile(void)
return;
}
status = pNtQueryInformationFile( dirh, &io, &pos_info, sizeof(pos_info), FilePositionInformation );
- ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", status );
ok( pos_info.CurrentByteOffset.QuadPart == 0, "wrong pos %s\n",
wine_dbgstr_longlong(pos_info.CurrentByteOffset.QuadPart));
pos_info.CurrentByteOffset.QuadPart = 0xbeef;
status = pNtSetInformationFile( dirh, &io, &pos_info, sizeof(pos_info), FilePositionInformation );
- ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", status );
status = pNtQueryInformationFile( dirh, &io, &pos_info, sizeof(pos_info), FilePositionInformation );
- ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", status );
ok( pos_info.CurrentByteOffset.QuadPart == 0xbeef, "wrong pos %s\n",
wine_dbgstr_longlong(pos_info.CurrentByteOffset.QuadPart));
@@ -523,12 +524,12 @@ static void test_NtQueryDirectoryFile(void)
U(io).Status = 0xdeadbeef;
status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, TRUE, &mask, FALSE);
- ok(status == STATUS_SUCCESS, "failed to query directory; status %x\n", status);
- ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status);
+ ok(status == STATUS_SUCCESS, "failed to query directory; status %lx\n", status);
+ ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %lx\n", U(io).Status);
ok(fbdi->ShortName[0], "ShortName is empty\n");
status = pNtQueryInformationFile( dirh, &io, &pos_info, sizeof(pos_info), FilePositionInformation );
- ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", status );
ok( pos_info.CurrentByteOffset.QuadPart == 0xbeef, "wrong pos %s\n",
wine_dbgstr_longlong(pos_info.CurrentByteOffset.QuadPart) );
@@ -539,17 +540,17 @@ static void test_NtQueryDirectoryFile(void)
U(io).Information = 0xdeadbeef;
status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, TRUE, &mask, TRUE);
- ok(status == STATUS_SUCCESS, "failed to query directory status %x\n", status);
- ok(U(io).Status == STATUS_SUCCESS, "failed to query directory status %x\n", U(io).Status);
+ ok(status == STATUS_SUCCESS, "failed to query directory status %lx\n", status);
+ ok(U(io).Status == STATUS_SUCCESS, "failed to query directory status %lx\n", U(io).Status);
ok(U(io).Information == offsetof(FILE_BOTH_DIRECTORY_INFORMATION, FileName[lstrlenW(testfiles[0].name)]),
- "wrong info %lx\n", U(io).Information);
+ "wrong info %Ix\n", U(io).Information);
ok(fbdi->FileNameLength == lstrlenW(testfiles[0].name)*sizeof(WCHAR) &&
!memcmp(fbdi->FileName, testfiles[0].name, fbdi->FileNameLength),
"incorrect long file name: %s\n", wine_dbgstr_wn(fbdi->FileName,
fbdi->FileNameLength/sizeof(WCHAR)));
status = pNtQueryInformationFile( dirh, &io, &pos_info, sizeof(pos_info), FilePositionInformation );
- ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %x\n", status );
+ ok( status == STATUS_SUCCESS, "NtQueryInformationFile failed %lx\n", status );
ok( pos_info.CurrentByteOffset.QuadPart == 0xbeef, "wrong pos %s\n",
wine_dbgstr_longlong(pos_info.CurrentByteOffset.QuadPart) );
@@ -560,16 +561,16 @@ static void test_NtQueryDirectoryFile(void)
data_size = offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] );
status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, TRUE, &mask, TRUE);
- ok( status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", status );
- ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", U(io).Status );
+ ok( status == STATUS_BUFFER_OVERFLOW, "wrong status %lx\n", status );
+ ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "wrong status %lx\n", U(io).Status );
ok( U(io).Information == data_size || broken( U(io).Information == 0),
- "wrong info %lx\n", U(io).Information );
+ "wrong info %Ix\n", U(io).Information );
ok( fbdi->NextEntryOffset == 0 || fbdi->NextEntryOffset == 0x55555555, /* win10 >= 1709 */
- "wrong offset %x\n", fbdi->NextEntryOffset );
+ "wrong offset %lx\n", fbdi->NextEntryOffset );
if (!fbdi->NextEntryOffset)
{
ok( fbdi->FileNameLength == lstrlenW(testfiles[0].name) * sizeof(WCHAR),
- "wrong length %x\n", fbdi->FileNameLength );
+ "wrong length %lx\n", fbdi->FileNameLength );
ok( filename[0] == testfiles[0].name[0], "incorrect long file name: %s\n",
wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR)));
ok( filename[1] == 0x5555, "incorrect long file name: %s\n",
@@ -584,8 +585,8 @@ static void test_NtQueryDirectoryFile(void)
data_size = offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[256] );
status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, TRUE, &mask, TRUE);
- ok( status == STATUS_SUCCESS || status == STATUS_NO_MORE_FILES, "wrong status %x\n", status );
- ok( U(io).Status == status, "wrong status %x / %x\n", U(io).Status, status );
+ ok( status == STATUS_SUCCESS || status == STATUS_NO_MORE_FILES, "wrong status %lx\n", status );
+ ok( U(io).Status == status, "wrong status %lx / %lx\n", U(io).Status, status );
if (!status)
ok( fbdi->FileNameLength == lstrlenW(testfiles[0].name)*sizeof(WCHAR) &&
!memcmp(fbdi->FileName, testfiles[0].name, fbdi->FileNameLength),
@@ -604,18 +605,18 @@ static void test_NtQueryDirectoryFile(void)
U(io).Information = 0xdeadbeef;
status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, FALSE, NULL, TRUE);
- ok(status == STATUS_SUCCESS, "wrong status %x\n", status);
- ok(U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status);
- ok(U(io).Information > 0 && U(io).Information < data_size, "wrong info %lx\n", U(io).Information);
+ ok(status == STATUS_SUCCESS, "wrong status %lx\n", status);
+ ok(U(io).Status == STATUS_SUCCESS, "wrong status %lx\n", U(io).Status);
+ ok(U(io).Information > 0 && U(io).Information < data_size, "wrong info %Ix\n", U(io).Information);
ok( fbdi->NextEntryOffset == ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7),
- "wrong offset %x\n", fbdi->NextEntryOffset );
- ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %x\n", fbdi->FileNameLength );
+ "wrong offset %lx\n", fbdi->NextEntryOffset );
+ ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %lx\n", fbdi->FileNameLength );
ok( fbdi->FileName[0] == '.', "incorrect long file name: %s\n",
wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR)));
next = (FILE_BOTH_DIRECTORY_INFORMATION *)(data + fbdi->NextEntryOffset);
ok( next->NextEntryOffset == ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] ) + 7) & ~7),
- "wrong offset %x\n", next->NextEntryOffset );
- ok( next->FileNameLength == 2 * sizeof(WCHAR), "wrong length %x\n", next->FileNameLength );
+ "wrong offset %lx\n", next->NextEntryOffset );
+ ok( next->FileNameLength == 2 * sizeof(WCHAR), "wrong length %lx\n", next->FileNameLength );
filename = next->FileName;
ok( filename[0] == '.' && filename[1] == '.', "incorrect long file name: %s\n",
wine_dbgstr_wn(next->FileName, next->FileNameLength/sizeof(WCHAR)));
@@ -626,16 +627,16 @@ static void test_NtQueryDirectoryFile(void)
U(io).Information = 0xdeadbeef;
status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, FALSE, NULL, TRUE );
- ok( status == STATUS_SUCCESS, "wrong status %x\n", status );
- ok( U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status );
+ ok( status == STATUS_SUCCESS, "wrong status %lx\n", status );
+ ok( U(io).Status == STATUS_SUCCESS, "wrong status %lx\n", U(io).Status );
ok( U(io).Information == offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ),
- "wrong info %lx\n", U(io).Information );
- ok( fbdi->NextEntryOffset == 0, "wrong offset %x\n", fbdi->NextEntryOffset );
- ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %x\n", fbdi->FileNameLength );
+ "wrong info %Ix\n", U(io).Information );
+ ok( fbdi->NextEntryOffset == 0, "wrong offset %lx\n", fbdi->NextEntryOffset );
+ ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %lx\n", fbdi->FileNameLength );
ok( fbdi->FileName[0] == '.', "incorrect long file name: %s\n",
wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR)));
next = (FILE_BOTH_DIRECTORY_INFORMATION *)&fbdi->FileName[1];
- ok( next->NextEntryOffset == 0x55555555, "wrong offset %x\n", next->NextEntryOffset );
+ ok( next->NextEntryOffset == 0x55555555, "wrong offset %lx\n", next->NextEntryOffset );
data_size = fbdi->NextEntryOffset + offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] );
memset( data, 0x55, data_size );
@@ -643,11 +644,11 @@ static void test_NtQueryDirectoryFile(void)
U(io).Information = 0xdeadbeef;
status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, FALSE, NULL, TRUE );
- ok( status == STATUS_SUCCESS, "wrong status %x\n", status );
- ok( U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status );
+ ok( status == STATUS_SUCCESS, "wrong status %lx\n", status );
+ ok( U(io).Status == STATUS_SUCCESS, "wrong status %lx\n", U(io).Status );
ok( U(io).Information == offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ),
- "wrong info %lx\n", U(io).Information );
- ok( fbdi->NextEntryOffset == 0, "wrong offset %x\n", fbdi->NextEntryOffset );
+ "wrong info %Ix\n", U(io).Information );
+ ok( fbdi->NextEntryOffset == 0, "wrong offset %lx\n", fbdi->NextEntryOffset );
data_size = ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7) +
offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[2] );
@@ -656,18 +657,18 @@ static void test_NtQueryDirectoryFile(void)
U(io).Information = 0xdeadbeef;
status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, (data_size + 7) & ~7,
FileBothDirectoryInformation, FALSE, NULL, TRUE );
- ok( status == STATUS_SUCCESS, "wrong status %x\n", status );
- ok( U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status );
+ ok( status == STATUS_SUCCESS, "wrong status %lx\n", status );
+ ok( U(io).Status == STATUS_SUCCESS, "wrong status %lx\n", U(io).Status );
ok( U(io).Information == data_size || U(io).Information == ((data_size + 7) & ~7),
- "wrong info %lx / %x\n", U(io).Information, data_size );
+ "wrong info %Ix / %x\n", U(io).Information, data_size );
ok( fbdi->NextEntryOffset == ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7),
- "wrong offset %x\n", fbdi->NextEntryOffset );
- ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %x\n", fbdi->FileNameLength );
+ "wrong offset %lx\n", fbdi->NextEntryOffset );
+ ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %lx\n", fbdi->FileNameLength );
ok( fbdi->FileName[0] == '.', "incorrect long file name: %s\n",
wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR)));
next = (FILE_BOTH_DIRECTORY_INFORMATION *)(data + fbdi->NextEntryOffset);
- ok( next->NextEntryOffset == 0, "wrong offset %x\n", next->NextEntryOffset );
- ok( next->FileNameLength == 2 * sizeof(WCHAR), "wrong length %x\n", next->FileNameLength );
+ ok( next->NextEntryOffset == 0, "wrong offset %lx\n", next->NextEntryOffset );
+ ok( next->FileNameLength == 2 * sizeof(WCHAR), "wrong length %lx\n", next->FileNameLength );
filename = next->FileName;
ok( filename[0] == '.' && filename[1] == '.', "incorrect long file name: %s\n",
wine_dbgstr_wn(next->FileName, next->FileNameLength/sizeof(WCHAR)));
@@ -679,18 +680,18 @@ static void test_NtQueryDirectoryFile(void)
U(io).Information = 0xdeadbeef;
status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size,
FileNamesInformation, FALSE, NULL, TRUE );
- ok( status == STATUS_SUCCESS, "wrong status %x\n", status );
- ok( U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status );
- ok( U(io).Information == data_size, "wrong info %lx / %x\n", U(io).Information, data_size );
+ ok( status == STATUS_SUCCESS, "wrong status %lx\n", status );
+ ok( U(io).Status == STATUS_SUCCESS, "wrong status %lx\n", U(io).Status );
+ ok( U(io).Information == data_size, "wrong info %Ix / %x\n", U(io).Information, data_size );
names = (FILE_NAMES_INFORMATION *)data;
ok( names->NextEntryOffset == ((offsetof( FILE_NAMES_INFORMATION, FileName[1] ) + 7) & ~7),
- "wrong offset %x\n", names->NextEntryOffset );
- ok( names->FileNameLength == sizeof(WCHAR), "wrong length %x\n", names->FileNameLength );
+ "wrong offset %lx\n", names->NextEntryOffset );
+ ok( names->FileNameLength == sizeof(WCHAR), "wrong length %lx\n", names->FileNameLength );
ok( names->FileName[0] == '.', "incorrect long file name: %s\n",
wine_dbgstr_wn(names->FileName, names->FileNameLength/sizeof(WCHAR)));
names = (FILE_NAMES_INFORMATION *)(data + names->NextEntryOffset);
- ok( names->NextEntryOffset == 0, "wrong offset %x\n", names->NextEntryOffset );
- ok( names->FileNameLength == 2 * sizeof(WCHAR), "wrong length %x\n", names->FileNameLength );
+ ok( names->NextEntryOffset == 0, "wrong offset %lx\n", names->NextEntryOffset );
+ ok( names->FileNameLength == 2 * sizeof(WCHAR), "wrong length %lx\n", names->FileNameLength );
filename = names->FileName;
ok( filename[0] == '.' && filename[1] == '.', "incorrect long file name: %s\n",
wine_dbgstr_wn(names->FileName, names->FileNameLength/sizeof(WCHAR)));
@@ -707,28 +708,28 @@ static void test_NtQueryDirectoryFile(void)
data_size = sizeof(data);
status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, TRUE, &mask, TRUE);
- ok(status == STATUS_NO_SUCH_FILE, "wrong status %x\n", status);
- ok(U(io).Status == 0xdeadbeef, "wrong status %x\n", U(io).Status);
+ ok(status == STATUS_NO_SUCH_FILE, "wrong status %lx\n", status);
+ ok(U(io).Status == 0xdeadbeef, "wrong status %lx\n", U(io).Status);
U(io).Status = 0xdeadbeef;
status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, TRUE, NULL, FALSE);
- ok(status == STATUS_NO_MORE_FILES, "wrong status %x\n", status);
- ok(U(io).Status == STATUS_NO_MORE_FILES, "wrong status %x\n", U(io).Status);
+ ok(status == STATUS_NO_MORE_FILES, "wrong status %lx\n", status);
+ ok(U(io).Status == STATUS_NO_MORE_FILES, "wrong status %lx\n", U(io).Status);
U(io).Status = 0xdeadbeef;
status = pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, TRUE, NULL, TRUE);
- ok(status == STATUS_NO_MORE_FILES, "wrong status %x\n", status);
- ok(U(io).Status == STATUS_NO_MORE_FILES, "wrong status %x\n", U(io).Status);
+ ok(status == STATUS_NO_MORE_FILES, "wrong status %lx\n", status);
+ ok(U(io).Status == STATUS_NO_MORE_FILES, "wrong status %lx\n", U(io).Status);
pNtClose(dirh);
U(io).Status = 0xdeadbeef;
status = pNtQueryDirectoryFile( (HANDLE)0xbeef, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, TRUE, NULL, TRUE );
- ok(status == STATUS_INVALID_HANDLE, "wrong status %x\n", status);
- ok(U(io).Status == 0xdeadbeef, "wrong status %x\n", U(io).Status);
+ ok(status == STATUS_INVALID_HANDLE, "wrong status %lx\n", status);
+ ok(U(io).Status == 0xdeadbeef, "wrong status %lx\n", U(io).Status);
GetModuleFileNameA( 0, buffer, sizeof(buffer) );
h = CreateFileA( buffer, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 );
@@ -737,8 +738,8 @@ static void test_NtQueryDirectoryFile(void)
U(io).Status = 0xdeadbeef;
status = pNtQueryDirectoryFile( h, 0, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, TRUE, NULL, TRUE );
- ok(status == STATUS_INVALID_PARAMETER, "wrong status %x\n", status);
- ok(U(io).Status == 0xdeadbeef, "wrong status %x\n", U(io).Status);
+ ok(status == STATUS_INVALID_PARAMETER, "wrong status %lx\n", status);
+ ok(U(io).Status == 0xdeadbeef, "wrong status %lx\n", U(io).Status);
CloseHandle ( h );
}
@@ -755,7 +756,7 @@ static void set_up_case_test(const char *testdir)
HANDLE h;
ret = CreateDirectoryA(testdir, NULL);
- ok(ret, "couldn't create dir '%s', error %d\n", testdir, GetLastError());
+ ok(ret, "couldn't create dir '%s', error %ld\n", testdir, GetLastError());
sprintf(buf, "%s\\%s", testdir, "TesT");
h = CreateFileA(buf, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
@@ -772,7 +773,7 @@ static void tear_down_case_test(const char *testdir)
sprintf(buf, "%s\\%s", testdir, "TesT");
ret = DeleteFileA(buf);
ok(ret || (GetLastError() == ERROR_PATH_NOT_FOUND),
- "Failed to rm %s, error %d\n", buf, GetLastError());
+ "Failed to rm %s, error %ld\n", buf, GetLastError());
RemoveDirectoryA(testdir);
}
@@ -814,7 +815,7 @@ static void test_NtQueryDirectoryFile_case(void)
status = pNtOpenFile(&dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ,
FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE);
- ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%x, error %d\n", testdir, status, GetLastError());
+ ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%lx, error %ld\n", testdir, status, GetLastError());
if (status != STATUS_SUCCESS)
{
skip("can't test if we can't open the directory\n");
@@ -825,14 +826,14 @@ static void test_NtQueryDirectoryFile_case(void)
mask.Length = mask.MaximumLength = sizeof(testmask);
pNtQueryDirectoryFile(dirh, NULL, NULL, NULL, &io, data, data_size,
FileBothDirectoryInformation, TRUE, &mask, FALSE);
- ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status);
+ ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %lx\n", U(io).Status);
data_len = io.Information;
ok(data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n");
name = dir_info->FileName;
name_len = dir_info->FileNameLength / sizeof(WCHAR);
- ok(name_len == testfile_len, "unexpected filename length %u\n", name_len);
+ ok(name_len == testfile_len, "unexpected filename length %lu\n", name_len);
ok(!memcmp(name, testfile_w, testfile_len * sizeof(WCHAR)), "unexpected filename %s\n",
wine_dbgstr_wn(name, name_len));
@@ -894,7 +895,7 @@ static void test_redirection(void)
skip( "Wow64 redirection not supported\n" );
return;
}
- ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );
+ ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status );
#ifndef _WIN64
if (NtCurrentTeb()->GdiBatchCount)
@@ -902,46 +903,46 @@ static void test_redirection(void)
#endif
status = pRtlWow64EnableFsRedirectionEx( FALSE, &cur );
- ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );
- ok( !cur, "RtlWow64EnableFsRedirectionEx got %u\n", cur );
+ ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status );
+ ok( !cur, "RtlWow64EnableFsRedirectionEx got %lu\n", cur );
if (tls64) ok( *tls64 == FALSE, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) );
status = pRtlWow64EnableFsRedirectionEx( TRUE, &cur );
- ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );
+ ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status );
status = pRtlWow64EnableFsRedirectionEx( TRUE, &cur );
- ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );
- ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %u\n", cur );
+ ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status );
+ ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %lu\n", cur );
if (tls64) ok( *tls64 == TRUE, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) );
status = pRtlWow64EnableFsRedirection( TRUE );
- ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );
+ ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status );
status = pRtlWow64EnableFsRedirectionEx( TRUE, &cur );
- ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );
- ok( !cur, "RtlWow64EnableFsRedirectionEx got %u\n", cur );
+ ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status );
+ ok( !cur, "RtlWow64EnableFsRedirectionEx got %lu\n", cur );
if (tls64) ok( *tls64 == TRUE, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) );
status = pRtlWow64EnableFsRedirectionEx( 123, &cur );
- ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );
- ok( cur == TRUE, "RtlWow64EnableFsRedirectionEx got %u\n", cur );
+ ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status );
+ ok( cur == TRUE, "RtlWow64EnableFsRedirectionEx got %lu\n", cur );
if (tls64) ok( *tls64 == 123, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) );
status = pRtlWow64EnableFsRedirectionEx( 0xdeadbeef, &cur );
- ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );
- ok( cur == 123, "RtlWow64EnableFsRedirectionEx got %u\n", cur );
+ ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status );
+ ok( cur == 123, "RtlWow64EnableFsRedirectionEx got %lu\n", cur );
if (tls64) ok( *tls64 == 0xdeadbeef, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) );
status = pRtlWow64EnableFsRedirectionEx( TRUE, NULL );
- ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %lx\n", status );
status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)1 );
- ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %lx\n", status );
status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)0xDEADBEEF );
- ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status );
+ ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %lx\n", status );
status = pRtlWow64EnableFsRedirection( FALSE );
- ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );
+ ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status );
status = pRtlWow64EnableFsRedirectionEx( FALSE, &cur );
- ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );
- ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %u\n", cur );
+ ok( !status, "RtlWow64EnableFsRedirectionEx failed status %lx\n", status );
+ ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %lu\n", cur );
if (tls64) ok( *tls64 == FALSE, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) );
if (tls64)
@@ -993,13 +994,13 @@ static void test_redirection(void)
pRtlWow64EnableFsRedirection( FALSE );
status = get_file_id( &info, tests[i].root, tests[i].name );
ok( !status || status == tests[i].expect || (tests[i].alt && status == tests[i].alt),
- "%u: got %x / %x for %s + %s without redirect\n", i, status, tests[i].expect,
+ "%u: got %lx / %lx for %s + %s without redirect\n", i, status, tests[i].expect,
debugstr_w( tests[i].root ), debugstr_w( tests[i].name ));
if (status) memset( &info, 0xcc, sizeof(info) );
pRtlWow64EnableFsRedirection( TRUE );
status = get_file_id( &info_redir, tests[i].root, tests[i].name );
ok( status == tests[i].expect || (tests[i].alt && status == tests[i].alt),
- "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect,
+ "%u: got %lx / %lx for %s + %s\n", i, status, tests[i].expect,
debugstr_w( tests[i].root ), debugstr_w( tests[i].name ));
if (!status)
{
1
0
18 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/change.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c
index e7201b52a3c..89e319bccd7 100644
--- a/dlls/ntdll/tests/change.c
+++ b/dlls/ntdll/tests/change.c
@@ -17,6 +17,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include <ntstatus.h>
#define WIN32_NO_STATUS
@@ -301,9 +302,9 @@ static void test_ntncdf_async(void)
CloseHandle(hdir);
- ok(U(iosb).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb).Status);
- ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb2).Status);
- ok(U(iosb3).Status == STATUS_SUCCESS, "status wrong %x\n",U(iosb3).Status);
+ ok(U(iosb).Status == STATUS_CANCELLED, "status wrong %lx\n",U(iosb).Status);
+ ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong %lx\n",U(iosb2).Status);
+ ok(U(iosb3).Status == STATUS_SUCCESS, "status wrong %lx\n",U(iosb3).Status);
ok(iosb.Information == 0, "info wrong\n");
ok(iosb2.Information == 0, "info wrong\n");
@@ -312,8 +313,8 @@ static void test_ntncdf_async(void)
U(iosb3).Status = 0x111111;
iosb3.Information = 0x222222;
r = pNtCancelIoFile(hdir, &iosb3);
- ok( r == STATUS_INVALID_HANDLE, "cancel failed %x\n", r);
- ok(U(iosb3).Status == 0x111111, "status wrong %x\n",U(iosb3).Status);
+ ok( r == STATUS_INVALID_HANDLE, "cancel failed %lx\n", r);
+ ok(U(iosb3).Status == 0x111111, "status wrong %lx\n",U(iosb3).Status);
ok(iosb3.Information == 0x222222, "info wrong\n");
r = RemoveDirectoryW( path );
1
0
18 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/ntdll/tests/atom.c | 187 ++++++++++++++++++++++++-----------------------
1 file changed, 94 insertions(+), 93 deletions(-)
diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c
index 6bb789867bf..f93194d450f 100644
--- a/dlls/ntdll/tests/atom.c
+++ b/dlls/ntdll/tests/atom.c
@@ -20,6 +20,7 @@
* We use function pointers here as there is no import library for NTDLL on
* windows.
*/
+#undef WINE_NO_LONG_TYPES /* temporary for migration */
#include <stdio.h>
#include <stdarg.h>
@@ -100,30 +101,30 @@ static DWORD WINAPI RtlAtomTestThread(LPVOID Table)
WCHAR Name[64];
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &Atom);
- ok(!res, "Unable to find atom from another thread, retval: %x\n", res);
+ ok(!res, "Unable to find atom from another thread, retval: %lx\n", res);
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom2, &Atom);
- ok(!res, "Unable to lookup pinned atom in table, retval: %x\n", res);
+ ok(!res, "Unable to lookup pinned atom in table, retval: %lx\n", res);
res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, Name, &Len);
- ok(res == STATUS_BUFFER_TOO_SMALL, "We got wrong retval: %x\n", res);
+ ok(res == STATUS_BUFFER_TOO_SMALL, "We got wrong retval: %lx\n", res);
Len = 64;
res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, Name, &Len);
- ok(!res, "Failed with long enough buffer, retval: %x\n", res);
- ok(RefCount == 1, "Refcount was not 1 but %x\n", RefCount);
- ok(PinCount == 1, "Pincount was not 1 but %x\n", PinCount);
+ ok(!res, "Failed with long enough buffer, retval: %lx\n", res);
+ ok(RefCount == 1, "Refcount was not 1 but %lx\n", RefCount);
+ ok(PinCount == 1, "Pincount was not 1 but %lx\n", PinCount);
ok(!lstrcmpW(Name, testAtom2), "We found wrong atom!!\n");
- ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len);
+ ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len);
Len = 64;
res = pRtlQueryAtomInAtomTable(AtomTable, Atom, NULL, NULL, Name, &Len);
- ok(!res, "RtlQueryAtomInAtomTable with optional args invalid failed, retval: %x\n", res);
+ ok(!res, "RtlQueryAtomInAtomTable with optional args invalid failed, retval: %lx\n", res);
ok(!lstrcmpW(Name, testAtom2), "Found Wrong atom!\n");
- ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len);
+ ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len);
res = pRtlPinAtomInAtomTable(AtomTable, Atom);
- ok(!res, "Unable to pin atom in atom table, retval: %x\n", res);
+ ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res);
return 0;
}
@@ -145,39 +146,39 @@ static void test_NtAtom(void)
if (!res)
{
res = pRtlDestroyAtomTable(AtomTable);
- ok(!res, "We could create the atom table, but we couldn't destroy it! retval: %x\n", res);
+ ok(!res, "We could create the atom table, but we couldn't destroy it! retval: %lx\n", res);
}
AtomTable = NULL;
res = pRtlCreateAtomTable(37, &AtomTable);
- ok(!res, "We're unable to create an atom table with a valid table size retval: %x\n", res);
+ ok(!res, "We're unable to create an atom table with a valid table size retval: %lx\n", res);
if (!res)
{
- ok( *(DWORD *)AtomTable == 0x6d6f7441, "wrong signature %x\n", *(DWORD *)AtomTable );
+ ok( *(DWORD *)AtomTable == 0x6d6f7441, "wrong signature %lx\n", *(DWORD *)AtomTable );
res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom1);
- ok(!res, "We were unable to add a simple atom to the atom table, retval: %x\n", res);
+ ok(!res, "We were unable to add a simple atom to the atom table, retval: %lx\n", res);
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1Cap, &testAtom);
- ok(!res, "We were unable to find capital version of the atom, retval: %x\n", res);
+ ok(!res, "We were unable to find capital version of the atom, retval: %lx\n", res);
ok(Atom1 == testAtom, "Found wrong atom in table when querying capital atom\n");
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1Low, &testAtom);
- ok(!res, "Unable to find lowercase version of the atom, retval: %x\n", res);
+ ok(!res, "Unable to find lowercase version of the atom, retval: %lx\n", res);
ok(testAtom == Atom1, "Found wrong atom when querying lowercase atom\n");
res = pRtlAddAtomToAtomTable(AtomTable, EmptyAtom, &testEAtom);
- ok(res == STATUS_OBJECT_NAME_INVALID, "Got wrong retval, retval: %x\n", res);
+ ok(res == STATUS_OBJECT_NAME_INVALID, "Got wrong retval, retval: %lx\n", res);
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom);
- ok(!res, "Failed to find totally legitimate atom, retval: %x\n", res);
+ ok(!res, "Failed to find totally legitimate atom, retval: %lx\n", res);
ok(testAtom == Atom1, "Found wrong atom!\n");
res = pRtlAddAtomToAtomTable(AtomTable, testAtom2, &Atom2);
- ok(!res, "Unable to add other legitimate atom to table, retval: %x\n", res);
+ ok(!res, "Unable to add other legitimate atom to table, retval: %lx\n", res);
res = pRtlPinAtomInAtomTable(AtomTable, Atom2);
- ok(!res, "Unable to pin atom in atom table, retval: %x\n", res);
+ ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res);
testThread = CreateThread(NULL, 0, RtlAtomTestThread, &AtomTable, 0, NULL);
WaitForSingleObject(testThread, INFINITE);
@@ -185,28 +186,28 @@ static void test_NtAtom(void)
Len = 64;
res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, &RefCount, &PinCount, Name, &Len);
- ok(!res, "Unable to query atom in atom table, retval: %x\n", res);
- ok(RefCount == 1, "RefCount is not 1 but %x\n", RefCount);
- ok(PinCount == 1, "PinCount is not 1 but %x\n", PinCount);
+ ok(!res, "Unable to query atom in atom table, retval: %lx\n", res);
+ ok(RefCount == 1, "RefCount is not 1 but %lx\n", RefCount);
+ ok(PinCount == 1, "PinCount is not 1 but %lx\n", PinCount);
ok(!lstrcmpW(Name, testAtom2), "We found wrong atom\n");
- ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len);
+ ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len);
res = pRtlEmptyAtomTable(AtomTable, FALSE);
- ok(!res, "Unable to empty atom table, retval %x\n", res);
+ ok(!res, "Unable to empty atom table, retval %lx\n", res);
Len = 64;
res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, &RefCount, &PinCount, Name, &Len);
- ok(!res, "It seems RtlEmptyAtomTable deleted our pinned atom eaven though we asked it not to, retval: %x\n", res);
- ok(RefCount == 1, "RefCount is not 1 but %x\n", RefCount);
- ok(PinCount == 1, "PinCount is not 1 but %x\n", PinCount);
+ ok(!res, "It seems RtlEmptyAtomTable deleted our pinned atom eaven though we asked it not to, retval: %lx\n", res);
+ ok(RefCount == 1, "RefCount is not 1 but %lx\n", RefCount);
+ ok(PinCount == 1, "PinCount is not 1 but %lx\n", PinCount);
ok(!lstrcmpW(Name, testAtom2), "We found wrong atom\n");
- ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %d\n", Len);
+ ok((lstrlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len);
Len = 8;
Name[0] = Name[1] = Name[2] = Name[3] = Name[4] = 0x1337;
res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, NULL, NULL, Name, &Len);
- ok(!res, "query atom %x\n", res);
- ok(Len == 6, "wrong length %u\n", Len);
+ ok(!res, "query atom %lx\n", res);
+ ok(Len == 6, "wrong length %lu\n", Len);
ok(!memcmp(Name, testAtom2, Len), "wrong atom string\n");
ok(!Name[3], "wrong string termination\n");
ok(Name[4] == 0x1337, "buffer overwrite\n");
@@ -214,75 +215,75 @@ static void test_NtAtom(void)
Len = lstrlenW(testAtom2) * sizeof(WCHAR);
memset(Name, '.', sizeof(Name));
res = pRtlQueryAtomInAtomTable( AtomTable, Atom2, NULL, NULL, Name, &Len );
- ok(!res, "query atom %x\n", res);
- ok(Len == (lstrlenW(testAtom2) - 1) * sizeof(WCHAR), "wrong length %u\n", Len);
+ ok(!res, "query atom %lx\n", res);
+ ok(Len == (lstrlenW(testAtom2) - 1) * sizeof(WCHAR), "wrong length %lu\n", Len);
ok(!memcmp(testAtom2, Name, (lstrlenW(testAtom2) - 1) * sizeof(WCHAR)), "wrong atom name\n");
ok(Name[lstrlenW(testAtom2) - 1] == '\0', "wrong char\n");
ok(Name[lstrlenW(testAtom2)] == ('.' << 8) + '.', "wrong char\n");
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom2, &testAtom);
- ok(!res, "We can't find our pinned atom!! retval: %x\n", res);
+ ok(!res, "We can't find our pinned atom!! retval: %lx\n", res);
ok(testAtom == Atom2, "We found wrong atom!!!\n");
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom);
- ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "We found the atom in our table eaven though we asked RtlEmptyAtomTable to remove it, retval: %x\n", res);
+ ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "We found the atom in our table eaven though we asked RtlEmptyAtomTable to remove it, retval: %lx\n", res);
res = pRtlAddAtomToAtomTable(AtomTable, testAtom3, &Atom3);
- ok(!res, "Unable to add atom to table, retval: %x\n", res);
+ ok(!res, "Unable to add atom to table, retval: %lx\n", res);
res = pRtlEmptyAtomTable(AtomTable, TRUE);
- ok(!res, "Unable to empty atom table, retval: %x\n", res);
+ ok(!res, "Unable to empty atom table, retval: %lx\n", res);
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom2, &testAtom);
- ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "The pinned atom should be removed, retval: %x\n", res);
+ ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "The pinned atom should be removed, retval: %lx\n", res);
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom3, &testAtom);
- ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Non pinned atom should also be removed, retval: %x\n", res);
+ ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Non pinned atom should also be removed, retval: %lx\n", res);
res = pRtlDestroyAtomTable(AtomTable);
- ok(!res, "Can't destroy atom table, retval: %x\n", res);
+ ok(!res, "Can't destroy atom table, retval: %lx\n", res);
}
AtomTable = NULL;
res = pRtlCreateAtomTable(37, &AtomTable);
- ok(!res, "Unable to create atom table, retval: %x\n", res);
+ ok(!res, "Unable to create atom table, retval: %lx\n", res);
if (!res)
{
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom);
- ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Didn't get expected retval with querying an empty atom table, retval: %x\n", res);
+ ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Didn't get expected retval with querying an empty atom table, retval: %lx\n", res);
res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom1);
- ok(!res, "Unable to add atom to atom table, retval %x\n", res);
+ ok(!res, "Unable to add atom to atom table, retval %lx\n", res);
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom);
- ok(!res, "Can't find previously added atom in table, retval: %x\n", res);
- ok(testAtom == Atom1, "Found wrong atom! retval: %x\n", res);
+ ok(!res, "Can't find previously added atom in table, retval: %lx\n", res);
+ ok(testAtom == Atom1, "Found wrong atom! retval: %lx\n", res);
res = pRtlDeleteAtomFromAtomTable(AtomTable, Atom1);
- ok(!res, "Unable to delete atom from table, retval: %x\n", res);
+ ok(!res, "Unable to delete atom from table, retval: %lx\n", res);
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom);
- ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Able to find previously deleted atom in table, retval: %x\n", res);
+ ok(res == STATUS_OBJECT_NAME_NOT_FOUND, "Able to find previously deleted atom in table, retval: %lx\n", res);
res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom1);
- ok(!res, "Unable to add atom to atom table, retval: %x\n", res);
+ ok(!res, "Unable to add atom to atom table, retval: %lx\n", res);
Len = 0;
res = pRtlQueryAtomInAtomTable(AtomTable, Atom1, NULL, NULL, Name, &Len);
- ok(res == STATUS_BUFFER_TOO_SMALL, "Got wrong retval, retval: %x\n", res);
- ok((lstrlenW(testAtom1) * sizeof(WCHAR)) == Len || broken(!Len) /* nt4 */, "Got wrong length %x\n", Len);
+ ok(res == STATUS_BUFFER_TOO_SMALL, "Got wrong retval, retval: %lx\n", res);
+ ok((lstrlenW(testAtom1) * sizeof(WCHAR)) == Len || broken(!Len) /* nt4 */, "Got wrong length %lx\n", Len);
if (!Len) pNtAddAtomNT4 = (void *)pNtAddAtom;
res = pRtlPinAtomInAtomTable(AtomTable, Atom1);
- ok(!res, "Unable to pin atom in atom table, retval: %x\n", res);
+ ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res);
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom);
- ok(!res, "Unable to find atom in atom table, retval: %x\n", res);
+ ok(!res, "Unable to find atom in atom table, retval: %lx\n", res);
ok(testAtom == Atom1, "Wrong atom found\n");
res = pRtlDeleteAtomFromAtomTable(AtomTable, Atom1);
- ok(res == STATUS_WAS_LOCKED, "Unable to delete atom from table, retval: %x\n", res);
+ ok(res == STATUS_WAS_LOCKED, "Unable to delete atom from table, retval: %lx\n", res);
res = pRtlLookupAtomInAtomTable(AtomTable, testAtom1, &testAtom);
ok(!res, "Able to find deleted atom in table\n");
@@ -305,82 +306,82 @@ static void test_NtIntAtom(void)
AtomTable = NULL;
res = pRtlCreateAtomTable(37, &AtomTable);
- ok(!res, "Unable to create atom table, %x\n", res);
+ ok(!res, "Unable to create atom table, %lx\n", res);
if (!res)
{
/* According to the kernel32 functions, integer atoms are only allowed from
* 0x0001 to 0xbfff and not 0xc000 to 0xffff, which is correct */
res = pRtlAddAtomToAtomTable(AtomTable, NULL, &testAtom);
- ok(res == STATUS_INVALID_PARAMETER, "Didn't get expected result from adding 0 int atom, retval: %x\n", res);
+ ok(res == STATUS_INVALID_PARAMETER, "Didn't get expected result from adding 0 int atom, retval: %lx\n", res);
for (i = 1; i <= 0xbfff; i++)
{
res = pRtlAddAtomToAtomTable(AtomTable, (LPWSTR)i, &testAtom);
- ok(!res, "Unable to add valid integer atom %li, retval: %x\n", i, res);
+ ok(!res, "Unable to add valid integer atom %Ii, retval: %lx\n", i, res);
}
for (i = 1; i <= 0xbfff; i++)
{
res = pRtlLookupAtomInAtomTable(AtomTable, (LPWSTR)i, &testAtom);
- ok(!res, "Unable to find int atom %li, retval: %x\n", i, res);
+ ok(!res, "Unable to find int atom %Ii, retval: %lx\n", i, res);
if (!res)
{
res = pRtlPinAtomInAtomTable(AtomTable, testAtom);
- ok(!res, "Unable to pin int atom %li, retval: %x\n", i, res);
+ ok(!res, "Unable to pin int atom %Ii, retval: %lx\n", i, res);
}
}
for (i = 0xc000; i <= 0xffff; i++)
{
res = pRtlAddAtomToAtomTable(AtomTable, (LPWSTR)i, &testAtom);
- ok(res, "Able to illeageal integer atom %li, retval: %x\n", i, res);
+ ok(res, "Able to illeageal integer atom %Ii, retval: %lx\n", i, res);
}
res = pRtlDestroyAtomTable(AtomTable);
- ok(!res, "Unable to destroy atom table, retval: %x\n", res);
+ ok(!res, "Unable to destroy atom table, retval: %lx\n", res);
}
AtomTable = NULL;
res = pRtlCreateAtomTable(37, &AtomTable);
- ok(!res, "Unable to create atom table, %x\n", res);
+ ok(!res, "Unable to create atom table, %lx\n", res);
if (!res)
{
res = pRtlLookupAtomInAtomTable(AtomTable, (PWSTR)123, &testAtom);
- ok(!res, "Unable to query atom in atom table, retval: %x\n", res);
+ ok(!res, "Unable to query atom in atom table, retval: %lx\n", res);
res = pRtlAddAtomToAtomTable(AtomTable, testAtomInt, &testAtom);
- ok(!res, "Unable to add int atom to table, retval: %x\n", res);
+ ok(!res, "Unable to add int atom to table, retval: %lx\n", res);
res = pRtlAddAtomToAtomTable(AtomTable, testAtomIntInv, &testAtom);
- ok(!res, "Unable to add int atom to table, retval: %x\n", res);
+ ok(!res, "Unable to add int atom to table, retval: %lx\n", res);
res = pRtlAddAtomToAtomTable(AtomTable, (PWSTR)123, &testAtom);
- ok(!res, "Unable to add int atom to table, retval: %x\n", res);
+ ok(!res, "Unable to add int atom to table, retval: %lx\n", res);
res = pRtlAddAtomToAtomTable(AtomTable, (PWSTR)123, &testAtom);
- ok(!res, "Unable to re-add int atom to table, retval: %x\n", res);
+ ok(!res, "Unable to re-add int atom to table, retval: %lx\n", res);
Len = 64;
res = pRtlQueryAtomInAtomTable(AtomTable, testAtom, &RefCount, &PinCount, Name, &Len);
- ok(!res, "Unable to query atom in atom table, retval: %x\n", res);
- ok(PinCount == 1, "Expected pincount 1 but got %x\n", PinCount);
- ok(RefCount == 1, "Expected refcount 1 but got %x\n", RefCount);
+ ok(!res, "Unable to query atom in atom table, retval: %lx\n", res);
+ ok(PinCount == 1, "Expected pincount 1 but got %lx\n", PinCount);
+ ok(RefCount == 1, "Expected refcount 1 but got %lx\n", RefCount);
ok(!lstrcmpW(testAtomOTT, Name), "Got wrong atom name\n");
- ok((lstrlenW(testAtomOTT) * sizeof(WCHAR)) == Len, "Got wrong len %d\n", Len);
+ ok((lstrlenW(testAtomOTT) * sizeof(WCHAR)) == Len, "Got wrong len %ld\n", Len);
res = pRtlPinAtomInAtomTable(AtomTable, testAtom);
- ok(!res, "Unable to pin int atom, retval: %x\n", res);
+ ok(!res, "Unable to pin int atom, retval: %lx\n", res);
res = pRtlPinAtomInAtomTable(AtomTable, testAtom);
- ok(!res, "Unable to pin int atom, retval: %x\n", res);
+ ok(!res, "Unable to pin int atom, retval: %lx\n", res);
res = pRtlQueryAtomInAtomTable(AtomTable, testAtom, &RefCount, &PinCount, NULL, NULL);
- ok(!res, "Unable to query atom in atom table, retval: %x\n", res);
- ok(PinCount == 1, "Expected pincount 1 but got %x\n", PinCount);
- ok(RefCount == 1, "Expected refcount 1 but got %x\n", RefCount);
+ ok(!res, "Unable to query atom in atom table, retval: %lx\n", res);
+ ok(PinCount == 1, "Expected pincount 1 but got %lx\n", PinCount);
+ ok(RefCount == 1, "Expected refcount 1 but got %lx\n", RefCount);
res = pRtlDestroyAtomTable(AtomTable);
- ok(!res, "Unable to destroy atom table, retval: %x\n", res);
+ ok(!res, "Unable to destroy atom table, retval: %lx\n", res);
}
}
@@ -394,40 +395,40 @@ static void test_NtRefPinAtom(void)
AtomTable = NULL;
res = pRtlCreateAtomTable(37, &AtomTable);
- ok(!res, "Unable to create atom table, %x\n", res);
+ ok(!res, "Unable to create atom table, %lx\n", res);
if (!res)
{
res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom);
- ok(!res, "Unable to add our atom to the atom table, retval: %x\n", res);
+ ok(!res, "Unable to add our atom to the atom table, retval: %lx\n", res);
res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom);
- ok(!res, "Unable to add our atom to the atom table, retval: %x\n", res);
+ ok(!res, "Unable to add our atom to the atom table, retval: %lx\n", res);
res = pRtlAddAtomToAtomTable(AtomTable, testAtom1, &Atom);
- ok(!res, "Unable to add our atom to the atom table, retval: %x\n", res);
+ ok(!res, "Unable to add our atom to the atom table, retval: %lx\n", res);
res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, NULL, NULL);
- ok(!res, "Unable to query atom in atom table, retval: %x\n", res);
- ok(PinCount == 0, "Expected pincount 0 but got %x\n", PinCount);
- ok(RefCount == 3, "Expected refcount 3 but got %x\n", RefCount);
+ ok(!res, "Unable to query atom in atom table, retval: %lx\n", res);
+ ok(PinCount == 0, "Expected pincount 0 but got %lx\n", PinCount);
+ ok(RefCount == 3, "Expected refcount 3 but got %lx\n", RefCount);
res = pRtlPinAtomInAtomTable(AtomTable, Atom);
- ok(!res, "Unable to pin atom in atom table, retval: %x\n", res);
+ ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res);
res = pRtlPinAtomInAtomTable(AtomTable, Atom);
- ok(!res, "Unable to pin atom in atom table, retval: %x\n", res);
+ ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res);
res = pRtlPinAtomInAtomTable(AtomTable, Atom);
- ok(!res, "Unable to pin atom in atom table, retval: %x\n", res);
+ ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res);
res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, NULL, NULL);
- ok(!res, "Unable to query atom in atom table, retval: %x\n", res);
- ok(PinCount == 1, "Expected pincount 1 but got %x\n", PinCount);
- ok(RefCount == 3, "Expected refcount 3 but got %x\n", RefCount);
+ ok(!res, "Unable to query atom in atom table, retval: %lx\n", res);
+ ok(PinCount == 1, "Expected pincount 1 but got %lx\n", PinCount);
+ ok(RefCount == 3, "Expected refcount 3 but got %lx\n", RefCount);
res = pRtlDestroyAtomTable(AtomTable);
- ok(!res, "Unable to destroy atom table, retval: %x\n", res);
+ ok(!res, "Unable to destroy atom table, retval: %lx\n", res);
}
}
@@ -444,7 +445,7 @@ static void test_Global(void)
else
res = pNtAddAtom(testAtom1, lstrlenW(testAtom1) * sizeof(WCHAR), &atom);
- ok(!res, "Added atom (%x)\n", res);
+ ok(!res, "Added atom (%lx)\n", res);
memset( ptr, 0xcc, sizeof(ptr) );
res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL );
@@ -456,14 +457,14 @@ static void test_Global(void)
ptr_size = sizeof(ATOM_BASIC_INFORMATION);
res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL );
- ok(res == STATUS_BUFFER_TOO_SMALL, "wrong return status (%x)\n", res);
+ ok(res == STATUS_BUFFER_TOO_SMALL, "wrong return status (%lx)\n", res);
ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR) || broken(abi->NameLength == sizeof(WCHAR)), /* nt4 */
"string length %u\n",abi->NameLength);
memset( ptr, 0xcc, sizeof(ptr) );
ptr_size = sizeof(ATOM_BASIC_INFORMATION) + lstrlenW(testAtom1) * sizeof(WCHAR);
res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL );
- ok(!res, "atom lookup %x\n", res);
+ ok(!res, "atom lookup %lx\n", res);
ok(!lstrcmpW(abi->Name, testAtom1), "strings don't match\n");
ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR), "wrong string length\n");
ok(abi->Name[lstrlenW(testAtom1)] == 0, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1)]);
1
0
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
loader/wine.inf.in | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 0e488d87dcb..3e6194a3929 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -71,6 +71,7 @@ AddReg=\
Services, \
SessionMgr,\
Tapi,\
+ ThemeManager,\
Timezones,\
LicenseInformation
@@ -95,6 +96,7 @@ AddReg=\
Services, \
SessionMgr,\
Tapi,\
+ ThemeManager,\
Timezones,\
VersionInfo,\
LicenseInformation
@@ -121,6 +123,7 @@ AddReg=\
Services, \
SessionMgr,\
Tapi,\
+ ThemeManager,\
Timezones,\
VersionInfo.ntamd64,\
LicenseInformation
@@ -147,6 +150,7 @@ AddReg=\
Services, \
SessionMgr,\
Tapi,\
+ ThemeManager,\
Timezones,\
VersionInfo.ntamd64,\
LicenseInformation
@@ -5494,6 +5498,12 @@ ServiceType=32
StartType=3
ErrorControl=1
+[ThemeManager]
+HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","ThemeActive",2,"1"
+HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","DllName",2,"%10%\resources\themes\light\light.msstyles"
+HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","ColorName",2,"Blue"
+HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","SizeName",2,"NormalSize"
+
[WinmgmtService]
Description="Provides access to Windows Management Instrumentation"
DisplayName="Windows Management Instrumentation Service"
--
2.32.0
3
4
Re: [PATCH vkd3d v3 2/8] vkd3d-shader/hlsl: Add default writemask for matrix stores.
by Zebediah Figura 17 Mar '22
by Zebediah Figura 17 Mar '22
17 Mar '22
On 3/7/22 09:09, Francisco Casas wrote:
> Hello,
>
> March 4, 2022 10:01 PM, "Zebediah Figura (she/her)" <zfigura(a)codeweavers.com> wrote:
>
>> On 3/2/22 12:31, Francisco Casas wrote:
>>
>>> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
>>> ---
>>> v3:
>>> - This patch is new.
>>> - While we don't use the default writemask for matrices (yet),
>>> I think it is good for consistency, since we are getting rid
>>> of the type_is_single_reg() function.
>>> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
>>> ---
>>> libs/vkd3d-shader/hlsl.c | 12 ++++++++----
>>> 1 file changed, 8 insertions(+), 4 deletions(-)
>>> diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
>>> index 00a374b4..5152aec4 100644
>>> --- a/libs/vkd3d-shader/hlsl.c
>>> +++ b/libs/vkd3d-shader/hlsl.c
>>> @@ -527,9 +527,13 @@ struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char
>>> *nam
>>> return var;
>>> }
>>>> -static bool type_is_single_reg(const struct hlsl_type *type)
>>> +static unsigned int type_default_writemask(const struct hlsl_type *type)
>>> - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR;
>>> + if (type->type == HLSL_CLASS_MATRIX && hlsl_type_is_row_major(type))
>>> + return (1 << type->dimy) - 1;
>>
>> I don't understand the logic here. A nonzero writemask should encompass the whole type, which this
>> does not. Why do we need this?
>>
>
> Well, I am not totally sure this patch is actually necessary, I just
> thought it could be a good default behavior since we are getting rid of
> hlsl_is_single_reg(), but maybe I am overthinking...
FWIW, I don't know that that instance of type_is_single_reg()
necessarily needs to go away. Although given 1/8, we could certainly say
that a zero writemask always means the whole variable, and let
hlsl_reg_from_deref() deal with that even for scalar and vector types.
>
> As you know, if we have a HLSL_IR_STORE with a whole matrix in the rhs,
> we have to split it in up to 4 stores, each one with a writemask that
> matches the result of this type_default_writemask() here.
Well, yeah, but we should be using the result type in that case, i.e.
vectors rather than matrices.
>
> The patch from Giovanni that implements this split_matrix_copies()
> pass (which is many patches ahead), makes sure to do it with only vectors
> in the rhs.
>
> But currently, if I am not mistaken (I could be), a HLSL_IR_STORE with a
> matrix in the rhs is producing a single MOV instruction for the first
> register that the matrix uses. Which maybe could be problematic in sm4
> with matrices with major size =1 and minor size <4.
Currently it's not producing anything, actually; we have a FIXME for
that case in write_sm[14]_instructions().
>
> I added this default behavior thinking on those cases (if they could actually
> happen), and maybe because I thought it could be useful in the future if for
> some reason we wanted to implement split_matrix_copies() in other way, by
> directly copying the store instructions.
>
> But well, maybe I'll just do
> ---
> if (!writemask && (type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR))
> writemask = (1 << rhs->data_type->dimx) - 1;
> ---
> or remove the patch altogether in the next version of the batch.
>
>
> Best regards,
> Francisco
2
1
[PATCH vkd3d v3 1/8] vkd3d-shader/hlsl: Allow offsets for scalar and vector variables.
by Francisco Casas 17 Mar '22
by Francisco Casas 17 Mar '22
17 Mar '22
From: Giovanni Mascellani <gmascellani(a)codeweavers.com>
Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
---
v3:
- In v3, this patch replaces
vkd3d-shader/hlsl: Move type_is_single_reg() to hlsl.h and
rename it to hlsl_type_uses_writemask().
This in order to simplify numeric variable initializations later.
Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
---
libs/vkd3d-shader/hlsl.h | 3 +--
libs/vkd3d-shader/hlsl_codegen.c | 22 +++++-----------------
libs/vkd3d-shader/hlsl_sm1.c | 4 ++--
libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++++-----
4 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 243ed72b..1fd5dc58 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -793,8 +793,7 @@ unsigned int hlsl_swizzle_from_writemask(unsigned int writemask);
bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset);
unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref);
-struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref,
- const struct hlsl_type *type);
+struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref);
bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context);
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 837d39e3..d25e0ff5 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -1542,11 +1542,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type)
}
}
-static bool type_is_single_reg(const struct hlsl_type *type)
-{
- return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR;
-}
-
bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset)
{
struct hlsl_ir_node *offset_node = deref->offset.node;
@@ -1589,8 +1584,7 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl
return 0;
}
-struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref,
- const struct hlsl_type *type)
+struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref)
{
const struct hlsl_ir_var *var = deref->var;
struct hlsl_reg ret = var->reg;
@@ -1598,16 +1592,10 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere
ret.id += offset / 4;
- if (type_is_single_reg(var->data_type))
- {
- assert(!offset);
- ret.writemask = var->reg.writemask;
- }
- else
- {
- assert(type_is_single_reg(type));
- ret.writemask = ((1 << type->dimx) - 1) << (offset % 4);
- }
+ ret.writemask = 0xf & (0xf << (offset % 4));
+ if (var->reg.writemask)
+ ret.writemask = hlsl_combine_writemasks(var->reg.writemask, ret.writemask);
+
return ret;
}
diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c
index 90ec6058..f661dbc2 100644
--- a/libs/vkd3d-shader/hlsl_sm1.c
+++ b/libs/vkd3d-shader/hlsl_sm1.c
@@ -663,7 +663,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b
static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr)
{
const struct hlsl_ir_load *load = hlsl_ir_load(instr);
- const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src, instr->data_type);
+ const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src);
struct sm1_instruction sm1_instr =
{
.opcode = D3DSIO_MOV,
@@ -707,7 +707,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *
{
const struct hlsl_ir_store *store = hlsl_ir_store(instr);
const struct hlsl_ir_node *rhs = store->rhs.node;
- const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs, rhs->data_type);
+ const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs);
struct sm1_instruction sm1_instr =
{
.opcode = D3DSIO_MOV,
diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
index 6996bb2d..802db3c1 100644
--- a/libs/vkd3d-shader/hlsl_sm4.c
+++ b/libs/vkd3d-shader/hlsl_sm4.c
@@ -870,6 +870,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r
if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, ®->type, swizzle_type, &has_idx))
{
+ unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref);
+
if (has_idx)
{
reg->idx[0] = var->semantic.index;
@@ -877,11 +879,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r
}
reg->dim = VKD3D_SM4_DIMENSION_VEC4;
- *writemask = (1u << data_type->dimx) - 1;
+ *writemask = ((1u << data_type->dimx) - 1) << (offset % 4);
}
else
{
- struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type);
+ struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref);
assert(hlsl_reg.allocated);
reg->type = VKD3D_SM4_RT_INPUT;
@@ -899,6 +901,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r
if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, ®->type, swizzle_type, &has_idx))
{
+ unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref);
+
if (has_idx)
{
reg->idx[0] = var->semantic.index;
@@ -909,11 +913,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r
reg->dim = VKD3D_SM4_DIMENSION_SCALAR;
else
reg->dim = VKD3D_SM4_DIMENSION_VEC4;
- *writemask = (1u << data_type->dimx) - 1;
+ *writemask = ((1u << data_type->dimx) - 1) << (offset % 4);
}
else
{
- struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type);
+ struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref);
assert(hlsl_reg.allocated);
reg->type = VKD3D_SM4_RT_OUTPUT;
@@ -925,7 +929,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r
}
else
{
- struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type);
+ struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref);
assert(hlsl_reg.allocated);
reg->type = VKD3D_SM4_RT_TEMP;
--
2.25.1
3
2
Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com>
---
po/fi.po | 104 ++++++++++++++++++-------------------------------------
1 file changed, 33 insertions(+), 71 deletions(-)
diff --git a/po/fi.po b/po/fi.po
index de3434f4d3d..be14b9b2ebd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: Wine\n"
"Report-Msgid-Bugs-To: https://bugs.winehq.org\n"
"POT-Creation-Date: N/A\n"
-"PO-Revision-Date: 2020-06-17 12:10+0300\n"
+"PO-Revision-Date: 2022-03-17 20:32+0200\n"
"Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n"
"Language-Team: Finnish\n"
"Language: fi\n"
@@ -10519,16 +10519,16 @@ msgstr "(UTC-03:00) Saint-Pierre ja Miquelon"
#: dlls/tzres/tzres.rc:327
msgctxt "maximum 31 characters"
msgid "Sao Tome Standard Time"
-msgstr "Sao Tomen normaaliaika"
+msgstr "São Tomén normaaliaika"
#: dlls/tzres/tzres.rc:328
msgctxt "maximum 31 characters"
msgid "Sao Tome Daylight Time"
-msgstr "Sao Tomen kesäaika"
+msgstr "São Tomén kesäaika"
#: dlls/tzres/tzres.rc:329
msgid "(UTC+00:00) Sao Tome"
-msgstr "(UTC+00:00) Sao Tome"
+msgstr "(UTC+00:00) São Tomé"
#: dlls/tzres/tzres.rc:249
msgctxt "maximum 31 characters"
@@ -10559,18 +10559,14 @@ msgid "(UTC+13:00) Nuku'alofa"
msgstr "(UTC+13:00) Nuku'alofa"
#: dlls/tzres/tzres.rc:240
-#, fuzzy
-#| msgid "Mountain Standard Time (Mexico)"
msgctxt "maximum 31 characters"
msgid "Mountain Standard Time (Mexico)"
-msgstr "Kalliovuorten normaaliaika (Meksiko)"
+msgstr "Kalliovuorten norm.aika (Meks.)"
#: dlls/tzres/tzres.rc:241
-#, fuzzy
-#| msgid "Mountain Daylight Time (Mexico)"
msgctxt "maximum 31 characters"
msgid "Mountain Daylight Time (Mexico)"
-msgstr "Kalliovuorten kesäaika (Meksiko)"
+msgstr "Kalliovuorten kesäaika (Meks.)"
#: dlls/tzres/tzres.rc:242
msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan"
@@ -10782,11 +10778,9 @@ msgid "(UTC+02:00) Kaliningrad"
msgstr "(UTC+02:00) Kaliningrad"
#: dlls/tzres/tzres.rc:282
-#, fuzzy
-#| msgid "Pacific Standard Time (Mexico)"
msgctxt "maximum 31 characters"
msgid "Pacific Standard Time (Mexico)"
-msgstr "Tyynenmeren normaaliaika (Meksiko)"
+msgstr "Tyynenmeren norm.aika (Meksiko)"
#: dlls/tzres/tzres.rc:283
msgctxt "maximum 31 characters"
@@ -10919,11 +10913,9 @@ msgid "(UTC-01:00) Azores"
msgstr "(UTC-01:00) Azorit"
#: dlls/tzres/tzres.rc:264
-#, fuzzy
-#| msgid "North Asia East Standard Time"
msgctxt "maximum 31 characters"
msgid "North Asia East Standard Time"
-msgstr "Itäisen Pohjois-Aasian normaaliaika"
+msgstr "It. Pohjois-Aasian normaaliaika"
#: dlls/tzres/tzres.rc:265
msgctxt "maximum 31 characters"
@@ -10958,18 +10950,14 @@ msgid "(UTC-03:00) City of Buenos Aires"
msgstr "(UTC-03:00) Buenos Aires"
#: dlls/tzres/tzres.rc:378
-#, fuzzy
-#| msgid "Turks And Caicos Standard Time"
msgctxt "maximum 31 characters"
msgid "Turks And Caicos Standard Time"
-msgstr "Turks- ja Caicossaarten normaaliaika"
+msgstr "Turks ja Caicos, normaaliaika"
#: dlls/tzres/tzres.rc:379
-#, fuzzy
-#| msgid "Turks And Caicos Daylight Time"
msgctxt "maximum 31 characters"
msgid "Turks And Caicos Daylight Time"
-msgstr "Turks- ja Caicossaarten kesäaika"
+msgstr "Turks ja Caicos, kesäaika"
#: dlls/tzres/tzres.rc:380
msgid "(UTC-05:00) Turks and Caicos"
@@ -11209,11 +11197,9 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney"
msgstr "(UTC+10:00) Canberra, Melbourne, Sydney"
#: dlls/tzres/tzres.rc:246
-#, fuzzy
-#| msgid "N. Central Asia Standard Time"
msgctxt "maximum 31 characters"
msgid "N. Central Asia Standard Time"
-msgstr "Pohjoisen Keski-Aasian normaaliaika"
+msgstr "Pohj. Keski-Aasian normaaliaika"
#: dlls/tzres/tzres.rc:247
msgctxt "maximum 31 characters"
@@ -11402,11 +11388,9 @@ msgid "(UTC-02:00) Coordinated Universal Time-02"
msgstr "(UTC-02:00) Koordinoitu yleisaika -02"
#: dlls/tzres/tzres.rc:387
-#, fuzzy
-#| msgid "US Mountain Standard Time"
msgctxt "maximum 31 characters"
msgid "US Mountain Standard Time"
-msgstr "Kalliovuorten normaaliaika (USA)"
+msgstr "Kalliovuorten norm.aika (USA)"
#: dlls/tzres/tzres.rc:388
msgctxt "maximum 31 characters"
@@ -11497,16 +11481,14 @@ msgid "(UTC+09:00) Yakutsk"
msgstr "(UTC+09:00) Jakutsk"
#: dlls/tzres/tzres.rc:309
-#, fuzzy
-#| msgid "SA Eastern Standard Time"
msgctxt "maximum 31 characters"
msgid "SA Eastern Standard Time"
-msgstr "Etelä-Amerikan itäinen normaaliaika"
+msgstr "Etelä-Am. itäinen vyöhyke"
#: dlls/tzres/tzres.rc:310
msgctxt "maximum 31 characters"
msgid "SA Eastern Daylight Time"
-msgstr "Etelä-Amerikan itäinen kesäaika"
+msgstr "Etelä-Am. itäinen kesäaika"
#: dlls/tzres/tzres.rc:311
msgid "(UTC-03:00) Cayenne, Fortaleza"
@@ -11552,7 +11534,7 @@ msgstr "Tocantinsin kesäaika"
#: dlls/tzres/tzres.rc:362
msgid "(UTC-03:00) Araguaina"
-msgstr "(UTC-03:00) Araguaina"
+msgstr "(UTC-03:00) Araguaína"
#: dlls/tzres/tzres.rc:306
msgctxt "maximum 31 characters"
@@ -11569,11 +11551,9 @@ msgid "(UTC+03:00) Moscow, St. Petersburg"
msgstr "(UTC+03:00) Moskova, Pietari"
#: dlls/tzres/tzres.rc:63
-#, fuzzy
-#| msgid "Aus Central W. Standard Time"
msgctxt "maximum 31 characters"
msgid "Aus Central W. Standard Time"
-msgstr "Australian keskilännen normaaliaika"
+msgstr "Australian keskilännen vyöhyke"
#: dlls/tzres/tzres.rc:64
msgctxt "maximum 31 characters"
@@ -11596,7 +11576,7 @@ msgstr "Romaaninen kesäaika"
#: dlls/tzres/tzres.rc:296
msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris"
-msgstr "(UTC+01:00) Brysseli, Kööpenhamina, Madrid, Pariisi"
+msgstr "(UTC+01:00) Bryssel, Kööpenhamina, Madrid, Pariisi"
#: dlls/tzres/tzres.rc:159
msgctxt "maximum 31 characters"
@@ -11624,12 +11604,12 @@ msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamtšatski"
#: dlls/tzres/tzres.rc:435
msgctxt "maximum 31 characters"
msgid "West Bank Standard Time"
-msgstr "Länsirannikon normaaliaika"
+msgstr "Länsirannan ja Gazan norm.ika"
#: dlls/tzres/tzres.rc:436
msgctxt "maximum 31 characters"
msgid "West Bank Daylight Time"
-msgstr "Länsirannikon kesäaika"
+msgstr "Länsirannan ja Gazan kesäaika"
#: dlls/tzres/tzres.rc:437
msgid "(UTC+02:00) Gaza, Hebron"
@@ -11650,11 +11630,9 @@ msgid "(UTC+02:00) Damascus"
msgstr "(UTC+02:00) Damaskos"
#: dlls/tzres/tzres.rc:60
-#, fuzzy
-#| msgid "AUS Central Standard Time"
msgctxt "maximum 31 characters"
msgid "AUS Central Standard Time"
-msgstr "Australian keskinen normaaliaika"
+msgstr "Australian keskinen norm.aika"
#: dlls/tzres/tzres.rc:61
msgctxt "maximum 31 characters"
@@ -11710,12 +11688,12 @@ msgstr "(UTC+11:00) Norfolkinsaari"
#: dlls/tzres/tzres.rc:195
msgctxt "maximum 31 characters"
msgid "Israel Standard Time"
-msgstr "Israelin normaaliaika"
+msgstr "Jerusalemin normaaliaika"
#: dlls/tzres/tzres.rc:196
msgctxt "maximum 31 characters"
msgid "Israel Daylight Time"
-msgstr "Israelin kesäaika"
+msgstr "Jerusalemin kesäaika"
#: dlls/tzres/tzres.rc:197
msgid "(UTC+02:00) Jerusalem"
@@ -11736,18 +11714,14 @@ msgid "(UTC+06:00) Dhaka"
msgstr "(UTC+06:00) Dhaka"
#: dlls/tzres/tzres.rc:312
-#, fuzzy
-#| msgid "SA Pacific Standard Time"
msgctxt "maximum 31 characters"
msgid "SA Pacific Standard Time"
-msgstr "Etelä-Amerikan Tyynenmeren normaaliaika"
+msgstr "Etelä-Am. Tyynenmeren norm.aika"
#: dlls/tzres/tzres.rc:313
-#, fuzzy
-#| msgid "SA Pacific Daylight Time"
msgctxt "maximum 31 characters"
msgid "SA Pacific Daylight Time"
-msgstr "Etelä-Amerikan Tyynenmeren kesäaika"
+msgstr "Etelä-Am. Tyynenmeren kesäaika"
#: dlls/tzres/tzres.rc:314
msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco"
@@ -11793,7 +11767,7 @@ msgstr "Paraguayn kesäaika"
#: dlls/tzres/tzres.rc:290
msgid "(UTC-04:00) Asuncion"
-msgstr "(UTC-04:00) Asuncion"
+msgstr "(UTC-04:00) Asunción"
#: dlls/tzres/tzres.rc:132
msgctxt "maximum 31 characters"
@@ -11992,18 +11966,14 @@ msgid "(UTC+03:00) Minsk"
msgstr "(UTC+03:00) Minsk"
#: dlls/tzres/tzres.rc:315
-#, fuzzy
-#| msgid "SA Western Standard Time"
msgctxt "maximum 31 characters"
msgid "SA Western Standard Time"
-msgstr "Etelä-Amerikan läntinen normaaliaika"
+msgstr "Etelä-Am. läntinen normaaliaika"
#: dlls/tzres/tzres.rc:316
-#, fuzzy
-#| msgid "SA Western Daylight Time"
msgctxt "maximum 31 characters"
msgid "SA Western Daylight Time"
-msgstr "Etelä-Amerikan läntinen kesäaika"
+msgstr "Etelä-Am. läntinen kesäaika"
#: dlls/tzres/tzres.rc:317
msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan"
@@ -12173,16 +12143,14 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius"
msgstr "(UTC+02:00) Helsinki, Kiova, Riika, Sofia, Tallinna, Vilna"
#: dlls/tzres/tzres.rc:144
-#, fuzzy
-#| msgid "E. South America Standard Time"
msgctxt "maximum 31 characters"
msgid "E. South America Standard Time"
-msgstr "Itäisen Etelä-Amerikan normaaliaika"
+msgstr "Itäisen Etelä-Am. vyöhyke"
#: dlls/tzres/tzres.rc:145
msgctxt "maximum 31 characters"
msgid "E. South America Daylight Time"
-msgstr "Itäisen Etelä-Amerikan kesäaika"
+msgstr "Itäisen Etelä-Am. kesäaika"
#: dlls/tzres/tzres.rc:146
msgid "(UTC-03:00) Brasilia"
@@ -12203,11 +12171,9 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia"
msgstr "(UTC+11:00) Salomonsaaret, Uusi-Kaledonia"
#: dlls/tzres/tzres.rc:423
-#, fuzzy
-#| msgid "W. Central Africa Standard Time"
msgctxt "maximum 31 characters"
msgid "W. Central Africa Standard Time"
-msgstr "Läntisen Keski-Afrikan normaaliaika"
+msgstr "Läntis. Keski-Afrikan norm.aika"
#: dlls/tzres/tzres.rc:424
msgctxt "maximum 31 characters"
@@ -12216,21 +12182,17 @@ msgstr "Läntisen Keski-Afrikan kesäaika"
#: dlls/tzres/tzres.rc:425
msgid "(UTC+01:00) West Central Africa"
-msgstr "(UTC+01:00) Länsi-Afrikan aika"
+msgstr "(UTC+01:00) Läntinen Keski-Afrikka"
#: dlls/tzres/tzres.rc:276
-#, fuzzy
-#| msgid "Pacific SA Standard Time"
msgctxt "maximum 31 characters"
msgid "Pacific SA Standard Time"
-msgstr "Tyynenmeren Etelä-Amerikan normaaliaika"
+msgstr "Tyynenmeren Etelä-Am. norm.aika"
#: dlls/tzres/tzres.rc:277
-#, fuzzy
-#| msgid "Pacific SA Daylight Time"
msgctxt "maximum 31 characters"
msgid "Pacific SA Daylight Time"
-msgstr "Tyynenmeren Etelä-Amerikan kesäaika"
+msgstr "Tyynenmeren Etelä-Am. kesäaika"
#: dlls/tzres/tzres.rc:278
msgid "(UTC-04:00) Santiago"
--
2.35.1
1
0
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsamidi.c | 41 ++++++++++++++++++++++++++++++++++--
dlls/winealsa.drv/midi.c | 36 -------------------------------
dlls/winealsa.drv/unixlib.h | 15 ++-----------
3 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index f3de2a5ce07..b99c3aedd33 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -48,6 +48,17 @@
WINE_DEFAULT_DEBUG_CHANNEL(midi);
+struct midi_dest
+{
+ BOOL bEnabled;
+ MIDIOPENDESC midiDesc;
+ WORD wFlags;
+ MIDIOUTCAPSW caps;
+ snd_seq_t *seq;
+ snd_seq_addr_t addr;
+ int port_out;
+};
+
static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER;
static unsigned int num_dests, num_srcs;
@@ -353,9 +364,7 @@ NTSTATUS midi_init(void *args)
free( pinfo );
*params->err = NOERROR;
- params->num_dests = num_dests;
params->num_srcs = num_srcs;
- params->dests = dests;
params->srcs = srcs;
TRACE("End\n");
@@ -800,6 +809,31 @@ static UINT midi_out_get_volume(WORD dev_id, UINT* volume)
return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED;
}
+static UINT midi_out_reset(WORD dev_id)
+{
+ unsigned chn;
+
+ TRACE("(%04X);\n", dev_id);
+
+ if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID;
+ if (!dests[dev_id].bEnabled) return MIDIERR_NODEVICE;
+
+ /* stop all notes */
+ /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that
+ * it's channel dependent...
+ */
+ for (chn = 0; chn < 16; chn++)
+ {
+ /* turn off every note */
+ midi_out_data(dev_id, 0x7800 | MIDI_CMD_CONTROL | chn);
+ /* remove sustain on all channels */
+ midi_out_data(dev_id, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn);
+ }
+ /* FIXME: the LongData buffers must also be returned to the app */
+ return MMSYSERR_NOERROR;
+}
+
+
NTSTATUS midi_out_message(void *args)
{
struct midi_out_message_params *params = args;
@@ -844,6 +878,9 @@ NTSTATUS midi_out_message(void *args)
case MODM_SETVOLUME:
*params->err = 0;
break;
+ case MODM_RESET:
+ *params->err = midi_out_reset(params->dev_id);
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 0ed2feb41eb..53b683f59c8 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -48,10 +48,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(midi);
static WINE_MIDIIN *MidiInDev;
-static WINE_MIDIOUT *MidiOutDev;
-/* this is the total number of MIDI out devices found (synth and port) */
-static int MODM_NumDevs = 0;
/* this is the total number of MIDI out devices found */
static int MIDM_NumDevs = 0;
@@ -605,35 +602,6 @@ static DWORD midStop(WORD wDevID)
return MMSYSERR_NOERROR;
}
-/**************************************************************************
- * modReset [internal]
- */
-static DWORD modReset(WORD wDevID)
-{
- DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
- DWORD_PTR dwParam1, DWORD_PTR dwParam2);
- unsigned chn;
-
- TRACE("(%04X);\n", wDevID);
-
- if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
- if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE;
-
- /* stop all notes */
- /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that
- * it's channel dependent...
- */
- for (chn = 0; chn < 16; chn++) {
- /* turn off every note */
- ALSA_modMessage(wDevID, MODM_DATA, 0, 0x7800 | MIDI_CMD_CONTROL | chn, 0);
- /* remove sustain on all channels */
- ALSA_modMessage(wDevID, MODM_DATA, 0, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn, 0);
- }
- /* FIXME: the LongData buffers must also be returned to the app */
- return MMSYSERR_NOERROR;
-}
-
-
/*======================================================================*
* MIDI entry points *
*======================================================================*/
@@ -653,9 +621,7 @@ static BOOL ALSA_MidiInit(void)
if (!err)
{
- MODM_NumDevs = params.num_dests;
MIDM_NumDevs = params.num_srcs;
- MidiOutDev = params.dests;
MidiInDev = params.srcs;
}
return TRUE;
@@ -721,8 +687,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
case DRVM_INIT:
ALSA_MidiInit();
return 0;
- case MODM_RESET:
- return modReset(wDevID);
}
params.dev_id = wDevID;
diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h
index e3cd7123101..c1dbd83b84e 100644
--- a/dlls/winealsa.drv/unixlib.h
+++ b/dlls/winealsa.drv/unixlib.h
@@ -223,22 +223,11 @@ typedef struct midi_src
int port_in;
} WINE_MIDIIN;
-typedef struct midi_dest
-{
- BOOL bEnabled;
- MIDIOPENDESC midiDesc;
- WORD wFlags;
- MIDIOUTCAPSW caps;
- snd_seq_t *seq;
- snd_seq_addr_t addr;
- int port_out;
-} WINE_MIDIOUT;
-
struct midi_init_params
{
UINT *err;
- unsigned int num_dests, num_srcs;
- void *dests, *srcs;
+ unsigned int num_srcs;
+ void *srcs;
};
struct notify_context
--
2.25.1
2
1
[PATCH 6/7] winealsa: Move MODM_GETVOLUME and MODM_SETVOLUME to the unixlib.
by Huw Davies 17 Mar '22
by Huw Davies 17 Mar '22
17 Mar '22
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsamidi.c | 15 +++++++++++++++
dlls/winealsa.drv/midi.c | 15 ---------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index fa09626bc80..f3de2a5ce07 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -791,6 +791,15 @@ static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size)
return MMSYSERR_NOERROR;
}
+static UINT midi_out_get_volume(WORD dev_id, UINT* volume)
+{
+ if (!volume) return MMSYSERR_INVALPARAM;
+ if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID;
+
+ *volume = 0xFFFFFFFF;
+ return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED;
+}
+
NTSTATUS midi_out_message(void *args)
{
struct midi_out_message_params *params = args;
@@ -829,6 +838,12 @@ NTSTATUS midi_out_message(void *args)
case MODM_GETNUMDEVS:
*params->err = num_dests;
break;
+ case MODM_GETVOLUME:
+ *params->err = midi_out_get_volume(params->dev_id, (UINT *)params->param_1);
+ break;
+ case MODM_SETVOLUME:
+ *params->err = 0;
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 4b8062390fa..0ed2feb41eb 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -605,17 +605,6 @@ static DWORD midStop(WORD wDevID)
return MMSYSERR_NOERROR;
}
-/**************************************************************************
- * modGetVolume [internal]
- */
-static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume)
-{
- if (!lpdwVolume) return MMSYSERR_INVALPARAM;
- if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
- *lpdwVolume = 0xFFFFFFFF;
- return (MidiOutDev[wDevID].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED;
-}
-
/**************************************************************************
* modReset [internal]
*/
@@ -732,10 +721,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
case DRVM_INIT:
ALSA_MidiInit();
return 0;
- case MODM_GETVOLUME:
- return modGetVolume(wDevID, (DWORD*)dwParam1);
- case MODM_SETVOLUME:
- return 0;
case MODM_RESET:
return modReset(wDevID);
}
--
2.25.1
2
1
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsamidi.c | 3 +++
dlls/winealsa.drv/midi.c | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index 602682554c0..fa09626bc80 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -826,6 +826,9 @@ NTSTATUS midi_out_message(void *args)
case MODM_GETDEVCAPS:
*params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2);
break;
+ case MODM_GETNUMDEVS:
+ *params->err = num_dests;
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index b9b3bbf7c35..4b8062390fa 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -732,8 +732,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
case DRVM_INIT:
ALSA_MidiInit();
return 0;
- case MODM_GETNUMDEVS:
- return MODM_NumDevs;
case MODM_GETVOLUME:
return modGetVolume(wDevID, (DWORD*)dwParam1);
case MODM_SETVOLUME:
--
2.25.1
2
1
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsamidi.c | 15 +++++++++++++++
dlls/winealsa.drv/midi.c | 17 -----------------
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index bc68442a0d7..602682554c0 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -779,6 +779,18 @@ static UINT midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size)
return MMSYSERR_NOERROR;
}
+static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size)
+{
+ TRACE("(%04X, %p, %08X);\n", dev_id, caps, size);
+
+ if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID;
+ if (!caps) return MMSYSERR_INVALPARAM;
+
+ memcpy(caps, &dests[dev_id].caps, min(size, sizeof(*caps)));
+
+ return MMSYSERR_NOERROR;
+}
+
NTSTATUS midi_out_message(void *args)
{
struct midi_out_message_params *params = args;
@@ -811,6 +823,9 @@ NTSTATUS midi_out_message(void *args)
case MODM_UNPREPARE:
*params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2);
break;
+ case MODM_GETDEVCAPS:
+ *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2);
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 7329b2cd2e7..b9b3bbf7c35 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -605,21 +605,6 @@ static DWORD midStop(WORD wDevID)
return MMSYSERR_NOERROR;
}
-/**************************************************************************
- * modGetDevCaps [internal]
- */
-static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize)
-{
- TRACE("(%04X, %p, %08X);\n", wDevID, lpCaps, dwSize);
-
- if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
- if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
-
- memcpy(lpCaps, &MidiOutDev[wDevID].caps, min(dwSize, sizeof(*lpCaps)));
-
- return MMSYSERR_NOERROR;
-}
-
/**************************************************************************
* modGetVolume [internal]
*/
@@ -747,8 +732,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
case DRVM_INIT:
ALSA_MidiInit();
return 0;
- case MODM_GETDEVCAPS:
- return modGetDevCaps(wDevID, (LPMIDIOUTCAPSW)dwParam1, dwParam2);
case MODM_GETNUMDEVS:
return MODM_NumDevs;
case MODM_GETVOLUME:
--
2.25.1
2
1
17 Mar '22
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsamidi.c | 36 +++++++++++++++++++++++++++++++++
dlls/winealsa.drv/midi.c | 39 ------------------------------------
2 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index 0a3e1a80be3..bc68442a0d7 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -749,6 +749,36 @@ static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct
return MMSYSERR_NOERROR;
}
+static UINT midi_out_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size)
+{
+ TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size);
+
+ if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData)
+ return MMSYSERR_INVALPARAM;
+ if (hdr->dwFlags & MHDR_PREPARED)
+ return MMSYSERR_NOERROR;
+
+ hdr->lpNext = 0;
+ hdr->dwFlags |= MHDR_PREPARED;
+ hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE);
+ return MMSYSERR_NOERROR;
+}
+
+static UINT midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size)
+{
+ TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size);
+
+ if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData)
+ return MMSYSERR_INVALPARAM;
+ if (!(hdr->dwFlags & MHDR_PREPARED))
+ return MMSYSERR_NOERROR;
+ if (hdr->dwFlags & MHDR_INQUEUE)
+ return MIDIERR_STILLPLAYING;
+
+ hdr->dwFlags &= ~MHDR_PREPARED;
+ return MMSYSERR_NOERROR;
+}
+
NTSTATUS midi_out_message(void *args)
{
struct midi_out_message_params *params = args;
@@ -775,6 +805,12 @@ NTSTATUS midi_out_message(void *args)
case MODM_LONGDATA:
*params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify);
break;
+ case MODM_PREPARE:
+ *params->err = midi_out_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2);
+ break;
+ case MODM_UNPREPARE:
+ *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2);
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 5638dace27c..7329b2cd2e7 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -620,41 +620,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize)
return MMSYSERR_NOERROR;
}
-/**************************************************************************
- * modPrepare [internal]
- */
-static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
-{
- TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize);
-
- if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0)
- return MMSYSERR_INVALPARAM;
- if (lpMidiHdr->dwFlags & MHDR_PREPARED)
- return MMSYSERR_NOERROR;
-
- lpMidiHdr->lpNext = 0;
- lpMidiHdr->dwFlags |= MHDR_PREPARED;
- lpMidiHdr->dwFlags &= ~(MHDR_DONE|MHDR_INQUEUE); /* flags cleared since w2k */
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * modUnprepare [internal]
- */
-static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
-{
- TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize);
-
- if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0)
- return MMSYSERR_INVALPARAM;
- if (!(lpMidiHdr->dwFlags & MHDR_PREPARED))
- return MMSYSERR_NOERROR;
- if (lpMidiHdr->dwFlags & MHDR_INQUEUE)
- return MIDIERR_STILLPLAYING;
- lpMidiHdr->dwFlags &= ~MHDR_PREPARED;
- return MMSYSERR_NOERROR;
-}
-
/**************************************************************************
* modGetVolume [internal]
*/
@@ -782,10 +747,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
case DRVM_INIT:
ALSA_MidiInit();
return 0;
- case MODM_PREPARE:
- return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
- case MODM_UNPREPARE:
- return modUnprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
case MODM_GETDEVCAPS:
return modGetDevCaps(wDevID, (LPMIDIOUTCAPSW)dwParam1, dwParam2);
case MODM_GETNUMDEVS:
--
2.25.1
2
1
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsamidi.c | 101 +++++++++++++++++++++++++++++++++
dlls/winealsa.drv/midi.c | 106 -----------------------------------
2 files changed, 101 insertions(+), 106 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index 32c983ba0a3..0a3e1a80be3 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -651,6 +651,104 @@ static UINT midi_out_data(WORD dev_id, UINT data)
return MMSYSERR_NOERROR;
}
+static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct notify_context *notify)
+{
+ struct midi_dest *dest;
+ int len_add = 0;
+ BYTE *data, *new_data = NULL;
+ snd_seq_event_t event;
+
+ TRACE("(%04X, %p, %08X);\n", dev_id, hdr, hdr_size);
+
+ /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure
+ * but it seems to be used only for midi input.
+ * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption.
+ */
+
+ if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID;
+ dest = dests + dev_id;
+
+ if (!dest->bEnabled) return MIDIERR_NODEVICE;
+
+ if (dest->seq == NULL)
+ {
+ WARN("can't play !\n");
+ return MIDIERR_NODEVICE;
+ }
+
+ data = (BYTE*)hdr->lpData;
+
+ if (data == NULL)
+ return MIDIERR_UNPREPARED;
+ if (!(hdr->dwFlags & MHDR_PREPARED))
+ return MIDIERR_UNPREPARED;
+ if (hdr->dwFlags & MHDR_INQUEUE)
+ return MIDIERR_STILLPLAYING;
+ hdr->dwFlags &= ~MHDR_DONE;
+ hdr->dwFlags |= MHDR_INQUEUE;
+
+ /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive
+ * data, or can it also contain raw MIDI data, to be split up and sent to
+ * modShortData() ?
+ * If the latest is true, then the following WARNing will fire up
+ */
+ if (data[0] != 0xF0 || data[hdr->dwBufferLength - 1] != 0xF7)
+ {
+ WARN("Alleged system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
+ new_data = malloc(hdr->dwBufferLength + 2);
+ }
+
+ TRACE("dwBufferLength=%u !\n", hdr->dwBufferLength);
+ TRACE(" %02X %02X %02X ... %02X %02X %02X\n",
+ data[0], data[1], data[2], data[hdr->dwBufferLength-3],
+ data[hdr->dwBufferLength-2], data[hdr->dwBufferLength-1]);
+
+ switch (dest->caps.wTechnology)
+ {
+ case MOD_FMSYNTH:
+ /* FIXME: I don't think there is much to do here */
+ free(new_data);
+ break;
+ case MOD_MIDIPORT:
+ if (data[0] != 0xF0)
+ {
+ /* Send start of System Exclusive */
+ len_add = 1;
+ new_data[0] = 0xF0;
+ memcpy(new_data + 1, data, hdr->dwBufferLength);
+ WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n");
+ }
+ if (data[hdr->dwBufferLength-1] != 0xF7)
+ {
+ /* Send end of System Exclusive */
+ if (!len_add)
+ memcpy(new_data, data, hdr->dwBufferLength);
+ new_data[hdr->dwBufferLength + len_add] = 0xF7;
+ len_add++;
+ WARN("Adding missing 0xF7 marker at the end of system exclusive byte stream\n");
+ }
+ snd_seq_ev_clear(&event);
+ snd_seq_ev_set_direct(&event);
+ snd_seq_ev_set_source(&event, dest->port_out);
+ snd_seq_ev_set_subs(&event);
+ snd_seq_ev_set_sysex(&event, hdr->dwBufferLength + len_add, new_data ? new_data : data);
+ seq_lock();
+ snd_seq_event_output_direct(dest->seq, &event);
+ seq_unlock();
+ free(new_data);
+ break;
+ default:
+ WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology);
+ free(new_data);
+ return MMSYSERR_NOTENABLED;
+ }
+
+ hdr->dwFlags &= ~MHDR_INQUEUE;
+ hdr->dwFlags |= MHDR_DONE;
+ set_out_notify(notify, dest, dev_id, MOM_DONE, (DWORD_PTR)hdr, 0);
+ return MMSYSERR_NOERROR;
+}
+
NTSTATUS midi_out_message(void *args)
{
struct midi_out_message_params *params = args;
@@ -674,6 +772,9 @@ NTSTATUS midi_out_message(void *args)
case MODM_DATA:
*params->err = midi_out_data(params->dev_id, params->param_1);
break;
+ case MODM_LONGDATA:
+ *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify);
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index dd2f3cd9040..5638dace27c 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -122,16 +122,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg,
wDevID, wMsg, dwParam1, dwParam2);
switch (wMsg) {
- case MOM_DONE:
- case MOM_POSITIONCB:
- if (wDevID > MODM_NumDevs) return;
-
- dwCallBack = MidiOutDev[wDevID].midiDesc.dwCallback;
- uFlags = MidiOutDev[wDevID].wFlags;
- hDev = MidiOutDev[wDevID].midiDesc.hMidi;
- dwInstance = MidiOutDev[wDevID].midiDesc.dwInstance;
- break;
-
case MIM_OPEN:
case MIM_CLOSE:
case MIM_DATA:
@@ -630,100 +620,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize)
return MMSYSERR_NOERROR;
}
-/**************************************************************************
- * modLongData [internal]
- */
-static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
-{
- int len_add = 0;
- BYTE *lpData, *lpNewData = NULL;
- snd_seq_event_t event;
-
- TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
-
- /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure
- * but it seems to be used only for midi input.
- * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption.
- */
-
- if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
- if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE;
-
- if (MidiOutDev[wDevID].seq == NULL) {
- WARN("can't play !\n");
- return MIDIERR_NODEVICE;
- }
-
- lpData = (BYTE*)lpMidiHdr->lpData;
-
- if (lpData == NULL)
- return MIDIERR_UNPREPARED;
- if (!(lpMidiHdr->dwFlags & MHDR_PREPARED))
- return MIDIERR_UNPREPARED;
- if (lpMidiHdr->dwFlags & MHDR_INQUEUE)
- return MIDIERR_STILLPLAYING;
- lpMidiHdr->dwFlags &= ~MHDR_DONE;
- lpMidiHdr->dwFlags |= MHDR_INQUEUE;
-
- /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive
- * data, or can it also contain raw MIDI data, to be split up and sent to
- * modShortData() ?
- * If the latest is true, then the following WARNing will fire up
- */
- if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) {
- WARN("Alleged system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
- lpNewData = HeapAlloc(GetProcessHeap(), 0, lpMidiHdr->dwBufferLength + 2);
- }
-
- TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength);
- TRACE(" %02X %02X %02X ... %02X %02X %02X\n",
- lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3],
- lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]);
-
- switch (MidiOutDev[wDevID].caps.wTechnology) {
- case MOD_FMSYNTH:
- /* FIXME: I don't think there is much to do here */
- HeapFree(GetProcessHeap(), 0, lpNewData);
- break;
- case MOD_MIDIPORT:
- if (lpData[0] != 0xF0) {
- /* Send start of System Exclusive */
- len_add = 1;
- lpNewData[0] = 0xF0;
- memcpy(lpNewData + 1, lpData, lpMidiHdr->dwBufferLength);
- WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n");
- }
- if (lpData[lpMidiHdr->dwBufferLength-1] != 0xF7) {
- /* Send end of System Exclusive */
- if (!len_add)
- memcpy(lpNewData, lpData, lpMidiHdr->dwBufferLength);
- lpNewData[lpMidiHdr->dwBufferLength + len_add] = 0xF7;
- len_add++;
- WARN("Adding missing 0xF7 marker at the end of system exclusive byte stream\n");
- }
- snd_seq_ev_clear(&event);
- snd_seq_ev_set_direct(&event);
- snd_seq_ev_set_source(&event, MidiOutDev[wDevID].port_out);
- snd_seq_ev_set_subs(&event);
- snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData);
- seq_lock();
- snd_seq_event_output_direct(MidiOutDev[wDevID].seq, &event);
- seq_unlock();
- HeapFree(GetProcessHeap(), 0, lpNewData);
- break;
- default:
- WARN("Technology not supported (yet) %d !\n",
- MidiOutDev[wDevID].caps.wTechnology);
- HeapFree(GetProcessHeap(), 0, lpNewData);
- return MMSYSERR_NOTENABLED;
- }
-
- lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
- lpMidiHdr->dwFlags |= MHDR_DONE;
- MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L);
- return MMSYSERR_NOERROR;
-}
-
/**************************************************************************
* modPrepare [internal]
*/
@@ -886,8 +782,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
case DRVM_INIT:
ALSA_MidiInit();
return 0;
- case MODM_LONGDATA:
- return modLongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
case MODM_PREPARE:
return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
case MODM_UNPREPARE:
--
2.25.1
2
1
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsamidi.c | 129 +++++++++++++++++++++++++++++++++
dlls/winealsa.drv/midi.c | 134 ++---------------------------------
2 files changed, 135 insertions(+), 128 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index a92c08793af..32c983ba0a3 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -525,6 +525,132 @@ static UINT midi_out_close(WORD dev_id, struct notify_context *notify)
return MMSYSERR_NOERROR;
}
+static UINT midi_out_data(WORD dev_id, UINT data)
+{
+ BYTE evt = LOBYTE(LOWORD(data));
+ BYTE d1 = HIBYTE(LOWORD(data));
+ BYTE d2 = LOBYTE(HIWORD(data));
+ struct midi_dest *dest;
+
+ TRACE("(%04X, %08X);\n", dev_id, data);
+
+ if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID;
+ dest = dests + dev_id;
+
+ if (!dest->bEnabled) return MIDIERR_NODEVICE;
+
+ if (dest->seq == NULL)
+ {
+ WARN("can't play !\n");
+ return MIDIERR_NODEVICE;
+ }
+ switch (dest->caps.wTechnology)
+ {
+ case MOD_SYNTH:
+ case MOD_MIDIPORT:
+ {
+ int handled = 1; /* Assume event is handled */
+ snd_seq_event_t event;
+ snd_seq_ev_clear(&event);
+ snd_seq_ev_set_direct(&event);
+ snd_seq_ev_set_source(&event, dest->port_out);
+ snd_seq_ev_set_subs(&event);
+
+ switch (evt & 0xF0)
+ {
+ case MIDI_CMD_NOTE_OFF:
+ snd_seq_ev_set_noteoff(&event, evt & 0x0F, d1, d2);
+ break;
+ case MIDI_CMD_NOTE_ON:
+ snd_seq_ev_set_noteon(&event, evt & 0x0F, d1, d2);
+ break;
+ case MIDI_CMD_NOTE_PRESSURE:
+ snd_seq_ev_set_keypress(&event, evt & 0x0F, d1, d2);
+ break;
+ case MIDI_CMD_CONTROL:
+ snd_seq_ev_set_controller(&event, evt & 0x0F, d1, d2);
+ break;
+ case MIDI_CMD_BENDER:
+ snd_seq_ev_set_pitchbend(&event, evt & 0x0F, ((WORD)d2 << 7 | (WORD)d1) - 0x2000);
+ break;
+ case MIDI_CMD_PGM_CHANGE:
+ snd_seq_ev_set_pgmchange(&event, evt & 0x0F, d1);
+ break;
+ case MIDI_CMD_CHANNEL_PRESSURE:
+ snd_seq_ev_set_chanpress(&event, evt & 0x0F, d1);
+ break;
+ case MIDI_CMD_COMMON_SYSEX:
+ switch (evt & 0x0F)
+ {
+ case 0x00: /* System Exclusive, don't do it on modData,
+ * should require modLongData*/
+ case 0x04: /* Undefined. */
+ case 0x05: /* Undefined. */
+ case 0x07: /* End of Exclusive. */
+ case 0x09: /* Undefined. */
+ case 0x0D: /* Undefined. */
+ handled = 0;
+ break;
+ case 0x06: /* Tune Request */
+ case 0x08: /* Timing Clock. */
+ case 0x0A: /* Start. */
+ case 0x0B: /* Continue */
+ case 0x0C: /* Stop */
+ case 0x0E: /* Active Sensing. */
+ {
+ snd_midi_event_t *midi_event;
+
+ snd_midi_event_new(1, &midi_event);
+ snd_midi_event_init(midi_event);
+ snd_midi_event_encode_byte(midi_event, evt, &event);
+ snd_midi_event_free(midi_event);
+ break;
+ }
+ case 0x0F: /* Reset */
+ /* snd_seq_ev_set_sysex(&event, 1, &evt);
+ this other way may be better */
+ {
+ BYTE reset_sysex_seq[] = {MIDI_CMD_COMMON_SYSEX, 0x7e, 0x7f, 0x09, 0x01, 0xf7};
+ snd_seq_ev_set_sysex(&event, sizeof(reset_sysex_seq), reset_sysex_seq);
+ break;
+ }
+ case 0x01: /* MTC Quarter frame */
+ case 0x03: /* Song Select. */
+ {
+ BYTE buf[2];
+ buf[0] = evt;
+ buf[1] = d1;
+ snd_seq_ev_set_sysex(&event, sizeof(buf), buf);
+ break;
+ }
+ case 0x02: /* Song Position Pointer. */
+ {
+ BYTE buf[3];
+ buf[0] = evt;
+ buf[1] = d1;
+ buf[2] = d2;
+ snd_seq_ev_set_sysex(&event, sizeof(buf), buf);
+ break;
+ }
+ }
+ break;
+ }
+ if (handled)
+ {
+ seq_lock();
+ snd_seq_event_output_direct(dest->seq, &event);
+ seq_unlock();
+ }
+ break;
+ }
+ default:
+ WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology);
+ return MMSYSERR_NOTENABLED;
+ }
+
+ return MMSYSERR_NOERROR;
+}
+
NTSTATUS midi_out_message(void *args)
{
struct midi_out_message_params *params = args;
@@ -545,6 +671,9 @@ NTSTATUS midi_out_message(void *args)
case MODM_CLOSE:
*params->err = midi_out_close(params->dev_id, params->notify);
break;
+ case MODM_DATA:
+ *params->err = midi_out_data(params->dev_id, params->param_1);
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 5f8d855c9fb..dd2f3cd9040 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -630,128 +630,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize)
return MMSYSERR_NOERROR;
}
-/**************************************************************************
- * modData [internal]
- */
-static DWORD modData(WORD wDevID, DWORD dwParam)
-{
- BYTE evt = LOBYTE(LOWORD(dwParam));
- BYTE d1 = HIBYTE(LOWORD(dwParam));
- BYTE d2 = LOBYTE(HIWORD(dwParam));
-
- TRACE("(%04X, %08X);\n", wDevID, dwParam);
-
- if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
- if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE;
-
- if (MidiOutDev[wDevID].seq == NULL) {
- WARN("can't play !\n");
- return MIDIERR_NODEVICE;
- }
- switch (MidiOutDev[wDevID].caps.wTechnology) {
- case MOD_SYNTH:
- case MOD_MIDIPORT:
- {
- int handled = 1; /* Assume event is handled */
- snd_seq_event_t event;
- snd_seq_ev_clear(&event);
- snd_seq_ev_set_direct(&event);
- snd_seq_ev_set_source(&event, MidiOutDev[wDevID].port_out);
- snd_seq_ev_set_subs(&event);
-
- switch (evt & 0xF0) {
- case MIDI_CMD_NOTE_OFF:
- snd_seq_ev_set_noteoff(&event, evt&0x0F, d1, d2);
- break;
- case MIDI_CMD_NOTE_ON:
- snd_seq_ev_set_noteon(&event, evt&0x0F, d1, d2);
- break;
- case MIDI_CMD_NOTE_PRESSURE:
- snd_seq_ev_set_keypress(&event, evt&0x0F, d1, d2);
- break;
- case MIDI_CMD_CONTROL:
- snd_seq_ev_set_controller(&event, evt&0x0F, d1, d2);
- break;
- case MIDI_CMD_BENDER:
- snd_seq_ev_set_pitchbend(&event, evt&0x0F, ((WORD)d2 << 7 | (WORD)d1) - 0x2000);
- break;
- case MIDI_CMD_PGM_CHANGE:
- snd_seq_ev_set_pgmchange(&event, evt&0x0F, d1);
- break;
- case MIDI_CMD_CHANNEL_PRESSURE:
- snd_seq_ev_set_chanpress(&event, evt&0x0F, d1);
- break;
- case MIDI_CMD_COMMON_SYSEX:
- switch (evt & 0x0F) {
- case 0x00: /* System Exclusive, don't do it on modData,
- * should require modLongData*/
- case 0x04: /* Undefined. */
- case 0x05: /* Undefined. */
- case 0x07: /* End of Exclusive. */
- case 0x09: /* Undefined. */
- case 0x0D: /* Undefined. */
- handled = 0;
- break;
- case 0x06: /* Tune Request */
- case 0x08: /* Timing Clock. */
- case 0x0A: /* Start. */
- case 0x0B: /* Continue */
- case 0x0C: /* Stop */
- case 0x0E: /* Active Sensing. */
- {
- snd_midi_event_t *midi_event;
-
- snd_midi_event_new(1, &midi_event);
- snd_midi_event_init(midi_event);
- snd_midi_event_encode_byte(midi_event, evt, &event);
- snd_midi_event_free(midi_event);
- break;
- }
- case 0x0F: /* Reset */
- /* snd_seq_ev_set_sysex(&event, 1, &evt);
- this other way may be better */
- {
- BYTE reset_sysex_seq[] = {MIDI_CMD_COMMON_SYSEX, 0x7e, 0x7f, 0x09, 0x01, 0xf7};
- snd_seq_ev_set_sysex(&event, sizeof(reset_sysex_seq), reset_sysex_seq);
- }
- break;
- case 0x01: /* MTC Quarter frame */
- case 0x03: /* Song Select. */
- {
- BYTE buf[2];
- buf[0] = evt;
- buf[1] = d1;
- snd_seq_ev_set_sysex(&event, sizeof(buf), buf);
- }
- break;
- case 0x02: /* Song Position Pointer. */
- {
- BYTE buf[3];
- buf[0] = evt;
- buf[1] = d1;
- buf[2] = d2;
- snd_seq_ev_set_sysex(&event, sizeof(buf), buf);
- }
- break;
- }
- break;
- }
- if (handled) {
- seq_lock();
- snd_seq_event_output_direct(MidiOutDev[wDevID].seq, &event);
- seq_unlock();
- }
- }
- break;
- default:
- WARN("Technology not supported (yet) %d !\n",
- MidiOutDev[wDevID].caps.wTechnology);
- return MMSYSERR_NOTENABLED;
- }
-
- return MMSYSERR_NOERROR;
-}
-
/**************************************************************************
* modLongData [internal]
*/
@@ -897,6 +775,8 @@ static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume)
*/
static DWORD modReset(WORD wDevID)
{
+ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
+ DWORD_PTR dwParam1, DWORD_PTR dwParam2);
unsigned chn;
TRACE("(%04X);\n", wDevID);
@@ -909,10 +789,10 @@ static DWORD modReset(WORD wDevID)
* it's channel dependent...
*/
for (chn = 0; chn < 16; chn++) {
- /* turn off every note */
- modData(wDevID, 0x7800 | MIDI_CMD_CONTROL | chn);
- /* remove sustain on all channels */
- modData(wDevID, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn);
+ /* turn off every note */
+ ALSA_modMessage(wDevID, MODM_DATA, 0, 0x7800 | MIDI_CMD_CONTROL | chn, 0);
+ /* remove sustain on all channels */
+ ALSA_modMessage(wDevID, MODM_DATA, 0, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn, 0);
}
/* FIXME: the LongData buffers must also be returned to the app */
return MMSYSERR_NOERROR;
@@ -1006,8 +886,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
case DRVM_INIT:
ALSA_MidiInit();
return 0;
- case MODM_DATA:
- return modData(wDevID, dwParam1);
case MODM_LONGDATA:
return modLongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
case MODM_PREPARE:
--
2.25.1
2
1
supersedes 227544
As described in bugzilla ticket, when calling CreateProcess:
- with "default" console inheritance (no CREATE_NEW_CONSOLE
nor DETACHED_PROCESS flags),
- when parent is not attached to a console
- and when the child's subsystem is CUI
, native behaves as if CREATE_NEW_CONSOLE was passed.
builtin doesn't...
this serie:
- adds a test case for showing the CUI/GUI discrepancies
- fixes kernelbase accordingly
- but also requires to fix all usage of CreateProcess in Wine Code
that would now generate the creation of a console
+ a couple of programs moved into the GUI subsystem (to avoid console
creation on invocation)
+ when looking to the other usage of CreateProcess, I only convinced
myself to adapt one of them
V1 => V2:
- don't mess up with the number of patches in the serie
- no longer modify makedep for creating cui vs gui test executable, but
copy current *_test.exe executable and adapt its subsystem to the need
V2 => V3:
- removed the hacks in wow64 redirect, and let programs/uninstaller and
programs/wusa belong to the GUI subsystem instead
- force console creation for wine initial process when a) none of the unix
fd are attached to a TTY, b) the initial process is in CUI subsystem
V3 => V4:
- included Jacek's comments:
+ removed unneeded casts
+ move CreateProcess change in programs/services into a separate patch
+ I didn't change programs/start as you suggested. Testing on W10 shows
that 'start /b cui.exe' from a cmd prompt just reuses the current
console.
V4 => V5:
- removed patches applied in V4
- added tweaks in start.exe not so create a console when detached
And Marvin will generate errors for Chinese and Japanese VM in console
testing that are independant of this serie.
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
Eric Pouech (4):
dlls/kernel32/tests: add some console tests about creating cui vs gui processes
programs/services: start services detached from console
programs/start: force no console creation when using start /exec
dlls/kernelbase: handle corner case in CreateProcess
dlls/kernel32/tests/console.c | 85 +++++++++++++++++++++++++++++++++++
dlls/kernelbase/process.c | 6 ++-
programs/services/services.c | 2 +-
programs/start/start.c | 7 ++-
4 files changed, 96 insertions(+), 4 deletions(-)
2
8
17 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/clipboard.c | 23 ---
dlls/user32/combo.c | 2 +-
dlls/user32/dde_misc.c | 6 +-
dlls/user32/dde_server.c | 2 +-
dlls/user32/defwnd.c | 2 +-
dlls/user32/dialog.c | 4 +-
dlls/user32/driver.c | 7 +-
dlls/user32/mdi.c | 2 +-
dlls/user32/menu.c | 8 +-
dlls/user32/message.c | 2 -
dlls/user32/msgbox.c | 70 ++++----
dlls/user32/painting.c | 12 --
dlls/user32/user32.spec | 2 +-
dlls/user32/user_main.c | 10 ++
dlls/user32/win.c | 248 +--------------------------
dlls/user32/win.h | 1 -
dlls/win32u/clipboard.c | 25 +++
dlls/win32u/driver.c | 1 +
dlls/win32u/gdiobj.c | 1 +
dlls/win32u/message.c | 2 +
dlls/win32u/ntuser_private.h | 4 +
dlls/win32u/sysparams.c | 18 +-
dlls/win32u/win32u.spec | 2 +-
dlls/win32u/win32u_private.h | 6 +
dlls/win32u/window.c | 315 +++++++++++++++++++++++++++++++++++
dlls/win32u/wrappers.c | 6 +
include/ntuser.h | 4 +-
27 files changed, 440 insertions(+), 345 deletions(-)
2
1
[PATCH v2 5/5] win32u: Move GetWindowContextHelpId implementation from user32.
by Huw Davies 17 Mar '22
by Huw Davies 17 Mar '22
17 Mar '22
From: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/user32/win.c | 12 +-----------
dlls/win32u/window.c | 18 ++++++++++++++++++
include/ntuser.h | 1 +
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 4d4199c67fc..22227c23280 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -2249,17 +2249,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert )
*/
DWORD WINAPI GetWindowContextHelpId( HWND hwnd )
{
- DWORD retval;
- WND *wnd = WIN_GetPtr( hwnd );
- if (!wnd || wnd == WND_DESKTOP) return 0;
- if (wnd == WND_OTHER_PROCESS)
- {
- if (IsWindow( hwnd )) FIXME( "not supported on other process window %p\n", hwnd );
- return 0;
- }
- retval = wnd->helpContext;
- WIN_ReleasePtr( wnd );
- return retval;
+ return NtUserCallHwnd( hwnd, NtUserGetWindowContextHelpId );
}
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index ab69096184c..e513a13b152 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -3913,6 +3913,22 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info )
}
}
+/* see GetWindowContextHelpId */
+static DWORD get_window_context_help_id( HWND hwnd )
+{
+ DWORD retval;
+ WND *win = get_win_ptr( hwnd );
+ if (!win || win == WND_DESKTOP) return 0;
+ if (win == WND_OTHER_PROCESS)
+ {
+ if (is_window( hwnd )) FIXME( "not supported on other process window %p\n", hwnd );
+ return 0;
+ }
+ retval = win->helpContext;
+ release_win_ptr( win );
+ return retval;
+}
+
/***********************************************************************
* send_destroy_message
*/
@@ -4190,6 +4206,8 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code )
return get_dpi_for_window( hwnd );
case NtUserGetParent:
return HandleToUlong( get_parent( hwnd ));
+ case NtUserGetWindowContextHelpId:
+ return get_window_context_help_id( hwnd );
case NtUserGetWindowDpiAwarenessContext:
return (ULONG_PTR)get_window_dpi_awareness_context( hwnd );
case NtUserGetWindowTextLength:
diff --git a/include/ntuser.h b/include/ntuser.h
index 6526d190e28..7bcb91fcc25 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -147,6 +147,7 @@ enum
{
NtUserGetDpiForWindow,
NtUserGetParent,
+ NtUserGetWindowContextHelpId,
NtUserGetWindowDpiAwarenessContext,
NtUserGetWindowTextLength,
NtUserIsWindow,
--
2.23.0
1
0
17 Mar '22
From: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/user32/combo.c | 4 +-
dlls/user32/defwnd.c | 2 +-
dlls/user32/dialog.c | 6 +-
dlls/user32/driver.c | 8 +-
dlls/user32/mdi.c | 12 +-
dlls/user32/message.c | 21 +-
dlls/user32/nonclient.c | 6 +-
dlls/user32/scroll.c | 2 +-
dlls/user32/user32.spec | 4 +-
dlls/user32/user_main.c | 1 -
dlls/user32/win.c | 10 +-
dlls/user32/win.h | 6 -
dlls/user32/winpos.c | 228 +---------------
dlls/win32u/driver.c | 1 +
dlls/win32u/gdiobj.c | 2 +
dlls/win32u/input.c | 2 +-
dlls/win32u/message.c | 3 +
dlls/win32u/ntuser_private.h | 7 +-
dlls/win32u/win32u.spec | 4 +-
dlls/win32u/win32u_private.h | 4 +
dlls/win32u/window.c | 487 ++++++++++++++++++++++++++++++++++-
dlls/win32u/wrappers.c | 12 +
include/ntuser.h | 1 +
23 files changed, 542 insertions(+), 291 deletions(-)
diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c
index b375de5080c..d9123057295 100644
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -1030,7 +1030,7 @@ static void CBRollUp( LPHEADCOMBO lphc, BOOL ok, BOOL bButton )
RECT rect;
lphc->wState &= ~CBF_DROPPED;
- ShowWindow( lphc->hWndLBox, SW_HIDE );
+ NtUserShowWindow( lphc->hWndLBox, SW_HIDE );
if(GetCapture() == lphc->hWndLBox)
{
@@ -1419,7 +1419,7 @@ static void CBResetPos(HEADCOMBO *combo, BOOL redraw)
if (combo->wState & CBF_DROPPED)
{
combo->wState &= ~CBF_DROPPED;
- ShowWindow(combo->hWndLBox, SW_HIDE);
+ NtUserShowWindow( combo->hWndLBox, SW_HIDE );
}
if (redraw && !(combo->wState & CBF_NOREDRAW))
diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c
index 271644bb953..bd1928412e0 100644
--- a/dlls/user32/defwnd.c
+++ b/dlls/user32/defwnd.c
@@ -562,7 +562,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
}
else pWnd->flags |= WIN_NEEDS_SHOW_OWNEDPOPUP;
WIN_ReleasePtr( pWnd );
- ShowWindow( hwnd, wParam ? SW_SHOWNOACTIVATE : SW_HIDE );
+ NtUserShowWindow( hwnd, wParam ? SW_SHOWNOACTIVATE : SW_HIDE );
break;
}
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
index f9d388d0104..a3efd5b6742 100644
--- a/dlls/user32/dialog.c
+++ b/dlls/user32/dialog.c
@@ -702,7 +702,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE))
{
- ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */
+ NtUserShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */
}
return hwnd;
}
@@ -793,7 +793,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner )
if (bFirstEmpty)
{
/* ShowWindow the first time the queue goes empty */
- ShowWindow( hwnd, SW_SHOWNORMAL );
+ NtUserShowWindow( hwnd, SW_SHOWNORMAL );
bFirstEmpty = FALSE;
}
if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG))
@@ -821,7 +821,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner )
if (bFirstEmpty && msg.message == WM_TIMER)
{
- ShowWindow( hwnd, SW_SHOWNORMAL );
+ NtUserShowWindow( hwnd, SW_SHOWNORMAL );
bFirstEmpty = FALSE;
}
}
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index ada0b8ca2f7..25ed33ff073 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -95,11 +95,6 @@ static void CDECL nulldrv_SetWindowText( HWND hwnd, LPCWSTR text )
{
}
-static UINT CDECL nulldrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp )
-{
- return ~0; /* use default implementation */
-}
-
static LRESULT CDECL nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam )
{
return -1;
@@ -184,7 +179,7 @@ static struct user_driver_funcs lazy_load_driver =
nulldrv_SetWindowIcon,
NULL,
nulldrv_SetWindowText,
- nulldrv_ShowWindow,
+ NULL,
nulldrv_SysCommand,
NULL,
NULL,
@@ -222,7 +217,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v
SET_USER_FUNC(MsgWaitForMultipleObjectsEx);
SET_USER_FUNC(SetWindowIcon);
SET_USER_FUNC(SetWindowText);
- SET_USER_FUNC(ShowWindow);
SET_USER_FUNC(SysCommand);
SET_USER_FUNC(WindowPosChanging);
SET_USER_FUNC(WindowPosChanged);
diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
index 3d85487f808..19db8382bd0 100644
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -514,13 +514,13 @@ static void MDI_SwitchActiveChild( MDICLIENTINFO *ci, HWND hwndTo, BOOL activate
{
/* restore old MDI child */
SendMessageW( hwndPrev, WM_SETREDRAW, FALSE, 0 );
- ShowWindow( hwndPrev, SW_RESTORE );
+ NtUserShowWindow( hwndPrev, SW_RESTORE );
SendMessageW( hwndPrev, WM_SETREDRAW, TRUE, 0 );
/* activate new MDI child */
NtUserSetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE );
/* maximize new MDI child */
- ShowWindow( hwndTo, SW_MAXIMIZE );
+ NtUserShowWindow( hwndTo, SW_MAXIMIZE );
}
/* activate new MDI child */
NtUserSetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0,
@@ -547,7 +547,7 @@ static LRESULT MDIDestroyChild( HWND client, MDICLIENTINFO *ci,
MDI_SwitchActiveChild(ci, next, TRUE);
else
{
- ShowWindow(child, SW_HIDE);
+ NtUserShowWindow( child, SW_HIDE );
if (child == ci->hwndChildMaximized)
{
HWND frame = GetParent(client);
@@ -1133,7 +1133,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM
return 0;
case WM_MDIMAXIMIZE:
- ShowWindow( (HWND)wParam, SW_MAXIMIZE );
+ NtUserShowWindow( (HWND)wParam, SW_MAXIMIZE );
return 0;
case WM_MDINEXT: /* lParam != 0 means previous window */
@@ -1147,7 +1147,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM
}
case WM_MDIRESTORE:
- ShowWindow( (HWND)wParam, SW_SHOWNORMAL );
+ NtUserShowWindow( (HWND)wParam, SW_SHOWNORMAL );
return 0;
case WM_MDISETMENU:
@@ -1518,7 +1518,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
SendMessageW( hMaxChild, WM_SETREDRAW, FALSE, 0 );
MDI_RestoreFrameMenu( GetParent(client), hMaxChild );
- ShowWindow( hMaxChild, SW_SHOWNOACTIVATE );
+ NtUserShowWindow( hMaxChild, SW_SHOWNOACTIVATE );
SendMessageW( hMaxChild, WM_SETREDRAW, TRUE, 0 );
}
diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index 0ba540d2e5d..2badec331c1 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -1857,21 +1857,12 @@ static void reply_message( struct received_message_info *info, LRESULT result, B
*/
LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam )
{
- switch(msg)
- {
- case WM_WINE_SHOWWINDOW:
- if (is_desktop_window( hwnd )) return 0;
- return ShowWindow( hwnd, wparam );
- default:
- {
- MSG m;
- m.hwnd = hwnd;
- m.message = msg;
- m.wParam = wparam;
- m.lParam = lparam;
- return NtUserCallOneParam( (UINT_PTR)&m, NtUserHandleInternalMessage );
- }
- }
+ MSG m;
+ m.hwnd = hwnd;
+ m.message = msg;
+ m.wParam = wparam;
+ m.lParam = lparam;
+ return NtUserCallOneParam( (UINT_PTR)&m, NtUserHandleInternalMessage );
}
/* since the WM_DDE_ACK response to a WM_DDE_EXECUTE message should contain the handle
diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c
index 096674db5f7..a2a49fda27b 100644
--- a/dlls/user32/nonclient.c
+++ b/dlls/user32/nonclient.c
@@ -1557,19 +1557,19 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam )
case SC_MINIMIZE:
ShowOwnedPopups(hwnd,FALSE);
- ShowWindow( hwnd, SW_MINIMIZE );
+ NtUserShowWindow( hwnd, SW_MINIMIZE );
break;
case SC_MAXIMIZE:
if (IsIconic(hwnd))
ShowOwnedPopups(hwnd,TRUE);
- ShowWindow( hwnd, SW_MAXIMIZE );
+ NtUserShowWindow( hwnd, SW_MAXIMIZE );
break;
case SC_RESTORE:
if (IsIconic(hwnd))
ShowOwnedPopups(hwnd,TRUE);
- ShowWindow( hwnd, SW_RESTORE );
+ NtUserShowWindow( hwnd, SW_RESTORE );
break;
case SC_CLOSE:
diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c
index d666707299f..c042b72a344 100644
--- a/dlls/user32/scroll.c
+++ b/dlls/user32/scroll.c
@@ -1973,7 +1973,7 @@ static BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar, BOOL fShowH, BOOL fShowV
switch(nBar)
{
case SB_CTL:
- ShowWindow( hwnd, fShowH ? SW_SHOW : SW_HIDE );
+ NtUserShowWindow( hwnd, fShowH ? SW_SHOW : SW_HIDE );
return TRUE;
case SB_BOTH:
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index cb18d9415c9..36ec63c21d4 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -740,8 +740,8 @@
@ stdcall ShowOwnedPopups(long long)
@ stdcall ShowScrollBar(long long long)
@ stub ShowStartGlass
-@ stdcall ShowWindow(long long)
-@ stdcall ShowWindowAsync(long long)
+@ stdcall ShowWindow(long long) NtUserShowWindow
+@ stdcall ShowWindowAsync(long long) NtUserShowWindowAsync
@ stdcall ShutdownBlockReasonCreate(long wstr)
@ stdcall ShutdownBlockReasonDestroy(long)
# @ stub SoftModalMessageBox
diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c
index 15293d76c41..5a3db40c93c 100644
--- a/dlls/user32/user_main.c
+++ b/dlls/user32/user_main.c
@@ -166,7 +166,6 @@ static const struct user_callbacks user_funcs =
SendMessageW,
SendNotifyMessageW,
ShowCaret,
- ShowWindow,
WaitForInputIdle,
free_win_ptr,
MENU_IsMenuActive,
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index b0e6b33eb56..4d4199c67fc 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -1023,10 +1023,10 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module,
{
/* if the new window is maximized don't bother repainting */
SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 );
- ShowWindow( top_child, SW_SHOWNORMAL );
+ NtUserShowWindow( top_child, SW_SHOWNORMAL );
SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 );
}
- else ShowWindow( top_child, SW_SHOWNORMAL );
+ else NtUserShowWindow( top_child, SW_SHOWNORMAL );
}
}
}
@@ -1303,7 +1303,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module,
else if (cs->style & WS_MINIMIZE)
sw = SW_SHOWMINIMIZED;
- ShowWindow( hwnd, sw );
+ NtUserShowWindow( hwnd, sw );
if (cs->dwExStyle & WS_EX_MDICHILD)
{
SendMessageW(cs->hwndParent, WM_MDIREFRESHMENU, 0, 0);
@@ -1399,7 +1399,7 @@ HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExW( DWORD exStyle, LPCWSTR className,
BOOL WINAPI CloseWindow( HWND hwnd )
{
if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) return FALSE;
- ShowWindow( hwnd, SW_MINIMIZE );
+ NtUserShowWindow( hwnd, SW_MINIMIZE );
return TRUE;
}
@@ -1410,7 +1410,7 @@ BOOL WINAPI CloseWindow( HWND hwnd )
BOOL WINAPI OpenIcon( HWND hwnd )
{
if (!IsIconic( hwnd )) return FALSE;
- ShowWindow( hwnd, SW_SHOWNORMAL );
+ NtUserShowWindow( hwnd, SW_SHOWNORMAL );
return TRUE;
}
diff --git a/dlls/user32/win.h b/dlls/user32/win.h
index 89e91a255f9..79a57de6bb9 100644
--- a/dlls/user32/win.h
+++ b/dlls/user32/win.h
@@ -42,7 +42,6 @@ extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN;
extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN;
extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN;
extern HWND WIN_IsCurrentThread( HWND hwnd ) DECLSPEC_HIDDEN;
-extern UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) DECLSPEC_HIDDEN;
extern ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN;
extern BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWindow, RECT *rectClient ) DECLSPEC_HIDDEN;
extern HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) DECLSPEC_HIDDEN;
@@ -94,9 +93,4 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect )
rect->right = width - tmp;
}
-static inline UINT win_get_flags( HWND hwnd )
-{
- return win_set_flags( hwnd, 0, 0 );
-}
-
#endif /* __WINE_WIN_H */
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index 1951f887351..4ba0c47626d 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -67,7 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win);
*/
void WINAPI SwitchToThisWindow( HWND hwnd, BOOL alt_tab )
{
- if (IsIconic( hwnd )) ShowWindow( hwnd, SW_RESTORE );
+ if (IsIconic( hwnd )) NtUserShowWindow( hwnd, SW_RESTORE );
else BringWindowToTop( hwnd );
}
@@ -799,228 +799,6 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect )
}
-/***********************************************************************
- * show_window
- *
- * Implementation of ShowWindow and ShowWindowAsync.
- */
-static BOOL show_window( HWND hwnd, INT cmd )
-{
- WND *wndPtr;
- HWND parent;
- DPI_AWARENESS_CONTEXT context;
- LONG style = GetWindowLongW( hwnd, GWL_STYLE );
- BOOL wasVisible = (style & WS_VISIBLE) != 0;
- BOOL showFlag = TRUE;
- RECT newPos = {0, 0, 0, 0};
- UINT new_swp, swp = 0;
-
- TRACE("hwnd=%p, cmd=%d, wasVisible %d\n", hwnd, cmd, wasVisible);
-
- context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd ));
-
- switch(cmd)
- {
- case SW_HIDE:
- if (!wasVisible) goto done;
- showFlag = FALSE;
- swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE;
- if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER;
- break;
-
- case SW_SHOWMINNOACTIVE:
- case SW_MINIMIZE:
- case SW_FORCEMINIMIZE: /* FIXME: Does not work if thread is hung. */
- swp |= SWP_NOACTIVATE | SWP_NOZORDER;
- /* fall through */
- case SW_SHOWMINIMIZED:
- swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
- swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos );
- if ((style & WS_MINIMIZE) && wasVisible) goto done;
- break;
-
- case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */
- if (!wasVisible) swp |= SWP_SHOWWINDOW;
- swp |= SWP_FRAMECHANGED;
- swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos );
- if ((style & WS_MAXIMIZE) && wasVisible) goto done;
- break;
-
- case SW_SHOWNA:
- swp |= SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE;
- if (style & WS_CHILD) swp |= SWP_NOZORDER;
- break;
- case SW_SHOW:
- if (wasVisible) goto done;
- swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE;
- if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER;
- break;
-
- case SW_SHOWNOACTIVATE:
- swp |= SWP_NOACTIVATE | SWP_NOZORDER;
- /* fall through */
- case SW_RESTORE:
- /* fall through */
- case SW_SHOWNORMAL: /* same as SW_NORMAL: */
- case SW_SHOWDEFAULT: /* FIXME: should have its own handler */
- if (!wasVisible) swp |= SWP_SHOWWINDOW;
- if (style & (WS_MINIMIZE | WS_MAXIMIZE))
- {
- swp |= SWP_FRAMECHANGED;
- swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos );
- }
- else
- {
- if (wasVisible) goto done;
- swp |= SWP_NOSIZE | SWP_NOMOVE;
- }
- if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER;
- break;
- default:
- goto done;
- }
-
- if ((showFlag != wasVisible || cmd == SW_SHOWNA) && cmd != SW_SHOWMAXIMIZED && !(swp & SWP_STATECHANGED))
- {
- SendMessageW( hwnd, WM_SHOWWINDOW, showFlag, 0 );
- if (!IsWindow( hwnd )) goto done;
- }
-
- if (IsRectEmpty( &newPos )) new_swp = swp;
- else if ((new_swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp )) == ~0)
- {
- if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) new_swp = swp;
- else if (IsIconic( hwnd ) && (newPos.left != -32000 || newPos.top != -32000))
- {
- OffsetRect( &newPos, -32000 - newPos.left, -32000 - newPos.top );
- new_swp = swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE);
- }
- else new_swp = swp;
- }
- swp = new_swp;
-
- parent = NtUserGetAncestor( hwnd, GA_PARENT );
- if (parent && !IsWindowVisible( parent ) && !(swp & SWP_STATECHANGED))
- {
- /* if parent is not visible simply toggle WS_VISIBLE and return */
- if (showFlag) WIN_SetStyle( hwnd, WS_VISIBLE, 0 );
- else WIN_SetStyle( hwnd, 0, WS_VISIBLE );
- }
- else
- NtUserSetWindowPos( hwnd, HWND_TOP, newPos.left, newPos.top,
- newPos.right - newPos.left, newPos.bottom - newPos.top, swp );
-
- if (cmd == SW_HIDE)
- {
- HWND hFocus;
-
- /* FIXME: This will cause the window to be activated irrespective
- * of whether it is owned by the same thread. Has to be done
- * asynchronously.
- */
-
- if (hwnd == GetActiveWindow())
- WINPOS_ActivateOtherWindow(hwnd);
-
- /* Revert focus to parent */
- hFocus = GetFocus();
- if (hwnd == hFocus)
- {
- HWND parent = NtUserGetAncestor(hwnd, GA_PARENT);
- if (parent == GetDesktopWindow()) parent = 0;
- NtUserSetFocus( parent );
- }
- goto done;
- }
-
- if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) goto done;
-
- if (wndPtr->flags & WIN_NEED_SIZE)
- {
- /* should happen only in CreateWindowEx() */
- int wParam = SIZE_RESTORED;
- RECT client;
- LPARAM lparam;
-
- WIN_GetRectangles( hwnd, COORDS_PARENT, NULL, &client );
- lparam = MAKELONG( client.right - client.left, client.bottom - client.top );
- wndPtr->flags &= ~WIN_NEED_SIZE;
- if (wndPtr->dwStyle & WS_MAXIMIZE) wParam = SIZE_MAXIMIZED;
- else if (wndPtr->dwStyle & WS_MINIMIZE)
- {
- wParam = SIZE_MINIMIZED;
- lparam = 0;
- }
- WIN_ReleasePtr( wndPtr );
-
- SendMessageW( hwnd, WM_SIZE, wParam, lparam );
- SendMessageW( hwnd, WM_MOVE, 0, MAKELONG( client.left, client.top ));
- }
- else WIN_ReleasePtr( wndPtr );
-
- /* if previous state was minimized Windows sets focus to the window */
- if (style & WS_MINIMIZE)
- {
- NtUserSetFocus( hwnd );
- /* Send a WM_ACTIVATE message for a top level window, even if the window is already active */
- if (NtUserGetAncestor( hwnd, GA_ROOT ) == hwnd && !(swp & SWP_NOACTIVATE))
- SendMessageW( hwnd, WM_ACTIVATE, WA_ACTIVE, 0 );
- }
-
-done:
- SetThreadDpiAwarenessContext( context );
- return wasVisible;
-}
-
-
-/***********************************************************************
- * ShowWindowAsync (USER32.@)
- *
- * doesn't wait; returns immediately.
- * used by threads to toggle windows in other (possibly hanging) threads
- */
-BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd )
-{
- HWND full_handle;
-
- if (is_broadcast(hwnd))
- {
- SetLastError( ERROR_INVALID_PARAMETER );
- return FALSE;
- }
-
- if ((full_handle = WIN_IsCurrentThread( hwnd )))
- return show_window( full_handle, cmd );
-
- return SendNotifyMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 );
-}
-
-
-/***********************************************************************
- * ShowWindow (USER32.@)
- */
-BOOL WINAPI ShowWindow( HWND hwnd, INT cmd )
-{
- HWND full_handle;
-
- if (is_broadcast(hwnd))
- {
- SetLastError( ERROR_INVALID_PARAMETER );
- return FALSE;
- }
- if ((full_handle = WIN_IsCurrentThread( hwnd )))
- return show_window( full_handle, cmd );
-
- if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE))
- return FALSE;
-
- if ((cmd == SW_SHOW) && (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE))
- return TRUE;
-
- return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 );
-}
-
-
/***********************************************************************
* GetInternalWindowPos (USER32.@)
*/
@@ -1190,7 +968,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f
wp.rcNormalPosition.bottom - wp.rcNormalPosition.top,
SWP_NOZORDER | SWP_NOACTIVATE );
- ShowWindow( hwnd, wndpl->showCmd );
+ NtUserShowWindow( hwnd, wndpl->showCmd );
if (IsIconic( hwnd ))
{
@@ -1237,7 +1015,7 @@ BOOL WINAPI AnimateWindow(HWND hwnd, DWORD dwTime, DWORD dwFlags)
return FALSE;
}
- ShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA));
+ NtUserShowWindow( hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA) );
return TRUE;
}
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 166c2009dbc..ec8162b0284 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -1202,6 +1202,7 @@ static const struct user_driver_funcs lazy_load_driver =
.pReleaseDC = nulldrv_ReleaseDC,
.pScrollDC = nulldrv_ScrollDC,
.pSetFocus = nulldrv_SetFocus,
+ .pShowWindow = nulldrv_ShowWindow,
.pUpdateLayeredWindow = loaderdrv_UpdateLayeredWindow,
.pWindowMessage = nulldrv_WindowMessage,
/* system parameters */
diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c
index 69607f0e3de..e47271e6108 100644
--- a/dlls/win32u/gdiobj.c
+++ b/dlls/win32u/gdiobj.c
@@ -1210,6 +1210,8 @@ static struct unix_funcs unix_funcs =
NtUserSetWindowRgn,
NtUserSetWindowWord,
NtUserShowCursor,
+ NtUserShowWindow,
+ NtUserShowWindowAsync,
NtUserSystemParametersInfo,
NtUserSystemParametersInfoForDpi,
NtUserToUnicodeEx,
diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index bc82d5e17a3..5cd2cdd0970 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -1162,7 +1162,7 @@ HWND get_active_window(void)
}
/* see GetFocus */
-static HWND get_focus(void)
+HWND get_focus(void)
{
GUITHREADINFO info;
info.cbSize = sizeof(info);
diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
index 690de6cdf8a..853182b6e94 100644
--- a/dlls/win32u/message.c
+++ b/dlls/win32u/message.c
@@ -46,6 +46,9 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar
case WM_WINE_SETWINDOWPOS:
if (is_desktop_window( hwnd )) return 0;
return set_window_pos( (WINDOWPOS *)lparam, 0, 0 );
+ case WM_WINE_SHOWWINDOW:
+ if (is_desktop_window( hwnd )) return 0;
+ return NtUserShowWindow( hwnd, wparam );
case WM_WINE_SETPARENT:
if (is_desktop_window( hwnd )) return 0;
return HandleToUlong( NtUserSetParent( hwnd, UlongToHandle(wparam) ));
diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h
index 51f17f63de5..49fd22ca140 100644
--- a/dlls/win32u/ntuser_private.h
+++ b/dlls/win32u/ntuser_private.h
@@ -42,7 +42,6 @@ struct user_callbacks
LRESULT (WINAPI *pSendMessageW)( HWND, UINT, WPARAM, LPARAM );
BOOL (WINAPI *pSendNotifyMessageW)( HWND, UINT, WPARAM, LPARAM );
BOOL (WINAPI *pShowCaret)( HWND hwnd );
- BOOL (WINAPI *pShowWindow)( HWND, INT );
DWORD (WINAPI *pWaitForInputIdle)( HANDLE, DWORD );
void (CDECL *free_win_ptr)( struct tagWND *win );
HWND (CDECL *is_menu_active)(void);
@@ -278,6 +277,12 @@ HANDLE alloc_user_handle( struct user_object *ptr, unsigned int type ) DECLSPEC_
void *free_user_handle( HANDLE handle, unsigned int type ) DECLSPEC_HIDDEN;
void *get_user_handle_ptr( HANDLE handle, unsigned int type ) DECLSPEC_HIDDEN;
void release_user_handle_ptr( void *ptr ) DECLSPEC_HIDDEN;
+UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) DECLSPEC_HIDDEN;
+
+static inline UINT win_get_flags( HWND hwnd )
+{
+ return win_set_flags( hwnd, 0, 0 );
+}
WND *get_win_ptr( HWND hwnd ) DECLSPEC_HIDDEN;
BOOL is_child( HWND parent, HWND child );
diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec
index aacfebd1b15..68348db4033 100644
--- a/dlls/win32u/win32u.spec
+++ b/dlls/win32u/win32u.spec
@@ -1261,8 +1261,8 @@
@ stdcall NtUserShowCursor(long)
@ stub NtUserShowScrollBar
@ stub NtUserShowSystemCursor
-@ stub NtUserShowWindow
-@ stub NtUserShowWindowAsync
+@ stdcall NtUserShowWindow(long long)
+@ stdcall NtUserShowWindowAsync(long long)
@ stub NtUserShutdownBlockReasonCreate
@ stub NtUserShutdownBlockReasonQuery
@ stub NtUserShutdownReasonDestroy
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index 2e8a8e3da8e..361bec31ec8 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -258,6 +258,8 @@ struct unix_funcs
int (WINAPI *pNtUserSetWindowRgn)( HWND hwnd, HRGN hrgn, BOOL redraw );
WORD (WINAPI *pNtUserSetWindowWord)( HWND hwnd, INT offset, WORD newval );
INT (WINAPI *pNtUserShowCursor)( BOOL show );
+ BOOL (WINAPI *pNtUserShowWindow)( HWND hwnd, INT cmd );
+ BOOL (WINAPI *pNtUserShowWindowAsync)( HWND hwnd, INT cmd );
BOOL (WINAPI *pNtUserSystemParametersInfo)( UINT action, UINT val, PVOID ptr, UINT winini );
BOOL (WINAPI *pNtUserSystemParametersInfoForDpi)( UINT action, UINT val, PVOID ptr,
UINT winini, UINT dpi );
@@ -311,6 +313,7 @@ extern BOOL unhook_windows_hook( INT id, HOOKPROC proc ) DECLSPEC_HIDDEN;
extern LONG global_key_state_counter DECLSPEC_HIDDEN;
extern HWND get_active_window(void) DECLSPEC_HIDDEN;
extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN;
+extern HWND get_focus(void) DECLSPEC_HIDDEN;
extern DWORD get_input_state(void) DECLSPEC_HIDDEN;
extern BOOL WINAPI release_capture(void) DECLSPEC_HIDDEN;
extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN;
@@ -353,6 +356,7 @@ struct tagWND;
extern HDWP begin_defer_window_pos( INT count ) DECLSPEC_HIDDEN;
extern void destroy_thread_windows(void) DECLSPEC_HIDDEN;
extern LRESULT destroy_window( HWND hwnd ) DECLSPEC_HIDDEN;
+extern BOOL get_client_rect( HWND hwnd, RECT *rect ) DECLSPEC_HIDDEN;
extern HWND get_desktop_window(void) DECLSPEC_HIDDEN;
extern UINT get_dpi_for_window( HWND hwnd ) DECLSPEC_HIDDEN;
extern HWND get_full_window_handle( HWND hwnd ) DECLSPEC_HIDDEN;
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 1069ace0794..ab69096184c 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -916,6 +916,11 @@ BOOL is_iconic( HWND hwnd )
return (get_window_long( hwnd, GWL_STYLE ) & WS_MINIMIZE) != 0;
}
+static BOOL is_zoomed( HWND hwnd )
+{
+ return (get_window_long( hwnd, GWL_STYLE ) & WS_MAXIMIZE) != 0;
+}
+
static LONG_PTR get_window_long_size( HWND hwnd, INT offset, UINT size, BOOL ansi )
{
LONG_PTR retval = 0;
@@ -1655,7 +1660,7 @@ BOOL get_window_rect( HWND hwnd, RECT *rect, UINT dpi )
}
/* see GetClientRect */
-static BOOL get_client_rect( HWND hwnd, RECT *rect )
+BOOL get_client_rect( HWND hwnd, RECT *rect )
{
return get_window_rects( hwnd, COORDS_CLIENT, NULL, rect, get_thread_dpi() );
}
@@ -2174,14 +2179,6 @@ BOOL get_window_placement( HWND hwnd, WINDOWPLACEMENT *placement )
return TRUE;
}
-/*****************************************************************************
- * NtUserShowWindow (win32u.@)
- */
-BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd )
-{
- return user_callbacks && user_callbacks->pShowWindow( hwnd, cmd );
-}
-
/*****************************************************************************
* NtUserBuildHwndList (win32u.@)
*/
@@ -3179,7 +3176,7 @@ BOOL WINAPI NtUserEndDeferWindowPosEx( HDWP hdwp, BOOL async )
*
* Set the flags of a window and return the previous value.
*/
-static UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask )
+UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask )
{
WND *win = get_win_ptr( hwnd );
UINT ret;
@@ -3361,6 +3358,255 @@ static MINMAXINFO get_min_max_info( HWND hwnd )
return minmax;
}
+static POINT get_first_minimized_child_pos( const RECT *parent, const MINIMIZEDMETRICS *mm,
+ int width, int height )
+{
+ POINT ret;
+
+ if (mm->iArrange & ARW_STARTRIGHT)
+ ret.x = parent->right - mm->iHorzGap - width;
+ else
+ ret.x = parent->left + mm->iHorzGap;
+ if (mm->iArrange & ARW_STARTTOP)
+ ret.y = parent->top + mm->iVertGap;
+ else
+ ret.y = parent->bottom - mm->iVertGap - height;
+
+ return ret;
+}
+
+static void get_next_minimized_child_pos( const RECT *parent, const MINIMIZEDMETRICS *mm,
+ int width, int height, POINT *pos )
+{
+ BOOL next;
+
+ if (mm->iArrange & ARW_UP) /* == ARW_DOWN */
+ {
+ if (mm->iArrange & ARW_STARTTOP)
+ {
+ pos->y += height + mm->iVertGap;
+ if ((next = pos->y + height > parent->bottom))
+ pos->y = parent->top + mm->iVertGap;
+ }
+ else
+ {
+ pos->y -= height + mm->iVertGap;
+ if ((next = pos->y < parent->top))
+ pos->y = parent->bottom - mm->iVertGap - height;
+ }
+
+ if (next)
+ {
+ if (mm->iArrange & ARW_STARTRIGHT)
+ pos->x -= width + mm->iHorzGap;
+ else
+ pos->x += width + mm->iHorzGap;
+ }
+ }
+ else
+ {
+ if (mm->iArrange & ARW_STARTRIGHT)
+ {
+ pos->x -= width + mm->iHorzGap;
+ if ((next = pos->x < parent->left))
+ pos->x = parent->right - mm->iHorzGap - width;
+ }
+ else
+ {
+ pos->x += width + mm->iHorzGap;
+ if ((next = pos->x + width > parent->right))
+ pos->x = parent->left + mm->iHorzGap;
+ }
+
+ if (next)
+ {
+ if (mm->iArrange & ARW_STARTTOP)
+ pos->y += height + mm->iVertGap;
+ else
+ pos->y -= height + mm->iVertGap;
+ }
+ }
+}
+
+static POINT get_minimized_pos( HWND hwnd, POINT pt )
+{
+ RECT rect, parent_rect;
+ HWND parent, child;
+ HRGN hrgn, tmp;
+ MINIMIZEDMETRICS metrics;
+ int width, height;
+
+ parent = NtUserGetAncestor( hwnd, GA_PARENT );
+ if (parent == get_desktop_window())
+ {
+ MONITORINFO mon_info;
+ HMONITOR monitor = monitor_from_window( hwnd, MONITOR_DEFAULTTOPRIMARY, get_thread_dpi() );
+
+ mon_info.cbSize = sizeof( mon_info );
+ get_monitor_info( monitor, &mon_info );
+ parent_rect = mon_info.rcWork;
+ }
+ else get_client_rect( parent, &parent_rect );
+
+ if (pt.x >= parent_rect.left && (pt.x + get_system_metrics( SM_CXMINIMIZED ) < parent_rect.right) &&
+ pt.y >= parent_rect.top && (pt.y + get_system_metrics( SM_CYMINIMIZED ) < parent_rect.bottom))
+ return pt; /* The icon already has a suitable position */
+
+ width = get_system_metrics( SM_CXMINIMIZED );
+ height = get_system_metrics( SM_CYMINIMIZED );
+
+ metrics.cbSize = sizeof(metrics);
+ NtUserSystemParametersInfo( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 );
+
+ /* Check if another icon already occupies this spot */
+ /* FIXME: this is completely inefficient */
+
+ hrgn = NtGdiCreateRectRgn( 0, 0, 0, 0 );
+ tmp = NtGdiCreateRectRgn( 0, 0, 0, 0 );
+ for (child = get_window_relative( parent, GW_CHILD );
+ child;
+ child = get_window_relative( child, GW_HWNDNEXT ))
+ {
+ if (child == hwnd) continue;
+ if ((get_window_long( child, GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) != (WS_VISIBLE|WS_MINIMIZE))
+ continue;
+ if (get_window_rects( child, COORDS_PARENT, &rect, NULL, get_thread_dpi() ))
+ {
+ NtGdiSetRectRgn( tmp, rect.left, rect.top, rect.right, rect.bottom );
+ NtGdiCombineRgn( hrgn, hrgn, tmp, RGN_OR );
+ }
+ }
+ NtGdiDeleteObjectApp( tmp );
+
+ pt = get_first_minimized_child_pos( &parent_rect, &metrics, width, height );
+ for (;;)
+ {
+ set_rect( &rect, pt.x, pt.y, pt.x + width, pt.y + height );
+ if (!NtGdiRectInRegion( hrgn, &rect ))
+ break;
+
+ get_next_minimized_child_pos( &parent_rect, &metrics, width, height, &pt );
+ }
+
+ NtGdiDeleteObjectApp( hrgn );
+ return pt;
+}
+
+/***********************************************************************
+ * window_min_maximize
+ */
+static UINT window_min_maximize( HWND hwnd, UINT cmd, RECT *rect )
+{
+ UINT swp_flags = 0;
+ LONG old_style;
+ MINMAXINFO minmax;
+ WINDOWPLACEMENT wpl;
+
+ TRACE( "%p %u\n", hwnd, cmd );
+
+ wpl.length = sizeof(wpl);
+ get_window_placement( hwnd, &wpl );
+
+ if (call_hooks( WH_CBT, HCBT_MINMAX, (WPARAM)hwnd, cmd, TRUE ))
+ return SWP_NOSIZE | SWP_NOMOVE;
+
+ if (is_iconic( hwnd ))
+ {
+ switch (cmd)
+ {
+ case SW_SHOWMINNOACTIVE:
+ case SW_SHOWMINIMIZED:
+ case SW_FORCEMINIMIZE:
+ case SW_MINIMIZE:
+ wpl.ptMinPosition = get_minimized_pos( hwnd, wpl.ptMinPosition );
+
+ set_rect( rect, wpl.ptMinPosition.x, wpl.ptMinPosition.y,
+ wpl.ptMinPosition.x + get_system_metrics( SM_CXMINIMIZED ),
+ wpl.ptMinPosition.y + get_system_metrics( SM_CYMINIMIZED ));
+ return SWP_NOSIZE | SWP_NOMOVE;
+ }
+ if (!send_message( hwnd, WM_QUERYOPEN, 0, 0 )) return SWP_NOSIZE | SWP_NOMOVE;
+ swp_flags |= SWP_NOCOPYBITS;
+ }
+
+ switch( cmd )
+ {
+ case SW_SHOWMINNOACTIVE:
+ case SW_SHOWMINIMIZED:
+ case SW_FORCEMINIMIZE:
+ case SW_MINIMIZE:
+ if (is_zoomed( hwnd )) win_set_flags( hwnd, WIN_RESTORE_MAX, 0 );
+ else win_set_flags( hwnd, 0, WIN_RESTORE_MAX );
+
+ if (get_focus() == hwnd)
+ {
+ if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD)
+ NtUserSetFocus( NtUserGetAncestor( hwnd, GA_PARENT ));
+ else
+ NtUserSetFocus( 0 );
+ }
+
+ old_style = set_window_style( hwnd, WS_MINIMIZE, WS_MAXIMIZE );
+
+ wpl.ptMinPosition = get_minimized_pos( hwnd, wpl.ptMinPosition );
+
+ if (!(old_style & WS_MINIMIZE)) swp_flags |= SWP_STATECHANGED;
+ set_rect( rect, wpl.ptMinPosition.x, wpl.ptMinPosition.y,
+ wpl.ptMinPosition.x + get_system_metrics(SM_CXMINIMIZED),
+ wpl.ptMinPosition.y + get_system_metrics(SM_CYMINIMIZED) );
+ swp_flags |= SWP_NOCOPYBITS;
+ break;
+
+ case SW_MAXIMIZE:
+ old_style = get_window_long( hwnd, GWL_STYLE );
+ if ((old_style & WS_MAXIMIZE) && (old_style & WS_VISIBLE)) return SWP_NOSIZE | SWP_NOMOVE;
+
+ minmax = get_min_max_info( hwnd );
+
+ old_style = set_window_style( hwnd, WS_MAXIMIZE, WS_MINIMIZE );
+ if (old_style & WS_MINIMIZE)
+ win_set_flags( hwnd, WIN_RESTORE_MAX, 0 );
+
+ if (!(old_style & WS_MAXIMIZE)) swp_flags |= SWP_STATECHANGED;
+ set_rect( rect, minmax.ptMaxPosition.x, minmax.ptMaxPosition.y,
+ minmax.ptMaxPosition.x + minmax.ptMaxSize.x,
+ minmax.ptMaxPosition.y + minmax.ptMaxSize.y );
+ break;
+
+ case SW_SHOWNOACTIVATE:
+ win_set_flags( hwnd, 0, WIN_RESTORE_MAX );
+ /* fall through */
+ case SW_SHOWNORMAL:
+ case SW_RESTORE:
+ case SW_SHOWDEFAULT: /* FIXME: should have its own handler */
+ old_style = set_window_style( hwnd, 0, WS_MINIMIZE | WS_MAXIMIZE );
+ if (old_style & WS_MINIMIZE)
+ {
+ if (win_get_flags( hwnd ) & WIN_RESTORE_MAX)
+ {
+ /* Restore to maximized position */
+ minmax = get_min_max_info( hwnd );
+ set_window_style( hwnd, WS_MAXIMIZE, 0 );
+ swp_flags |= SWP_STATECHANGED;
+ set_rect( rect, minmax.ptMaxPosition.x, minmax.ptMaxPosition.y,
+ minmax.ptMaxPosition.x + minmax.ptMaxSize.x,
+ minmax.ptMaxPosition.y + minmax.ptMaxSize.y );
+ break;
+ }
+ }
+ else if (!(old_style & WS_MAXIMIZE)) break;
+
+ swp_flags |= SWP_STATECHANGED;
+
+ /* Restore to normal position */
+
+ *rect = wpl.rcNormalPosition;
+ break;
+ }
+
+ return swp_flags;
+}
+
/*******************************************************************
* update_window_state
*
@@ -3387,6 +3633,227 @@ void update_window_state( HWND hwnd )
set_thread_dpi_awareness_context( context );
}
+/***********************************************************************
+ * show_window
+ *
+ * Implementation of ShowWindow and ShowWindowAsync.
+ */
+static BOOL show_window( HWND hwnd, INT cmd )
+{
+ WND *win;
+ HWND parent;
+ DPI_AWARENESS_CONTEXT context;
+ LONG style = get_window_long( hwnd, GWL_STYLE );
+ BOOL was_visible = (style & WS_VISIBLE) != 0;
+ BOOL show_flag = TRUE;
+ RECT newPos = {0, 0, 0, 0};
+ UINT new_swp, swp = 0;
+
+ TRACE( "hwnd=%p, cmd=%d, was_visible %d\n", hwnd, cmd, was_visible );
+
+ context = set_thread_dpi_awareness_context( get_window_dpi_awareness_context( hwnd ));
+
+ switch(cmd)
+ {
+ case SW_HIDE:
+ if (!was_visible) goto done;
+ show_flag = FALSE;
+ swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE;
+ if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER;
+ break;
+
+ case SW_SHOWMINNOACTIVE:
+ case SW_MINIMIZE:
+ case SW_FORCEMINIMIZE: /* FIXME: Does not work if thread is hung. */
+ swp |= SWP_NOACTIVATE | SWP_NOZORDER;
+ /* fall through */
+ case SW_SHOWMINIMIZED:
+ swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
+ swp |= window_min_maximize( hwnd, cmd, &newPos );
+ if ((style & WS_MINIMIZE) && was_visible) goto done;
+ break;
+
+ case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */
+ if (!was_visible) swp |= SWP_SHOWWINDOW;
+ swp |= SWP_FRAMECHANGED;
+ swp |= window_min_maximize( hwnd, SW_MAXIMIZE, &newPos );
+ if ((style & WS_MAXIMIZE) && was_visible) goto done;
+ break;
+
+ case SW_SHOWNA:
+ swp |= SWP_NOACTIVATE | SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE;
+ if (style & WS_CHILD) swp |= SWP_NOZORDER;
+ break;
+
+ case SW_SHOW:
+ if (was_visible) goto done;
+ swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE;
+ if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER;
+ break;
+
+ case SW_SHOWNOACTIVATE:
+ swp |= SWP_NOACTIVATE | SWP_NOZORDER;
+ /* fall through */
+ case SW_RESTORE:
+ /* fall through */
+ case SW_SHOWNORMAL: /* same as SW_NORMAL: */
+ case SW_SHOWDEFAULT: /* FIXME: should have its own handler */
+ if (!was_visible) swp |= SWP_SHOWWINDOW;
+ if (style & (WS_MINIMIZE | WS_MAXIMIZE))
+ {
+ swp |= SWP_FRAMECHANGED;
+ swp |= window_min_maximize( hwnd, cmd, &newPos );
+ }
+ else
+ {
+ if (was_visible) goto done;
+ swp |= SWP_NOSIZE | SWP_NOMOVE;
+ }
+ if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER;
+ break;
+
+ default:
+ goto done;
+ }
+
+ if ((show_flag != was_visible || cmd == SW_SHOWNA) && cmd != SW_SHOWMAXIMIZED && !(swp & SWP_STATECHANGED))
+ {
+ send_message( hwnd, WM_SHOWWINDOW, show_flag, 0 );
+ if (!is_window( hwnd )) goto done;
+ }
+
+ if (IsRectEmpty( &newPos )) new_swp = swp;
+ else if ((new_swp = user_driver->pShowWindow( hwnd, cmd, &newPos, swp )) == ~0)
+ {
+ if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) new_swp = swp;
+ else if (is_iconic( hwnd ) && (newPos.left != -32000 || newPos.top != -32000))
+ {
+ offset_rect( &newPos, -32000 - newPos.left, -32000 - newPos.top );
+ new_swp = swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE);
+ }
+ else new_swp = swp;
+ }
+ swp = new_swp;
+
+ parent = NtUserGetAncestor( hwnd, GA_PARENT );
+ if (parent && !is_window_visible( parent ) && !(swp & SWP_STATECHANGED))
+ {
+ /* if parent is not visible simply toggle WS_VISIBLE and return */
+ if (show_flag) set_window_style( hwnd, WS_VISIBLE, 0 );
+ else set_window_style( hwnd, 0, WS_VISIBLE );
+ }
+ else
+ NtUserSetWindowPos( hwnd, HWND_TOP, newPos.left, newPos.top,
+ newPos.right - newPos.left, newPos.bottom - newPos.top, swp );
+
+ if (cmd == SW_HIDE)
+ {
+ HWND hFocus;
+
+ /* FIXME: This will cause the window to be activated irrespective
+ * of whether it is owned by the same thread. Has to be done
+ * asynchronously.
+ */
+
+ if (hwnd == get_active_window()) activate_other_window( hwnd );
+
+ /* Revert focus to parent */
+ hFocus = get_focus();
+ if (hwnd == hFocus)
+ {
+ HWND parent = NtUserGetAncestor(hwnd, GA_PARENT);
+ if (parent == get_desktop_window()) parent = 0;
+ NtUserSetFocus(parent);
+ }
+ goto done;
+ }
+
+ if (!(win = get_win_ptr( hwnd )) || win == WND_OTHER_PROCESS) goto done;
+
+ if (win->flags & WIN_NEED_SIZE)
+ {
+ /* should happen only in CreateWindowEx() */
+ int wParam = SIZE_RESTORED;
+ RECT client;
+ LPARAM lparam;
+
+ get_window_rects( hwnd, COORDS_PARENT, NULL, &client, get_thread_dpi() );
+ lparam = MAKELONG( client.right - client.left, client.bottom - client.top );
+ win->flags &= ~WIN_NEED_SIZE;
+ if (win->dwStyle & WS_MAXIMIZE) wParam = SIZE_MAXIMIZED;
+ else if (win->dwStyle & WS_MINIMIZE)
+ {
+ wParam = SIZE_MINIMIZED;
+ lparam = 0;
+ }
+ release_win_ptr( win );
+
+ send_message( hwnd, WM_SIZE, wParam, lparam );
+ send_message( hwnd, WM_MOVE, 0, MAKELONG( client.left, client.top ));
+ }
+ else release_win_ptr( win );
+
+ /* if previous state was minimized Windows sets focus to the window */
+ if (style & WS_MINIMIZE)
+ {
+ NtUserSetFocus( hwnd );
+ /* Send a WM_ACTIVATE message for a top level window, even if the window is already active */
+ if (NtUserGetAncestor( hwnd, GA_ROOT ) == hwnd && !(swp & SWP_NOACTIVATE))
+ send_message( hwnd, WM_ACTIVATE, WA_ACTIVE, 0 );
+ }
+
+done:
+ set_thread_dpi_awareness_context( context );
+ return was_visible;
+}
+
+/***********************************************************************
+ * NtUserShowWindowAsync (win32u.@)
+ *
+ * doesn't wait; returns immediately.
+ * used by threads to toggle windows in other (possibly hanging) threads
+ */
+BOOL WINAPI NtUserShowWindowAsync( HWND hwnd, INT cmd )
+{
+ HWND full_handle;
+
+ if (is_broadcast(hwnd))
+ {
+ SetLastError( ERROR_INVALID_PARAMETER );
+ return FALSE;
+ }
+
+ if ((full_handle = is_current_thread_window( hwnd )))
+ return show_window( full_handle, cmd );
+
+ return NtUserMessageCall( hwnd, WM_WINE_SHOWWINDOW, cmd, 0, 0,
+ FNID_SENDNOTIFYMESSAGE, FALSE );
+}
+
+/***********************************************************************
+ * NtUserShowWindow (win32u.@)
+ */
+BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd )
+{
+ HWND full_handle;
+
+ if (is_broadcast(hwnd))
+ {
+ SetLastError( ERROR_INVALID_PARAMETER );
+ return FALSE;
+ }
+ if ((full_handle = is_current_thread_window( hwnd )))
+ return show_window( full_handle, cmd );
+
+ if ((cmd == SW_HIDE) && !(get_window_long( hwnd, GWL_STYLE ) & WS_VISIBLE))
+ return FALSE;
+
+ if ((cmd == SW_SHOW) && (get_window_long( hwnd, GWL_STYLE ) & WS_VISIBLE))
+ return TRUE;
+
+ return send_message( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 );
+}
+
/*******************************************************************
* NtUserFlashWindowEx (win32u.@)
*/
diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c
index da1957c8c88..6cb3a6896b5 100644
--- a/dlls/win32u/wrappers.c
+++ b/dlls/win32u/wrappers.c
@@ -1075,6 +1075,18 @@ INT WINAPI NtUserShowCursor( BOOL show )
return unix_funcs->pNtUserShowCursor( show );
}
+BOOL WINAPI NtUserShowWindowAsync( HWND hwnd, INT cmd )
+{
+ if (!unix_funcs) return FALSE;
+ return unix_funcs->pNtUserShowWindowAsync( hwnd, cmd );
+}
+
+BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd )
+{
+ if (!unix_funcs) return FALSE;
+ return unix_funcs->pNtUserShowWindow( hwnd, cmd );
+}
+
BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, PVOID ptr, UINT winini )
{
if (!unix_funcs) return FALSE;
diff --git a/include/ntuser.h b/include/ntuser.h
index 274c0cf31c9..6526d190e28 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -422,6 +422,7 @@ HWINEVENTHOOK WINAPI NtUserSetWinEventHook( DWORD event_min, DWORD event_max, HM
DWORD pid, DWORD tid, DWORD flags );
INT WINAPI NtUserShowCursor( BOOL show );
BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd );
+BOOL WINAPI NtUserShowWindowAsync( HWND hwnd, INT cmd );
BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT winini );
BOOL WINAPI NtUserSystemParametersInfoForDpi( UINT action, UINT val, PVOID ptr, UINT winini, UINT dpi );
INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state,
--
2.23.0
1
0
17 Mar '22
From: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/user32/user_main.c | 1 +
dlls/user32/winpos.c | 92 ++--------------------------------
dlls/win32u/menu.c | 6 +++
dlls/win32u/ntuser_private.h | 1 +
dlls/win32u/win32u_private.h | 3 ++
dlls/win32u/window.c | 97 ++++++++++++++++++++++++++++++++++++
include/ntuser.h | 1 +
7 files changed, 113 insertions(+), 88 deletions(-)
diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c
index bc0dec6b579..15293d76c41 100644
--- a/dlls/user32/user_main.c
+++ b/dlls/user32/user_main.c
@@ -154,6 +154,7 @@ static void CDECL free_win_ptr( WND *win )
static const struct user_callbacks user_funcs =
{
+ AdjustWindowRectEx,
CopyImage,
DestroyCaret,
DestroyMenu,
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index b3e8aff3cfa..1951f887351 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -48,8 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win);
(((style) & WS_THICKFRAME) && \
!(((style) & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME))
-#define EMPTYPOINT(pt) ((pt).x == -1 && (pt).y == -1)
-
#define ON_LEFT_BORDER(hit) \
(((hit) == HTLEFT) || ((hit) == HTTOPLEFT) || ((hit) == HTBOTTOMLEFT))
#define ON_RIGHT_BORDER(hit) \
@@ -548,94 +546,12 @@ static BOOL get_work_rect( HWND hwnd, RECT *rect )
*/
MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd )
{
- DPI_AWARENESS_CONTEXT context;
- RECT rc_work, rc_primary;
- MINMAXINFO MinMax;
- INT xinc, yinc;
- LONG style = GetWindowLongW( hwnd, GWL_STYLE );
- LONG adjustedStyle;
- LONG exstyle = GetWindowLongW( hwnd, GWL_EXSTYLE );
- RECT rc;
- WND *win;
-
- context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd ));
-
- /* Compute default values */
-
- GetWindowRect(hwnd, &rc);
- MinMax.ptReserved.x = rc.left;
- MinMax.ptReserved.y = rc.top;
-
- if ((style & WS_CAPTION) == WS_CAPTION)
- adjustedStyle = style & ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */
- else
- adjustedStyle = style;
-
- GetClientRect(NtUserGetAncestor(hwnd,GA_PARENT), &rc);
- AdjustWindowRectEx(&rc, adjustedStyle, ((style & WS_POPUP) && GetMenu(hwnd)), exstyle);
-
- xinc = -rc.left;
- yinc = -rc.top;
-
- MinMax.ptMaxSize.x = rc.right - rc.left;
- MinMax.ptMaxSize.y = rc.bottom - rc.top;
- if (style & (WS_DLGFRAME | WS_BORDER))
- {
- MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK);
- MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK);
- }
- else
- {
- MinMax.ptMinTrackSize.x = 2 * xinc;
- MinMax.ptMinTrackSize.y = 2 * yinc;
- }
- MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK);
- MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK);
- MinMax.ptMaxPosition.x = -xinc;
- MinMax.ptMaxPosition.y = -yinc;
-
- if ((win = WIN_GetPtr( hwnd )) && win != WND_DESKTOP && win != WND_OTHER_PROCESS)
- {
- if (!EMPTYPOINT(win->max_pos)) MinMax.ptMaxPosition = win->max_pos;
- WIN_ReleasePtr( win );
- }
-
- SendMessageW( hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax );
-
- /* if the app didn't change the values, adapt them for the current monitor */
-
- if (get_work_rect( hwnd, &rc_work ))
- {
- rc_primary = get_primary_monitor_rect();
- if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc &&
- MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc)
- {
- MinMax.ptMaxSize.x = (rc_work.right - rc_work.left) + 2 * xinc;
- MinMax.ptMaxSize.y = (rc_work.bottom - rc_work.top) + 2 * yinc;
- }
- if (MinMax.ptMaxPosition.x == -xinc && MinMax.ptMaxPosition.y == -yinc)
- {
- MinMax.ptMaxPosition.x = rc_work.left - xinc;
- MinMax.ptMaxPosition.y = rc_work.top - yinc;
- }
- }
-
- /* Some sanity checks */
-
- TRACE("%d %d / %d %d / %d %d / %d %d\n",
- MinMax.ptMaxSize.x, MinMax.ptMaxSize.y,
- MinMax.ptMaxPosition.x, MinMax.ptMaxPosition.y,
- MinMax.ptMaxTrackSize.x, MinMax.ptMaxTrackSize.y,
- MinMax.ptMinTrackSize.x, MinMax.ptMinTrackSize.y);
- MinMax.ptMaxTrackSize.x = max( MinMax.ptMaxTrackSize.x,
- MinMax.ptMinTrackSize.x );
- MinMax.ptMaxTrackSize.y = max( MinMax.ptMaxTrackSize.y,
- MinMax.ptMinTrackSize.y );
-
- SetThreadDpiAwarenessContext( context );
- return MinMax;
+ MINMAXINFO info;
+ NtUserCallHwndParam( hwnd, (UINT_PTR)&info, NtUserGetMinMaxInfo );
+ return info;
}
+
static POINT get_first_minimized_child_pos( const RECT *parent, const MINIMIZEDMETRICS *mm,
int width, int height )
{
diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c
index 1e8410d347e..921c5752536 100644
--- a/dlls/win32u/menu.c
+++ b/dlls/win32u/menu.c
@@ -106,6 +106,12 @@ BOOL WINAPI NtUserDestroyAcceleratorTable( HACCEL handle )
return TRUE;
}
+/* see GetMenu */
+HMENU get_menu( HWND hwnd )
+{
+ return UlongToHandle( get_window_long( hwnd, GWLP_ID ));
+}
+
/**********************************************************************
* NtUserDestroyMenu (win32u.@)
*/
diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h
index b3cafe791df..51f17f63de5 100644
--- a/dlls/win32u/ntuser_private.h
+++ b/dlls/win32u/ntuser_private.h
@@ -30,6 +30,7 @@ struct tagWND;
struct user_callbacks
{
+ BOOL (WINAPI *pAdjustWindowRectEx)( RECT *, DWORD, BOOL, DWORD );
HANDLE (WINAPI *pCopyImage)( HANDLE, UINT, INT, INT, UINT );
BOOL (WINAPI *pDestroyCaret)(void);
BOOL (WINAPI *pDestroyMenu)( HMENU );
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index 83b0e093a20..2e8a8e3da8e 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -316,6 +316,9 @@ extern BOOL WINAPI release_capture(void) DECLSPEC_HIDDEN;
extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN;
extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN;
+/* menu.c */
+extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN;
+
/* message.c */
extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) DECLSPEC_HIDDEN;
extern LRESULT post_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index f8d147b785c..1069ace0794 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -3267,6 +3267,100 @@ static void send_parent_notify( HWND hwnd, UINT msg )
}
}
+/*******************************************************************
+ * get_min_max_info
+ *
+ * Get the minimized and maximized information for a window.
+ */
+static MINMAXINFO get_min_max_info( HWND hwnd )
+{
+ LONG style = get_window_long( hwnd, GWL_STYLE );
+ LONG exstyle = get_window_long( hwnd, GWL_EXSTYLE );
+ DPI_AWARENESS_CONTEXT context;
+ RECT rc_work, rc_primary;
+ LONG adjusted_style;
+ MINMAXINFO minmax;
+ INT xinc, yinc;
+ RECT rc;
+ WND *win;
+
+ context = set_thread_dpi_awareness_context( get_window_dpi_awareness_context( hwnd ));
+
+ /* Compute default values */
+
+ get_window_rect( hwnd, &rc, get_thread_dpi() );
+ minmax.ptReserved.x = rc.left;
+ minmax.ptReserved.y = rc.top;
+
+ if ((style & WS_CAPTION) == WS_CAPTION)
+ adjusted_style = style & ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */
+ else
+ adjusted_style = style;
+
+ get_client_rect( NtUserGetAncestor( hwnd, GA_PARENT ), &rc );
+ if (user_callbacks)
+ user_callbacks->pAdjustWindowRectEx( &rc, adjusted_style,
+ (style & WS_POPUP) && get_menu( hwnd ), exstyle);
+
+ xinc = -rc.left;
+ yinc = -rc.top;
+
+ minmax.ptMaxSize.x = rc.right - rc.left;
+ minmax.ptMaxSize.y = rc.bottom - rc.top;
+ if (style & (WS_DLGFRAME | WS_BORDER))
+ {
+ minmax.ptMinTrackSize.x = get_system_metrics( SM_CXMINTRACK );
+ minmax.ptMinTrackSize.y = get_system_metrics( SM_CYMINTRACK );
+ }
+ else
+ {
+ minmax.ptMinTrackSize.x = 2 * xinc;
+ minmax.ptMinTrackSize.y = 2 * yinc;
+ }
+ minmax.ptMaxTrackSize.x = get_system_metrics( SM_CXMAXTRACK );
+ minmax.ptMaxTrackSize.y = get_system_metrics( SM_CYMAXTRACK );
+ minmax.ptMaxPosition.x = -xinc;
+ minmax.ptMaxPosition.y = -yinc;
+
+ if ((win = get_win_ptr( hwnd )) && win != WND_DESKTOP && win != WND_OTHER_PROCESS)
+ {
+ if (!empty_point( win->max_pos )) minmax.ptMaxPosition = win->max_pos;
+ release_win_ptr( win );
+ }
+
+ send_message( hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&minmax );
+
+ /* if the app didn't change the values, adapt them for the current monitor */
+
+ if (get_work_rect( hwnd, &rc_work ))
+ {
+ rc_primary = get_primary_monitor_rect( get_thread_dpi() );
+ if (minmax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc &&
+ minmax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc)
+ {
+ minmax.ptMaxSize.x = (rc_work.right - rc_work.left) + 2 * xinc;
+ minmax.ptMaxSize.y = (rc_work.bottom - rc_work.top) + 2 * yinc;
+ }
+ if (minmax.ptMaxPosition.x == -xinc && minmax.ptMaxPosition.y == -yinc)
+ {
+ minmax.ptMaxPosition.x = rc_work.left - xinc;
+ minmax.ptMaxPosition.y = rc_work.top - yinc;
+ }
+ }
+
+ TRACE( "%d %d / %d %d / %d %d / %d %d\n",
+ minmax.ptMaxSize.x, minmax.ptMaxSize.y,
+ minmax.ptMaxPosition.x, minmax.ptMaxPosition.y,
+ minmax.ptMaxTrackSize.x, minmax.ptMaxTrackSize.y,
+ minmax.ptMinTrackSize.x, minmax.ptMinTrackSize.y );
+
+ minmax.ptMaxTrackSize.x = max( minmax.ptMaxTrackSize.x, minmax.ptMinTrackSize.x );
+ minmax.ptMaxTrackSize.y = max( minmax.ptMaxTrackSize.y, minmax.ptMinTrackSize.y );
+
+ set_thread_dpi_awareness_context( context );
+ return minmax;
+}
+
/*******************************************************************
* update_window_state
*
@@ -3671,6 +3765,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code )
return get_class_word( hwnd, param );
case NtUserGetClientRect:
return get_client_rect( hwnd, (RECT *)param );
+ case NtUserGetMinMaxInfo:
+ *(MINMAXINFO *)param = get_min_max_info( hwnd );
+ return 0;
case NtUserGetWindowInfo:
return get_window_info( hwnd, (WINDOWINFO *)param );
case NtUserGetWindowLongA:
diff --git a/include/ntuser.h b/include/ntuser.h
index de958caa735..274c0cf31c9 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -167,6 +167,7 @@ enum
NtUserGetClassLongPtrW,
NtUserGetClassWord,
NtUserGetClientRect,
+ NtUserGetMinMaxInfo,
NtUserGetWindowInfo,
NtUserGetWindowLongA,
NtUserGetWindowLongW,
--
2.23.0
1
0
[PATCH v2 2/5] win32u: Move NtUserDestroyWindow implementation from user32.
by Huw Davies 17 Mar '22
by Huw Davies 17 Mar '22
17 Mar '22
From: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/user32/clipboard.c | 23 ---
dlls/user32/combo.c | 2 +-
dlls/user32/dde_misc.c | 6 +-
dlls/user32/dde_server.c | 2 +-
dlls/user32/defwnd.c | 2 +-
dlls/user32/dialog.c | 4 +-
dlls/user32/driver.c | 7 +-
dlls/user32/mdi.c | 2 +-
dlls/user32/menu.c | 8 +-
dlls/user32/message.c | 2 -
dlls/user32/msgbox.c | 70 ++++----
dlls/user32/painting.c | 12 --
dlls/user32/user32.spec | 2 +-
dlls/user32/user_main.c | 10 ++
dlls/user32/win.c | 248 +--------------------------
dlls/user32/win.h | 1 -
dlls/win32u/clipboard.c | 25 +++
dlls/win32u/driver.c | 1 +
dlls/win32u/gdiobj.c | 1 +
dlls/win32u/message.c | 2 +
dlls/win32u/ntuser_private.h | 4 +
dlls/win32u/sysparams.c | 18 +-
dlls/win32u/win32u.spec | 2 +-
dlls/win32u/win32u_private.h | 6 +
dlls/win32u/window.c | 315 +++++++++++++++++++++++++++++++++++
dlls/win32u/wrappers.c | 6 +
include/ntuser.h | 4 +-
27 files changed, 440 insertions(+), 345 deletions(-)
diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c
index 1a69421ea17..b45ddf9c7c0 100644
--- a/dlls/user32/clipboard.c
+++ b/dlls/user32/clipboard.c
@@ -616,29 +616,6 @@ static HANDLE render_synthesized_format( UINT format, UINT from )
return data;
}
-/**************************************************************************
- * CLIPBOARD_ReleaseOwner
- */
-void CLIPBOARD_ReleaseOwner( HWND hwnd )
-{
- HWND viewer = 0, owner = 0;
-
- SendMessageW( hwnd, WM_RENDERALLFORMATS, 0, 0 );
-
- SERVER_START_REQ( release_clipboard )
- {
- req->owner = wine_server_user_handle( hwnd );
- if (!wine_server_call( req ))
- {
- viewer = wine_server_ptr_handle( reply->viewer );
- owner = wine_server_ptr_handle( reply->owner );
- }
- }
- SERVER_END_REQ;
-
- if (viewer) SendNotifyMessageW( viewer, WM_DRAWCLIPBOARD, (WPARAM)owner, 0 );
-}
-
/**************************************************************************
* RegisterClipboardFormatW (USER32.@)
diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c
index 77cb24be064..b375de5080c 100644
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -173,7 +173,7 @@ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc )
TRACE("[%p]: freeing storage\n", lphc->self);
if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox )
- DestroyWindow( lphc->hWndLBox );
+ NtUserDestroyWindow( lphc->hWndLBox );
SetWindowLongPtrW( lphc->self, 0, 0 );
HeapFree( GetProcessHeap(), 0, lphc );
diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c
index 41181d099cc..7bc1656432e 100644
--- a/dlls/user32/dde_misc.c
+++ b/dlls/user32/dde_misc.c
@@ -1158,7 +1158,7 @@ BOOL WINAPI DdeUninitialize(DWORD idInst)
*/
WDML_FreeAllHSZ(pInstance);
- DestroyWindow(pInstance->hwndEvent);
+ NtUserDestroyWindow( pInstance->hwndEvent );
/* OK now delete the instance handle itself */
@@ -1711,7 +1711,7 @@ void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic)
pPrev->next = pServer->next;
}
- DestroyWindow(pServer->hwndServer);
+ NtUserDestroyWindow(pServer->hwndServer);
WDML_DecHSZ(pInstance, pServer->hszServiceSpec);
WDML_DecHSZ(pInstance, pServer->hszService);
@@ -2105,7 +2105,7 @@ void WDML_RemoveConv(WDML_CONV* pRef, WDML_SIDE side)
hWnd = (side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer;
SetWindowLongPtrW(hWnd, GWL_WDML_CONVERSATION, 0);
- DestroyWindow((side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer);
+ NtUserDestroyWindow((side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer);
WDML_DecHSZ(pRef->instance, pRef->hszService);
WDML_DecHSZ(pRef->instance, pRef->hszTopic);
diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c
index 3867e0f014b..26494b835e5 100644
--- a/dlls/user32/dde_server.c
+++ b/dlls/user32/dde_server.c
@@ -360,7 +360,7 @@ static WDML_CONV* WDML_CreateServerConv(WDML_INSTANCE* pInstance, HWND hwndClien
}
else
{
- DestroyWindow(hwndServerConv);
+ NtUserDestroyWindow(hwndServerConv);
}
return pConv;
}
diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c
index f78236cb194..271644bb953 100644
--- a/dlls/user32/defwnd.c
+++ b/dlls/user32/defwnd.c
@@ -400,7 +400,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
return 0;
case WM_CLOSE:
- DestroyWindow( hwnd );
+ NtUserDestroyWindow( hwnd );
return 0;
case WM_MOUSEACTIVATE:
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
index e6e5b91587c..f9d388d0104 100644
--- a/dlls/user32/dialog.c
+++ b/dlls/user32/dialog.c
@@ -707,7 +707,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
return hwnd;
}
if (disabled_owner) EnableWindow( disabled_owner, TRUE );
- if( IsWindow(hwnd) ) DestroyWindow( hwnd );
+ if (IsWindow(hwnd)) NtUserDestroyWindow( hwnd );
return 0;
}
@@ -827,7 +827,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner )
}
}
retval = dlgInfo->idResult;
- DestroyWindow( hwnd );
+ NtUserDestroyWindow( hwnd );
return retval;
}
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 72ea5ad17bd..ada0b8ca2f7 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -79,10 +79,6 @@ static BOOL CDECL nulldrv_CreateWindow( HWND hwnd )
return TRUE;
}
-static void CDECL nulldrv_DestroyWindow( HWND hwnd )
-{
-}
-
static DWORD CDECL nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout,
DWORD mask, DWORD flags )
{
@@ -174,7 +170,7 @@ static struct user_driver_funcs lazy_load_driver =
/* windowing functions */
NULL,
loaderdrv_CreateWindow,
- nulldrv_DestroyWindow,
+ NULL,
NULL,
NULL,
nulldrv_MsgWaitForMultipleObjectsEx,
@@ -223,7 +219,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v
SET_USER_FUNC(SetCursorPos);
SET_USER_FUNC(UpdateClipboard);
SET_USER_FUNC(CreateWindow);
- SET_USER_FUNC(DestroyWindow);
SET_USER_FUNC(MsgWaitForMultipleObjectsEx);
SET_USER_FUNC(SetWindowIcon);
SET_USER_FUNC(SetWindowText);
diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
index 6bab3e96adf..3d85487f808 100644
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -580,7 +580,7 @@ static LRESULT MDIDestroyChild( HWND client, MDICLIENTINFO *ci,
{
SendMessageW(client, WM_MDIREFRESHMENU, 0, 0);
MDI_PostUpdate(GetParent(child), ci, SB_BOTH+1);
- DestroyWindow(child);
+ NtUserDestroyWindow(child);
}
TRACE("child destroyed - %p\n", child);
diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 1d680009747..113e6103cd9 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -2333,7 +2333,7 @@ static void MENU_HideSubPopups( HWND hwndOwner, HMENU hmenu,
if (!(submenu = MENU_GetMenu( hsubmenu ))) return;
MENU_HideSubPopups( hwndOwner, hsubmenu, FALSE, wFlags );
MENU_SelectItem( hwndOwner, hsubmenu, NO_SELECTED_ITEM, sendMenuSelect, 0 );
- DestroyWindow( submenu->hWnd );
+ NtUserDestroyWindow( submenu->hWnd );
submenu->hWnd = 0;
if (!(wFlags & TPM_NONOTIFY))
@@ -3319,7 +3319,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
if (menu && (menu->wFlags & MF_POPUP))
{
- DestroyWindow( menu->hWnd );
+ NtUserDestroyWindow( menu->hWnd );
menu->hWnd = 0;
if (!(wFlags & TPM_NONOTIFY))
@@ -3531,7 +3531,7 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y,
if (menu->hWnd)
{
- DestroyWindow( menu->hWnd );
+ NtUserDestroyWindow( menu->hWnd );
menu->hWnd = 0;
if (!(wFlags & TPM_NONOTIFY))
@@ -4269,7 +4269,7 @@ BOOL WINAPI DestroyMenu( HMENU hMenu )
/* DestroyMenu should not destroy system menu popup owner */
if ((lppop->wFlags & (MF_POPUP | MF_SYSMENU)) == MF_POPUP && lppop->hWnd)
{
- DestroyWindow( lppop->hWnd );
+ NtUserDestroyWindow( lppop->hWnd );
lppop->hWnd = 0;
}
diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index 365f703c56e..0ba540d2e5d 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -1859,8 +1859,6 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar
{
switch(msg)
{
- case WM_WINE_DESTROYWINDOW:
- return WIN_DestroyWindow( hwnd );
case WM_WINE_SHOWWINDOW:
if (is_desktop_window( hwnd )) return 0;
return ShowWindow( hwnd, wparam );
diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c
index 195bab2384b..c74d33092f0 100644
--- a/dlls/user32/msgbox.c
+++ b/dlls/user32/msgbox.c
@@ -116,57 +116,57 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb)
hItem = 0;
switch(lpmb->dwStyle & MB_TYPEMASK) {
case MB_OK:
- DestroyWindow(GetDlgItem(hwnd, IDCANCEL));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDCANCEL));
/* fall through */
case MB_OKCANCEL:
hItem = GetDlgItem(hwnd, IDOK);
- DestroyWindow(GetDlgItem(hwnd, IDABORT));
- DestroyWindow(GetDlgItem(hwnd, IDRETRY));
- DestroyWindow(GetDlgItem(hwnd, IDIGNORE));
- DestroyWindow(GetDlgItem(hwnd, IDYES));
- DestroyWindow(GetDlgItem(hwnd, IDNO));
- DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
- DestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDABORT));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDRETRY));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDIGNORE));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDYES));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDNO));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
break;
case MB_ABORTRETRYIGNORE:
hItem = GetDlgItem(hwnd, IDABORT);
- DestroyWindow(GetDlgItem(hwnd, IDOK));
- DestroyWindow(GetDlgItem(hwnd, IDCANCEL));
- DestroyWindow(GetDlgItem(hwnd, IDYES));
- DestroyWindow(GetDlgItem(hwnd, IDNO));
- DestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
- DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDOK));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDCANCEL));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDYES));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDNO));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
break;
case MB_YESNO:
- DestroyWindow(GetDlgItem(hwnd, IDCANCEL));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDCANCEL));
/* fall through */
case MB_YESNOCANCEL:
hItem = GetDlgItem(hwnd, IDYES);
- DestroyWindow(GetDlgItem(hwnd, IDOK));
- DestroyWindow(GetDlgItem(hwnd, IDABORT));
- DestroyWindow(GetDlgItem(hwnd, IDRETRY));
- DestroyWindow(GetDlgItem(hwnd, IDIGNORE));
- DestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
- DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDOK));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDABORT));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDRETRY));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDIGNORE));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
break;
case MB_RETRYCANCEL:
hItem = GetDlgItem(hwnd, IDRETRY);
- DestroyWindow(GetDlgItem(hwnd, IDOK));
- DestroyWindow(GetDlgItem(hwnd, IDABORT));
- DestroyWindow(GetDlgItem(hwnd, IDIGNORE));
- DestroyWindow(GetDlgItem(hwnd, IDYES));
- DestroyWindow(GetDlgItem(hwnd, IDNO));
- DestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
- DestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDOK));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDABORT));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDIGNORE));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDYES));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDNO));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDCONTINUE));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDTRYAGAIN));
break;
case MB_CANCELTRYCONTINUE:
hItem = GetDlgItem(hwnd, IDCANCEL);
- DestroyWindow(GetDlgItem(hwnd, IDOK));
- DestroyWindow(GetDlgItem(hwnd, IDABORT));
- DestroyWindow(GetDlgItem(hwnd, IDIGNORE));
- DestroyWindow(GetDlgItem(hwnd, IDYES));
- DestroyWindow(GetDlgItem(hwnd, IDNO));
- DestroyWindow(GetDlgItem(hwnd, IDRETRY));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDOK));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDABORT));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDIGNORE));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDYES));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDNO));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDRETRY));
}
if (hItem) SetWindowLongW(hItem, GWL_STYLE, GetWindowLongW(hItem, GWL_STYLE) | WS_GROUP);
@@ -202,7 +202,7 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb)
/* Remove Help button unless MB_HELP supplied */
if (!(lpmb->dwStyle & MB_HELP)) {
- DestroyWindow(GetDlgItem(hwnd, IDHELP));
+ NtUserDestroyWindow(GetDlgItem(hwnd, IDHELP));
}
/* Position everything */
diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c
index 8722cb68f12..ee9d23b1f71 100644
--- a/dlls/user32/painting.c
+++ b/dlls/user32/painting.c
@@ -35,18 +35,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(win);
-/***********************************************************************
- * free_dce
- *
- * Free a class or window DCE.
- */
-void free_dce( struct dce *dce, HWND hwnd )
-{
- /* FIXME: move callers to win32u */
- NtUserCallTwoParam( (UINT_PTR)dce, HandleToUlong(hwnd), NtUserFreeDCE );
-}
-
-
/***********************************************************************
* invalidate_dce
*
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index 7c27d9400db..cb18d9415c9 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -161,7 +161,7 @@
@ stdcall DestroyIcon(long)
@ stdcall DestroyMenu(long)
# @ stub DestroyReasons
-@ stdcall DestroyWindow(long)
+@ stdcall DestroyWindow(long) NtUserDestroyWindow
# @ stub DeviceEventWorker
@ stdcall DialogBoxIndirectParamA(long ptr long ptr long)
@ stdcall DialogBoxIndirectParamAorW(long ptr long ptr long long)
diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c
index ff9b469dae6..bc0dec6b579 100644
--- a/dlls/user32/user_main.c
+++ b/dlls/user32/user_main.c
@@ -140,6 +140,11 @@ static void CDECL notify_ime( HWND hwnd, UINT param )
if (ime_default) SendMessageW( ime_default, WM_IME_INTERNAL, param, HandleToUlong(hwnd) );
}
+void WINAPI unregister_imm( HWND hwnd )
+{
+ imm_unregister_window( hwnd );
+}
+
static void CDECL free_win_ptr( WND *win )
{
HeapFree( GetProcessHeap(), 0, win->text );
@@ -150,7 +155,9 @@ static void CDECL free_win_ptr( WND *win )
static const struct user_callbacks user_funcs =
{
CopyImage,
+ DestroyCaret,
DestroyMenu,
+ EndMenu,
HideCaret,
PostMessageW,
SendInput,
@@ -161,12 +168,14 @@ static const struct user_callbacks user_funcs =
ShowWindow,
WaitForInputIdle,
free_win_ptr,
+ MENU_IsMenuActive,
notify_ime,
register_builtin_classes,
MSG_SendInternalMessageTimeout,
SCROLL_SetStandardScrollPainted,
(void *)__wine_set_user_driver,
set_window_pos,
+ unregister_imm,
};
static void WINAPI User32CallFreeIcon( ULONG *param, ULONG size )
@@ -227,6 +236,7 @@ static void thread_detach(void)
struct user_thread_info *thread_info = get_user_thread_info();
exiting_thread_id = GetCurrentThreadId();
+ NtUserCallNoParam( NtUserExitingThread );
WDML_NotifyThreadDetach();
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index b57d6bd7566..b0e6b33eb56 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -558,38 +558,6 @@ HWND WIN_GetFullHandle( HWND hwnd )
}
-/***********************************************************************
- * WIN_SetOwner
- *
- * Change the owner of a window.
- */
-static HWND WIN_SetOwner( HWND hwnd, HWND owner )
-{
- WND *win = WIN_GetPtr( hwnd );
- HWND ret = 0;
-
- if (!win || win == WND_DESKTOP) return 0;
- if (win == WND_OTHER_PROCESS)
- {
- if (IsWindow(hwnd)) ERR( "cannot set owner %p on other process window %p\n", owner, hwnd );
- return 0;
- }
- SERVER_START_REQ( set_window_owner )
- {
- req->handle = wine_server_user_handle( hwnd );
- req->owner = wine_server_user_handle( owner );
- if (!wine_server_call( req ))
- {
- win->owner = wine_server_ptr_handle( reply->full_owner );
- ret = wine_server_ptr_handle( reply->prev_owner );
- }
- }
- SERVER_END_REQ;
- WIN_ReleasePtr( win );
- return ret;
-}
-
-
/***********************************************************************
* WIN_SetStyle
*
@@ -739,87 +707,6 @@ other_process:
}
-/***********************************************************************
- * WIN_DestroyWindow
- *
- * Destroy storage associated to a window. "Internals" p.358
- */
-LRESULT WIN_DestroyWindow( HWND hwnd )
-{
- WND *wndPtr;
- HWND *list;
- HMENU menu = 0, sys_menu;
- struct window_surface *surface;
-
- TRACE("%p\n", hwnd );
-
- /* destroy default IME window */
- if (win_set_flags( hwnd, 0, WIN_HAS_IME_WIN ) & WIN_HAS_IME_WIN)
- {
- TRACE("unregister IME window for %p\n", hwnd);
- imm_unregister_window( hwnd );
- }
-
- /* free child windows */
- if ((list = WIN_ListChildren( hwnd )))
- {
- int i;
- for (i = 0; list[i]; i++)
- {
- if (WIN_IsCurrentThread( list[i] )) WIN_DestroyWindow( list[i] );
- else SendNotifyMessageW( list[i], WM_WINE_DESTROYWINDOW, 0, 0 );
- }
- HeapFree( GetProcessHeap(), 0, list );
- }
-
- /* Unlink now so we won't bother with the children later on */
- SERVER_START_REQ( set_parent )
- {
- req->handle = wine_server_user_handle( hwnd );
- req->parent = 0;
- wine_server_call( req );
- }
- SERVER_END_REQ;
-
- /*
- * Send the WM_NCDESTROY to the window being destroyed.
- */
- SendMessageW( hwnd, WM_NCDESTROY, 0, 0 );
-
- /* FIXME: do we need to fake QS_MOUSEMOVE wakebit? */
-
- /* free resources associated with the window */
-
- if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return 0;
- if ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD)
- menu = (HMENU)wndPtr->wIDmenu;
- sys_menu = wndPtr->hSysMenu;
- free_dce( wndPtr->dce, hwnd );
- wndPtr->dce = NULL;
- HeapFree( GetProcessHeap(), 0, wndPtr->text );
- wndPtr->text = NULL;
- HeapFree( GetProcessHeap(), 0, wndPtr->pScroll );
- wndPtr->pScroll = NULL;
- DestroyIcon( wndPtr->hIconSmall2 );
- surface = wndPtr->surface;
- wndPtr->surface = NULL;
- WIN_ReleasePtr( wndPtr );
-
- if (menu) DestroyMenu( menu );
- if (sys_menu) DestroyMenu( sys_menu );
- if (surface)
- {
- register_window_surface( surface, NULL );
- window_surface_release( surface );
- }
-
- USER_Driver->pDestroyWindow( hwnd );
-
- free_window_handle( hwnd );
- return 0;
-}
-
-
/***********************************************************************
* WIN_FixCoordinates
*
@@ -1435,7 +1322,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module,
return hwnd;
failed:
- WIN_DestroyWindow( hwnd );
+ NtUserCallHwnd( hwnd, NtUserDestroyWindowHandle );
SetThreadDpiAwarenessContext( context );
return 0;
}
@@ -1506,139 +1393,6 @@ HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExW( DWORD exStyle, LPCWSTR className,
}
-/***********************************************************************
- * WIN_SendDestroyMsg
- */
-static void WIN_SendDestroyMsg( HWND hwnd )
-{
- GUITHREADINFO info;
-
- info.cbSize = sizeof(info);
- if (NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ))
- {
- if (hwnd == info.hwndCaret) DestroyCaret();
- if (hwnd == info.hwndActive) WINPOS_ActivateOtherWindow( hwnd );
- }
-
- if (hwnd == NtUserGetClipboardOwner()) CLIPBOARD_ReleaseOwner( hwnd );
-
- /*
- * Send the WM_DESTROY to the window.
- */
- SendMessageW( hwnd, WM_DESTROY, 0, 0);
-
- /*
- * This WM_DESTROY message can trigger re-entrant calls to DestroyWindow
- * make sure that the window still exists when we come back.
- */
- if (IsWindow(hwnd))
- {
- HWND* pWndArray;
- int i;
-
- if (!(pWndArray = WIN_ListChildren( hwnd ))) return;
-
- for (i = 0; pWndArray[i]; i++)
- {
- if (IsWindow( pWndArray[i] )) WIN_SendDestroyMsg( pWndArray[i] );
- }
- HeapFree( GetProcessHeap(), 0, pWndArray );
- }
- else
- WARN("\tdestroyed itself while in WM_DESTROY!\n");
-}
-
-
-/***********************************************************************
- * DestroyWindow (USER32.@)
- */
-BOOL WINAPI DestroyWindow( HWND hwnd )
-{
- BOOL is_child;
-
- if (!(hwnd = WIN_IsCurrentThread( hwnd )) || is_desktop_window( hwnd ))
- {
- SetLastError( ERROR_ACCESS_DENIED );
- return FALSE;
- }
-
- TRACE("(%p)\n", hwnd);
-
- /* Call hooks */
-
- if (HOOK_CallHooks( WH_CBT, HCBT_DESTROYWND, (WPARAM)hwnd, 0, TRUE )) return FALSE;
-
- if (MENU_IsMenuActive() == hwnd)
- EndMenu();
-
- is_child = (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) != 0;
-
- if (is_child)
- {
- if (!USER_IsExitingThread( GetCurrentThreadId() ))
- send_parent_notify( hwnd, WM_DESTROY );
- }
- else if (!GetWindow( hwnd, GW_OWNER ))
- {
- HOOK_CallHooks( WH_SHELL, HSHELL_WINDOWDESTROYED, (WPARAM)hwnd, 0L, TRUE );
- /* FIXME: clean up palette - see "Internals" p.352 */
- }
-
- if (!IsWindow(hwnd)) return TRUE;
-
- /* Hide the window */
- if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)
- {
- /* Only child windows receive WM_SHOWWINDOW in DestroyWindow() */
- if (is_child)
- ShowWindow( hwnd, SW_HIDE );
- else
- NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE |
- SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW );
- }
-
- if (!IsWindow(hwnd)) return TRUE;
-
- /* Recursively destroy owned windows */
-
- if (!is_child)
- {
- for (;;)
- {
- int i;
- BOOL got_one = FALSE;
- HWND *list = WIN_ListChildren( GetDesktopWindow() );
- if (list)
- {
- for (i = 0; list[i]; i++)
- {
- if (GetWindow( list[i], GW_OWNER ) != hwnd) continue;
- if (WIN_IsCurrentThread( list[i] ))
- {
- DestroyWindow( list[i] );
- got_one = TRUE;
- continue;
- }
- WIN_SetOwner( list[i], 0 );
- }
- HeapFree( GetProcessHeap(), 0, list );
- }
- if (!got_one) break;
- }
- }
-
- /* Send destroy messages */
-
- WIN_SendDestroyMsg( hwnd );
- if (!IsWindow( hwnd )) return TRUE;
-
- /* Destroy the window storage */
-
- WIN_DestroyWindow( hwnd );
- return TRUE;
-}
-
-
/***********************************************************************
* CloseWindow (USER32.@)
*/
diff --git a/dlls/user32/win.h b/dlls/user32/win.h
index 3e6885ab090..89e91a255f9 100644
--- a/dlls/user32/win.h
+++ b/dlls/user32/win.h
@@ -45,7 +45,6 @@ extern HWND WIN_IsCurrentThread( HWND hwnd ) DECLSPEC_HIDDEN;
extern UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) DECLSPEC_HIDDEN;
extern ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN;
extern BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWindow, RECT *rectClient ) DECLSPEC_HIDDEN;
-extern LRESULT WIN_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN;
extern HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) DECLSPEC_HIDDEN;
extern BOOL WIN_IsWindowDrawable( HWND hwnd, BOOL ) DECLSPEC_HIDDEN;
extern HWND *WIN_ListChildren( HWND hwnd ) DECLSPEC_HIDDEN;
diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c
index e132f981344..585a2aae631 100644
--- a/dlls/win32u/clipboard.c
+++ b/dlls/win32u/clipboard.c
@@ -288,3 +288,28 @@ BOOL WINAPI NtUserRemoveClipboardFormatListener( HWND hwnd )
SERVER_END_REQ;
return ret;
}
+
+/**************************************************************************
+ * release_clipboard_owner
+ */
+void release_clipboard_owner( HWND hwnd )
+{
+ HWND viewer = 0, owner = 0;
+
+ send_message( hwnd, WM_RENDERALLFORMATS, 0, 0 );
+
+ SERVER_START_REQ( release_clipboard )
+ {
+ req->owner = wine_server_user_handle( hwnd );
+ if (!wine_server_call( req ))
+ {
+ viewer = wine_server_ptr_handle( reply->viewer );
+ owner = wine_server_ptr_handle( reply->owner );
+ }
+ }
+ SERVER_END_REQ;
+
+ if (viewer)
+ NtUserMessageCall( viewer, WM_DRAWCLIPBOARD, (WPARAM)owner, 0,
+ 0, FNID_SENDNOTIFYMESSAGE, FALSE );
+}
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index afe44e1c4a3..166c2009dbc 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -1190,6 +1190,7 @@ static const struct user_driver_funcs lazy_load_driver =
.pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices,
/* windowing functions */
.pCreateDesktopWindow = loaderdrv_CreateDesktopWindow,
+ .pDestroyWindow = nulldrv_DestroyWindow,
.pFlashWindowEx = loaderdrv_FlashWindowEx,
.pGetDC = loaderdrv_GetDC,
.pSetCapture = nulldrv_SetCapture,
diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c
index adb162ab7ff..69607f0e3de 100644
--- a/dlls/win32u/gdiobj.c
+++ b/dlls/win32u/gdiobj.c
@@ -1162,6 +1162,7 @@ static struct unix_funcs unix_funcs =
NtUserCountClipboardFormats,
NtUserDeferWindowPosAndBand,
NtUserDestroyCursor,
+ NtUserDestroyWindow,
NtUserDrawIconEx,
NtUserEndDeferWindowPosEx,
NtUserEndPaint,
diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
index d00178e6aa4..690de6cdf8a 100644
--- a/dlls/win32u/message.c
+++ b/dlls/win32u/message.c
@@ -41,6 +41,8 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar
{
switch(msg)
{
+ case WM_WINE_DESTROYWINDOW:
+ return destroy_window( hwnd );
case WM_WINE_SETWINDOWPOS:
if (is_desktop_window( hwnd )) return 0;
return set_window_pos( (WINDOWPOS *)lparam, 0, 0 );
diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h
index aa9b45b1542..b3cafe791df 100644
--- a/dlls/win32u/ntuser_private.h
+++ b/dlls/win32u/ntuser_private.h
@@ -31,7 +31,9 @@ struct tagWND;
struct user_callbacks
{
HANDLE (WINAPI *pCopyImage)( HANDLE, UINT, INT, INT, UINT );
+ BOOL (WINAPI *pDestroyCaret)(void);
BOOL (WINAPI *pDestroyMenu)( HMENU );
+ BOOL (WINAPI *pEndMenu)(void);
BOOL (WINAPI *pHideCaret)( HWND hwnd );
BOOL (WINAPI *pPostMessageW)( HWND, UINT, WPARAM, LPARAM );
UINT (WINAPI *pSendInput)( UINT count, INPUT *inputs, int size );
@@ -42,6 +44,7 @@ struct user_callbacks
BOOL (WINAPI *pShowWindow)( HWND, INT );
DWORD (WINAPI *pWaitForInputIdle)( HANDLE, DWORD );
void (CDECL *free_win_ptr)( struct tagWND *win );
+ HWND (CDECL *is_menu_active)(void);
void (CDECL *notify_ime)( HWND hwnd, UINT param );
void (CDECL *register_builtin_classes)(void);
LRESULT (WINAPI *send_ll_message)( DWORD, DWORD, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR );
@@ -50,6 +53,7 @@ struct user_callbacks
BOOL (CDECL *set_window_pos)( HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect,
const RECT *valid_rects );
+ void (WINAPI *unregister_imm)( HWND hwnd );
};
#define WM_SYSTIMER 0x0118
diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index d9ddfe3400e..0166b64c76a 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -4591,6 +4591,16 @@ static BOOL message_beep( UINT i )
return TRUE;
}
+static DWORD exiting_thread_id;
+
+/**********************************************************************
+ * is_exiting_thread
+ */
+BOOL is_exiting_thread( DWORD tid )
+{
+ return tid == exiting_thread_id;
+}
+
static void thread_detach(void)
{
struct user_thread_info *thread_info = get_user_thread_info();
@@ -4602,6 +4612,8 @@ static void thread_detach(void)
destroy_thread_windows();
NtClose( thread_info->server_queue );
+
+ exiting_thread_id = 0;
}
/***********************************************************************
@@ -4618,6 +4630,9 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code )
case NtUserReleaseCapture:
return release_capture();
/* temporary exports */
+ case NtUserExitingThread:
+ exiting_thread_id = GetCurrentThreadId();
+ return 0;
case NtUserThreadDetach:
thread_detach();
return 0;
@@ -4724,9 +4739,6 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code
return HandleToUlong( alloc_user_handle( (struct user_object *)arg1, arg2 ));
case NtUserAllocWinProc:
return (UINT_PTR)alloc_winproc( (WNDPROC)arg1, arg2 );
- case NtUserFreeDCE:
- free_dce( (struct dce *)arg1, UlongToHandle(arg2) );
- return 0;
case NtUserFreeHandle:
return (UINT_PTR)free_user_handle( UlongToHandle(arg1), arg2 );
case NtUserGetHandlePtr:
diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec
index 96d8d4833b0..aacfebd1b15 100644
--- a/dlls/win32u/win32u.spec
+++ b/dlls/win32u/win32u.spec
@@ -834,7 +834,7 @@
@ stub NtUserDestroyInputContext
@ stub NtUserDestroyMenu
@ stub NtUserDestroyPalmRejectionDelayZone
-@ stub NtUserDestroyWindow
+@ stdcall NtUserDestroyWindow(long)
@ stub NtUserDisableImmersiveOwner
@ stub NtUserDisableProcessWindowFiltering
@ stub NtUserDisableThreadIme
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index 516f4540315..83b0e093a20 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -199,6 +199,7 @@ struct unix_funcs
INT x, INT y, INT cx, INT cy,
UINT flags, UINT unk1, UINT unk2 );
BOOL (WINAPI *pNtUserDestroyCursor)( HCURSOR cursor, ULONG arg );
+ BOOL (WINAPI *pNtUserDestroyWindow)( HWND hwnd );
BOOL (WINAPI *pNtUserDrawIconEx)( HDC hdc, INT x0, INT y0, HICON icon, INT width,
INT height, UINT istep, HBRUSH hbr, UINT flags );
BOOL (WINAPI *pNtUserEndDeferWindowPosEx)( HDWP hdwp, BOOL async );
@@ -286,6 +287,9 @@ struct unix_funcs
struct window_surface *surface );
};
+/* clipboard.c */
+extern void release_clipboard_owner( HWND hwnd ) DECLSPEC_HIDDEN;
+
/* cursoricon.c */
extern HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN;
extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN;
@@ -327,6 +331,7 @@ extern UINT get_system_dpi(void) DECLSPEC_HIDDEN;
extern int get_system_metrics( int index ) DECLSPEC_HIDDEN;
extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN;
extern RECT get_virtual_screen_rect( UINT dpi ) DECLSPEC_HIDDEN;
+extern BOOL is_exiting_thread( DWORD tid ) DECLSPEC_HIDDEN;
extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN;
extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN;
extern HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN;
@@ -344,6 +349,7 @@ extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN;
struct tagWND;
extern HDWP begin_defer_window_pos( INT count ) DECLSPEC_HIDDEN;
extern void destroy_thread_windows(void) DECLSPEC_HIDDEN;
+extern LRESULT destroy_window( HWND hwnd ) DECLSPEC_HIDDEN;
extern HWND get_desktop_window(void) DECLSPEC_HIDDEN;
extern UINT get_dpi_for_window( HWND hwnd ) DECLSPEC_HIDDEN;
extern HWND get_full_window_handle( HWND hwnd ) DECLSPEC_HIDDEN;
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index a28b6ae9ebf..f8d147b785c 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -3174,6 +3174,99 @@ BOOL WINAPI NtUserEndDeferWindowPosEx( HDWP hdwp, BOOL async )
return TRUE;
}
+/***********************************************************************
+ * win_set_flags
+ *
+ * Set the flags of a window and return the previous value.
+ */
+static UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask )
+{
+ WND *win = get_win_ptr( hwnd );
+ UINT ret;
+
+ if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return 0;
+ ret = win->flags;
+ win->flags = (ret & ~clear_mask) | set_mask;
+ release_win_ptr( win );
+ return ret;
+}
+
+/*******************************************************************
+ * can_activate_window
+ *
+ * Check if we can activate the specified window.
+ */
+static BOOL can_activate_window( HWND hwnd )
+{
+ LONG style;
+
+ if (!hwnd) return FALSE;
+ style = get_window_long( hwnd, GWL_STYLE );
+ if (!(style & WS_VISIBLE)) return FALSE;
+ if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE;
+ return !(style & WS_DISABLED);
+}
+
+/*******************************************************************
+ * activate_other_window
+ *
+ * Activates window other than hwnd.
+ */
+static void activate_other_window( HWND hwnd )
+{
+ HWND hwnd_to, fg;
+
+ if ((get_window_long( hwnd, GWL_STYLE ) & WS_POPUP) &&
+ (hwnd_to = get_window_relative( hwnd, GW_OWNER )))
+ {
+ hwnd_to = NtUserGetAncestor( hwnd_to, GA_ROOT );
+ if (can_activate_window( hwnd_to )) goto done;
+ }
+
+ hwnd_to = hwnd;
+ for (;;)
+ {
+ if (!(hwnd_to = get_window_relative( hwnd_to, GW_HWNDNEXT ))) break;
+ if (can_activate_window( hwnd_to )) goto done;
+ }
+
+ hwnd_to = get_window_relative( get_desktop_window(), GW_CHILD );
+ for (;;)
+ {
+ if (hwnd_to == hwnd)
+ {
+ hwnd_to = 0;
+ break;
+ }
+ if (can_activate_window( hwnd_to )) goto done;
+ if (!(hwnd_to = get_window_relative( hwnd_to, GW_HWNDNEXT ))) break;
+ }
+
+ done:
+ fg = NtUserGetForegroundWindow();
+ TRACE( "win = %p fg = %p\n", hwnd_to, fg );
+ if (!fg || hwnd == fg)
+ {
+ if (set_foreground_window( hwnd_to, FALSE )) return;
+ }
+ if (NtUserSetActiveWindow( hwnd_to )) NtUserSetActiveWindow( 0 );
+}
+
+/*******************************************************************
+ * send_parent_notify
+ */
+static void send_parent_notify( HWND hwnd, UINT msg )
+{
+ if ((get_window_long( hwnd, GWL_STYLE ) & (WS_CHILD | WS_POPUP)) == WS_CHILD &&
+ !(get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY))
+ {
+ HWND parent = get_parent( hwnd );
+ if (parent && parent != get_desktop_window())
+ send_message( parent, WM_PARENTNOTIFY,
+ MAKEWPARAM( msg, get_window_long( hwnd, GWLP_ID )), (LPARAM)hwnd );
+ }
+}
+
/*******************************************************************
* update_window_state
*
@@ -3260,6 +3353,226 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info )
}
/***********************************************************************
+ * send_destroy_message
+ */
+static void send_destroy_message( HWND hwnd )
+{
+ GUITHREADINFO info;
+
+ info.cbSize = sizeof(info);
+ if (NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ))
+ {
+ if (hwnd == info.hwndCaret && user_callbacks) user_callbacks->pDestroyCaret();
+ if (hwnd == info.hwndActive) activate_other_window( hwnd );
+ }
+
+ if (hwnd == NtUserGetClipboardOwner()) release_clipboard_owner( hwnd );
+
+ send_message( hwnd, WM_DESTROY, 0, 0);
+
+ /*
+ * This WM_DESTROY message can trigger re-entrant calls to DestroyWindow
+ * make sure that the window still exists when we come back.
+ */
+ if (is_window(hwnd))
+ {
+ HWND *children;
+ int i;
+
+ if (!(children = list_window_children( 0, hwnd, NULL, 0 ))) return;
+
+ for (i = 0; children[i]; i++)
+ {
+ if (is_window( children[i] )) send_destroy_message( children[i] );
+ }
+ free( children );
+ }
+ else
+ WARN( "\tdestroyed itself while in WM_DESTROY!\n" );
+}
+
+/***********************************************************************
+ * free_window_handle
+ *
+ * Free a window handle.
+ */
+static void free_window_handle( HWND hwnd )
+{
+ WND *win;
+
+ TRACE( "\n" );
+
+ if ((win = get_user_handle_ptr( hwnd, NTUSER_OBJ_WINDOW )) && win != OBJ_OTHER_PROCESS)
+ {
+ SERVER_START_REQ( destroy_window )
+ {
+ req->handle = wine_server_user_handle( hwnd );
+ wine_server_call( req );
+ set_user_handle_ptr( hwnd, NULL );
+ }
+ SERVER_END_REQ;
+ user_unlock();
+ if (user_callbacks) user_callbacks->free_win_ptr( win );
+ }
+}
+
+/***********************************************************************
+ * destroy_window
+ */
+LRESULT destroy_window( HWND hwnd )
+{
+ struct window_surface *surface;
+ HMENU menu = 0, sys_menu;
+ WND *win;
+ HWND *children;
+
+ TRACE( "%p\n", hwnd );
+
+ /* destroy default IME window */
+ if (win_set_flags( hwnd, 0, WIN_HAS_IME_WIN ) & WIN_HAS_IME_WIN)
+ {
+ TRACE("unregister IME window for %p\n", hwnd);
+ if (user_callbacks) user_callbacks->unregister_imm( hwnd );
+ }
+
+ /* free child windows */
+ if ((children = list_window_children( 0, hwnd, NULL, 0 )))
+ {
+ int i;
+ for (i = 0; children[i]; i++)
+ {
+ if (is_current_thread_window( children[i] ))
+ destroy_window( children[i] );
+ else
+ NtUserMessageCall( children[i], WM_WINE_DESTROYWINDOW, 0, 0,
+ 0, FNID_SENDNOTIFYMESSAGE, FALSE );
+ }
+ free( children );
+ }
+
+ /* Unlink now so we won't bother with the children later on */
+ SERVER_START_REQ( set_parent )
+ {
+ req->handle = wine_server_user_handle( hwnd );
+ req->parent = 0;
+ wine_server_call( req );
+ }
+ SERVER_END_REQ;
+
+ send_message( hwnd, WM_NCDESTROY, 0, 0 );
+
+ /* FIXME: do we need to fake QS_MOUSEMOVE wakebit? */
+
+ /* free resources associated with the window */
+
+ if (!(win = get_win_ptr( hwnd )) || win == WND_OTHER_PROCESS) return 0;
+ if ((win->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD)
+ menu = (HMENU)win->wIDmenu;
+ sys_menu = win->hSysMenu;
+ free_dce( win->dce, hwnd );
+ win->dce = NULL;
+ NtUserDestroyCursor( win->hIconSmall2, 0 );
+ surface = win->surface;
+ win->surface = NULL;
+ release_win_ptr( win );
+
+ NtUserDestroyMenu( menu );
+ NtUserDestroyMenu( sys_menu );
+ if (surface)
+ {
+ register_window_surface( surface, NULL );
+ window_surface_release( surface );
+ }
+
+ user_driver->pDestroyWindow( hwnd );
+
+ free_window_handle( hwnd );
+ return 0;
+}
+
+/***********************************************************************
+ * NtUserDestroyWindow (win32u.@)
+ */
+BOOL WINAPI NtUserDestroyWindow( HWND hwnd )
+{
+ BOOL is_child;
+
+ if (!(hwnd = is_current_thread_window( hwnd )) || is_desktop_window( hwnd ))
+ {
+ SetLastError( ERROR_ACCESS_DENIED );
+ return FALSE;
+ }
+
+ TRACE( "(%p)\n", hwnd );
+
+ if (call_hooks( WH_CBT, HCBT_DESTROYWND, (WPARAM)hwnd, 0, TRUE )) return FALSE;
+
+ if (user_callbacks && user_callbacks->is_menu_active() == hwnd)
+ user_callbacks->pEndMenu();
+
+ is_child = (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) != 0;
+
+ if (is_child)
+ {
+ if (!is_exiting_thread( GetCurrentThreadId() ))
+ send_parent_notify( hwnd, WM_DESTROY );
+ }
+ else if (!get_window_relative( hwnd, GW_OWNER ))
+ {
+ call_hooks( WH_SHELL, HSHELL_WINDOWDESTROYED, (WPARAM)hwnd, 0L, TRUE );
+ /* FIXME: clean up palette - see "Internals" p.352 */
+ }
+
+ if (!is_window( hwnd )) return TRUE;
+
+ /* Hide the window */
+ if (get_window_long( hwnd, GWL_STYLE ) & WS_VISIBLE)
+ {
+ /* Only child windows receive WM_SHOWWINDOW in DestroyWindow() */
+ if (is_child)
+ NtUserShowWindow( hwnd, SW_HIDE );
+ else
+ NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE |
+ SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW );
+ }
+
+ if (!is_window( hwnd )) return TRUE;
+
+ /* Recursively destroy child windows */
+ if (!is_child)
+ {
+ for (;;)
+ {
+ BOOL got_one = FALSE;
+ HWND *children;
+ unsigned int i;
+
+ if (!(children = list_window_children( 0, get_desktop_window(), NULL, 0 ))) break;
+
+ for (i = 0; children[i]; i++)
+ {
+ if (get_window_relative( children[i], GW_OWNER ) != hwnd) continue;
+ if (is_current_thread_window( children[i] ))
+ {
+ NtUserDestroyWindow( children[i] );
+ got_one = TRUE;
+ continue;
+ }
+ set_window_owner( children[i], 0 );
+ }
+ free( children );
+ if (!got_one) break;
+ }
+ }
+
+ send_destroy_message( hwnd );
+ if (!is_window( hwnd )) return TRUE;
+
+ destroy_window( hwnd );
+ return TRUE;
+}
+
+/*****************************************************************************
* destroy_thread_windows
*
* Destroy all window owned by the current thread.
@@ -3329,6 +3642,8 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code )
/* temporary exports */
case NtUserCreateDesktopWindow:
return user_driver->pCreateDesktopWindow( hwnd );
+ case NtUserDestroyWindowHandle:
+ return destroy_window( hwnd );
case NtUserGetDummySurface:
return (UINT_PTR)&dummy_surface;
default:
diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c
index 258483ad8de..da1957c8c88 100644
--- a/dlls/win32u/wrappers.c
+++ b/dlls/win32u/wrappers.c
@@ -783,6 +783,12 @@ BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg )
return unix_funcs->pNtUserDestroyCursor( cursor, arg );
}
+BOOL WINAPI NtUserDestroyWindow( HWND hwnd )
+{
+ if (!unix_funcs) return FALSE;
+ return unix_funcs->pNtUserDestroyWindow( hwnd );
+}
+
BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width,
INT height, UINT istep, HBRUSH hbr, UINT flags )
{
diff --git a/include/ntuser.h b/include/ntuser.h
index aeb3e9ae2cc..de958caa735 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -91,6 +91,7 @@ enum
NtUserGetInputState,
NtUserReleaseCapture,
/* temporary exports */
+ NtUserExitingThread,
NtUserThreadDetach,
};
@@ -134,7 +135,6 @@ enum
/* temporary exports */
NtUserAllocHandle,
NtUserAllocWinProc,
- NtUserFreeDCE,
NtUserFreeHandle,
NtUserGetHandlePtr,
NtUserInvalidateDCE,
@@ -154,6 +154,7 @@ enum
NtUserIsWindowVisible,
/* temporary exports */
NtUserCreateDesktopWindow,
+ NtUserDestroyWindowHandle,
NtUserGetDummySurface,
};
@@ -302,6 +303,7 @@ HDWP WINAPI NtUserDeferWindowPosAndBand( HDWP hdwp, HWND hwnd, HWND after, IN
BOOL WINAPI NtUserDestroyAcceleratorTable( HACCEL handle );
BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg );
BOOL WINAPI NtUserDestroyMenu( HMENU menu );
+BOOL WINAPI NtUserDestroyWindow( HWND hwnd );
BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width,
INT height, UINT istep, HBRUSH hbr, UINT flags );
BOOL WINAPI NtUserEndDeferWindowPosEx( HDWP hdwp, BOOL async );
--
2.23.0
1
0
[PATCH v2 1/5] win32u: Move destroy_thread_windows implementation from user32.
by Huw Davies 17 Mar '22
by Huw Davies 17 Mar '22
17 Mar '22
From: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/user32/user_main.c | 11 +++++--
dlls/user32/win.c | 56 ------------------------------------
dlls/user32/win.h | 1 -
dlls/win32u/menu.c | 8 ++++++
dlls/win32u/ntuser_private.h | 5 ++--
dlls/win32u/sysparams.c | 5 ++--
dlls/win32u/win32u_private.h | 1 +
dlls/win32u/window.c | 48 ++++++++++++++++++++++++++++++-
include/ntuser.h | 2 +-
9 files changed, 72 insertions(+), 65 deletions(-)
diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c
index 8e8c357bdcf..ff9b469dae6 100644
--- a/dlls/user32/user_main.c
+++ b/dlls/user32/user_main.c
@@ -140,9 +140,17 @@ static void CDECL notify_ime( HWND hwnd, UINT param )
if (ime_default) SendMessageW( ime_default, WM_IME_INTERNAL, param, HandleToUlong(hwnd) );
}
+static void CDECL free_win_ptr( WND *win )
+{
+ HeapFree( GetProcessHeap(), 0, win->text );
+ HeapFree( GetProcessHeap(), 0, win->pScroll );
+ HeapFree( GetProcessHeap(), 0, win );
+}
+
static const struct user_callbacks user_funcs =
{
CopyImage,
+ DestroyMenu,
HideCaret,
PostMessageW,
SendInput,
@@ -152,6 +160,7 @@ static const struct user_callbacks user_funcs =
ShowCaret,
ShowWindow,
WaitForInputIdle,
+ free_win_ptr,
notify_ime,
register_builtin_classes,
MSG_SendInternalMessageTimeout,
@@ -222,8 +231,6 @@ static void thread_detach(void)
WDML_NotifyThreadDetach();
NtUserCallNoParam( NtUserThreadDetach );
- destroy_thread_windows();
- CloseHandle( thread_info->server_queue );
HeapFree( GetProcessHeap(), 0, thread_info->wmchar_data );
HeapFree( GetProcessHeap(), 0, thread_info->rawinput );
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index a21bdc62ed5..b57d6bd7566 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -820,62 +820,6 @@ LRESULT WIN_DestroyWindow( HWND hwnd )
}
-/***********************************************************************
- * next_thread_window
- */
-static WND *next_thread_window( HWND *hwnd )
-{
- return (WND *)NtUserCallOneParam( (UINT_PTR)hwnd, NtUserNextThreadWindow );
-}
-
-
-/***********************************************************************
- * destroy_thread_windows
- *
- * Destroy all window owned by the current thread.
- */
-void destroy_thread_windows(void)
-{
- WND *win, *free_list = NULL, **free_list_ptr = &free_list;
- HWND hwnd = 0;
-
- USER_Lock();
- while ((win = next_thread_window( &hwnd )))
- {
- free_dce( win->dce, win->obj.handle );
- NtUserCallTwoParam( HandleToUlong(hwnd), 0, NtUserSetHandlePtr );
- win->obj.handle = *free_list_ptr;
- free_list_ptr = (WND **)&win->obj.handle;
- }
- if (free_list)
- {
- SERVER_START_REQ( destroy_window )
- {
- req->handle = 0; /* destroy all thread windows */
- wine_server_call( req );
- }
- SERVER_END_REQ;
- }
- USER_Unlock();
-
- while ((win = free_list))
- {
- free_list = win->obj.handle;
- TRACE( "destroying %p\n", win );
-
- if ((win->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD && win->wIDmenu)
- DestroyMenu( UlongToHandle(win->wIDmenu) );
- if (win->hSysMenu) DestroyMenu( win->hSysMenu );
- if (win->surface)
- {
- register_window_surface( win->surface, NULL );
- window_surface_release( win->surface );
- }
- HeapFree( GetProcessHeap(), 0, win );
- }
-}
-
-
/***********************************************************************
* WIN_FixCoordinates
*
diff --git a/dlls/user32/win.h b/dlls/user32/win.h
index 08bb16a0d4a..3e6885ab090 100644
--- a/dlls/user32/win.h
+++ b/dlls/user32/win.h
@@ -46,7 +46,6 @@ extern UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) DECLSPEC_
extern ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN;
extern BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWindow, RECT *rectClient ) DECLSPEC_HIDDEN;
extern LRESULT WIN_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN;
-extern void destroy_thread_windows(void) DECLSPEC_HIDDEN;
extern HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) DECLSPEC_HIDDEN;
extern BOOL WIN_IsWindowDrawable( HWND hwnd, BOOL ) DECLSPEC_HIDDEN;
extern HWND *WIN_ListChildren( HWND hwnd ) DECLSPEC_HIDDEN;
diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c
index abaca12047f..1e8410d347e 100644
--- a/dlls/win32u/menu.c
+++ b/dlls/win32u/menu.c
@@ -105,3 +105,11 @@ BOOL WINAPI NtUserDestroyAcceleratorTable( HACCEL handle )
free( accel );
return TRUE;
}
+
+/**********************************************************************
+ * NtUserDestroyMenu (win32u.@)
+ */
+BOOL WINAPI NtUserDestroyMenu( HMENU menu )
+{
+ return user_callbacks && user_callbacks->pDestroyMenu( menu );
+}
diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h
index d6c3e681c2f..aa9b45b1542 100644
--- a/dlls/win32u/ntuser_private.h
+++ b/dlls/win32u/ntuser_private.h
@@ -26,10 +26,12 @@
#include "wine/list.h"
struct dce;
+struct tagWND;
struct user_callbacks
{
HANDLE (WINAPI *pCopyImage)( HANDLE, UINT, INT, INT, UINT );
+ BOOL (WINAPI *pDestroyMenu)( HMENU );
BOOL (WINAPI *pHideCaret)( HWND hwnd );
BOOL (WINAPI *pPostMessageW)( HWND, UINT, WPARAM, LPARAM );
UINT (WINAPI *pSendInput)( UINT count, INPUT *inputs, int size );
@@ -39,6 +41,7 @@ struct user_callbacks
BOOL (WINAPI *pShowCaret)( HWND hwnd );
BOOL (WINAPI *pShowWindow)( HWND, INT );
DWORD (WINAPI *pWaitForInputIdle)( HANDLE, DWORD );
+ void (CDECL *free_win_ptr)( struct tagWND *win );
void (CDECL *notify_ime)( HWND hwnd, UINT param );
void (CDECL *register_builtin_classes)(void);
LRESULT (WINAPI *send_ll_message)( DWORD, DWORD, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR );
@@ -122,8 +125,6 @@ static inline BOOL is_broadcast( HWND hwnd )
return hwnd == HWND_BROADCAST || hwnd == HWND_TOPMOST;
}
-WND *next_thread_window_ptr( HWND *hwnd );
-
#define WM_IME_INTERNAL 0x287
#define IME_INTERNAL_ACTIVATE 0x17
#define IME_INTERNAL_DEACTIVATE 0x18
diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index f0ecb3b92bb..d9ddfe3400e 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -4599,6 +4599,9 @@ static void thread_detach(void)
free( thread_info->key_state );
thread_info->key_state = 0;
+
+ destroy_thread_windows();
+ NtClose( thread_info->server_queue );
}
/***********************************************************************
@@ -4689,8 +4692,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code )
case 1: user_unlock(); return 0;
default: user_check_not_lock(); return 0;
}
- case NtUserNextThreadWindow:
- return (UINT_PTR)next_thread_window_ptr( (HWND *)arg );
case NtUserSetCallbacks:
return (UINT_PTR)InterlockedExchangePointer( (void **)&user_callbacks, (void *)arg );
default:
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index 0c4e3b82f0f..516f4540315 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -343,6 +343,7 @@ extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN;
/* window.c */
struct tagWND;
extern HDWP begin_defer_window_pos( INT count ) DECLSPEC_HIDDEN;
+extern void destroy_thread_windows(void) DECLSPEC_HIDDEN;
extern HWND get_desktop_window(void) DECLSPEC_HIDDEN;
extern UINT get_dpi_for_window( HWND hwnd ) DECLSPEC_HIDDEN;
extern HWND get_full_window_handle( HWND hwnd ) DECLSPEC_HIDDEN;
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 079b4b0695f..a28b6ae9ebf 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -141,7 +141,7 @@ void *free_user_handle( HANDLE handle, unsigned int type )
/***********************************************************************
* next_thread_window
*/
-WND *next_thread_window_ptr( HWND *hwnd )
+static WND *next_thread_window_ptr( HWND *hwnd )
{
struct user_object *ptr;
WND *win;
@@ -3259,6 +3259,52 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info )
}
}
+/***********************************************************************
+ * destroy_thread_windows
+ *
+ * Destroy all window owned by the current thread.
+ */
+void destroy_thread_windows(void)
+{
+ WND *win, *free_list = NULL;
+ HWND hwnd = 0;
+
+ user_lock();
+ while ((win = next_thread_window_ptr( &hwnd )))
+ {
+ free_dce( win->dce, win->obj.handle );
+ set_user_handle_ptr( hwnd, NULL );
+ win->obj.handle = free_list;
+ free_list = win;
+ }
+ if (free_list)
+ {
+ SERVER_START_REQ( destroy_window )
+ {
+ req->handle = 0; /* destroy all thread windows */
+ wine_server_call( req );
+ }
+ SERVER_END_REQ;
+ }
+ user_unlock();
+
+ while ((win = free_list))
+ {
+ free_list = win->obj.handle;
+ TRACE( "destroying %p\n", win );
+
+ if ((win->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD && win->wIDmenu)
+ NtUserDestroyMenu( UlongToHandle(win->wIDmenu) );
+ if (win->hSysMenu) NtUserDestroyMenu( win->hSysMenu );
+ if (win->surface)
+ {
+ register_window_surface( win->surface, NULL );
+ window_surface_release( win->surface );
+ }
+ if (user_callbacks) user_callbacks->free_win_ptr( win );
+ }
+}
+
/*****************************************************************************
* NtUserCallHwnd (win32u.@)
*/
diff --git a/include/ntuser.h b/include/ntuser.h
index 5e79083aa01..aeb3e9ae2cc 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -119,7 +119,6 @@ enum
NtUserHandleInternalMessage,
NtUserIncrementKeyStateCounter,
NtUserLock,
- NtUserNextThreadWindow,
NtUserSetCallbacks,
};
@@ -302,6 +301,7 @@ HDWP WINAPI NtUserDeferWindowPosAndBand( HDWP hdwp, HWND hwnd, HWND after, IN
INT cx, INT cy, UINT flags, UINT unk1, UINT unk2 );
BOOL WINAPI NtUserDestroyAcceleratorTable( HACCEL handle );
BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg );
+BOOL WINAPI NtUserDestroyMenu( HMENU menu );
BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width,
INT height, UINT istep, HBRUSH hbr, UINT flags );
BOOL WINAPI NtUserEndDeferWindowPosEx( HDWP hdwp, BOOL async );
--
2.23.0
1
0
[PATCH 5/5] win32u: Move GetWindowContextHelpId implementation from user32.
by Jacek Caban 17 Mar '22
by Jacek Caban 17 Mar '22
17 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/win.c | 12 +-----------
dlls/win32u/window.c | 18 ++++++++++++++++++
include/ntuser.h | 1 +
3 files changed, 20 insertions(+), 11 deletions(-)
1
0
17 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/combo.c | 4 +-
dlls/user32/defwnd.c | 2 +-
dlls/user32/dialog.c | 6 +-
dlls/user32/driver.c | 8 +-
dlls/user32/mdi.c | 12 +-
dlls/user32/message.c | 21 +-
dlls/user32/nonclient.c | 6 +-
dlls/user32/scroll.c | 2 +-
dlls/user32/user32.spec | 4 +-
dlls/user32/user_main.c | 1 -
dlls/user32/win.c | 10 +-
dlls/user32/win.h | 6 -
dlls/user32/winpos.c | 228 +---------------
dlls/win32u/driver.c | 1 +
dlls/win32u/gdiobj.c | 2 +
dlls/win32u/input.c | 2 +-
dlls/win32u/message.c | 3 +
dlls/win32u/ntuser_private.h | 7 +-
dlls/win32u/win32u.spec | 4 +-
dlls/win32u/win32u_private.h | 4 +
dlls/win32u/window.c | 485 ++++++++++++++++++++++++++++++++++-
dlls/win32u/wrappers.c | 12 +
include/ntuser.h | 1 +
23 files changed, 540 insertions(+), 291 deletions(-)
1
0
17 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/user_main.c | 1 +
dlls/user32/winpos.c | 92 ++--------------------------------
dlls/win32u/menu.c | 6 +++
dlls/win32u/ntuser_private.h | 1 +
dlls/win32u/win32u_private.h | 3 ++
dlls/win32u/window.c | 97 ++++++++++++++++++++++++++++++++++++
include/ntuser.h | 1 +
7 files changed, 113 insertions(+), 88 deletions(-)
1
0
[PATCH 1/5] win32u: Move destroy_thread_windows implementation from user32.
by Jacek Caban 17 Mar '22
by Jacek Caban 17 Mar '22
17 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/user_main.c | 11 +++++--
dlls/user32/win.c | 56 ------------------------------------
dlls/user32/win.h | 1 -
dlls/win32u/menu.c | 8 ++++++
dlls/win32u/ntuser_private.h | 5 ++--
dlls/win32u/sysparams.c | 5 ++--
dlls/win32u/win32u_private.h | 1 +
dlls/win32u/window.c | 48 ++++++++++++++++++++++++++++++-
include/ntuser.h | 2 +-
9 files changed, 72 insertions(+), 65 deletions(-)
1
0
[PATCH vkd3d v2 1/3] tests: Work around a rounding difference between NVIDIA and AMD.
by Giovanni Mascellani 17 Mar '22
by Giovanni Mascellani 17 Mar '22
17 Mar '22
NVIDIA and AMD round differently the assignment of 0.5f to a UAV
of type R16G16_UNORM. NVIDIA rounds to 0x7fff and AMD to 0x8000.
According to both Vulkan and D3D12 specifications, both values
are acceptable, but the discrepancy currently appears as a
failure on NVIDIA cards.
Work around the issue by using 0.25f instead of 0.5f, which is
rounded as 0x4000 on both implementations.
Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com>
---
tests/d3d12.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 5067dd97..46de3316 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -4930,7 +4930,7 @@ static void test_clear_unordered_access_view_buffer(void)
{DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
{0x1234, 0xabcd, 0, 0}, 0xabcd1234},
{DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
- {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true},
+ {0x3e800000 /* 0.25f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff4000, true},
{DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
{0x40000000 /* 2.0f */, 0 /* 0.0f */, 0, 0}, 0x0000ffff, true},
{DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
@@ -5124,7 +5124,7 @@ static void test_clear_unordered_access_view_image(void)
{DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001},
/* Test float clears with formats. */
{DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {},
- {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true},
+ {0x3e800000 /* 0.25f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff4000, true},
{DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, 0, {},
{0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, true},
{DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {},
--
2.35.1
2
5
17 Mar '22
This is needed because BCryptFinalizeKey doesn't change the
pubkey_len member based on the keylen member. Also it doesn't
reallocate the pubkey buffer. If we don't do this programs get
an error when trying to generate a key by setting the length
using BCryptSetProperty.
Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com>
---
dlls/bcrypt/bcrypt_main.c | 19 ++++++++++++++++++-
dlls/bcrypt/tests/bcrypt.c | 29 +++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
index 5df4da009a4..2b3ceb803a0 100644
--- a/dlls/bcrypt/bcrypt_main.c
+++ b/dlls/bcrypt/bcrypt_main.c
@@ -704,7 +704,24 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val
else if (!wcscmp( prop, BCRYPT_KEY_LENGTH ))
{
if (size < sizeof(DWORD)) return STATUS_INVALID_PARAMETER;
- key->u.a.bitlen = *(DWORD*)value;
+ if (key->u.a.bitlen == *(DWORD *)value) return STATUS_SUCCESS;
+
+ key->u.a.bitlen = *(DWORD *)value;
+ switch (key->alg_id)
+ {
+ case ALG_ID_RSA:
+ case ALG_ID_RSA_SIGN:
+ key->u.a.pubkey_len = sizeof(BCRYPT_RSAKEY_BLOB) + 2 * key->u.a.bitlen / 8;
+ break;
+ case ALG_ID_DSA:
+ key->u.a.pubkey_len = sizeof(BCRYPT_DSA_KEY_BLOB) + 3 * key->u.a.bitlen / 8;
+ break;
+ default:
+ FIXME( "algorithm %u not supported\n", key->alg_id );
+ return STATUS_NOT_SUPPORTED;
+ }
+
+ key->u.a.pubkey = realloc( key->u.a.pubkey, key->u.a.pubkey_len );
return STATUS_SUCCESS;
}
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index efb5843fa4e..3b4fd3e31e7 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -2182,6 +2182,19 @@ static void test_RSA(void)
HeapFree(GetProcessHeap(), 0, buf);
BCryptDestroyKey(key);
+ /* generate rsa keys setting the key len by using properties */
+ key = NULL;
+ ret = BCryptGenerateKeyPair(alg, &key, 1024, 0);
+ ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
+ ok(key != NULL, "got null handle\n");
+
+ keylen = 2048;
+ BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0);
+
+ ret = BCryptFinalizeKeyPair(key, 0);
+ ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
+ if(key) BCryptDestroyKey(key);
+
ret = BCryptCloseAlgorithmProvider(alg, 0);
ok(!ret, "got %#lx\n", ret);
}
@@ -2867,6 +2880,7 @@ static void test_DSA(void)
BCRYPT_DSA_KEY_BLOB *dsablob;
UCHAR sig[40], schemes;
ULONG len, size;
+ DWORD keylen;
NTSTATUS ret;
BYTE *buf;
@@ -2945,6 +2959,21 @@ static void test_DSA(void)
ret = BCryptDestroyKey(key);
ok(!ret, "got %#lx\n", ret);
+ /* generate dsa key by setting the key length */
+ key = NULL;
+ ret = BCryptGenerateKeyPair(alg, &key, 512, 0);
+ ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
+
+ keylen = 1024;
+ ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0);
+ ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
+
+ ret = BCryptFinalizeKeyPair(key, 0);
+ ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
+
+ ret = BCryptDestroyKey(key);
+ ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
+
ret = BCryptCloseAlgorithmProvider(alg, 0);
ok(!ret, "got %#lx\n", ret);
}
--
2.32.0
2
1
17 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/user32/tests/win.c | 1499 ++++++++++++++++++++++++-----------------------
1 file changed, 750 insertions(+), 749 deletions(-)
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index cfcec5cc78f..49bbd5894a9 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -19,6 +19,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 <assert.h>
#include <limits.h>
@@ -76,7 +77,7 @@ static DWORD our_pid;
static void dump_minmax_info( const MINMAXINFO *minmax )
{
- trace("Reserved=%d,%d MaxSize=%d,%d MaxPos=%d,%d MinTrack=%d,%d MaxTrack=%d,%d\n",
+ trace("Reserved=%ld,%ld MaxSize=%ld,%ld MaxPos=%ld,%ld MinTrack=%ld,%ld MaxTrack=%ld,%ld\n",
minmax->ptReserved.x, minmax->ptReserved.y,
minmax->ptMaxSize.x, minmax->ptMaxSize.y,
minmax->ptMaxPosition.x, minmax->ptMaxPosition.y,
@@ -186,7 +187,7 @@ static DWORD wait_for_events( DWORD count, HANDLE *events, DWORD timeout )
else timeout = end - GetTickCount();
}
- ok( ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %#x\n", ret );
+ ok( ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %#lx\n", ret );
return ret;
}
@@ -229,7 +230,7 @@ static void test_parent_owner(void)
test = CreateWindowExA(0, "ToolWindowClass", "Tool window 1",
WS_CHILD, 0, 0, 100, 100, 0, 0, 0, NULL );
ok( !test, "WS_CHILD without parent created\n" );
- ok( GetLastError() == ERROR_TLW_WITH_WSCHILD, "CreateWindowExA error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_TLW_WITH_WSCHILD, "CreateWindowExA error %lu\n", GetLastError() );
/* desktop window */
check_parents( desktop, 0, 0, 0, 0, 0, 0 );
@@ -681,7 +682,7 @@ static DWORD CALLBACK enum_thread( void *arg )
info.cbSize = sizeof(info) + 1;
ret = pGetGUIThreadInfo( GetCurrentThreadId(), &info );
ok( !ret, "GetGUIThreadInfo succeeded with wrong size\n" );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() );
}
PeekMessageA( &msg, 0, 0, 0, PM_NOREMOVE ); /* make sure we have a message queue */
@@ -741,7 +742,7 @@ static DWORD CALLBACK test_thread_exit_parent_thread( void *args )
params->hwnd = CreateWindowW( L"static", L"parent", WS_OVERLAPPEDWINDOW|WS_VISIBLE,
100, 100, 200, 200, 0, 0, 0, NULL );
- ok( params->hwnd != 0, "CreateWindowExW failed, error %u\n", GetLastError() );
+ ok( params->hwnd != 0, "CreateWindowExW failed, error %lu\n", GetLastError() );
flush_events( TRUE );
SetEvent( params->created_event );
@@ -779,22 +780,22 @@ static void test_thread_exit_destroy(void)
adopter = CreateWindowW( L"static", L"adopter", WS_OVERLAPPEDWINDOW|WS_VISIBLE,
300, 100, 200, 200, 0, 0, 0, NULL );
- ok( adopter != 0, "CreateWindowExW failed, error %u\n", GetLastError() );
+ ok( adopter != 0, "CreateWindowExW failed, error %lu\n", GetLastError() );
flush_events( TRUE );
thread = CreateThread( NULL, 0, test_thread_exit_parent_thread, ¶ms, 0, NULL );
- ok( thread != 0, "CreateThread failed, error %u\n", GetLastError() );
+ ok( thread != 0, "CreateThread failed, error %lu\n", GetLastError() );
WaitForSingleObject( params.created_event, INFINITE );
child1 = CreateWindowW( L"static", L"child1", WS_CHILD|WS_VISIBLE,
50, 50, 50, 50, params.hwnd, 0, 0, NULL );
- ok( child1 != 0, "CreateWindowExW failed, error %u\n", GetLastError() );
+ ok( child1 != 0, "CreateWindowExW failed, error %lu\n", GetLastError() );
child2 = CreateWindowW( L"static", L"child2", WS_CHILD|WS_VISIBLE,
100, 50, 50, 50, params.hwnd, 0, 0, NULL );
- ok( child2 != 0, "CreateWindowExW failed, error %u\n", GetLastError() );
+ ok( child2 != 0, "CreateWindowExW failed, error %lu\n", GetLastError() );
child3 = CreateWindowW( L"static", L"child3", WS_CHILD|WS_VISIBLE,
50, 100, 50, 50, params.hwnd, 0, 0, NULL );
- ok( child3 != 0, "CreateWindowExW failed, error %u\n", GetLastError() );
+ ok( child3 != 0, "CreateWindowExW failed, error %lu\n", GetLastError() );
flush_events( TRUE );
trace("parent %p adopter %p child1 %p child2 %p child3 %p\n", params.hwnd, adopter, child1, child2, child3);
@@ -808,28 +809,28 @@ static void test_thread_exit_destroy(void)
ok( GetCapture() == child1, "GetCapture %p, expected %p\n", GetCapture(), child1 );
ret = SetPropW( child1, L"myprop", UlongToHandle(0xdeadbeef) );
- ok( ret, "SetPropW failed, error %u\n", GetLastError() );
+ ok( ret, "SetPropW failed, error %lu\n", GetLastError() );
ret = SetPropW( child2, L"myprop", UlongToHandle(0xdeadbeef) );
- ok( ret, "SetPropW failed, error %u\n", GetLastError() );
+ ok( ret, "SetPropW failed, error %lu\n", GetLastError() );
old_wndproc = (WNDPROC)GetWindowLongPtrW( child1, GWLP_WNDPROC );
- ok( old_wndproc != NULL, "GetWindowLongPtrW GWLP_WNDPROC failed, error %u\n", GetLastError() );
+ ok( old_wndproc != NULL, "GetWindowLongPtrW GWLP_WNDPROC failed, error %lu\n", GetLastError() );
ret = GetWindowLongW( child1, GWL_STYLE );
- ok( ret == (WS_CHILD|WS_VISIBLE), "GetWindowLongW returned %#x\n", ret );
+ ok( ret == (WS_CHILD|WS_VISIBLE), "GetWindowLongW returned %#lx\n", ret );
SetEvent( params.stop_event );
ret = WaitForSingleObject( thread, INFINITE );
- ok( ret == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", ret );
+ ok( ret == WAIT_OBJECT_0, "WaitForSingleObject returned %#lx\n", ret );
CloseHandle( thread );
/* child windows should all still be alive but hidden */
ret = IsWindow( child1 );
- ok( ret, "IsWindow returned %u\n", ret );
+ ok( ret, "IsWindow returned %lu\n", ret );
ret = IsWindow( child2 );
- ok( ret, "IsWindow returned %u\n", ret );
+ ok( ret, "IsWindow returned %lu\n", ret );
ret = IsWindow( child3 );
- ok( ret, "IsWindow returned %u\n", ret );
+ ok( ret, "IsWindow returned %lu\n", ret );
todo_wine
ok( GetActiveWindow() == adopter, "GetActiveWindow %p, expected %p\n", GetActiveWindow(), adopter );
@@ -850,38 +851,38 @@ static void test_thread_exit_destroy(void)
SetLastError( 0xdeadbeef );
ret = GetWindowLongW( child1, GWL_STYLE );
todo_wine
- ok( ret == WS_CHILD, "GetWindowLongW returned %#x\n", ret );
- ok( GetLastError() == 0xdeadbeef, "GetWindowLongW error %u\n", GetLastError() );
+ ok( ret == WS_CHILD, "GetWindowLongW returned %#lx\n", ret );
+ ok( GetLastError() == 0xdeadbeef, "GetWindowLongW error %lu\n", GetLastError() );
ret = SetWindowLongW( child1, GWL_STYLE, WS_CHILD|WS_VISIBLE );
- ok( ret, "SetWindowLongW failed, error %u\n", GetLastError() );
+ ok( ret, "SetWindowLongW failed, error %lu\n", GetLastError() );
ret = GetWindowLongW( child1, GWL_STYLE );
- ok( ret == (WS_CHILD|WS_VISIBLE), "GetWindowLongW returned %#x\n", ret );
+ ok( ret == (WS_CHILD|WS_VISIBLE), "GetWindowLongW returned %#lx\n", ret );
/* and cannot be adopted */
SetLastError( 0xdeadbeef );
tmp = GetParent( child1 );
- ok( tmp == params.hwnd, "GetParent returned %p, error %u\n", tmp, GetLastError() );
- ok( GetLastError() == 0xdeadbeef, "GetWindowLongW error %u\n", GetLastError() );
+ ok( tmp == params.hwnd, "GetParent returned %p, error %lu\n", tmp, GetLastError() );
+ ok( GetLastError() == 0xdeadbeef, "GetWindowLongW error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
tmp = SetParent( child1, adopter );
ok( tmp == 0, "SetParent returned %p\n", tmp );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
tmp = SetParent( child3, adopter );
ok( tmp == 0, "SetParent returned %p\n", tmp );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
tmp = GetParent( child1 );
- ok( tmp == params.hwnd, "GetParent returned %p, error %u\n", tmp, GetLastError() );
- ok( GetLastError() == 0xdeadbeef, "GetWindowLongW error %u\n", GetLastError() );
+ ok( tmp == params.hwnd, "GetParent returned %p, error %lu\n", tmp, GetLastError() );
+ ok( GetLastError() == 0xdeadbeef, "GetWindowLongW error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
ret = GetWindowLongW( params.hwnd, GWL_STYLE );
- ok( ret == 0, "GetWindowLongW returned %#x\n", ret );
- ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "GetWindowLongW error %u\n", GetLastError() );
+ ok( ret == 0, "GetWindowLongW returned %#lx\n", ret );
+ ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "GetWindowLongW error %lu\n", GetLastError() );
wndproc = (WNDPROC)GetWindowLongPtrW( child1, GWLP_WNDPROC );
- ok( wndproc != NULL, "GetWindowLongPtrW GWLP_WNDPROC failed, error %u\n", GetLastError() );
+ ok( wndproc != NULL, "GetWindowLongPtrW GWLP_WNDPROC failed, error %lu\n", GetLastError() );
ok( wndproc == old_wndproc, "GetWindowLongPtrW GWLP_WNDPROC returned %p\n", wndproc );
tmp = GetPropW( child1, L"myprop" );
@@ -892,58 +893,58 @@ static void test_thread_exit_destroy(void)
child = CreateWindowExA( 0, "ToolWindowClass", "Tool window 1", WS_CHILD,
0, 0, 100, 100, child1, 0, 0, NULL );
ok( !child && GetLastError() == ERROR_INVALID_PARAMETER,
- "CreateWindowExA returned %p %u\n", child, GetLastError() );
+ "CreateWindowExA returned %p %lu\n", child, GetLastError() );
ret = MoveWindow( child1, 5, 5, 10, 10, FALSE );
- ok( ret, "MoveWindow failed: %u\n", GetLastError() );
+ ok( ret, "MoveWindow failed: %lu\n", GetLastError() );
/* destroying child1 ourselves succeeds */
ret = DestroyWindow( child1 );
- ok( ret, "DestroyWindow returned %u\n", ret );
+ ok( ret, "DestroyWindow returned %lu\n", ret );
ret = DestroyWindow( child1 );
- ok( !ret, "DestroyWindow returned %u\n", ret );
+ ok( !ret, "DestroyWindow returned %lu\n", ret );
ret = IsWindow( child1 );
- ok( !ret, "IsWindow returned %u\n", ret );
+ ok( !ret, "IsWindow returned %lu\n", ret );
tmp = GetPropW( child1, L"myprop" );
ok( HandleToULong(tmp) == 0, "GetPropW returned %p\n", tmp );
/* child2 is still alive, for now */
ret = IsWindow( child2 );
- ok( ret, "IsWindow returned %u\n", ret );
+ ok( ret, "IsWindow returned %lu\n", ret );
SetLastError( 0xdeadbeef );
ret = SetWindowPos( child2, HWND_TOPMOST, 0, 0, 100, 100, SWP_NOSIZE|SWP_NOMOVE );
todo_wine
ok( !ret, "SetWindowPos succeeded\n" );
todo_wine
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "SetWindowPos returned error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "SetWindowPos returned error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
ret = SetWindowPos( child2, 0, 10, 10, 200, 200, SWP_NOZORDER | SWP_NOACTIVATE );
todo_wine
ok( !ret, "SetWindowPos succeeded\n" );
todo_wine
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "SetWindowPos returned error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "SetWindowPos returned error %lu\n", GetLastError() );
rgn = CreateRectRgn( 5, 5, 15, 15 );
SetLastError( 0xdeadbeef );
ret = SetWindowRgn( child2, rgn, TRUE );
- ok( ret, "SetWindowRgn failed, error %u\n", GetLastError() );
+ ok( ret, "SetWindowRgn failed, error %lu\n", GetLastError() );
DeleteObject( rgn );
wndproc = (WNDPROC)SetWindowLongPtrW( child2, GWLP_WNDPROC, (LONG_PTR)test_thread_exit_wnd_proc );
ret = SendMessageW( child2, WM_USER, 0, 0 );
- ok( ret == 0xdeadbeef, "SendMessageW returned %u, error %u\n", ret, GetLastError() );
+ ok( ret == 0xdeadbeef, "SendMessageW returned %lu, error %lu\n", ret, GetLastError() );
ret = SendMessageW( child2, WM_USER + 1, 0, 0 );
- ok( ret == 0xfeedcafe, "SendMessageW returned %u, error %u\n", ret, GetLastError() );
+ ok( ret == 0xfeedcafe, "SendMessageW returned %lu, error %lu\n", ret, GetLastError() );
ret = SendMessageW( child2, WM_USER + 2, 0, 0 );
- ok( ret == 0, "SendMessageW returned %u, error %u\n", ret, GetLastError() );
+ ok( ret == 0, "SendMessageW returned %lu, error %lu\n", ret, GetLastError() );
ret = GetWindowTextW( child2, buffer, ARRAY_SIZE(buffer) );
- ok( ret == 6, "GetWindowTextW returned %u\n", ret );
+ ok( ret == 6, "GetWindowTextW returned %lu\n", ret );
ok( !wcscmp( buffer, L"child2" ), "GetWindowTextW returned %s\n", debugstr_w( buffer ) );
ret = IsWindow( child2 );
- ok( ret, "IsWindow returned %u\n", ret );
+ ok( ret, "IsWindow returned %lu\n", ret );
/* but peeking any message should reap them all */
PeekMessageW( &msg, child2, 0, 0, PM_REMOVE );
@@ -952,12 +953,12 @@ static void test_thread_exit_destroy(void)
ok( HandleToULong(tmp) == 0, "GetPropW returned %p\n", tmp );
ret = IsWindow( child2 );
- ok( !ret, "IsWindow returned %u\n", ret );
+ ok( !ret, "IsWindow returned %lu\n", ret );
ret = IsWindow( child3 );
todo_wine
- ok( !ret, "IsWindow returned %u\n", ret );
+ ok( !ret, "IsWindow returned %lu\n", ret );
ret = DestroyWindow( child2 );
- ok( !ret, "DestroyWindow returned %u\n", ret );
+ ok( !ret, "DestroyWindow returned %lu\n", ret );
DestroyWindow( adopter );
@@ -1025,7 +1026,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR
GetClientRect(hwnd, &rc2);
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2);
ok(EqualRect(&rc1, &rc2), "rects do not match %s / %s\n", wine_dbgstr_rect(&rc1),
wine_dbgstr_rect(&rc2));
@@ -1082,7 +1083,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR
case WM_NCCALCSIZE:
{
LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam);
- ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ ok(!ret, "got %08Ix (%08Ix %08Ix)\n", ret, wparam, lparam);
return ret;
}
}
@@ -1119,7 +1120,7 @@ static LRESULT WINAPI main_window_procW(HWND hwnd, UINT msg, WPARAM wparam, LPAR
case WM_NCCALCSIZE:
{
LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam);
- ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ ok(!ret, "got %08Ix (%08Ix %08Ix)\n", ret, wparam, lparam);
return ret;
}
}
@@ -1151,7 +1152,7 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR
case WM_NCCALCSIZE:
{
LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam);
- ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ ok(!ret, "got %08Ix (%08Ix %08Ix)\n", ret, wparam, lparam);
return ret;
}
}
@@ -1224,17 +1225,17 @@ static void verify_window_info(const char *hook, HWND hwnd, const WINDOWINFO *in
ok(EqualRect(&rcClient, &info->rcClient), "wrong rcClient for %p in hook %s\n", hwnd, hook);
ok(info->dwStyle == (DWORD)GetWindowLongA(hwnd, GWL_STYLE),
- "wrong dwStyle: %08x != %08x for %p in hook %s\n",
+ "wrong dwStyle: %08lx != %08lx for %p in hook %s\n",
info->dwStyle, GetWindowLongA(hwnd, GWL_STYLE), hwnd, hook);
/* Windows reports some undocumented exstyles in WINDOWINFO, but
* doesn't return them in GetWindowLong(hwnd, GWL_EXSTYLE).
*/
ok((info->dwExStyle & ~0xe0000800) == (DWORD)GetWindowLongA(hwnd, GWL_EXSTYLE),
- "wrong dwExStyle: %08x != %08x for %p in hook %s\n",
+ "wrong dwExStyle: %08lx != %08lx for %p in hook %s\n",
info->dwExStyle, GetWindowLongA(hwnd, GWL_EXSTYLE), hwnd, hook);
status = (GetActiveWindow() == hwnd) ? WS_ACTIVECAPTION : 0;
if (GetForegroundWindow())
- ok(info->dwWindowStatus == status, "wrong dwWindowStatus: %04x != %04x active %p fg %p in hook %s\n",
+ ok(info->dwWindowStatus == status, "wrong dwWindowStatus: %04lx != %04lx active %p fg %p in hook %s\n",
info->dwWindowStatus, status, GetActiveWindow(), GetForegroundWindow(), hook);
/* win2k and XP return broken border info in GetWindowInfo most of
@@ -1244,7 +1245,7 @@ if (0)
{
UINT border;
ok(info->cxWindowBorders == (unsigned)(rcClient.left - rcWindow.left),
- "wrong cxWindowBorders %d != %d\n", info->cxWindowBorders, rcClient.left - rcWindow.left);
+ "wrong cxWindowBorders %d != %ld\n", info->cxWindowBorders, rcClient.left - rcWindow.left);
border = min(rcWindow.bottom - rcClient.bottom, rcClient.top - rcWindow.top);
ok(info->cyWindowBorders == border,
"wrong cyWindowBorders %d != %d\n", info->cyWindowBorders, border);
@@ -1267,13 +1268,13 @@ static void test_window_info(const char *hook, HWND hwnd)
SetLastError(0xdeadbeef);
ok(!pGetWindowInfo(0, NULL), "GetWindowInfo should fail\n");
ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE,
- "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError());
+ "got error %ld expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError());
}
SetLastError(0xdeadbeef);
ok(!pGetWindowInfo(0, &info), "GetWindowInfo should fail\n");
ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE,
- "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError());
+ "got error %ld expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError());
info.cbSize = sizeof(WINDOWINFO);
ok(pGetWindowInfo(hwnd, &info), "GetWindowInfo should not fail\n");
@@ -1422,7 +1423,7 @@ static LRESULT CALLBACK test_standard_scrollbar_proc(HWND hwnd, UINT msg, WPARAM
case WM_NCCALCSIZE:
{
LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wp, lp);
- ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wp, lp);
+ ok(!ret, "got %08Ix (%08Ix %08Ix)\n", ret, wp, lp);
return ret;
}
@@ -1462,28 +1463,28 @@ static void test_nonclient_area(HWND hwnd)
FixedAdjustWindowRectEx(&rc, style, menu, exstyle);
ok(EqualRect(&rc, &rc_window),
- "window rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, win=%s, calc=%s\n",
+ "window rect does not match: style:exstyle=0x%08lx:0x%08lx, menu=%d, win=%s, calc=%s\n",
style, exstyle, menu, wine_dbgstr_rect(&rc_window), wine_dbgstr_rect(&rc));
rc = rc_client;
MapWindowPoints(hwnd, 0, (LPPOINT)&rc, 2);
wine_AdjustWindowRectEx(&rc, style, menu, exstyle);
ok(EqualRect(&rc, &rc_window),
- "window rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, win=%s, calc=%s\n",
+ "window rect does not match: style:exstyle=0x%08lx:0x%08lx, menu=%d, win=%s, calc=%s\n",
style, exstyle, menu, wine_dbgstr_rect(&rc_window), wine_dbgstr_rect(&rc));
rc = rc_window;
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2);
ok(EqualRect(&rc, &rc_client),
- "client rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d client=%s, calc=%s\n",
+ "client rect does not match: style:exstyle=0x%08lx:0x%08lx, menu=%d client=%s, calc=%s\n",
style, exstyle, menu, wine_dbgstr_rect(&rc_client), wine_dbgstr_rect(&rc));
/* NULL rectangle shouldn't crash */
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, 0);
- ok(ret == 0, "NULL rectangle returned %ld instead of 0\n", ret);
+ ok(ret == 0, "NULL rectangle returned %Id instead of 0\n", ret);
/* and now test AdjustWindowRectEx and WM_NCCALCSIZE on synthetic data */
SetRect(&rc_client, 0, 0, 250, 150);
@@ -1493,17 +1494,17 @@ static void test_nonclient_area(HWND hwnd)
rc = rc_window;
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2);
ok(EqualRect(&rc, &rc_client),
- "synthetic rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, client=%s, calc=%s\n",
+ "synthetic rect does not match: style:exstyle=0x%08lx:0x%08lx, menu=%d, client=%s, calc=%s\n",
style, exstyle, menu, wine_dbgstr_rect(&rc_client), wine_dbgstr_rect(&rc));
/* Test standard scroll bars */
uxtheme = LoadLibraryA("uxtheme.dll");
- ok(!!uxtheme, "Failed to load uxtheme.dll, error %u.\n", GetLastError());
+ ok(!!uxtheme, "Failed to load uxtheme.dll, error %lu.\n", GetLastError());
pIsThemeActive = (void *)GetProcAddress(uxtheme, "IsThemeActive");
- ok(!!pIsThemeActive, "Failed to load IsThemeActive, error %u.\n", GetLastError());
+ ok(!!pIsThemeActive, "Failed to load IsThemeActive, error %lu.\n", GetLastError());
is_theme_active = pIsThemeActive();
memset(&cls, 0, sizeof(cls));
@@ -1521,7 +1522,7 @@ static void test_nonclient_area(HWND hwnd)
parent = CreateWindowA("TestStandardScrollbarParentClass", "parent", WS_POPUP | WS_VISIBLE, 100,
100, 100, 100, NULL, NULL, 0, NULL);
- ok(!!parent, "Failed to create a parent window, error %u.\n", GetLastError());
+ ok(!!parent, "Failed to create a parent window, error %lu.\n", GetLastError());
GetCursorPos(&old_cursor_pos);
/* Place the cursor on the standard scroll bar arrow button when not painting it at all.
@@ -1529,16 +1530,16 @@ static void test_nonclient_area(HWND hwnd)
offset = GetSystemMetrics(SM_CYHSCROLL);
child = CreateWindowA("TestStandardScrollbarClass", "test", WS_CHILD | WS_HSCROLL | WS_VISIBLE,
0, 0, 50, 50, parent, NULL, 0, NULL);
- ok(!!child, "Failed to create a test window, error %u.\n", GetLastError());
+ ok(!!child, "Failed to create a test window, error %lu.\n", GetLastError());
hdc = GetDC(parent);
- ok(!!hdc, "GetDC failed, error %d.\n", GetLastError());
+ ok(!!hdc, "GetDC failed, error %ld.\n", GetLastError());
SetCursorPos(0, 0);
flush_events(TRUE);
RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME);
old_color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2,
50 - GetSystemMetrics(SM_CYHSCROLL) / 2);
- ok(old_color == 0xc0c0c0, "Expected color %#x, got %#x.\n", 0xc0c0c0, old_color);
+ ok(old_color == 0xc0c0c0, "Expected color %#x, got %#lx.\n", 0xc0c0c0, old_color);
point.x = 50 - GetSystemMetrics(SM_CXVSCROLL) / 2;
point.y = 50 - GetSystemMetrics(SM_CYHSCROLL) / 2;
@@ -1548,7 +1549,7 @@ static void test_nonclient_area(HWND hwnd)
RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME);
color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2,
50 - GetSystemMetrics(SM_CYHSCROLL) / 2);
- ok(color == old_color, "Expected color %#x, got %#x.\n", old_color, color);
+ ok(color == old_color, "Expected color %#lx, got %#lx.\n", old_color, color);
ReleaseDC(parent, hdc);
DestroyWindow(child);
@@ -1558,9 +1559,9 @@ static void test_nonclient_area(HWND hwnd)
offset = GetSystemMetrics(SM_CYHSCROLL) - 1;
child = CreateWindowA("TestStandardScrollbarClass", "test", WS_CHILD | WS_HSCROLL | WS_VISIBLE,
0, 0, 50, 50, parent, NULL, 0, NULL);
- ok(!!child, "Failed to create a test window, error %u.\n", GetLastError());
+ ok(!!child, "Failed to create a test window, error %lu.\n", GetLastError());
hdc = GetDC(parent);
- ok(!!hdc, "GetDC failed, error %d.\n", GetLastError());
+ ok(!!hdc, "GetDC failed, error %ld.\n", GetLastError());
SetCursorPos(0, 0);
flush_events(TRUE);
@@ -1578,10 +1579,10 @@ static void test_nonclient_area(HWND hwnd)
50 - GetSystemMetrics(SM_CYHSCROLL) / 2);
if (is_theme_active)
ok(color != old_color || broken(color == old_color), /* Win 10 1507 64-bit */
- "Got unexpected color %#x.\n", color);
+ "Got unexpected color %#lx.\n", color);
else
todo_wine
- ok(color == old_color, "Expected color %#x, got %#x.\n", old_color, color);
+ ok(color == old_color, "Expected color %#lx, got %#lx.\n", old_color, color);
SetCursorPos(old_cursor_pos.x, old_cursor_pos.y);
ReleaseDC(parent, hdc);
@@ -1623,7 +1624,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam)
/* WS_VISIBLE should be turned off yet */
style = createwnd->lpcs->style & ~WS_VISIBLE;
ok(style == GetWindowLongA(hwnd, GWL_STYLE),
- "style of hwnd and style in the CREATESTRUCT do not match: %08x != %08x\n",
+ "style of hwnd and style in the CREATESTRUCT do not match: %08lx != %08lx\n",
GetWindowLongA(hwnd, GWL_STYLE), style);
if (0)
@@ -1827,7 +1828,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_child = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&mdi_cs);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0;
ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd);
@@ -1838,7 +1839,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_child = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&mdi_cs);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd);
SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0);
@@ -1854,7 +1855,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
{
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd);
ok(GetMenuItemCount(frame_menu) == 0, "Got wrong frame menu item count: %u\n", GetMenuItemCount(frame_menu));
@@ -1871,7 +1872,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_child = (HWND)SendMessageW(mdi_client, WM_MDICREATE, 0, (LPARAM)&mdi_cs);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0;
ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd);
@@ -1887,7 +1888,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
(LPARAM)mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0;
ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd);
@@ -1903,7 +1904,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
(LPARAM)mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd);
ok(GetMenuItemCount(frame_menu) == 0, "Got wrong frame menu item count: %u\n", GetMenuItemCount(frame_menu));
@@ -1924,7 +1925,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
{
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd);
ok(GetMenuItemCount(frame_menu) == 0, "Got wrong frame menu item count: %u\n", GetMenuItemCount(frame_menu));
@@ -1942,7 +1943,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
(LPARAM)mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0;
ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd);
@@ -1958,7 +1959,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0;
ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd);
@@ -1974,7 +1975,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0;
ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd);
@@ -1993,7 +1994,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd);
ok(GetMenuItemCount(frame_menu) == 0, "Got wrong frame menu item count: %u\n", GetMenuItemCount(frame_menu));
@@ -2014,7 +2015,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
{
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd);
ok(GetMenuItemCount(frame_menu) == 0, "Got wrong frame menu item count: %u\n", GetMenuItemCount(frame_menu));
@@ -2032,7 +2033,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == first_id, "wrong child id %ld\n", id);
+ ok(id == first_id, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0;
ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd);
@@ -2056,7 +2057,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == 0, "wrong child id %ld\n", id);
+ ok(id == 0, "wrong child id %Id\n", id);
ok(GetMenuItemCount(frame_menu) == 0, "Got wrong frame menu item count: %u\n", GetMenuItemCount(frame_menu));
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd);
@@ -2070,7 +2071,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == 0, "wrong child id %ld\n", id);
+ ok(id == 0, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd);
ok(GetMenuItemCount(frame_menu) == 0, "Got wrong frame menu item count: %u\n", GetMenuItemCount(frame_menu));
@@ -2085,7 +2086,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == 0, "wrong child id %ld\n", id);
+ ok(id == 0, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd);
ok(GetMenuItemCount(frame_menu) == 0, "Got wrong frame menu item count: %u\n", GetMenuItemCount(frame_menu));
@@ -2099,7 +2100,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == 0, "wrong child id %ld\n", id);
+ ok(id == 0, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd);
ok(GetMenuItemCount(frame_menu) == 0, "Got wrong frame menu item count: %u\n", GetMenuItemCount(frame_menu));
@@ -2113,7 +2114,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id)
mdi_lParam_test_message);
ok(mdi_child != 0, "MDI child creation failed\n");
id = GetWindowLongPtrA(mdi_child, GWLP_ID);
- ok(id == 0, "wrong child id %ld\n", id);
+ ok(id == 0, "wrong child id %Id\n", id);
hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0);
ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd);
ok(GetMenuItemCount(frame_menu) == 0, "Got wrong frame menu item count: %u\n", GetMenuItemCount(frame_menu));
@@ -2233,7 +2234,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_1(HWND hwnd, UINT msg, WPARAM wparam, L
/* MDICREATESTRUCT should have original values */
ok(mdi_cs->style == 0 || mdi_cs->style == 0x7fffffff || mdi_cs->style == 0xffffffff || mdi_cs->style == WS_MAXIMIZE,
- "mdi_cs->style does not match (%08x)\n", mdi_cs->style);
+ "mdi_cs->style does not match (%08lx)\n", mdi_cs->style);
ok(mdi_cs->x == CW_USEDEFAULT, "%d != CW_USEDEFAULT\n", mdi_cs->x);
ok(mdi_cs->y == CW_USEDEFAULT, "%d != CW_USEDEFAULT\n", mdi_cs->y);
ok(mdi_cs->cx == CW_USEDEFAULT, "%d != CW_USEDEFAULT\n", mdi_cs->cx);
@@ -2253,7 +2254,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_1(HWND hwnd, UINT msg, WPARAM wparam, L
{
LONG style = mdi_cs->style | WS_CHILD | WS_CLIPSIBLINGS;
ok(cs->style == style,
- "cs->style does not match (%08x)\n", cs->style);
+ "cs->style does not match (%08lx)\n", cs->style);
}
else
{
@@ -2262,7 +2263,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_1(HWND hwnd, UINT msg, WPARAM wparam, L
style |= WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
ok(cs->style == style,
- "cs->style does not match (%08x)\n", cs->style);
+ "cs->style does not match (%08lx)\n", cs->style);
}
break;
}
@@ -2286,13 +2287,13 @@ static LRESULT WINAPI mdi_child_wnd_proc_1(HWND hwnd, UINT msg, WPARAM wparam, L
AdjustWindowRectEx(&rc, style, 0, exstyle);
if (winetest_debug > 1)
{
- trace("MDI child: calculated max window size = (%d x %d)\n", rc.right-rc.left, rc.bottom-rc.top);
+ trace("MDI child: calculated max window size = (%ld x %ld)\n", rc.right-rc.left, rc.bottom-rc.top);
dump_minmax_info( minmax );
}
- ok(minmax->ptMaxSize.x == rc.right - rc.left, "default width of maximized child %d != %d\n",
+ ok(minmax->ptMaxSize.x == rc.right - rc.left, "default width of maximized child %ld != %ld\n",
minmax->ptMaxSize.x, rc.right - rc.left);
- ok(minmax->ptMaxSize.y == rc.bottom - rc.top, "default height of maximized child %d != %d\n",
+ ok(minmax->ptMaxSize.y == rc.bottom - rc.top, "default height of maximized child %ld != %ld\n",
minmax->ptMaxSize.y, rc.bottom - rc.top);
DefMDIChildProcA(hwnd, msg, wparam, lparam);
@@ -2304,9 +2305,9 @@ static LRESULT WINAPI mdi_child_wnd_proc_1(HWND hwnd, UINT msg, WPARAM wparam, L
}
MDI_ChildGetMinMaxInfo(client, hwnd, &my_minmax);
- ok(minmax->ptMaxSize.x == my_minmax.ptMaxSize.x, "default width of maximized child %d != %d\n",
+ ok(minmax->ptMaxSize.x == my_minmax.ptMaxSize.x, "default width of maximized child %ld != %ld\n",
minmax->ptMaxSize.x, my_minmax.ptMaxSize.x);
- ok(minmax->ptMaxSize.y == my_minmax.ptMaxSize.y, "default height of maximized child %d != %d\n",
+ ok(minmax->ptMaxSize.y == my_minmax.ptMaxSize.y, "default height of maximized child %ld != %ld\n",
minmax->ptMaxSize.y, my_minmax.ptMaxSize.y);
return 1;
@@ -2369,7 +2370,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L
GetClientRect(parent, &rc);
if (winetest_debug > 1)
{
- trace("WM_GETMINMAXINFO: parent %p client size = (%d x %d)\n", parent, rc.right, rc.bottom);
+ trace("WM_GETMINMAXINFO: parent %p client size = (%ld x %ld)\n", parent, rc.right, rc.bottom);
dump_minmax_info( minmax );
}
GetClientRect(parent, &rc);
@@ -2377,9 +2378,9 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L
style &= ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */
AdjustWindowRectEx(&rc, style, 0, exstyle);
- ok(minmax->ptMaxSize.x == rc.right - rc.left, "default width of maximized child %d != %d\n",
+ ok(minmax->ptMaxSize.x == rc.right - rc.left, "default width of maximized child %ld != %ld\n",
minmax->ptMaxSize.x, rc.right - rc.left);
- ok(minmax->ptMaxSize.y == rc.bottom - rc.top, "default height of maximized child %d != %d\n",
+ ok(minmax->ptMaxSize.y == rc.bottom - rc.top, "default height of maximized child %ld != %ld\n",
minmax->ptMaxSize.y, rc.bottom - rc.top);
break;
}
@@ -2399,7 +2400,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L
GetWindowRect(hwnd, &rc1);
GetClientRect(hwnd, &rc2);
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2);
ok(EqualRect(&rc1, &rc2), "rects do not match, window=%s client=%s\n",
wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2));
@@ -2429,7 +2430,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L
case WM_NCCALCSIZE:
{
LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam);
- ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ ok(!ret, "got %08Ix (%08Ix %08Ix)\n", ret, wparam, lparam);
return ret;
}
}
@@ -2492,7 +2493,7 @@ static LRESULT WINAPI mdi_main_wnd_procA(HWND hwnd, UINT msg, WPARAM wparam, LPA
case WM_NCCALCSIZE:
{
LRESULT ret = DefFrameProcA(hwnd, mdi_client, WM_NCCALCSIZE, wparam, lparam);
- ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ ok(!ret, "got %08Ix (%08Ix %08Ix)\n", ret, wparam, lparam);
return ret;
}
@@ -2562,7 +2563,7 @@ static void test_mdi(void)
SCROLLINFO si;
BOOL ret, gotit;
- winetest_push_context("style %#x", style[i]);
+ winetest_push_context("style %#lx", style[i]);
mdi_client = CreateWindowExA(0, "mdiclient", NULL,
WS_CHILD | style[i],
0, 0, rc.right, rc.bottom,
@@ -2797,11 +2798,11 @@ static void check_icon_size_( int line, HICON icon, LONG width, LONG height )
BOOL ret;
ret = GetIconInfo( icon, &info );
- ok_(__FILE__, line)(ret, "failed to get icon info, error %u\n", GetLastError());
+ ok_(__FILE__, line)(ret, "failed to get icon info, error %lu\n", GetLastError());
ret = GetObjectW(info.hbmColor, sizeof(bitmap), &bitmap);
- ok_(__FILE__, line)(ret, "failed to get bitmap, error %u\n", GetLastError());
- ok_(__FILE__, line)(bitmap.bmWidth == width, "expected width %d, got %d\n", width, bitmap.bmWidth);
- ok_(__FILE__, line)(bitmap.bmHeight == height, "expected height %d, got %d\n", height, bitmap.bmHeight);
+ ok_(__FILE__, line)(ret, "failed to get bitmap, error %lu\n", GetLastError());
+ ok_(__FILE__, line)(bitmap.bmWidth == width, "expected width %ld, got %d\n", width, bitmap.bmWidth);
+ ok_(__FILE__, line)(bitmap.bmHeight == height, "expected height %ld, got %d\n", height, bitmap.bmHeight);
}
#define check_internal_icon_size(a, b, c, d) check_internal_icon_size_(__LINE__, a, b, c, d)
@@ -2814,7 +2815,7 @@ static void check_internal_icon_size_( int line, HANDLE window, UINT type, LONG
ok_(__FILE__, line)(icon != 0, "expected nonzero icon\n");
check_icon_size_( line, icon, width, height );
ret = DestroyIcon( icon );
- ok_(__FILE__, line)(ret, "failed to destroy icon, error %u\n", GetLastError());
+ ok_(__FILE__, line)(ret, "failed to destroy icon, error %lu\n", GetLastError());
}
static DWORD WINAPI internal_get_icon_thread(void *arg)
@@ -2825,7 +2826,7 @@ static DWORD WINAPI internal_get_icon_thread(void *arg)
icon = pInternalGetWindowIcon( arg, ICON_BIG );
ok( icon != 0, "expected nonzero icon\n" );
ret = DestroyIcon( icon );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
return 0;
}
@@ -2861,15 +2862,15 @@ static void test_icons(void)
SetLastError( 0xdeadbeef );
res = pInternalGetWindowIcon( hwnd, ICON_BIG );
ok( res != 0, "expected nonzero icon\n" );
- ok( GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError() );
+ ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() );
check_icon_size( res, 40, 40 );
res2 = pInternalGetWindowIcon( hwnd, ICON_BIG );
ok( res2 && res2 != res, "got %p\n", res2 );
check_icon_size( res2, 40, 40 );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
ret = DestroyIcon( res );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL, 0 );
ok( !res, "wrong small icon %p\n", res );
@@ -2880,9 +2881,9 @@ static void test_icons(void)
ok( res2 && res2 != res, "got %p\n", res2 );
check_icon_size( res2, 50, 50 );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
ret = DestroyIcon( res );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 );
ok( !res, "wrong small2 icon %p\n", res );
@@ -2893,9 +2894,9 @@ static void test_icons(void)
ok( res2 && res2 != res, "got %p\n", res2 );
check_icon_size( res2, 50, 50 );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
ret = DestroyIcon( res );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
res = (HICON)SendMessageA( hwnd, WM_SETICON, ICON_BIG, (LPARAM)icon );
ok( res == 0, "wrong previous big icon %p/0\n", res );
@@ -2905,7 +2906,7 @@ static void test_icons(void)
ok( res2 && res2 != icon, "got %p\n", res2 );
check_icon_size( res2, 10, 10 );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
res = (HICON)SendMessageA( hwnd, WM_SETICON, ICON_BIG, (LPARAM)icon2 );
ok( res == icon, "wrong previous big icon %p/%p\n", res, icon );
@@ -2915,7 +2916,7 @@ static void test_icons(void)
ok( res2 && res2 != icon2, "got %p\n", res2 );
check_icon_size( res2, 20, 20 );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL, 0 );
ok( res == 0, "wrong small icon %p/0\n", res );
@@ -2923,7 +2924,7 @@ static void test_icons(void)
ok( res2 != 0, "expected nonzero icon\n" );
check_icon_size( res2, small_width, small_height );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 );
ok( res && res != icon3 && res != icon2, "wrong small2 icon %p\n", res );
@@ -2934,7 +2935,7 @@ static void test_icons(void)
ok( res2 && res2 != icon3 && res2 != icon2 && res2 != res, "got %p\n", res2 );
check_icon_size( res2, small_width, small_height );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
res = (HICON)SendMessageA( hwnd, WM_SETICON, ICON_SMALL, (LPARAM)icon );
ok( res == 0, "wrong previous small icon %p/0\n", res );
@@ -2944,7 +2945,7 @@ static void test_icons(void)
ok( res2 && res2 != icon, "got %p\n", res2 );
check_icon_size( res2, 10, 10 );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 );
ok( res == icon, "wrong small2 icon after set %p/%p\n", res, icon );
@@ -2952,7 +2953,7 @@ static void test_icons(void)
ok( res2 && res2 != icon && res2 != res, "got %p\n", res2 );
check_icon_size( res2, 10, 10 );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
res = (HICON)SendMessageA( hwnd, WM_SETICON, ICON_SMALL, (LPARAM)icon3 );
ok( res == icon, "wrong previous small icon %p/%p\n", res, icon );
@@ -2962,7 +2963,7 @@ static void test_icons(void)
ok( res2 && res2 != icon3, "got %p\n", res2 );
check_icon_size( res2, 30, 30 );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 );
ok( res == icon3, "wrong small2 icon after set %p/%p\n", res, icon3 );
@@ -2970,7 +2971,7 @@ static void test_icons(void)
ok( res2 && res2 != icon3 && res2 != res, "got %p\n", res2 );
check_icon_size( res2, 30, 30 );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
/* make sure the big icon hasn't changed */
res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_BIG, 0 );
@@ -2979,17 +2980,17 @@ static void test_icons(void)
ok( res2 && res2 != icon2, "got %p\n", res2 );
check_icon_size( res2, 20, 20 );
ret = DestroyIcon( res2 );
- ok( ret, "got error %u\n", GetLastError() );
+ ok( ret, "got error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
res = pInternalGetWindowIcon( NULL, ICON_BIG );
ok( !res, "got %p\n", res );
- ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
res = pInternalGetWindowIcon( hwnd, 0xdeadbeef );
ok( !res, "got %p\n", res );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() );
thread = CreateThread( NULL, 0, internal_get_icon_thread, hwnd, 0, NULL );
ret = WaitForSingleObject( thread, 1000 );
@@ -3133,13 +3134,13 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2)
ok(ret, "Got %d\n", ret);
hwnd_desktop = GetDesktopWindow();
- ok(!!hwnd_desktop, "Failed to get hwnd_desktop window (%d).\n", GetLastError());
+ ok(!!hwnd_desktop, "Failed to get hwnd_desktop window (%ld).\n", GetLastError());
hwnd_child = create_tool_window(WS_VISIBLE|WS_CHILD, hwnd);
- ok(!!hwnd_child, "Failed to create child window (%d)\n", GetLastError());
+ ok(!!hwnd_child, "Failed to create child window (%ld)\n", GetLastError());
hwnd_grandchild = create_tool_window(WS_VISIBLE|WS_CHILD, hwnd_child);
- ok(!!hwnd_child, "Failed to create child window (%d)\n", GetLastError());
+ ok(!!hwnd_child, "Failed to create child window (%ld)\n", GetLastError());
hwnd_child2 = create_tool_window(WS_VISIBLE|WS_CHILD, hwnd);
- ok(!!hwnd_child2, "Failed to create second child window (%d)\n", GetLastError());
+ ok(!!hwnd_child2, "Failed to create second child window (%ld)\n", GetLastError());
ret = SetWindowPos(hwnd, hwnd2, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
ok(ret, "Got %d\n", ret);
@@ -3277,7 +3278,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2)
DestroyWindow(hwnd_child2);
hwnd_child = create_tool_window(WS_CHILD|WS_POPUP|WS_SYSMENU, hwnd2);
- ok(!!hwnd_child, "Failed to create child window (%d)\n", GetLastError());
+ ok(!!hwnd_child, "Failed to create child window (%ld)\n", GetLastError());
ret = SetWindowPos(hwnd_child, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_SHOWWINDOW);
ok(ret, "Got %d\n", ret);
flush_events( TRUE );
@@ -3305,7 +3306,7 @@ static void test_SetMenu(HWND parent)
ok(ret == hMenu, "unexpected menu id %p\n", ret);
/* test whether we can destroy a menu assigned to a window */
retok = DestroyMenu(hMenu);
- ok( retok, "DestroyMenu error %d\n", GetLastError());
+ ok( retok, "DestroyMenu error %ld\n", GetLastError());
retok = IsMenu(hMenu);
ok(!retok, "menu handle should be not valid after DestroyMenu\n");
ret = GetMenu(parent);
@@ -3409,7 +3410,7 @@ static void test_window_tree(HWND parent, const DWORD *style, const int *order,
for (i = 0; i < total; i++)
{
- ok(child[order[i]] == hwnd, "Z order of child #%ld is wrong\n", i);
+ ok(child[order[i]] == hwnd, "Z order of child #%Id is wrong\n", i);
hwnd = GetWindow(hwnd, GW_HWNDNEXT);
}
@@ -3677,7 +3678,7 @@ static void test_SetFocus(HWND hwnd)
ok( GetFocus() == child, "Focus should be on child %p\n", child );
SetLastError(0xdeadbeef);
EnableWindow(hwnd, FALSE);
- ok(GetLastError() == 0xdeadbeef, "got error %u in EnableWindow call\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "got error %lu in EnableWindow call\n", GetLastError());
ok( GetFocus() == child, "Focus should still be on child %p\n", child );
EnableWindow(hwnd, TRUE);
@@ -3736,16 +3737,16 @@ static void test_SetActiveWindow_0_proc( char **argv )
sscanf( argv[3], "%p", &other );
start_event = CreateEventW( NULL, FALSE, FALSE, L"test_SetActiveWindow_0_start" );
- ok( start_event != 0, "CreateEventW failed, error %u\n", GetLastError() );
+ ok( start_event != 0, "CreateEventW failed, error %lu\n", GetLastError() );
stop_event = CreateEventW( NULL, FALSE, FALSE, L"test_SetActiveWindow_0_stop" );
- ok( stop_event != 0, "CreateEventW failed, error %u\n", GetLastError() );
+ ok( stop_event != 0, "CreateEventW failed, error %lu\n", GetLastError() );
hwnd = CreateWindowExA( 0, "static", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, NULL, NULL );
- ok( !!hwnd, "CreateWindowExA failed, error %u\n", GetLastError() );
+ ok( !!hwnd, "CreateWindowExA failed, error %lu\n", GetLastError() );
flush_events( TRUE );
ret = SetForegroundWindow( hwnd );
- ok( ret, "SetForegroundWindow failed, error %u\n", GetLastError() );
+ ok( ret, "SetForegroundWindow failed, error %lu\n", GetLastError() );
tmp = GetForegroundWindow();
ok( tmp == hwnd, "GetForegroundWindow returned %p\n", tmp );
@@ -3756,12 +3757,12 @@ static void test_SetActiveWindow_0_proc( char **argv )
SetLastError( 0xdeadbeef );
tmp = SetActiveWindow( 0 );
- if (!tmp) ok( GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError() );
+ if (!tmp) ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() );
else /* < Win10 */
{
ok( tmp == hwnd, "SetActiveWindow returned %p\n", tmp );
todo_wine
- ok( GetLastError() == 0, "got error %u\n", GetLastError() );
+ ok( GetLastError() == 0, "got error %lu\n", GetLastError() );
tmp = GetForegroundWindow();
ok( tmp == other || tmp == 0, "GetForegroundWindow returned %p\n", tmp );
@@ -3809,7 +3810,7 @@ static void test_SetActiveWindow_0( char **argv )
BOOL ret;
hwnd = CreateWindowExA( 0, "static", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, NULL, NULL );
- ok( !!hwnd, "CreateWindowExA failed, error %u\n", GetLastError() );
+ ok( !!hwnd, "CreateWindowExA failed, error %lu\n", GetLastError() );
SetWindowPos( hwnd, HWND_TOPMOST, 150, 150, 300, 300, SWP_FRAMECHANGED | SWP_SHOWWINDOW );
flush_events( TRUE );
@@ -3821,13 +3822,13 @@ static void test_SetActiveWindow_0( char **argv )
ok( tmp == hwnd, "GetFocus returned %p\n", tmp );
events[1] = CreateEventW( NULL, FALSE, FALSE, L"test_SetActiveWindow_0_start" );
- ok( events[1] != 0, "CreateEventW failed, error %u\n", GetLastError() );
+ ok( events[1] != 0, "CreateEventW failed, error %lu\n", GetLastError() );
events[2] = CreateEventW( NULL, FALSE, FALSE, L"test_SetActiveWindow_0_stop" );
- ok( events[2] != 0, "CreateEventW failed, error %u\n", GetLastError() );
+ ok( events[2] != 0, "CreateEventW failed, error %lu\n", GetLastError() );
sprintf( cmdline, "%s %s SetActiveWindow_0 %p", argv[0], argv[1], hwnd );
ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info );
- ok( ret, "CreateProcessA failed, error %u\n", GetLastError() );
+ ok( ret, "CreateProcessA failed, error %lu\n", GetLastError() );
events[0] = info.hProcess;
if (wait_for_events( 2, events, INFINITE ) == 1)
@@ -3903,7 +3904,7 @@ static void test_SetActiveWindow(HWND hwnd)
ret = SetActiveWindow(GetDesktopWindow());
ok(ret == NULL, "expected NULL, got %p\n", ret);
todo_wine
- ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", GetLastError());
check_wnd_state(hwnd, hwnd, hwnd, 0);
/* activating a child should activate the parent */
@@ -3932,10 +3933,10 @@ static DWORD WINAPI create_window_thread(void *param)
p->window = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 0, 0, 0, 0, 0, 0);
ret = SetEvent(p->window_created);
- ok(ret, "SetEvent failed, last error %#x.\n", GetLastError());
+ ok(ret, "SetEvent failed, last error %#lx.\n", GetLastError());
res = WaitForSingleObject(p->test_finished, INFINITE);
- ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError());
+ ok(res == WAIT_OBJECT_0, "Wait failed (%#lx), last error %#lx.\n", res, GetLastError());
DestroyWindow(p->window);
return 0;
@@ -3970,7 +3971,7 @@ static void test_SetForegroundWindow(HWND hwnd)
ret = SetForegroundWindow(0);
ok(!ret, "SetForegroundWindow returned TRUE instead of FALSE\n");
ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE,
- "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError());
+ "got error %ld expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError());
check_wnd_state(hwnd, hwnd, hwnd, 0);
SetWindowPos(hwnd,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_HIDEWINDOW);
@@ -3982,7 +3983,7 @@ static void test_SetForegroundWindow(HWND hwnd)
hwnd2 = GetForegroundWindow();
ok(hwnd2 == hwnd, "Wrong foreground window %p\n", hwnd2);
ret = SetForegroundWindow( GetDesktopWindow() );
- ok(ret, "SetForegroundWindow(desktop) error: %d\n", GetLastError());
+ ok(ret, "SetForegroundWindow(desktop) error: %ld\n", GetLastError());
hwnd2 = GetForegroundWindow();
ok(hwnd2 != hwnd, "Wrong foreground window %p\n", hwnd2);
@@ -4016,13 +4017,13 @@ static void test_SetForegroundWindow(HWND hwnd)
check_wnd_state(hwnd2, hwnd2, hwnd2, 0);
thread_params.window_created = CreateEventW(NULL, FALSE, FALSE, NULL);
- ok(!!thread_params.window_created, "CreateEvent failed, last error %#x.\n", GetLastError());
+ ok(!!thread_params.window_created, "CreateEvent failed, last error %#lx.\n", GetLastError());
thread_params.test_finished = CreateEventW(NULL, FALSE, FALSE, NULL);
- ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError());
+ ok(!!thread_params.test_finished, "CreateEvent failed, last error %#lx.\n", GetLastError());
thread = CreateThread(NULL, 0, create_window_thread, &thread_params, 0, &tid);
- ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError());
+ ok(!!thread, "Failed to create thread, last error %#lx.\n", GetLastError());
res = WaitForSingleObject(thread_params.window_created, INFINITE);
- ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError());
+ ok(res == WAIT_OBJECT_0, "Wait failed (%#lx), last error %#lx.\n", res, GetLastError());
check_wnd_state(hwnd2, thread_params.window, hwnd2, 0);
SetForegroundWindow(hwnd2);
@@ -4235,11 +4236,11 @@ static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam,
gti.cbSize = sizeof(GUITHREADINFO);
status = pGetGUIThreadInfo(GetCurrentThreadId(), >i);
ok(status, "GetGUIThreadInfo() failed!\n");
- ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags);
+ ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08lX)!\n", gti.flags);
}
cap_wnd = GetCapture();
- ok(cap_wnd == (HWND)lParam, "capture window %p does not match lparam %lx\n", cap_wnd, lParam);
+ ok(cap_wnd == (HWND)lParam, "capture window %p does not match lparam %Ix\n", cap_wnd, lParam);
todo_wine ok(cap_wnd == hWnd, "capture window %p does not match hwnd %p\n", cap_wnd, hWnd);
/* check that re-setting the capture for the menu fails */
@@ -4266,7 +4267,7 @@ static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam,
gti.cbSize = sizeof(GUITHREADINFO);
status = pGetGUIThreadInfo(GetCurrentThreadId(), >i);
ok(status, "GetGUIThreadInfo() failed!\n");
- ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags);
+ ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08lX)!\n", gti.flags);
}
/* verify that no capture change took place */
@@ -4309,11 +4310,11 @@ static void test_capture_4(void)
wclass.cbClsExtra = 0;
wclass.cbWndExtra = 0;
aclass = RegisterClassA( &wclass );
- ok( aclass, "RegisterClassA failed with error %d\n", GetLastError());
+ ok( aclass, "RegisterClassA failed with error %ld\n", GetLastError());
hwnd = CreateWindowA( wclass.lpszClassName, "MenuTest",
WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0,
400, 200, NULL, NULL, hInstance, NULL);
- ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError());
+ ok(hwnd != NULL, "CreateWindowEx failed with error %ld\n", GetLastError());
if (!hwnd) return;
hmenu = CreatePopupMenu();
@@ -4483,7 +4484,7 @@ static void test_mouse_input(HWND hwnd)
{
ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n",
msg.hwnd, msg.message);
- ok(msg.pt.x == x && msg.pt.y == y, "wrong message coords (%d,%d)/(%d,%d)\n",
+ ok(msg.pt.x == x && msg.pt.y == y, "wrong message coords (%d,%d)/(%ld,%ld)\n",
x, y, msg.pt.x, msg.pt.y);
}
@@ -4628,7 +4629,7 @@ static void test_mouse_input(HWND hwnd)
}
ok(msg.hwnd == child && msg.message == WM_NCLBUTTONDOWN, "hwnd %p/%p message %04x\n",
msg.hwnd, child, msg.message);
- ok(msg.wParam == HTSYSMENU, "wparam %ld\n", msg.wParam);
+ ok(msg.wParam == HTSYSMENU, "wparam %Id\n", msg.wParam);
ret = wait_for_message( &msg );
ok(ret, "no message available\n");
@@ -4641,7 +4642,7 @@ static void test_mouse_input(HWND hwnd)
ok(ret, "no message available\n");
ok(msg.hwnd == child && msg.message == WM_LBUTTONDBLCLK, "hwnd %p/%p message %04x\n",
msg.hwnd, child, msg.message);
- ok(msg.wParam == MK_LBUTTON, "wparam %ld\n", msg.wParam);
+ ok(msg.wParam == MK_LBUTTON, "wparam %Id\n", msg.wParam);
ret = wait_for_message( &msg );
ok(ret, "no message available\n");
@@ -4713,7 +4714,7 @@ static void nccalchelper(HWND hwnd, INT x, INT y, RECT *prc)
GetWindowRect( hwnd, prc);
rc = *prc;
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)prc);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
if (winetest_debug > 1)
trace("window rect is %s, nccalc rect is %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(prc));
}
@@ -4953,17 +4954,17 @@ static LRESULT WINAPI cbt_proc(int ncode, WPARAM wparam, LPARAM lparam)
ts = c->lpcs->lpCreateParams;
ok(ts != NULL, "lpCreateParams not set\n");
- ok(c->lpcs->style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n",
+ ok(c->lpcs->style == ts->cs_style, "style = 0x%08lx, expected 0x%08lx\n",
c->lpcs->style, ts->cs_style);
- ok(c->lpcs->dwExStyle == ts->cs_exstyle, "exstyle = 0x%08x, expected 0x%08x\n",
+ ok(c->lpcs->dwExStyle == ts->cs_exstyle, "exstyle = 0x%08lx, expected 0x%08lx\n",
c->lpcs->dwExStyle, ts->cs_exstyle);
style = GetWindowLongW(hwnd, GWL_STYLE);
- ok(style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n",
+ ok(style == ts->cs_style, "style = 0x%08lx, expected 0x%08lx\n",
style, ts->cs_style);
style = GetWindowLongW(hwnd, GWL_EXSTYLE);
ok(style == (ts->cs_exstyle & ~WS_EX_LAYERED),
- "exstyle = 0x%08x, expected 0x%08x\n", style, ts->cs_exstyle);
+ "exstyle = 0x%08lx, expected 0x%08lx\n", style, ts->cs_exstyle);
return CallNextHookEx(NULL, ncode, wparam, lparam);
}
@@ -4981,16 +4982,16 @@ static LRESULT WINAPI StyleCheckProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
ts = cs->lpCreateParams;
ok(ts != NULL, "lpCreateParams not set\n");
- ok(cs->style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n",
+ ok(cs->style == ts->cs_style, "style = 0x%08lx, expected 0x%08lx\n",
cs->style, ts->cs_style);
- ok(cs->dwExStyle == ts->cs_exstyle, "exstyle = 0x%08x, expected 0x%08x\n",
+ ok(cs->dwExStyle == ts->cs_exstyle, "exstyle = 0x%08lx, expected 0x%08lx\n",
cs->dwExStyle, ts->cs_exstyle);
style = GetWindowLongW(hwnd, GWL_STYLE);
- ok(style == ts->style, "style = 0x%08x, expected 0x%08x\n",
+ ok(style == ts->style, "style = 0x%08lx, expected 0x%08lx\n",
style, ts->style);
style = GetWindowLongW(hwnd, GWL_EXSTYLE);
- ok(style == ts->exstyle, "exstyle = 0x%08x, expected 0x%08x\n",
+ ok(style == ts->exstyle, "exstyle = 0x%08lx, expected 0x%08lx\n",
style, ts->exstyle);
break;
}
@@ -5056,8 +5057,8 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle
dwActualStyle = GetWindowLongA(hwnd, GWL_STYLE);
dwActualExStyle = GetWindowLongA(hwnd, GWL_EXSTYLE);
- ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle);
- ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle);
+ ok(dwActualStyle == dwStyleOut, "expected style %#lx, got %#lx\n", dwStyleOut, dwActualStyle);
+ ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#lx, got %#lx\n", dwExStyleOut, dwActualExStyle);
/* try setting the styles explicitly */
SetWindowLongA( hwnd, GWL_EXSTYLE, dwExStyleIn );
@@ -5070,8 +5071,8 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle
dwExStyleOut = dwExStyleIn | WS_EX_WINDOWEDGE;
else
dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE;
- ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle);
- ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle);
+ ok(dwActualStyle == dwStyleOut, "expected style %#lx, got %#lx\n", dwStyleOut, dwActualStyle);
+ ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#lx, got %#lx\n", dwExStyleOut, dwActualExStyle);
SetWindowLongA( hwnd, GWL_STYLE, dwStyleIn );
dwActualStyle = GetWindowLongA(hwnd, GWL_STYLE);
@@ -5086,8 +5087,8 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle
dwExStyleOut = dwExStyleIn | WS_EX_WINDOWEDGE;
else
dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE;
- ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle);
- ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle);
+ ok(dwActualStyle == dwStyleOut, "expected style %#lx, got %#lx\n", dwStyleOut, dwActualStyle);
+ ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#lx, got %#lx\n", dwExStyleOut, dwActualExStyle);
DestroyWindow(hwnd);
if (hwndParent) DestroyWindow(hwndParent);
@@ -5150,7 +5151,7 @@ static void test_window_styles(void)
if ((tests[i].exstyle_in & WS_EX_LAYERED) && !pGetLayeredWindowAttributes)
continue;
- winetest_push_context("style %#x exstyle %#x", tests[i].style_in, tests[i].exstyle_in);
+ winetest_push_context("style %#lx exstyle %#lx", tests[i].style_in, tests[i].exstyle_in);
check_window_style(tests[i].style_in, tests[i].exstyle_in, tests[i].style_out, tests[i].exstyle_out);
winetest_pop_context();
}
@@ -5189,40 +5190,40 @@ static INT_PTR WINAPI empty_dlg_proc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
ok(IsWindowEnabled(hwnd), "wrong state for %p\n", hwnd);
if (parent_is_child)
{
- ok(IsWindowEnabled(param->parent), "wrong state for %08x\n", style);
+ ok(IsWindowEnabled(param->parent), "wrong state for %08lx\n", style);
disabled_hwnd = param->grand_parent;
}
else
{
- ok(!IsWindowEnabled(param->parent), "wrong state for %08x\n", style);
+ ok(!IsWindowEnabled(param->parent), "wrong state for %08lx\n", style);
disabled_hwnd = param->parent;
}
if (param->grand_parent)
{
if (parent_is_child)
- ok(!IsWindowEnabled(param->grand_parent), "wrong state for %08x\n", style);
+ ok(!IsWindowEnabled(param->grand_parent), "wrong state for %08lx\n", style);
else
- ok(IsWindowEnabled(param->grand_parent), "wrong state for %08x\n", style);
+ ok(IsWindowEnabled(param->grand_parent), "wrong state for %08lx\n", style);
}
DialogBoxIndirectParamA(GetModuleHandleA(NULL), param->dlg_data, disabled_hwnd, empty_dlg_proc3, 0);
- ok(IsWindowEnabled(disabled_hwnd), "wrong state for %08x\n", style);
+ ok(IsWindowEnabled(disabled_hwnd), "wrong state for %08lx\n", style);
ok(IsWindowEnabled(hwnd), "wrong state for %p\n", hwnd);
ok(IsWindowEnabled(param->parent), "wrong state for %p\n", param->parent);
if (param->grand_parent)
- ok(IsWindowEnabled(param->grand_parent), "wrong state for %p (%08x)\n", param->grand_parent, style);
+ ok(IsWindowEnabled(param->grand_parent), "wrong state for %p (%08lx)\n", param->grand_parent, style);
DialogBoxIndirectParamA(GetModuleHandleA(NULL), param->dlg_data, hwnd, empty_dlg_proc3, 0);
ok(IsWindowEnabled(hwnd), "wrong state for %p\n", hwnd);
ok(IsWindowEnabled(param->parent), "wrong state for %p\n", param->parent);
if (param->grand_parent)
- ok(IsWindowEnabled(param->grand_parent), "wrong state for %p (%08x)\n", param->grand_parent, style);
+ ok(IsWindowEnabled(param->grand_parent), "wrong state for %p (%08lx)\n", param->grand_parent, style);
param->dlg_data->style |= WS_CHILD;
DialogBoxIndirectParamA(GetModuleHandleA(NULL), param->dlg_data, hwnd, empty_dlg_proc3, 0);
- ok(IsWindowEnabled(hwnd), "wrong state for %p (%08x)\n", hwnd, style);
+ ok(IsWindowEnabled(hwnd), "wrong state for %p (%08lx)\n", hwnd, style);
EndDialog(hwnd, 0);
}
@@ -5252,7 +5253,7 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou
parent = CreateWindowExA(0, "static", NULL, style_in,
0, 0, 0, 0, grand_parent, NULL, NULL, NULL);
- ok(parent != 0, "parent creation failed, style %#x\n", style_in);
+ ok(parent != 0, "parent creation failed, style %#lx\n", style_in);
dlg_data.dt.style = style_in;
dlg_data.dt.dwExtendedStyle = ex_style_in;
@@ -5267,22 +5268,22 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou
dlg_data.caption[0] = 0;
hwnd = CreateDialogIndirectParamA(GetModuleHandleA(NULL), &dlg_data.dt, parent, empty_dlg_proc, 0);
- ok(hwnd != 0, "dialog creation failed, style %#x, exstyle %#x\n", style_in, ex_style_in);
+ ok(hwnd != 0, "dialog creation failed, style %#lx, exstyle %#lx\n", style_in, ex_style_in);
flush_events( TRUE );
style = GetWindowLongA(hwnd, GWL_STYLE);
ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE);
- ok(style == (style_out | DS_3DLOOK), "got %#x\n", style);
- ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style);
+ ok(style == (style_out | DS_3DLOOK), "got %#lx\n", style);
+ ok(ex_style == ex_style_out, "expected ex_style %#lx, got %#lx\n", ex_style_out, ex_style);
- ok(IsWindowEnabled(parent), "wrong parent state (dialog style %#x)\n", style_in);
+ ok(IsWindowEnabled(parent), "wrong parent state (dialog style %#lx)\n", style_in);
/* try setting the styles explicitly */
SetWindowLongA(hwnd, GWL_EXSTYLE, ex_style_in);
style = GetWindowLongA(hwnd, GWL_STYLE);
ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE);
- ok(style == (style_out | DS_3DLOOK), "got %#x\n", style);
+ ok(style == (style_out | DS_3DLOOK), "got %#lx\n", style);
/* WS_EX_WINDOWEDGE can't always be changed */
if (ex_style_in & WS_EX_DLGMODALFRAME)
ex_style_out = ex_style_in | WS_EX_WINDOWEDGE;
@@ -5290,7 +5291,7 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou
ex_style_out = ex_style_in | WS_EX_WINDOWEDGE;
else
ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE;
- ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style);
+ ok(ex_style == ex_style_out, "expected ex_style %#lx, got %#lx\n", ex_style_out, ex_style);
SetWindowLongA(hwnd, GWL_STYLE, style_in);
style = GetWindowLongA(hwnd, GWL_STYLE);
@@ -5298,7 +5299,7 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou
/* WS_CLIPSIBLINGS can't be reset on top-level windows */
if ((style_in & (WS_CHILD | WS_POPUP)) == WS_CHILD) style_out = style_in;
else style_out = style_in | WS_CLIPSIBLINGS;
- ok(style == style_out, "expected style %#x, got %#x\n", style_out, style);
+ ok(style == style_out, "expected style %#lx, got %#lx\n", style_out, style);
/* WS_EX_WINDOWEDGE can't always be changed */
if (ex_style_in & WS_EX_DLGMODALFRAME)
ex_style_out = ex_style_in | WS_EX_WINDOWEDGE;
@@ -5306,7 +5307,7 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou
ex_style_out = ex_style_in | WS_EX_WINDOWEDGE;
else
ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE;
- ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style);
+ ok(ex_style == ex_style_out, "expected ex_style %#lx, got %#lx\n", ex_style_out, ex_style);
DestroyWindow(hwnd);
@@ -5315,9 +5316,9 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou
param.dlg_data = &dlg_data.dt;
DialogBoxIndirectParamA(GetModuleHandleA(NULL), &dlg_data.dt, parent, empty_dlg_proc2, (LPARAM)¶m);
- ok(IsWindowEnabled(parent), "wrong parent state (dialog style %#x)\n", style_in);
+ ok(IsWindowEnabled(parent), "wrong parent state (dialog style %#lx)\n", style_in);
if (grand_parent)
- ok(IsWindowEnabled(grand_parent), "wrong grand parent state (dialog style %#x)\n", style_in);
+ ok(IsWindowEnabled(grand_parent), "wrong grand parent state (dialog style %#lx)\n", style_in);
DestroyWindow(parent);
DestroyWindow(grand_parent);
@@ -5546,7 +5547,7 @@ static void test_dialog_parent(void)
param.root = parent;
param.ga_root_owner = child;
ret = DialogBoxIndirectParamA(GetModuleHandleA(NULL), &dlg_data.dt, child2, parent_dlg_proc, (LPARAM)¶m);
- ok(ret == 2, "DialogBoxIndirectParam returned %ld\n", ret);
+ ok(ret == 2, "DialogBoxIndirectParam returned %Id\n", ret);
/* Dialogs without WS_CHILD behave as expected, they use passed owner just like CreateWindow does. */
dlg_data.dt.style = WS_OVERLAPPEDWINDOW;
@@ -5567,7 +5568,7 @@ static void test_dialog_parent(void)
param.owner = child;
param.root = param.ga_root_owner = NULL;
ret = DialogBoxIndirectParamA(GetModuleHandleA(NULL), &dlg_data.dt, child2, parent_dlg_proc, (LPARAM)¶m);
- ok(ret == 2, "DialogBoxIndirectParam returned %ld\n", ret);
+ ok(ret == 2, "DialogBoxIndirectParam returned %Id\n", ret);
other = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
SetWindowLongPtrA(child, GWLP_WNDPROC, (ULONG_PTR)reparent_dialog_owner_proc);
@@ -5591,7 +5592,7 @@ static void test_dialog_parent(void)
param.root = NULL;
param.ga_root_owner = child;
ret = DialogBoxIndirectParamA(GetModuleHandleA(NULL), &dlg_data.dt, child2, parent_dlg_proc, (LPARAM)¶m);
- ok(ret == 2, "DialogBoxIndirectParam returned %ld\n", ret);
+ ok(ret == 2, "DialogBoxIndirectParam returned %Id\n", ret);
/* If we change parent in WM_INITDIALOG for WS_CHILD dialog WM_ENTERIDLE is still sent to the original
* parent. EndDialog will enable the new parent. */
@@ -5599,7 +5600,7 @@ static void test_dialog_parent(void)
EnableWindow(other, FALSE);
dlg_data.dt.style = WS_CHILD;
ret = DialogBoxIndirectParamA(GetModuleHandleA(NULL), &dlg_data.dt, child2, reparent_dlg_proc, (LPARAM)other);
- ok(ret == 2, "DialogBoxIndirectParam returned %ld\n", ret);
+ ok(ret == 2, "DialogBoxIndirectParam returned %Id\n", ret);
ok(!IsWindowEnabled(other), "other is not disabled\n");
ok(!IsWindowEnabled(child), "child is not disabled\n");
ok(IsWindowEnabled(child2), "child2 is not enabled\n");
@@ -5611,7 +5612,7 @@ static void test_dialog_parent(void)
EnableWindow(other, FALSE);
dlg_data.dt.style = WS_OVERLAPPED;
ret = DialogBoxIndirectParamA(GetModuleHandleA(NULL), &dlg_data.dt, child2, reparent_owned_dlg_proc, (LPARAM)other);
- ok(ret == 1, "DialogBoxIndirectParam returned %ld\n", ret);
+ ok(ret == 1, "DialogBoxIndirectParam returned %Id\n", ret);
ok(!IsWindowEnabled(other), "other is not disabled\n");
ok(!IsWindowEnabled(child), "child is not disabled\n");
ok(IsWindowEnabled(child2), "child2 is not enabled\n");
@@ -5621,14 +5622,14 @@ static void test_dialog_parent(void)
/* Quit dialog message loop by sending WM_QUIT message. Dialog owner is not enabled. */
SetWindowLongPtrA(child, GWLP_WNDPROC, (ULONG_PTR)post_quit_dialog_owner_proc);
ret = DialogBoxIndirectParamA(GetModuleHandleA(NULL), &dlg_data.dt, other, empty_dlg_proc, 0);
- ok(ret == 1, "DialogBoxIndirectParam returned %ld\n", ret);
+ ok(ret == 1, "DialogBoxIndirectParam returned %Id\n", ret);
ok(!IsWindowEnabled(other), "other is enabled\n");
EnableWindow(other, TRUE);
/* Quit dialog message loop by destroying the window. Dialog owner is not enabled. */
SetWindowLongPtrA(child, GWLP_WNDPROC, (ULONG_PTR)destroy_dialog_owner_proc);
ret = DialogBoxIndirectParamA(GetModuleHandleA(NULL), &dlg_data.dt, other, empty_dlg_proc, 0);
- ok(ret == 1, "DialogBoxIndirectParam returned %ld\n", ret);
+ ok(ret == 1, "DialogBoxIndirectParam returned %Id\n", ret);
ok(!IsWindowEnabled(other), "other is enabled\n");
EnableWindow(other, TRUE);
@@ -5663,7 +5664,7 @@ static void test_scrollwindow( HWND hwnd)
flush_events(FALSE);
/* expected: black should have scrolled to the upper half */
colr = GetPixel( hdc, (rc2.left+rc2.right)/ 2, rc2.bottom / 4 );
- ok ( colr == 0, "pixel should be black, color is %08x\n", colr);
+ ok ( colr == 0, "pixel should be black, color is %08lx\n", colr);
/* Repeat that test of ScrollWindow(Ex) now with clip rectangle */
/* paint the lower half of the window black */
rc2 = rc;
@@ -5683,7 +5684,7 @@ static void test_scrollwindow( HWND hwnd)
flush_events(FALSE);
/* expected: black should have scrolled to the upper half */
colr = GetPixel( hdc, (rc2.left+rc2.right)/ 2, rc2.bottom / 4 );
- ok ( colr == 0, "pixel should be black, color is %08x\n", colr);
+ ok ( colr == 0, "pixel should be black, color is %08lx\n", colr);
/* clean up */
ReleaseDC( hwnd, hdc);
@@ -5914,11 +5915,11 @@ static void test_scrolldc( HWND parent)
cliprc.top = (rc.top + rc.bottom) /2;
/* test whether scrolled pixels are properly clipped */
colr = GetPixel( hdc, (rc.left+rc.right)/2, ( rc.top + rc.bottom) /2 - 1);
- ok ( colr == 0, "pixel should be black, color is %08x\n", colr);
+ ok ( colr == 0, "pixel should be black, color is %08lx\n", colr);
/* this scroll should not cause any visible changes */
ScrollDC( hdc, 5, -20, &rc, &cliprc, hrgn, &rcu);
colr = GetPixel( hdc, (rc.left+rc.right)/2, ( rc.top + rc.bottom) /2 - 1);
- ok ( colr == 0, "pixel should be black, color is %08x\n", colr);
+ ok ( colr == 0, "pixel should be black, color is %08lx\n", colr);
/* test with NULL clip rect */
ScrollDC( hdc, 20, -20, &rc, NULL, hrgn, &rcu);
/*FillRgn(hdc, hrgn, GetStockObject(WHITE_BRUSH));*/
@@ -5971,7 +5972,7 @@ static void test_params(void)
/* Just a param check */
SetLastError(0xdeadbeef);
rc = GetWindowTextA(hwndMain2, NULL, 1024);
- ok(!rc, "GetWindowText: rc=%d err=%d\n",rc,GetLastError());
+ ok(!rc, "GetWindowText: rc=%d err=%ld\n",rc,GetLastError());
SetLastError(0xdeadbeef);
hwnd=CreateWindowA("LISTBOX", "TestList",
@@ -5983,7 +5984,7 @@ static void test_params(void)
"CreateWindow with invalid menu handle should fail\n");
if (!hwnd)
ok(GetLastError() == ERROR_INVALID_MENU_HANDLE,
- "wrong last error value %d\n", GetLastError());
+ "wrong last error value %ld\n", GetLastError());
}
static void test_AWRwindow(LPCSTR class, LONG style, LONG exStyle, BOOL menu)
@@ -5996,7 +5997,7 @@ static void test_AWRwindow(LPCSTR class, LONG style, LONG exStyle, BOOL menu)
0,
menu ? hmenu : 0,
0, 0);
- ok(hwnd != NULL, "Failed to create window class=%s, style=0x%08x, exStyle=0x%08x\n", class, style, exStyle);
+ ok(hwnd != NULL, "Failed to create window class=%s, style=0x%08lx, exStyle=0x%08lx\n", class, style, exStyle);
ShowWindow(hwnd, SW_SHOW);
@@ -6080,7 +6081,7 @@ static void test_AWR_flags(void)
rect2 = rect;
AdjustWindowRectEx( &rect, style, FALSE, exstyle );
wine_AdjustWindowRectEx( &rect2, style, FALSE, exstyle );
- ok( EqualRect( &rect, &rect2 ), "%08x %08x rects do not match: win %s wine %s\n",
+ ok( EqualRect( &rect, &rect2 ), "%08lx %08lx rects do not match: win %s wine %s\n",
style, exstyle, wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &rect2 ));
if (pAdjustWindowRectExForDpi)
{
@@ -6088,7 +6089,7 @@ static void test_AWR_flags(void)
rect2 = rect;
pAdjustWindowRectExForDpi( &rect, style, FALSE, exstyle, 192 );
wine_AdjustWindowRectExForDpi( &rect2, style, FALSE, exstyle, 192 );
- ok( EqualRect( &rect, &rect2 ), "%08x %08x rects do not match: win %s wine %s\n",
+ ok( EqualRect( &rect, &rect2 ), "%08lx %08lx rects do not match: win %s wine %s\n",
style, exstyle, wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &rect2 ));
}
}
@@ -6238,7 +6239,7 @@ static void zero_parentdc_test(struct parentdc_test *t)
#define parentdc_field_ok(t, w, r, f, got) \
ok (t.w.r.f==got.w.r.f, "window " #w ", rect " #r ", field " #f \
- ": expected %d, got %d\n", \
+ ": expected %ld, got %ld\n", \
t.w.r.f, got.w.r.f)
#define parentdc_todo_field_ok(t, w, r, f, got) \
@@ -6611,7 +6612,7 @@ static LRESULT CALLBACK winsizes_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM
ok( EqualRect( &rect, r ), "passed rect %s doesn't match window rect %s\n",
wine_dbgstr_rect( r ), wine_dbgstr_rect( &rect ));
ret = DefWindowProcA(hwnd, msg, wp, lp);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
return ret;
}
default:
@@ -6632,13 +6633,13 @@ static void test_CreateWindow(void)
#define expect_menu(window, menu) \
SetLastError(0xdeadbeef); \
res = (GetMenu(window) == (HMENU)menu); \
- ok(res, "GetMenu error %d\n", GetLastError())
+ ok(res, "GetMenu error %ld\n", GetLastError())
#define expect_style(window, style)\
- ok((ULONG)GetWindowLongA(window, GWL_STYLE) == (style), "expected style %x != %x\n", (LONG)(style), GetWindowLongA(window, GWL_STYLE))
+ ok((ULONG)GetWindowLongA(window, GWL_STYLE) == (style), "expected style %lx != %lx\n", (LONG)(style), GetWindowLongA(window, GWL_STYLE))
#define expect_ex_style(window, ex_style)\
- ok((ULONG)GetWindowLongA(window, GWL_EXSTYLE) == (ex_style), "expected ex_style %x != %x\n", (LONG)(ex_style), GetWindowLongA(window, GWL_EXSTYLE))
+ ok((ULONG)GetWindowLongA(window, GWL_EXSTYLE) == (ex_style), "expected ex_style %lx != %lx\n", (LONG)(ex_style), GetWindowLongA(window, GWL_EXSTYLE))
hmenu = CreateMenu();
assert(hmenu != 0);
@@ -6647,13 +6648,13 @@ static void test_CreateWindow(void)
SetLastError(0xdeadbeef);
res = IsMenu(hmenu);
- ok(res, "IsMenu error %d\n", GetLastError());
+ ok(res, "IsMenu error %ld\n", GetLastError());
/* WS_CHILD */
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(WS_EX_APPWINDOW, "static", NULL, WS_CHILD,
0, 0, 100, 100, parent, (HMENU)1, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, 1);
expect_style(hwnd, WS_CHILD);
expect_ex_style(hwnd, WS_EX_APPWINDOW);
@@ -6662,7 +6663,7 @@ static void test_CreateWindow(void)
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_CAPTION,
0, 0, 100, 100, parent, (HMENU)1, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, 1);
expect_style(hwnd, WS_CHILD | WS_CAPTION);
expect_ex_style(hwnd, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE);
@@ -6671,7 +6672,7 @@ static void test_CreateWindow(void)
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(0, "static", NULL, WS_CHILD,
0, 0, 100, 100, parent, (HMENU)1, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, 1);
expect_style(hwnd, WS_CHILD);
expect_ex_style(hwnd, 0);
@@ -6680,7 +6681,7 @@ static void test_CreateWindow(void)
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(0, "static", NULL, WS_CHILD | WS_CAPTION,
0, 0, 100, 100, parent, (HMENU)1, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, 1);
expect_style(hwnd, WS_CHILD | WS_CAPTION);
expect_ex_style(hwnd, WS_EX_WINDOWEDGE);
@@ -6690,63 +6691,63 @@ static void test_CreateWindow(void)
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(WS_EX_APPWINDOW, "static", NULL, WS_POPUP,
0, 0, 100, 100, parent, hmenu, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, hmenu);
expect_style(hwnd, WS_POPUP | WS_CLIPSIBLINGS);
expect_ex_style(hwnd, WS_EX_APPWINDOW);
DestroyWindow(hwnd);
SetLastError(0xdeadbeef);
ok(!IsMenu(hmenu), "IsMenu should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
hmenu = CreateMenu();
assert(hmenu != 0);
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(WS_EX_APPWINDOW, "static", NULL, WS_POPUP | WS_CAPTION,
0, 0, 100, 100, parent, hmenu, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, hmenu);
expect_style(hwnd, WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS);
expect_ex_style(hwnd, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE);
DestroyWindow(hwnd);
SetLastError(0xdeadbeef);
ok(!IsMenu(hmenu), "IsMenu should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
hmenu = CreateMenu();
assert(hmenu != 0);
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP,
0, 0, 100, 100, parent, hmenu, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, hmenu);
expect_style(hwnd, WS_POPUP | WS_CLIPSIBLINGS);
expect_ex_style(hwnd, 0);
DestroyWindow(hwnd);
SetLastError(0xdeadbeef);
ok(!IsMenu(hmenu), "IsMenu should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
hmenu = CreateMenu();
assert(hmenu != 0);
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_CAPTION,
0, 0, 100, 100, parent, hmenu, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, hmenu);
expect_style(hwnd, WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS);
expect_ex_style(hwnd, WS_EX_WINDOWEDGE);
DestroyWindow(hwnd);
SetLastError(0xdeadbeef);
ok(!IsMenu(hmenu), "IsMenu should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
/* WS_CHILD | WS_POPUP */
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_POPUP,
0, 0, 100, 100, parent, (HMENU)1, 0, NULL);
ok(!hwnd, "CreateWindowEx should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
if (hwnd)
DestroyWindow(hwnd);
@@ -6755,20 +6756,20 @@ static void test_CreateWindow(void)
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_POPUP,
0, 0, 100, 100, parent, hmenu, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, hmenu);
expect_style(hwnd, WS_CHILD | WS_POPUP | WS_CLIPSIBLINGS);
expect_ex_style(hwnd, WS_EX_APPWINDOW);
DestroyWindow(hwnd);
SetLastError(0xdeadbeef);
ok(!IsMenu(hmenu), "IsMenu should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_POPUP | WS_CAPTION,
0, 0, 100, 100, parent, (HMENU)1, 0, NULL);
ok(!hwnd, "CreateWindowEx should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
if (hwnd)
DestroyWindow(hwnd);
@@ -6777,20 +6778,20 @@ static void test_CreateWindow(void)
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_POPUP | WS_CAPTION,
0, 0, 100, 100, parent, hmenu, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, hmenu);
expect_style(hwnd, WS_CHILD | WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS);
expect_ex_style(hwnd, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE);
DestroyWindow(hwnd);
SetLastError(0xdeadbeef);
ok(!IsMenu(hmenu), "IsMenu should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(0, "static", NULL, WS_CHILD | WS_POPUP,
0, 0, 100, 100, parent, (HMENU)1, 0, NULL);
ok(!hwnd, "CreateWindowEx should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
if (hwnd)
DestroyWindow(hwnd);
@@ -6799,20 +6800,20 @@ static void test_CreateWindow(void)
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(0, "static", NULL, WS_CHILD | WS_POPUP,
0, 0, 100, 100, parent, hmenu, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, hmenu);
expect_style(hwnd, WS_CHILD | WS_POPUP | WS_CLIPSIBLINGS);
expect_ex_style(hwnd, 0);
DestroyWindow(hwnd);
SetLastError(0xdeadbeef);
ok(!IsMenu(hmenu), "IsMenu should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(0, "static", NULL, WS_CHILD | WS_POPUP | WS_CAPTION,
0, 0, 100, 100, parent, (HMENU)1, 0, NULL);
ok(!hwnd, "CreateWindowEx should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
if (hwnd)
DestroyWindow(hwnd);
@@ -6821,14 +6822,14 @@ static void test_CreateWindow(void)
SetLastError(0xdeadbeef);
hwnd = CreateWindowExA(0, "static", NULL, WS_CHILD | WS_POPUP | WS_CAPTION,
0, 0, 100, 100, parent, hmenu, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, hmenu);
expect_style(hwnd, WS_CHILD | WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS);
expect_ex_style(hwnd, WS_EX_WINDOWEDGE);
DestroyWindow(hwnd);
SetLastError(0xdeadbeef);
ok(!IsMenu(hmenu), "IsMenu should fail\n");
- ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError());
/* test child window sizing */
cls.style = 0;
@@ -6846,7 +6847,7 @@ static void test_CreateWindow(void)
SetLastError(0xdeadbeef);
parent = CreateWindowExA(0, "MinMax_WndClass", NULL, WS_CAPTION | WS_SYSMENU | WS_THICKFRAME,
0, 0, 100, 100, 0, 0, 0, NULL);
- ok(parent != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(parent != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(parent, 0);
expect_style(parent, WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_CLIPSIBLINGS);
expect_ex_style(parent, WS_EX_WINDOWEDGE);
@@ -6869,7 +6870,7 @@ static void test_CreateWindow(void)
hwnd = CreateWindowExA(0, "MinMax_WndClass", NULL, WS_CHILD | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME,
rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,
parent, (HMENU)1, 0, NULL);
- ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError());
expect_menu(hwnd, 1);
expect_style(hwnd, WS_CHILD | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME);
expect_ex_style(hwnd, WS_EX_WINDOWEDGE);
@@ -6892,49 +6893,49 @@ static void test_CreateWindow(void)
SetRect( &expected_rect, 0, 0, 200000, 200000 );
broken_rect = expected_rect;
hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, 300000, 300000, 200000, 200000, parent, 0, 0, NULL);
- ok( hwnd != 0, "creation failed err %u\n", GetLastError());
+ ok( hwnd != 0, "creation failed err %lu\n", GetLastError());
GetClientRect( hwnd, &rc );
ok( rc.right == 200000 || rc.right == 65535 || broken(rc.right == (short)200000),
- "invalid rect right %u\n", rc.right );
+ "invalid rect right %lu\n", rc.right );
ok( rc.bottom == 200000 || rc.bottom == 65535 || broken(rc.bottom == (short)200000),
- "invalid rect bottom %u\n", rc.bottom );
+ "invalid rect bottom %lu\n", rc.bottom );
DestroyWindow(hwnd);
expected_cx = expected_cy = -10;
SetRectEmpty(&expected_rect);
SetRect( &broken_rect, 0, 0, -10, -10 );
hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -20, -20, -10, -10, parent, 0, 0, NULL);
- ok( hwnd != 0, "creation failed err %u\n", GetLastError());
+ ok( hwnd != 0, "creation failed err %lu\n", GetLastError());
GetClientRect( hwnd, &rc );
- ok( rc.right == 0, "invalid rect right %u\n", rc.right );
- ok( rc.bottom == 0, "invalid rect bottom %u\n", rc.bottom );
+ ok( rc.right == 0, "invalid rect right %lu\n", rc.right );
+ ok( rc.bottom == 0, "invalid rect bottom %lu\n", rc.bottom );
DestroyWindow(hwnd);
expected_cx = expected_cy = -200000;
SetRectEmpty(&expected_rect);
SetRect( &broken_rect, 0, 0, -200000, -200000 );
hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -300000, -300000, -200000, -200000, parent, 0, 0, NULL);
- ok( hwnd != 0, "creation failed err %u\n", GetLastError());
+ ok( hwnd != 0, "creation failed err %lu\n", GetLastError());
GetClientRect( hwnd, &rc );
- ok( rc.right == 0, "invalid rect right %u\n", rc.right );
- ok( rc.bottom == 0, "invalid rect bottom %u\n", rc.bottom );
+ ok( rc.right == 0, "invalid rect right %lu\n", rc.right );
+ ok( rc.bottom == 0, "invalid rect bottom %lu\n", rc.bottom );
DestroyWindow(hwnd);
/* we need a parent at 0,0 so that child coordinates match */
DestroyWindow(parent);
parent = CreateWindowExA(0, "MinMax_WndClass", NULL, WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL);
- ok(parent != 0, "CreateWindowEx error %d\n", GetLastError());
+ ok(parent != 0, "CreateWindowEx error %ld\n", GetLastError());
expected_cx = 100;
expected_cy = 0x7fffffff;
SetRect( &expected_rect, 10, 10, 110, 0x7fffffff );
SetRect( &broken_rect, 10, 10, 110, 0x7fffffffU + 10 );
hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, 10, 10, 100, 0x7fffffff, parent, 0, 0, NULL);
- ok( hwnd != 0, "creation failed err %u\n", GetLastError());
+ ok( hwnd != 0, "creation failed err %lu\n", GetLastError());
GetClientRect( hwnd, &rc );
- ok( rc.right == 100, "invalid rect right %u\n", rc.right );
+ ok( rc.right == 100, "invalid rect right %lu\n", rc.right );
ok( rc.bottom == 0x7fffffff - 10 || rc.bottom ==65535 || broken(rc.bottom == 0),
- "invalid rect bottom %u\n", rc.bottom );
+ "invalid rect bottom %lu\n", rc.bottom );
DestroyWindow(hwnd);
expected_cx = 0x7fffffff;
@@ -6942,22 +6943,22 @@ static void test_CreateWindow(void)
SetRect( &expected_rect, 20, 10, 0x7fffffff, 0x7fffffff );
SetRect( &broken_rect, 20, 10, 0x7fffffffU + 20, 0x7fffffffU + 10 );
hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, 20, 10, 0x7fffffff, 0x7fffffff, parent, 0, 0, NULL);
- ok( hwnd != 0, "creation failed err %u\n", GetLastError());
+ ok( hwnd != 0, "creation failed err %lu\n", GetLastError());
GetClientRect( hwnd, &rc );
ok( rc.right == 0x7fffffff - 20 || rc.right == 65535 || broken(rc.right == 0),
- "invalid rect right %u\n", rc.right );
+ "invalid rect right %lu\n", rc.right );
ok( rc.bottom == 0x7fffffff - 10 || rc.right == 65535 || broken(rc.bottom == 0),
- "invalid rect bottom %u\n", rc.bottom );
+ "invalid rect bottom %lu\n", rc.bottom );
DestroyWindow(hwnd);
/* top level window */
expected_cx = expected_cy = 200000;
SetRect( &expected_rect, 0, 0, GetSystemMetrics(SM_CXMAXTRACK), GetSystemMetrics(SM_CYMAXTRACK) );
hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_OVERLAPPEDWINDOW, 300000, 300000, 200000, 200000, 0, 0, 0, NULL);
- ok( hwnd != 0, "creation failed err %u\n", GetLastError());
+ ok( hwnd != 0, "creation failed err %lu\n", GetLastError());
GetClientRect( hwnd, &rc );
- ok( rc.right <= expected_cx, "invalid rect right %u\n", rc.right );
- ok( rc.bottom <= expected_cy, "invalid rect bottom %u\n", rc.bottom );
+ ok( rc.right <= expected_cx, "invalid rect right %lu\n", rc.right );
+ ok( rc.bottom <= expected_cy, "invalid rect bottom %lu\n", rc.bottom );
DestroyWindow(hwnd);
/* invalid class */
@@ -6965,7 +6966,7 @@ static void test_CreateWindow(void)
hwnd = CreateWindowExA(0, "INVALID_CLASS", NULL, WS_CHILD, 10, 10, 100, 100, parent, 0, 0, NULL);
ok(hwnd == 0, "CreateWindowEx succeeded\n");
ok(GetLastError() == ERROR_CLASS_DOES_NOT_EXIST || GetLastError() == ERROR_CANNOT_FIND_WND_CLASS,
- "invalid error %u\n", GetLastError());
+ "invalid error %lu\n", GetLastError());
DestroyWindow(hwnd);
hdc = GetDC( parent );
@@ -6977,19 +6978,19 @@ static void test_CreateWindow(void)
SetLastError( 0xdeadbeef );
parent = CreateWindowExA(WS_EX_APPWINDOW | WS_EX_LAYOUTRTL, "static", NULL, WS_POPUP,
0, 0, 100, 100, 0, 0, 0, NULL);
- ok( parent != 0, "creation failed err %u\n", GetLastError());
+ ok( parent != 0, "creation failed err %lu\n", GetLastError());
expect_ex_style( parent, WS_EX_APPWINDOW | WS_EX_LAYOUTRTL );
hwnd = CreateWindowExA(0, "static", NULL, WS_CHILD, 0, 0, 20, 20, parent, 0, 0, NULL);
- ok( hwnd != 0, "creation failed err %u\n", GetLastError());
+ ok( hwnd != 0, "creation failed err %lu\n", GetLastError());
expect_ex_style( hwnd, WS_EX_LAYOUTRTL );
DestroyWindow( hwnd );
hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0, 0, 20, 20, parent, 0, 0, NULL);
- ok( hwnd != 0, "creation failed err %u\n", GetLastError());
+ ok( hwnd != 0, "creation failed err %lu\n", GetLastError());
expect_ex_style( hwnd, 0 );
DestroyWindow( hwnd );
SetWindowLongW( parent, GWL_EXSTYLE, WS_EX_APPWINDOW | WS_EX_LAYOUTRTL | WS_EX_NOINHERITLAYOUT );
hwnd = CreateWindowExA(0, "static", NULL, WS_CHILD, 0, 0, 20, 20, parent, 0, 0, NULL);
- ok( hwnd != 0, "creation failed err %u\n", GetLastError());
+ ok( hwnd != 0, "creation failed err %lu\n", GetLastError());
expect_ex_style( hwnd, 0 );
DestroyWindow( hwnd );
@@ -6999,31 +7000,31 @@ static void test_CreateWindow(void)
SetLastError( 0xdeadbeef );
ok( !pGetProcessDefaultLayout( NULL ), "GetProcessDefaultLayout succeeded\n" );
- ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_NOACCESS, "wrong error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
res = pGetProcessDefaultLayout( &layout );
- ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ());
- ok( layout == 0, "GetProcessDefaultLayout wrong layout %x\n", layout );
+ ok( res, "GetProcessDefaultLayout failed err %lu\n", GetLastError ());
+ ok( layout == 0, "GetProcessDefaultLayout wrong layout %lx\n", layout );
SetLastError( 0xdeadbeef );
res = pSetProcessDefaultLayout( 7 );
- ok( res, "SetProcessDefaultLayout failed err %u\n", GetLastError ());
+ ok( res, "SetProcessDefaultLayout failed err %lu\n", GetLastError ());
res = pGetProcessDefaultLayout( &layout );
- ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ());
- ok( layout == 7, "GetProcessDefaultLayout wrong layout %x\n", layout );
+ ok( res, "GetProcessDefaultLayout failed err %lu\n", GetLastError ());
+ ok( layout == 7, "GetProcessDefaultLayout wrong layout %lx\n", layout );
SetLastError( 0xdeadbeef );
res = pSetProcessDefaultLayout( LAYOUT_RTL );
- ok( res, "SetProcessDefaultLayout failed err %u\n", GetLastError ());
+ ok( res, "SetProcessDefaultLayout failed err %lu\n", GetLastError ());
res = pGetProcessDefaultLayout( &layout );
- ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ());
- ok( layout == LAYOUT_RTL, "GetProcessDefaultLayout wrong layout %x\n", layout );
+ ok( res, "GetProcessDefaultLayout failed err %lu\n", GetLastError ());
+ ok( layout == LAYOUT_RTL, "GetProcessDefaultLayout wrong layout %lx\n", layout );
hwnd = CreateWindowExA(WS_EX_APPWINDOW, "static", NULL, WS_POPUP,
0, 0, 100, 100, 0, 0, 0, NULL);
- ok( hwnd != 0, "creation failed err %u\n", GetLastError());
+ ok( hwnd != 0, "creation failed err %lu\n", GetLastError());
expect_ex_style( hwnd, WS_EX_APPWINDOW | WS_EX_LAYOUTRTL );
DestroyWindow( hwnd );
hwnd = CreateWindowExA(WS_EX_APPWINDOW, "static", NULL, WS_POPUP,
0, 0, 100, 100, parent, 0, 0, NULL);
- ok( hwnd != 0, "creation failed err %u\n", GetLastError());
+ ok( hwnd != 0, "creation failed err %lu\n", GetLastError());
expect_ex_style( hwnd, WS_EX_APPWINDOW );
DestroyWindow( hwnd );
pSetProcessDefaultLayout( 0 );
@@ -7087,103 +7088,103 @@ static void test_set_window_long_size(void)
/* GWLP_USERDATA */
SetWindowLongPtrA(hwnd, GWLP_USERDATA, ((LONG_PTR)1 << 32) | 123);
ret = GetWindowLongA(hwnd, GWLP_USERDATA);
- ok(ret == 123, "Unexpected user data %#x.\n", ret);
+ ok(ret == 123, "Unexpected user data %#lx.\n", ret);
retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA);
ok(retval > 123, "Unexpected user data.\n");
ret = GetWindowWord(hwnd, GWLP_USERDATA);
todo_wine
- ok(ret == 123, "Unexpected user data %#x.\n", ret);
+ ok(ret == 123, "Unexpected user data %#lx.\n", ret);
ret = SetWindowWord(hwnd, GWLP_USERDATA, 124);
todo_wine
- ok(ret == 123, "Unexpected user data %#x.\n", ret);
+ ok(ret == 123, "Unexpected user data %#lx.\n", ret);
ret = GetWindowLongA(hwnd, GWLP_USERDATA);
todo_wine
- ok(ret == 124, "Unexpected user data %#x.\n", ret);
+ ok(ret == 124, "Unexpected user data %#lx.\n", ret);
retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA);
todo_wine
ok(retval == 124, "Unexpected user data.\n");
SetWindowLongA(hwnd, GWLP_USERDATA, (1 << 16) | 123);
ret = GetWindowLongA(hwnd, GWLP_USERDATA);
- ok(ret == ((1 << 16) | 123), "Unexpected user data %#x.\n", ret);
+ ok(ret == ((1 << 16) | 123), "Unexpected user data %#lx.\n", ret);
ret = GetWindowWord(hwnd, GWLP_USERDATA);
todo_wine
- ok(ret == 123, "Unexpected user data %#x.\n", ret);
+ ok(ret == 123, "Unexpected user data %#lx.\n", ret);
ret = SetWindowWord(hwnd, GWLP_USERDATA, 124);
todo_wine
- ok(ret == 123, "Unexpected user data %#x.\n", ret);
+ ok(ret == 123, "Unexpected user data %#lx.\n", ret);
ret = GetWindowLongA(hwnd, GWLP_USERDATA);
todo_wine
- ok(ret == ((1 << 16) | 124), "Unexpected user data %#x.\n", ret);
+ ok(ret == ((1 << 16) | 124), "Unexpected user data %#lx.\n", ret);
ret = GetWindowWord(hwnd, GWLP_USERDATA);
todo_wine
- ok(ret == 124, "Unexpected user data %#x.\n", ret);
+ ok(ret == 124, "Unexpected user data %#lx.\n", ret);
/* GWLP_ID */
ret = SetWindowLongA(hwnd, GWLP_ID, 1);
- ok(!ret, "Unexpected id %#x.\n", ret);
+ ok(!ret, "Unexpected id %#lx.\n", ret);
ret = GetWindowLongA(hwnd, GWLP_ID);
- ok(ret == 1, "Unexpected id %#x.\n", ret);
+ ok(ret == 1, "Unexpected id %#lx.\n", ret);
ret = GetWindowLongW(hwnd, GWLP_ID);
- ok(ret == 1, "Unexpected id %#x.\n", ret);
+ ok(ret == 1, "Unexpected id %#lx.\n", ret);
SetWindowLongPtrA(hwnd, GWLP_ID, ((LONG_PTR)1 << 32) | 123);
ret = GetWindowLongA(hwnd, GWLP_ID);
- ok(ret == 123, "Unexpected id %#x.\n", ret);
+ ok(ret == 123, "Unexpected id %#lx.\n", ret);
ret = GetWindowLongW(hwnd, GWLP_ID);
- ok(ret == 123, "Unexpected id %#x.\n", ret);
+ ok(ret == 123, "Unexpected id %#lx.\n", ret);
retval = GetWindowLongPtrA(hwnd, GWLP_ID);
ok(retval > 123, "Unexpected id.\n");
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_ID);
todo_wine
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#lx.\n", ret);
/* GWLP_HINSTANCE */
retval = GetWindowLongPtrA(hwnd, GWLP_HINSTANCE);
- ok(retval == (LONG_PTR)GetModuleHandleA(NULL), "Unexpected instance %#lx.\n", retval);
+ ok(retval == (LONG_PTR)GetModuleHandleA(NULL), "Unexpected instance %#Ix.\n", retval);
SetLastError(0xdeadbeef);
ret = GetWindowLongA(hwnd, GWLP_HINSTANCE);
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#lx.\n", ret);
SetLastError(0xdeadbeef);
ret = GetWindowLongW(hwnd, GWLP_HINSTANCE);
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#lx.\n", ret);
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_HINSTANCE);
todo_wine
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#lx.\n", ret);
SetLastError(0xdeadbeef);
ret = SetWindowLongA(hwnd, GWLP_HINSTANCE, 1);
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#lx.\n", ret);
SetLastError(0xdeadbeef);
ret = SetWindowLongW(hwnd, GWLP_HINSTANCE, 1);
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#lx.\n", ret);
/* GWLP_HWNDPARENT */
SetLastError(0xdeadbeef);
ret = GetWindowLongA(hwnd, GWLP_HWNDPARENT);
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#lx.\n", ret);
SetLastError(0xdeadbeef);
ret = SetWindowLongA(hwnd, GWLP_HWNDPARENT, 0);
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#lx.\n", ret);
SetLastError(0xdeadbeef);
ret = SetWindowLongW(hwnd, GWLP_HWNDPARENT, 0);
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#lx.\n", ret);
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_HWNDPARENT);
todo_wine
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#lx.\n", ret);
DestroyWindow(hwnd);
#endif
@@ -7218,59 +7219,59 @@ static void test_set_window_word_size(void)
/* GWLP_USERDATA */
ret = SetWindowLongA(hwnd, GWLP_USERDATA, (1 << 16) | 123);
- ok(!ret, "Unexpected user data %#x.\n", ret);
+ ok(!ret, "Unexpected user data %#lx.\n", ret);
ret = GetWindowLongA(hwnd, GWLP_USERDATA);
- ok(ret > 123, "Unexpected user data %#x.\n", ret);
+ ok(ret > 123, "Unexpected user data %#lx.\n", ret);
ret = GetWindowWord(hwnd, GWLP_USERDATA);
todo_wine
- ok(ret == 123, "Unexpected user data %#x.\n", ret);
+ ok(ret == 123, "Unexpected user data %#lx.\n", ret);
ret = SetWindowWord(hwnd, GWLP_USERDATA, 124);
todo_wine
- ok(ret == 123, "Unexpected user data %#x.\n", ret);
+ ok(ret == 123, "Unexpected user data %#lx.\n", ret);
ret = GetWindowWord(hwnd, GWLP_USERDATA);
todo_wine
- ok(ret == 124, "Unexpected user data %#x.\n", ret);
+ ok(ret == 124, "Unexpected user data %#lx.\n", ret);
ret = GetWindowLongA(hwnd, GWLP_USERDATA);
todo_wine
- ok(ret == ((1 << 16) | 124), "Unexpected user data %#x.\n", ret);
+ ok(ret == ((1 << 16) | 124), "Unexpected user data %#lx.\n", ret);
/* GWLP_ID */
ret = SetWindowLongA(hwnd, GWLP_ID, 1);
- ok(!ret, "Unexpected id %#x.\n", ret);
+ ok(!ret, "Unexpected id %#lx.\n", ret);
ret = GetWindowLongA(hwnd, GWLP_ID);
- ok(ret == 1, "Unexpected id %#x.\n", ret);
+ ok(ret == 1, "Unexpected id %#lx.\n", ret);
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_ID);
todo_wine
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#lx.\n", ret);
SetLastError(0xdeadbeef);
ret = SetWindowWord(hwnd, GWLP_ID, 2);
todo_wine
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#lx.\n", ret);
/* GWLP_HINSTANCE */
retval = GetWindowLongPtrA(hwnd, GWLP_HINSTANCE);
- ok(retval == (LONG_PTR)GetModuleHandleA(NULL), "Unexpected instance %#lx.\n", retval);
+ ok(retval == (LONG_PTR)GetModuleHandleA(NULL), "Unexpected instance %#Ix.\n", retval);
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_HINSTANCE);
todo_wine
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#lx.\n", ret);
SetLastError(0xdeadbeef);
ret = SetWindowWord(hwnd, GWLP_HINSTANCE, 0xdead);
todo_wine
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#lx.\n", ret);
/* GWLP_HWNDPARENT */
retval = GetWindowLongPtrA(hwnd, GWLP_HWNDPARENT);
- ok(!!retval, "Unexpected parent window %#x.\n", ret);
+ ok(!!retval, "Unexpected parent window %#lx.\n", ret);
SetLastError(0xdeadbeef);
ret = GetWindowWord(hwnd, GWLP_HWNDPARENT);
todo_wine
- ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret);
+ ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#lx.\n", ret);
DestroyWindow(hwnd);
}
@@ -7282,24 +7283,24 @@ static void test_SetWindowLong(void)
SetLastError(0xdeadbeef);
retval = SetWindowLongPtrA(NULL, GWLP_WNDPROC, 0);
- ok(!retval, "SetWindowLongPtr on invalid window handle should have returned 0 instead of 0x%lx\n", retval);
+ ok(!retval, "SetWindowLongPtr on invalid window handle should have returned 0 instead of 0x%Ix\n", retval);
ok(check_error(GetLastError(), ERROR_INVALID_WINDOW_HANDLE),
- "SetWindowLongPtr should have set error to ERROR_INVALID_WINDOW_HANDLE instead of %d\n", GetLastError());
+ "SetWindowLongPtr should have set error to ERROR_INVALID_WINDOW_HANDLE instead of %ld\n", GetLastError());
SetLastError(0xdeadbeef);
retval = SetWindowLongPtrA(hwndMain, 0xdeadbeef, 0);
- ok(!retval, "SetWindowLongPtr on invalid index should have returned 0 instead of 0x%lx\n", retval);
+ ok(!retval, "SetWindowLongPtr on invalid index should have returned 0 instead of 0x%Ix\n", retval);
ok(check_error(GetLastError(), ERROR_INVALID_INDEX),
- "SetWindowLongPtr should have set error to ERROR_INVALID_INDEX instead of %d\n", GetLastError());
+ "SetWindowLongPtr should have set error to ERROR_INVALID_INDEX instead of %ld\n", GetLastError());
SetLastError(0xdeadbeef);
retval = SetWindowLongPtrA(hwndMain, GWLP_WNDPROC, 0);
ok((WNDPROC)retval == main_window_procA,
- "SetWindowLongPtr on invalid window proc should have returned address of main_window_procA instead of 0x%lx\n", retval);
- ok(GetLastError() == 0xdeadbeef, "SetWindowLongPtr shouldn't have set the last error, instead of setting it to %d\n", GetLastError());
+ "SetWindowLongPtr on invalid window proc should have returned address of main_window_procA instead of 0x%Ix\n", retval);
+ ok(GetLastError() == 0xdeadbeef, "SetWindowLongPtr shouldn't have set the last error, instead of setting it to %ld\n", GetLastError());
retval = GetWindowLongPtrA(hwndMain, GWLP_WNDPROC);
ok((WNDPROC)retval == main_window_procA,
- "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%lx\n", retval);
+ "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%Ix\n", retval);
ok(!IsWindowUnicode(hwndMain), "hwndMain shouldn't be Unicode\n");
old_window_procW = (WNDPROC)GetWindowLongPtrW(hwndMain, GWLP_WNDPROC);
@@ -7307,10 +7308,10 @@ static void test_SetWindowLong(void)
retval = SetWindowLongPtrW(hwndMain, GWLP_WNDPROC, 0);
if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
{
- ok(GetLastError() == 0xdeadbeef, "SetWindowLongPtr shouldn't have set the last error, instead of setting it to %d\n", GetLastError());
- ok(retval != 0, "SetWindowLongPtr error %d\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "SetWindowLongPtr shouldn't have set the last error, instead of setting it to %ld\n", GetLastError());
+ ok(retval != 0, "SetWindowLongPtr error %ld\n", GetLastError());
ok((WNDPROC)retval == old_window_procW,
- "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%lx\n", retval);
+ "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%Ix\n", retval);
ok(IsWindowUnicode(hwndMain), "hwndMain should now be Unicode\n");
/* set it back to ANSI */
@@ -7328,16 +7329,16 @@ static LRESULT WINAPI check_style_wnd_proc(HWND hwnd, UINT message, WPARAM wPara
if (message == WM_STYLECHANGING && wParam == GWL_STYLE)
{
- ok(got->styleOld == expected[0].styleOld, "expected old style %#x, got %#x\n",
+ ok(got->styleOld == expected[0].styleOld, "expected old style %#lx, got %#lx\n",
expected[0].styleOld, got->styleOld);
- ok(got->styleNew == expected[0].styleNew, "expected new style %#x, got %#x\n",
+ ok(got->styleNew == expected[0].styleNew, "expected new style %#lx, got %#lx\n",
expected[0].styleNew, got->styleNew);
}
else if (message == WM_STYLECHANGED && wParam == GWL_STYLE)
{
- ok(got->styleOld == expected[1].styleOld, "expected old style %#x, got %#x\n",
+ ok(got->styleOld == expected[1].styleOld, "expected old style %#lx, got %#lx\n",
expected[1].styleOld, got->styleOld);
- ok(got->styleNew == expected[1].styleNew, "expected new style %#x, got %#x\n",
+ ok(got->styleNew == expected[1].styleNew, "expected new style %#lx, got %#lx\n",
expected[1].styleNew, got->styleNew);
}
@@ -7400,10 +7401,10 @@ static void test_set_window_style(void)
SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)&expected_stylestruct);
old_style = SetWindowLongA(hwnd, GWL_STYLE, tests[i].style);
- ok(old_style == tests[i].creation_style, "expected old style %#x, got %#x\n",
+ ok(old_style == tests[i].creation_style, "expected old style %#lx, got %#lx\n",
tests[i].creation_style, old_style);
new_style = GetWindowLongA(hwnd, GWL_STYLE);
- ok(new_style == expected_style, "expected new style %#x, got %#x\n",
+ ok(new_style == expected_style, "expected new style %#lx, got %#lx\n",
expected_style, new_style);
SetWindowLongPtrA(hwnd, GWLP_USERDATA, 0);
@@ -7471,7 +7472,7 @@ static void test_ShowWindow(void)
wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc));
ret = ShowWindow(hwnd, SW_SHOW);
- ok(!ret, "not expected ret: %lu\n", ret);
+ ok(!ret, "not expected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7485,7 +7486,7 @@ static void test_ShowWindow(void)
wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc));
ret = ShowWindow(hwnd, SW_MINIMIZE);
- ok(ret, "not expected ret: %lu\n", ret);
+ ok(ret, "not expected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7502,7 +7503,7 @@ static void test_ShowWindow(void)
(rcMinimized.right - rcMinimized.left) * 2,
(rcMinimized.bottom - rcMinimized.top) * 2,
SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER);
- ok(ret, "not expected ret: %lu\n", ret);
+ ok(ret, "not expected ret: %Iu\n", ret);
GetWindowRect(hwnd, &rc);
ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n",
wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc));
@@ -7512,7 +7513,7 @@ static void test_ShowWindow(void)
/* SetWindowPos shouldn't affect the client rect */
ret = SetWindowPos(hwnd, 0, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER);
- ok(ret, "not expected ret: %lu\n", ret);
+ ok(ret, "not expected ret: %Iu\n", ret);
GetWindowRect(hwnd, &rc);
ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n",
wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc));
@@ -7523,12 +7524,12 @@ static void test_ShowWindow(void)
GetWindowRect(hwnd, &rc);
SetRect(&rcNonClient, rc.left, rc.top, rc.left, rc.top);
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
ok(EqualRect(&rc, &rcNonClient), "expected %s, got %s\n",
wine_dbgstr_rect(&rcNonClient), wine_dbgstr_rect(&rc));
ret = ShowWindow(hwnd, SW_RESTORE);
- ok(ret, "not expected ret: %lu\n", ret);
+ ok(ret, "not expected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7542,7 +7543,7 @@ static void test_ShowWindow(void)
wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc));
ret = ShowWindow(hwnd, SW_MAXIMIZE);
- ok(ret, "not expected ret: %lu\n", ret);
+ ok(ret, "not expected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7553,14 +7554,14 @@ static void test_ShowWindow(void)
wine_dbgstr_rect(&rcMaximized), wine_dbgstr_rect(&rc));
/* maximized windows can be resized */
ret = SetWindowPos(hwnd, 0, 300, 300, 200, 200, SWP_NOACTIVATE | SWP_NOZORDER);
- ok(ret, "not expected ret: %lu\n", ret);
+ ok(ret, "not expected ret: %Iu\n", ret);
SetRect(&rcResized, 300, 300, 500, 500);
GetWindowRect(hwnd, &rc);
ok(EqualRect(&rcResized, &rc), "expected %s, got %s\n",
wine_dbgstr_rect(&rcResized), wine_dbgstr_rect(&rc));
ret = ShowWindow(hwnd, SW_RESTORE);
- ok(ret, "not expected ret: %lu\n", ret);
+ ok(ret, "not expected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7571,12 +7572,12 @@ static void test_ShowWindow(void)
wine_dbgstr_rect(&rc));
ret = EnableWindow(hwnd, FALSE);
- ok(!ret, "not expected ret: %lu\n", ret);
+ ok(!ret, "not expected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(style & WS_DISABLED, "window should be disabled\n");
ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0);
- ok(!ret, "not expected ret: %lu\n", ret);
+ ok(!ret, "not expected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(style & WS_DISABLED, "window should be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7590,7 +7591,7 @@ static void test_ShowWindow(void)
wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc));
ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0);
- ok(!ret, "not expected ret: %lu\n", ret);
+ ok(!ret, "not expected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(style & WS_DISABLED, "window should be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7604,7 +7605,7 @@ static void test_ShowWindow(void)
wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc));
ret = ShowWindow(hwnd, SW_MINIMIZE);
- ok(ret, "not expected ret: %lu\n", ret);
+ ok(ret, "not expected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(style & WS_DISABLED, "window should be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7618,7 +7619,7 @@ static void test_ShowWindow(void)
wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc));
ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0);
- ok(!ret, "not expected ret: %lu\n", ret);
+ ok(!ret, "not expected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(style & WS_DISABLED, "window should be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7632,7 +7633,7 @@ static void test_ShowWindow(void)
wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc));
ret = ShowWindow(hwnd, SW_RESTORE);
- ok(ret, "not expected ret: %lu\n", ret);
+ ok(ret, "not expected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(style & WS_DISABLED, "window should be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7646,14 +7647,14 @@ static void test_ShowWindow(void)
wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc));
ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0);
- ok(!ret, "not expected ret: %lu\n", ret);
+ ok(!ret, "not expected ret: %Iu\n", ret);
ok(IsWindow(hwnd), "window should exist\n");
ret = EnableWindow(hwnd, TRUE);
- ok(ret, "not expected ret: %lu\n", ret);
+ ok(ret, "not expected ret: %Iu\n", ret);
ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0);
- ok(!ret, "not expected ret: %lu\n", ret);
+ ok(!ret, "not expected ret: %Iu\n", ret);
ok(!IsWindow(hwnd), "window should not exist\n");
hwnd = CreateWindowExA(0, "MainWindowClass", NULL,
@@ -7662,7 +7663,7 @@ static void test_ShowWindow(void)
rcMain.left, rcMain.top,
rcMain.right - rcMain.left, rcMain.bottom - rcMain.top,
0, 0, 0, NULL);
- ok(hwnd != NULL, "failed to create window with error %u\n", GetLastError());
+ ok(hwnd != NULL, "failed to create window with error %lu\n", GetLastError());
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(style & WS_MINIMIZE, "window should be minimized\n");
GetWindowRect(hwnd, &rc);
@@ -7680,7 +7681,7 @@ static void test_ShowWindow(void)
rcMain.left, rcMain.top,
rcMain.right - rcMain.left, rcMain.bottom - rcMain.top,
0, 0, 0, NULL);
- ok(hwnd != NULL, "failed to create window with error %u\n", GetLastError());
+ ok(hwnd != NULL, "failed to create window with error %lu\n", GetLastError());
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(style & WS_MINIMIZE, "window should be minimized\n");
GetWindowRect(hwnd, &rc);
@@ -7703,7 +7704,7 @@ static void test_ShowWindow(void)
rcMain.left, rcMain.top,
rcMain.right - rcMain.left, rcMain.bottom - rcMain.top,
0, 0, 0, NULL);
- ok(hwnd != NULL, "Test %u: failed to create window with error %u\n", i, GetLastError());
+ ok(hwnd != NULL, "Test %u: failed to create window with error %lu\n", i, GetLastError());
GetWindowRect(hwnd, &rcMain);
ok(rcMain.left > mon_info.rcMonitor.left &&
@@ -7717,7 +7718,7 @@ static void test_ShowWindow(void)
0, GetWindowLongA(hwnd, GWL_EXSTYLE));
ret = ShowWindow(hwnd, SW_MAXIMIZE);
- ok(ret, "unexpected ret: %lu\n", ret);
+ ok(ret, "unexpected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(style & WS_MAXIMIZE, "Test %u: window should be maximized\n", i);
GetWindowRect(hwnd, &rc);
@@ -7734,7 +7735,7 @@ static void test_ShowWindow(void)
wine_dbgstr_rect(&rc));
ret = ShowWindow(hwnd, SW_RESTORE);
- ok(ret, "unexpected ret: %lu\n", ret);
+ ok(ret, "unexpected ret: %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_MAXIMIZE), "Test %u: window should not be maximized\n", i);
GetWindowRect(hwnd, &rc);
@@ -7761,12 +7762,12 @@ static void test_ShowWindow_owned(HWND hwndMain)
WS_MINIMIZEBOX | WS_MAXIMIZEBOX,
orig.left, orig.top, orig.right - orig.left,
orig.bottom - orig.top, hwndMain, 0, 0, NULL);
- ok(!!hwnd, "failed to create window, error %u\n", GetLastError());
+ ok(!!hwnd, "failed to create window, error %lu\n", GetLastError());
hwnd2 = CreateWindowA("MainWindowClass", "owned2", WS_CAPTION | WS_SYSMENU |
WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE,
orig.left, orig.top, orig.right - orig.left,
orig.bottom - orig.top, hwndMain, 0, 0, NULL);
- ok(!!hwnd2, "failed to create window, error %u\n", GetLastError());
+ ok(!!hwnd2, "failed to create window, error %lu\n", GetLastError());
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
@@ -7778,7 +7779,7 @@ static void test_ShowWindow_owned(HWND hwndMain)
wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_SHOW);
- ok(!ret, "wrong ret %lu\n", ret);
+ ok(!ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7789,7 +7790,7 @@ static void test_ShowWindow_owned(HWND hwndMain)
wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_MINIMIZE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7803,7 +7804,7 @@ static void test_ShowWindow_owned(HWND hwndMain)
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
/* shouldn't be able to resize minimized windows */
ret = SetWindowPos(hwnd, 0, 0, 0, 200, 200, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
GetWindowRect(hwnd, &rect);
todo_wine
ok(EqualRect(&expect, &rect), "expected %s, got %s\n",
@@ -7812,7 +7813,7 @@ static void test_ShowWindow_owned(HWND hwndMain)
GetWindowRect(hwnd, &rect);
SetRect(&nc, rect.left, rect.top, rect.left, rect.top);
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
ok(EqualRect(&rect, &nc), "expected %s, got %s\n",
wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect));
@@ -7820,7 +7821,7 @@ static void test_ShowWindow_owned(HWND hwndMain)
* on top of each other) */
OffsetRect(&expect, GetSystemMetrics(SM_CXMINIMIZED), 0);
ret = ShowWindow(hwnd2, SW_MINIMIZE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd2, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7832,7 +7833,7 @@ static void test_ShowWindow_owned(HWND hwndMain)
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_RESTORE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7843,7 +7844,7 @@ static void test_ShowWindow_owned(HWND hwndMain)
wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_MAXIMIZE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7857,14 +7858,14 @@ static void test_ShowWindow_owned(HWND hwndMain)
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
/* maximized windows can be resized */
ret = SetWindowPos(hwnd, 0, 300, 300, 200, 200, SWP_NOACTIVATE | SWP_NOZORDER);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
GetWindowRect(hwnd, &rect);
SetRect(&expect, 300, 300, 500, 500);
ok(EqualRect(&expect, &rect), "expected %s, got %s\n",
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_RESTORE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7891,12 +7892,12 @@ static void test_ShowWindow_child(HWND hwndMain)
WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CHILD,
orig.left, orig.top, orig.right - orig.left,
orig.bottom - orig.top, hwndMain, 0, 0, NULL);
- ok(!!hwnd, "failed to create window, error %u\n", GetLastError());
+ ok(!!hwnd, "failed to create window, error %lu\n", GetLastError());
hwnd2 = CreateWindowA("MainWindowClass", "child2", WS_CAPTION | WS_SYSMENU |
WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CHILD | WS_VISIBLE,
orig.left, orig.top, orig.right - orig.left,
orig.bottom - orig.top, hwndMain, 0, 0, NULL);
- ok(!!hwnd2, "failed to create window, error %u\n", GetLastError());
+ ok(!!hwnd2, "failed to create window, error %lu\n", GetLastError());
ClientToScreen(hwndMain, &pt);
OffsetRect(&orig, pt.x, pt.y);
@@ -7911,7 +7912,7 @@ static void test_ShowWindow_child(HWND hwndMain)
wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_SHOW);
- ok(!ret, "wrong ret %lu\n", ret);
+ ok(!ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7922,7 +7923,7 @@ static void test_ShowWindow_child(HWND hwndMain)
wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_MINIMIZE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7937,7 +7938,7 @@ static void test_ShowWindow_child(HWND hwndMain)
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
/* shouldn't be able to resize minimized windows */
ret = SetWindowPos(hwnd, 0, 0, 0, 200, 200, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
GetWindowRect(hwnd, &rect);
ok(EqualRect(&expect, &rect), "expected %s, got %s\n",
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
@@ -7945,7 +7946,7 @@ static void test_ShowWindow_child(HWND hwndMain)
GetWindowRect(hwnd, &rect);
SetRect(&nc, rect.left, rect.top, rect.left, rect.top);
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
ok(EqualRect(&rect, &nc), "expected %s, got %s\n",
wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect));
@@ -7953,7 +7954,7 @@ static void test_ShowWindow_child(HWND hwndMain)
* fit more than one per row */
OffsetRect(&expect, 0, -GetSystemMetrics(SM_CYMINIMIZED));
ret = ShowWindow(hwnd2, SW_MINIMIZE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd2, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7964,7 +7965,7 @@ static void test_ShowWindow_child(HWND hwndMain)
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_RESTORE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7975,7 +7976,7 @@ static void test_ShowWindow_child(HWND hwndMain)
wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_MAXIMIZE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -7990,7 +7991,7 @@ static void test_ShowWindow_child(HWND hwndMain)
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
/* maximized windows can be resized */
ret = SetWindowPos(hwnd, 0, 300, 300, 200, 200, SWP_NOACTIVATE | SWP_NOZORDER);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
GetWindowRect(hwnd, &rect);
SetRect(&expect, 300, 300, 500, 500);
OffsetRect(&expect, pt.x, pt.y);
@@ -7998,7 +7999,7 @@ static void test_ShowWindow_child(HWND hwndMain)
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_RESTORE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -8026,17 +8027,17 @@ static void test_ShowWindow_mdichild(HWND hwndMain)
mdiclient = CreateWindowA("mdiclient", "MDI client", WS_CHILD,
rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top,
hwndMain, 0, 0, &mdi_client_cs);
- ok(!!mdiclient, "failed to create window, error %u\n", GetLastError());
+ ok(!!mdiclient, "failed to create window, error %lu\n", GetLastError());
hwnd = CreateWindowExA(WS_EX_MDICHILD, "MainWindowClass", "MDI child",
WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX,
orig.left, orig.top, orig.right - orig.left,
orig.bottom - orig.top, mdiclient, 0, 0, NULL);
- ok(!!hwnd, "failed to create window, error %u\n", GetLastError());
+ ok(!!hwnd, "failed to create window, error %lu\n", GetLastError());
hwnd2 = CreateWindowExA(WS_EX_MDICHILD, "MainWindowClass", "MDI child 2",
WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX,
orig.left, orig.top, orig.right - orig.left,
orig.bottom - orig.top, mdiclient, 0, 0, NULL);
- ok(!!hwnd2, "failed to create window, error %u\n", GetLastError());
+ ok(!!hwnd2, "failed to create window, error %lu\n", GetLastError());
ClientToScreen(hwndMain, &pt);
OffsetRect(&orig, pt.x, pt.y);
@@ -8051,7 +8052,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain)
wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_MINIMIZE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -8066,7 +8067,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain)
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
/* shouldn't be able to resize minimized windows */
ret = SetWindowPos(hwnd, 0, 0, 0, 200, 200, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
GetWindowRect(hwnd, &rect);
ok(EqualRect(&expect, &rect), "expected %s, got %s\n",
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
@@ -8074,7 +8075,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain)
GetWindowRect(hwnd, &rect);
SetRect(&nc, rect.left, rect.top, rect.left, rect.top);
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
ok(EqualRect(&rect, &nc), "expected %s, got %s\n",
wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect));
@@ -8082,7 +8083,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain)
* fit more than one per row */
OffsetRect(&expect, 0, -GetSystemMetrics(SM_CYMINIMIZED));
ret = ShowWindow(hwnd2, SW_MINIMIZE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd2, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -8093,7 +8094,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain)
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_RESTORE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -8104,7 +8105,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain)
wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_MAXIMIZE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -8119,7 +8120,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain)
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
/* maximized windows can be resized */
ret = SetWindowPos(hwnd, 0, 300, 300, 200, 200, SWP_NOACTIVATE | SWP_NOZORDER);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
GetWindowRect(hwnd, &rect);
SetRect(&expect, 300, 300, 500, 500);
OffsetRect(&expect, pt.x, pt.y);
@@ -8127,7 +8128,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain)
wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect));
ret = ShowWindow(hwnd, SW_RESTORE);
- ok(ret, "wrong ret %lu\n", ret);
+ ok(ret, "wrong ret %Iu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
ok(style & WS_VISIBLE, "window should be visible\n");
@@ -8231,7 +8232,7 @@ static DWORD CALLBACK gettext_msg_thread( LPVOID arg )
buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) );
ok( buf_len != 0, "expected a nonempty window text\n" );
ok( !strcmp(buf, "another_caption"), "got wrong window text '%s'\n", buf );
- ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 1, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
return 0;
}
@@ -8245,7 +8246,7 @@ static DWORD CALLBACK settext_msg_thread( LPVOID arg )
num_settext_msgs = 0;
success = SetWindowTextA( hwnd, "thread_caption" );
ok( success, "SetWindowTextA failed\n" );
- ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs );
+ ok( num_settext_msgs == 1, "got %lu WM_SETTEXT messages\n", num_settext_msgs );
return 0;
}
@@ -8264,7 +8265,7 @@ static void test_gettext(void)
MSG msg;
hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL );
- ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() );
+ ok( hwnd != 0, "CreateWindowExA error %ld\n", GetLastError() );
/* test GetWindowTextA */
num_gettext_msgs = 0;
@@ -8272,7 +8273,7 @@ static void test_gettext(void)
buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) );
ok( buf_len != 0, "expected a nonempty window text\n" );
ok( !strcmp(buf, "caption"), "got wrong window text '%s'\n", buf );
- ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 1, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
/* other process window */
strcpy( buf, "a" );
@@ -8298,7 +8299,7 @@ static void test_gettext(void)
buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) );
ok( buf_len == 0, "got %d\n", buf_len );
ok( *buf == 0, "got %x\n", *buf );
- ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 1, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
strcpy( buf, "blah" );
@@ -8306,7 +8307,7 @@ static void test_gettext(void)
buf_len = GetWindowTextA( hwnd, buf, 0 );
ok( buf_len == 0, "got %d\n", buf_len );
ok( !strcmp(buf, "blah"), "got %s\n", buf );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
bufW[0] = 0xcc;
buf_len = InternalGetWindowText( hwnd, bufW, ARRAYSIZE(bufW) );
@@ -8317,7 +8318,7 @@ static void test_gettext(void)
/* same for W window */
hwnd2 = CreateWindowExW( 0, mainclassW, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL );
- ok( hwnd2 != 0, "CreateWindowExA error %d\n", GetLastError() );
+ ok( hwnd2 != 0, "CreateWindowExA error %ld\n", GetLastError() );
g_wm_gettext_override.enabled = TRUE;
@@ -8327,7 +8328,7 @@ static void test_gettext(void)
buf_len = GetWindowTextW( hwnd2, bufW, ARRAY_SIZE(bufW));
ok( buf_len == 0, "got %d\n", buf_len );
ok( *bufW == 0, "got %x\n", *bufW );
- ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 1, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
memset( bufW, 0xcc, sizeof(bufW) );
@@ -8335,7 +8336,7 @@ static void test_gettext(void)
buf_len = GetWindowTextW( hwnd2, bufW, 0 );
ok( buf_len == 0, "got %d\n", buf_len );
ok( *bufW == 0xcccc, "got %x\n", *bufW );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
g_wm_gettext_override.enabled = FALSE;
@@ -8347,33 +8348,33 @@ static void test_gettext(void)
r = SendMessageA( hwnd, WM_GETTEXT, sizeof(buf), (LONG_PTR)buf );
ok( r != 0, "expected a nonempty window text\n" );
ok( !strcmp(buf, "caption"), "got wrong window text '%s'\n", buf );
- ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 1, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
/* test SetWindowTextA */
num_settext_msgs = 0;
success = SetWindowTextA( hwnd, "new_caption" );
ok( success, "SetWindowTextA failed\n" );
- ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs );
+ ok( num_settext_msgs == 1, "got %lu WM_SETTEXT messages\n", num_settext_msgs );
num_gettext_msgs = 0;
memset( buf, 0, sizeof(buf) );
buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) );
ok( buf_len != 0, "expected a nonempty window text\n" );
ok( !strcmp(buf, "new_caption"), "got wrong window text '%s'\n", buf );
- ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 1, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
/* test WM_SETTEXT */
num_settext_msgs = 0;
r = SendMessageA( hwnd, WM_SETTEXT, 0, (ULONG_PTR)"another_caption" );
ok( r != 0, "WM_SETTEXT failed\n" );
- ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs );
+ ok( num_settext_msgs == 1, "got %lu WM_SETTEXT messages\n", num_settext_msgs );
num_gettext_msgs = 0;
memset( buf, 0, sizeof(buf) );
buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) );
ok( buf_len != 0, "expected a nonempty window text\n" );
ok( !strcmp(buf, "another_caption"), "got wrong window text '%s'\n", buf );
- ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 1, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ))
DispatchMessageA( &msg );
@@ -8381,7 +8382,7 @@ static void test_gettext(void)
/* test interthread GetWindowTextA */
num_msgs = 0;
thread = CreateThread( NULL, 0, gettext_msg_thread, hwnd, 0, &tid );
- ok(thread != NULL, "CreateThread failed, error %d\n", GetLastError());
+ ok(thread != NULL, "CreateThread failed, error %ld\n", GetLastError());
while (MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, QS_SENDMESSAGE ) != WAIT_OBJECT_0)
{
while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ))
@@ -8389,12 +8390,12 @@ static void test_gettext(void)
num_msgs++;
}
CloseHandle( thread );
- ok( num_msgs >= 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs );
+ ok( num_msgs >= 1, "got %lu wakeups from MsgWaitForMultipleObjects\n", num_msgs );
/* test interthread SetWindowText */
num_msgs = 0;
thread = CreateThread( NULL, 0, settext_msg_thread, hwnd, 0, &tid );
- ok(thread != NULL, "CreateThread failed, error %d\n", GetLastError());
+ ok(thread != NULL, "CreateThread failed, error %ld\n", GetLastError());
while (MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, QS_SENDMESSAGE ) != WAIT_OBJECT_0)
{
while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ))
@@ -8402,14 +8403,14 @@ static void test_gettext(void)
num_msgs++;
}
CloseHandle( thread );
- ok( num_msgs >= 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs );
+ ok( num_msgs >= 1, "got %lu wakeups from MsgWaitForMultipleObjects\n", num_msgs );
num_gettext_msgs = 0;
memset( buf, 0, sizeof(buf) );
buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) );
ok( buf_len != 0, "expected a nonempty window text\n" );
ok( !strcmp(buf, "thread_caption"), "got wrong window text '%s'\n", buf );
- ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 1, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
/* WM_GETTEXT does not terminate returned string */
memset( buf, 0x1c, sizeof(buf) );
@@ -8429,7 +8430,7 @@ static void test_gettext(void)
g_wm_gettext_override.dont_terminate = FALSE;
hwnd2 = CreateWindowExW( 0, mainclassW, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL );
- ok( hwnd2 != 0, "CreateWindowExA error %d\n", GetLastError() );
+ ok( hwnd2 != 0, "CreateWindowExA error %ld\n", GetLastError() );
memset( buf, 0x1c, sizeof(buf) );
g_wm_gettext_override.dont_terminate = TRUE;
@@ -8453,36 +8454,36 @@ static void test_gettext(void)
if (0)
{
r = SendMessageA( hwnd, WM_GETTEXT, 0x10, 0x1000);
- ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r );
+ ok( r == 0, "WM_GETTEXT should return zero (%Id)\n", r );
r = SendMessageA( hwnd, WM_GETTEXT, 0x10000, 0);
- ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r );
+ ok( r == 0, "WM_GETTEXT should return zero (%Id)\n", r );
r = SendMessageA( hwnd, WM_GETTEXT, 0xff000000, 0x1000);
- ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r );
+ ok( r == 0, "WM_GETTEXT should return zero (%Id)\n", r );
r = SendMessageA( hwnd, WM_GETTEXT, 0x1000, 0xff000000);
- ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r );
+ ok( r == 0, "WM_GETTEXT should return zero (%Id)\n", r );
}
/* GetWindowText doesn't crash */
r = GetWindowTextA( hwnd, (LPSTR)0x10, 0x1000 );
- ok( r == 0, "GetWindowText should return zero (%ld)\n", r );
+ ok( r == 0, "GetWindowText should return zero (%Id)\n", r );
r = GetWindowTextA( hwnd, (LPSTR)0x10000, 0 );
- ok( r == 0, "GetWindowText should return zero (%ld)\n", r );
+ ok( r == 0, "GetWindowText should return zero (%Id)\n", r );
r = GetWindowTextA( hwnd, (LPSTR)0xff000000, 0x1000 );
- ok( r == 0, "GetWindowText should return zero (%ld)\n", r );
+ ok( r == 0, "GetWindowText should return zero (%Id)\n", r );
r = GetWindowTextA( hwnd, (LPSTR)0x1000, 0xff000000 );
- ok( r == 0, "GetWindowText should return zero (%ld)\n", r );
+ ok( r == 0, "GetWindowText should return zero (%Id)\n", r );
r = GetWindowTextW( hwnd, (LPWSTR)0x10, 0x1000 );
- ok( r == 0, "GetWindowText should return zero (%ld)\n", r );
+ ok( r == 0, "GetWindowText should return zero (%Id)\n", r );
r = GetWindowTextW( hwnd, (LPWSTR)0x10000, 0 );
- ok( r == 0, "GetWindowText should return zero (%ld)\n", r );
+ ok( r == 0, "GetWindowText should return zero (%Id)\n", r );
r = GetWindowTextW( hwnd, (LPWSTR)0xff000000, 0x1000 );
- ok( r == 0, "GetWindowText should return zero (%ld)\n", r );
+ ok( r == 0, "GetWindowText should return zero (%Id)\n", r );
r = GetWindowTextW( hwnd, (LPWSTR)0x1000, 0xff000000);
- ok( r == 0, "GetWindowText should return zero (%ld)\n", r );
+ ok( r == 0, "GetWindowText should return zero (%Id)\n", r );
DestroyWindow(hwnd);
}
@@ -8741,12 +8742,12 @@ static void test_GetWindowModuleFileName(void)
buf1[0] = 0;
SetLastError(0xdeadbeef);
ret1 = GetModuleFileNameA(hinst, buf1, sizeof(buf1));
- ok(ret1, "GetModuleFileName error %u\n", GetLastError());
+ ok(ret1, "GetModuleFileName error %lu\n", GetLastError());
buf2[0] = 0;
SetLastError(0xdeadbeef);
ret2 = pGetWindowModuleFileNameA(hwnd, buf2, sizeof(buf2));
- ok(ret2, "GetWindowModuleFileNameA error %u\n", GetLastError());
+ ok(ret2, "GetWindowModuleFileNameA error %lu\n", GetLastError());
if (ret2)
{
@@ -8760,28 +8761,28 @@ static void test_GetWindowModuleFileName(void)
ok(ret2 == ret1 - 2, "expected %u, got %u\n", ret1 - 2, ret2);
ok(GetLastError() == 0xdeadbeef /* XP */ ||
GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3, vista */
- "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError());
+ "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError());
SetLastError(0xdeadbeef);
ret2 = GetModuleFileNameA(hinst, buf2, 0);
ok(!ret2, "GetModuleFileName should return 0\n");
ok(GetLastError() == 0xdeadbeef /* XP */ ||
GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3, vista */
- "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError());
+ "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError());
SetLastError(0xdeadbeef);
ret2 = pGetWindowModuleFileNameA(hwnd, buf2, ret1 - 2);
ok(ret2 == ret1 - 2, "expected %u, got %u\n", ret1 - 2, ret2);
ok(GetLastError() == 0xdeadbeef /* XP */ ||
GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3, vista */
- "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError());
+ "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError());
SetLastError(0xdeadbeef);
ret2 = pGetWindowModuleFileNameA(hwnd, buf2, 0);
ok(!ret2, "expected 0, got %u\n", ret2);
ok(GetLastError() == 0xdeadbeef /* XP */ ||
GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3, vista */
- "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError());
+ "expected 0xdeadbeef or ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError());
DestroyWindow(hwnd);
@@ -8791,7 +8792,7 @@ static void test_GetWindowModuleFileName(void)
ret1 = pGetWindowModuleFileNameA(hwnd, buf1, sizeof(buf1));
ok(!ret1, "expected 0, got %u\n", ret1);
ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE,
- "expected ERROR_INVALID_WINDOW_HANDLE, got %u\n", GetLastError());
+ "expected ERROR_INVALID_WINDOW_HANDLE, got %lu\n", GetLastError());
hwnd = FindWindowA("Shell_TrayWnd", NULL);
ok(IsWindow(hwnd) || broken(!hwnd), "got invalid tray window %p\n", hwnd);
@@ -8865,7 +8866,7 @@ static void test_hwnd_message(void)
SetLastError(0xdeadbeef);
found = FindWindowExA( GetDesktopWindow(), 0, 0, "message window" );
ok( found == 0, "found message window %p/%p\n", found, hwnd );
- ok( GetLastError() == 0xdeadbeef, "expected deadbeef, got %d\n", GetLastError() );
+ ok( GetLastError() == 0xdeadbeef, "expected deadbeef, got %ld\n", GetLastError() );
if (parent)
{
found = FindWindowExA( parent, 0, 0, "message window" );
@@ -8886,13 +8887,13 @@ static void test_hwnd_message(void)
{
SetLastError( 0xdeadbeef );
result = GetWindowLongPtrW( parent, tests[i].offset );
- ok( result == tests[i].expect, "offset %d, got %08lx expect %08lx\n",
+ ok( result == tests[i].expect, "offset %d, got %08Ix expect %08Ix\n",
tests[i].offset, result, tests[i].expect );
if (tests[i].error)
- ok( GetLastError() == tests[i].error, "offset %d: error %d expect %d\n",
+ ok( GetLastError() == tests[i].error, "offset %d: error %ld expect %ld\n",
tests[i].offset, GetLastError(), tests[i].error );
else
- ok( GetLastError() == 0xdeadbeef, "offset %d: error %d expect unchanged\n",
+ ok( GetLastError() == 0xdeadbeef, "offset %d: error %ld expect unchanged\n",
tests[i].offset, GetLastError() );
}
@@ -8928,7 +8929,7 @@ static void test_layered_window(void)
SetLastError( 0xdeadbeef );
ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE );
ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError() );
ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags );
ok( !ret, "GetLayeredWindowAttributes should fail on non-layered window\n" );
ret = pSetLayeredWindowAttributes( hwnd, 0, 0, LWA_ALPHA );
@@ -8944,13 +8945,13 @@ static void test_layered_window(void)
ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" );
ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags );
ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" );
- ok( key == 0x123456 || key == 0, "wrong color key %x\n", key );
+ ok( key == 0x123456 || key == 0, "wrong color key %lx\n", key );
ok( alpha == 44, "wrong alpha %u\n", alpha );
- ok( flags == LWA_ALPHA, "wrong flags %x\n", flags );
+ ok( flags == LWA_ALPHA, "wrong flags %lx\n", flags );
SetLastError( 0xdeadbeef );
ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE );
ok( !ret, "UpdateLayeredWindow should fail on layered but initialized window\n" );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError() );
/* clearing WS_EX_LAYERED resets attributes */
SetWindowLongA( hwnd, GWL_EXSTYLE, GetWindowLongA(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED );
@@ -8966,7 +8967,7 @@ static void test_layered_window(void)
ok( ret, "UpdateLayeredWindow should succeed on layered window\n" );
ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE | ULW_EX_NORESIZE );
ok( !ret, "UpdateLayeredWindow should fail with ex flag\n" );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() );
if (pUpdateLayeredWindowIndirect)
{
UPDATELAYEREDWINDOWINFO info;
@@ -8988,7 +8989,7 @@ static void test_layered_window(void)
ok( !ret, "UpdateLayeredWindowIndirect should fail\n" );
/* particular error code differs from version to version, could be ERROR_INCORRECT_SIZE,
ERROR_MR_MID_NOT_FOUND or ERROR_GEN_FAILURE (Win8/Win10) */
- ok( GetLastError() != 0, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() != 0, "wrong error %lu\n", GetLastError() );
info.dwFlags = ULW_OPAQUE;
ret = pUpdateLayeredWindowIndirect( hwnd, &info );
ok( ret, "UpdateLayeredWindowIndirect should succeed on layered window\n" );
@@ -8996,38 +8997,38 @@ static void test_layered_window(void)
info.dwFlags = ULW_OPAQUE | 0xf00;
ret = pUpdateLayeredWindowIndirect( hwnd, &info );
ok( !ret, "UpdateLayeredWindowIndirect should fail\n" );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() );
info.cbSize--;
info.dwFlags = ULW_OPAQUE;
ret = pUpdateLayeredWindowIndirect( hwnd, &info );
ok( !ret, "UpdateLayeredWindowIndirect should fail\n" );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() );
ret = pUpdateLayeredWindowIndirect( hwnd, NULL );
ok( !ret, "UpdateLayeredWindowIndirect should fail\n" );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() );
}
ret = pSetLayeredWindowAttributes( hwnd, 0x654321, 22, LWA_COLORKEY | LWA_ALPHA );
ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" );
ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags );
ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" );
- ok( key == 0x654321, "wrong color key %x\n", key );
+ ok( key == 0x654321, "wrong color key %lx\n", key );
ok( alpha == 22, "wrong alpha %u\n", alpha );
- ok( flags == (LWA_COLORKEY | LWA_ALPHA), "wrong flags %x\n", flags );
+ ok( flags == (LWA_COLORKEY | LWA_ALPHA), "wrong flags %lx\n", flags );
SetLastError( 0xdeadbeef );
ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE );
ok( !ret, "UpdateLayeredWindow should fail on layered but initialized window\n" );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError() );
ret = pSetLayeredWindowAttributes( hwnd, 0x888888, 33, LWA_COLORKEY );
ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" );
alpha = 0;
ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags );
ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" );
- ok( key == 0x888888, "wrong color key %x\n", key );
+ ok( key == 0x888888, "wrong color key %lx\n", key );
/* alpha not changed on vista if LWA_ALPHA is not set */
ok( alpha == 22 || alpha == 33, "wrong alpha %u\n", alpha );
- ok( flags == LWA_COLORKEY, "wrong flags %x\n", flags );
+ ok( flags == LWA_COLORKEY, "wrong flags %lx\n", flags );
/* color key may or may not be changed without LWA_COLORKEY */
ret = pSetLayeredWindowAttributes( hwnd, 0x999999, 44, 0 );
@@ -9035,9 +9036,9 @@ static void test_layered_window(void)
alpha = 0;
ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags );
ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" );
- ok( key == 0x888888 || key == 0x999999, "wrong color key %x\n", key );
+ ok( key == 0x888888 || key == 0x999999, "wrong color key %lx\n", key );
ok( alpha == 22 || alpha == 44, "wrong alpha %u\n", alpha );
- ok( flags == 0, "wrong flags %x\n", flags );
+ ok( flags == 0, "wrong flags %lx\n", flags );
/* default alpha and color key is 0 */
SetWindowLongA( hwnd, GWL_EXSTYLE, GetWindowLongA(hwnd, GWL_EXSTYLE) & ~WS_EX_LAYERED );
@@ -9046,9 +9047,9 @@ static void test_layered_window(void)
ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" );
ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags );
ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" );
- ok( key == 0 || key == 0x222222, "wrong color key %x\n", key );
+ ok( key == 0 || key == 0x222222, "wrong color key %lx\n", key );
ok( alpha == 0 || alpha == 55, "wrong alpha %u\n", alpha );
- ok( flags == 0, "wrong flags %x\n", flags );
+ ok( flags == 0, "wrong flags %lx\n", flags );
/* test layered window with WS_CLIPCHILDREN flag */
SetWindowLongA( hwnd, GWL_STYLE, GetWindowLongA(hwnd, GWL_STYLE) | WS_CLIPCHILDREN );
@@ -9056,7 +9057,7 @@ static void test_layered_window(void)
SetWindowLongA( hwnd, GWL_EXSTYLE, GetWindowLongA(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED );
child = CreateWindowExA( 0, "button", "button", WS_VISIBLE | WS_CHILD,
0, 0, 50, 50, hwnd, 0, 0, NULL );
- ok( child != NULL, "CreateWindowEx error %u\n", GetLastError() );
+ ok( child != NULL, "CreateWindowEx error %lu\n", GetLastError() );
ShowWindow( hwnd, SW_SHOW );
ret = pSetLayeredWindowAttributes( hwnd, 0, 255, LWA_ALPHA );
@@ -9107,16 +9108,16 @@ static LRESULT CALLBACK fullscreen_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPAR
case WM_GETMINMAXINFO:
{
MINMAXINFO *minmax = (MINMAXINFO *)lp;
- ok(minmax->ptMaxPosition.x <= mi.rcMonitor.left, "%d <= %d\n", minmax->ptMaxPosition.x, mi.rcMonitor.left);
- ok(minmax->ptMaxPosition.y <= mi.rcMonitor.top, "%d <= %d\n", minmax->ptMaxPosition.y, mi.rcMonitor.top);
- ok(minmax->ptMaxSize.x >= mi.rcMonitor.right, "%d >= %d\n", minmax->ptMaxSize.x, mi.rcMonitor.right);
- ok(minmax->ptMaxSize.y >= mi.rcMonitor.bottom, "%d >= %d\n", minmax->ptMaxSize.y, mi.rcMonitor.bottom);
+ ok(minmax->ptMaxPosition.x <= mi.rcMonitor.left, "%ld <= %ld\n", minmax->ptMaxPosition.x, mi.rcMonitor.left);
+ ok(minmax->ptMaxPosition.y <= mi.rcMonitor.top, "%ld <= %ld\n", minmax->ptMaxPosition.y, mi.rcMonitor.top);
+ ok(minmax->ptMaxSize.x >= mi.rcMonitor.right, "%ld >= %ld\n", minmax->ptMaxSize.x, mi.rcMonitor.right);
+ ok(minmax->ptMaxSize.y >= mi.rcMonitor.bottom, "%ld >= %ld\n", minmax->ptMaxSize.y, mi.rcMonitor.bottom);
break;
}
case WM_NCCALCSIZE:
{
LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wp, lp);
- ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wp, lp);
+ ok(!ret, "got %08Ix (%08Ix %08Ix)\n", ret, wp, lp);
return ret;
}
}
@@ -9143,12 +9144,12 @@ static void test_fullscreen(void)
pt.x = pt.y = 0;
SetLastError(0xdeadbeef);
hmon = MonitorFromPoint(pt, MONITOR_DEFAULTTOPRIMARY);
- ok(hmon != 0, "MonitorFromPoint error %u\n", GetLastError());
+ ok(hmon != 0, "MonitorFromPoint error %lu\n", GetLastError());
mi.cbSize = sizeof(mi);
SetLastError(0xdeadbeef);
ret = GetMonitorInfoA(hmon, &mi);
- ok(ret, "GetMonitorInfo error %u\n", GetLastError());
+ ok(ret, "GetMonitorInfo error %lu\n", GetLastError());
trace("monitor %s, work %s\n", wine_dbgstr_rect(&mi.rcMonitor), wine_dbgstr_rect(&mi.rcWork));
cls.style = 0;
@@ -9180,58 +9181,58 @@ static void test_fullscreen(void)
hwnd = CreateWindowExA(ex_style, "fullscreen_class", NULL, style,
mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom,
GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL);
- ok(hwnd != 0, "%d: CreateWindowExA(%#x/%#x) failed\n", i, ex_style, style);
+ ok(hwnd != 0, "%d: CreateWindowExA(%#lx/%#lx) failed\n", i, ex_style, style);
GetWindowRect(hwnd, &rc);
ok(rc.left <= mi.rcMonitor.left && rc.top <= mi.rcMonitor.top &&
rc.right >= mi.rcMonitor.right && rc.bottom >= mi.rcMonitor.bottom,
- "%#x/%#x: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
+ "%#lx/%#lx: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
DestroyWindow(hwnd);
style = t_style[i] | WS_MAXIMIZE;
hwnd = CreateWindowExA(ex_style, "fullscreen_class", NULL, style,
mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom,
GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL);
- ok(hwnd != 0, "%d: CreateWindowExA(%#x/%#x) failed\n", i, ex_style, style);
+ ok(hwnd != 0, "%d: CreateWindowExA(%#lx/%#lx) failed\n", i, ex_style, style);
GetWindowRect(hwnd, &rc);
ok(rc.left <= mi.rcMonitor.left && rc.top <= mi.rcMonitor.top &&
rc.right >= mi.rcMonitor.right && rc.bottom >= mi.rcMonitor.bottom,
- "%#x/%#x: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
+ "%#lx/%#lx: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
DestroyWindow(hwnd);
style = t_style[i] | WS_MAXIMIZE | WS_CAPTION;
hwnd = CreateWindowExA(ex_style, "fullscreen_class", NULL, style,
mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom,
GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL);
- ok(hwnd != 0, "%d: CreateWindowExA(%#x/%#x) failed\n", i, ex_style, style);
+ ok(hwnd != 0, "%d: CreateWindowExA(%#lx/%#lx) failed\n", i, ex_style, style);
GetWindowRect(hwnd, &rc);
ok(rc.left <= mi.rcMonitor.left && rc.top <= mi.rcMonitor.top &&
rc.right >= mi.rcMonitor.right && rc.bottom >= mi.rcMonitor.bottom,
- "%#x/%#x: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
+ "%#lx/%#lx: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
DestroyWindow(hwnd);
style = t_style[i] | WS_CAPTION | WS_MAXIMIZEBOX;
hwnd = CreateWindowExA(ex_style, "fullscreen_class", NULL, style,
mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom,
GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL);
- ok(hwnd != 0, "%d: CreateWindowExA(%#x/%#x) failed\n", i, ex_style, style);
+ ok(hwnd != 0, "%d: CreateWindowExA(%#lx/%#lx) failed\n", i, ex_style, style);
GetWindowRect(hwnd, &rc);
ok(rc.left <= mi.rcMonitor.left && rc.top <= mi.rcMonitor.top &&
rc.right >= mi.rcMonitor.right && rc.bottom >= mi.rcMonitor.bottom,
- "%#x/%#x: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
+ "%#lx/%#lx: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
DestroyWindow(hwnd);
style = t_style[i] | WS_MAXIMIZE | WS_CAPTION | WS_MAXIMIZEBOX;
hwnd = CreateWindowExA(ex_style, "fullscreen_class", NULL, style,
mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom,
GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL);
- ok(hwnd != 0, "%d: CreateWindowExA(%#x/%#x) failed\n", i, ex_style, style);
+ ok(hwnd != 0, "%d: CreateWindowExA(%#lx/%#lx) failed\n", i, ex_style, style);
GetWindowRect(hwnd, &rc);
/* Windows makes a maximized window slightly larger (to hide the borders?) */
fixup = min(abs(rc.left), abs(rc.top));
InflateRect(&rc, -fixup, -fixup);
ok(rc.left >= mi.rcMonitor.left && rc.top >= mi.rcMonitor.top &&
rc.right <= mi.rcMonitor.right && rc.bottom <= mi.rcMonitor.bottom,
- "%#x/%#x: window rect %s must be in %s\n", ex_style, style, wine_dbgstr_rect(&rc),
+ "%#lx/%#lx: window rect %s must be in %s\n", ex_style, style, wine_dbgstr_rect(&rc),
wine_dbgstr_rect(&mi.rcMonitor));
DestroyWindow(hwnd);
@@ -9239,7 +9240,7 @@ static void test_fullscreen(void)
hwnd = CreateWindowExA(ex_style, "fullscreen_class", NULL, style,
mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom,
GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL);
- ok(hwnd != 0, "%d: CreateWindowExA(%#x/%#x) failed\n", i, ex_style, style);
+ ok(hwnd != 0, "%d: CreateWindowExA(%#lx/%#lx) failed\n", i, ex_style, style);
GetWindowRect(hwnd, &rc);
/* Windows makes a maximized window slightly larger (to hide the borders?) */
fixup = min(abs(rc.left), abs(rc.top));
@@ -9247,11 +9248,11 @@ static void test_fullscreen(void)
if (style & (WS_CHILD | WS_POPUP))
ok(rc.left <= mi.rcMonitor.left && rc.top <= mi.rcMonitor.top &&
rc.right >= mi.rcMonitor.right && rc.bottom >= mi.rcMonitor.bottom,
- "%#x/%#x: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
+ "%#lx/%#lx: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
else
ok(rc.left >= mi.rcMonitor.left && rc.top >= mi.rcMonitor.top &&
rc.right <= mi.rcMonitor.right && rc.bottom <= mi.rcMonitor.bottom,
- "%#x/%#x: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
+ "%#lx/%#lx: window rect %s\n", ex_style, style, wine_dbgstr_rect(&rc));
DestroyWindow(hwnd);
}
}
@@ -9260,7 +9261,7 @@ static void test_fullscreen(void)
/* Add WS_THICKFRAME style later so that the window can cover the entire monitor */
hwnd = CreateWindowA("fullscreen_class", NULL, WS_POPUP | WS_VISIBLE, 0, 0, mi.rcMonitor.right,
mi.rcMonitor.bottom, NULL, NULL, GetModuleHandleA(NULL), NULL);
- ok(!!hwnd, "CreateWindow failed, error %#x.\n", GetLastError());
+ ok(!!hwnd, "CreateWindow failed, error %#lx.\n", GetLastError());
flush_events(TRUE);
/* Add WS_THICKFRAME and exit full screen */
@@ -9278,8 +9279,8 @@ static void test_fullscreen(void)
if (rc.right - rc.left == 100 && rc.bottom - rc.top == 100)
break;
}
- ok(rc.right - rc.left == 100, "Expect width %d, got %d.\n", 100, rc.right - rc.left);
- ok(rc.bottom - rc.top == 100, "Expect height %d, got %d.\n", 100, rc.bottom - rc.top);
+ ok(rc.right - rc.left == 100, "Expect width %d, got %ld.\n", 100, rc.right - rc.left);
+ ok(rc.bottom - rc.top == 100, "Expect height %d, got %ld.\n", 100, rc.bottom - rc.top);
DestroyWindow(hwnd);
UnregisterClassA("fullscreen_class", GetModuleHandleA(NULL));
@@ -9318,7 +9319,7 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM
minmax = (MINMAXINFO *)lparam;
if (winetest_debug > 1)
{
- trace("hwnd %p, WM_GETMINMAXINFO, %08lx, %08lx\n", hwnd, wparam, lparam);
+ trace("hwnd %p, WM_GETMINMAXINFO, %08Ix, %08Ix\n", hwnd, wparam, lparam);
dump_minmax_info( minmax );
}
test_thick_child_got_minmax = TRUE;
@@ -9382,7 +9383,7 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM
case WM_NCCALCSIZE:
{
LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam);
- ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ ok(!ret, "got %08Ix (%08Ix %08Ix)\n", ret, wparam, lparam);
return ret;
}
}
@@ -9473,7 +9474,7 @@ static void test_thick_child_size(HWND parentWindow)
cls.lpszClassName = className;
SetLastError(0xdeadbeef);
success = RegisterClassA(&cls);
- ok(success,"RegisterClassA failed, error: %u\n", GetLastError());
+ ok(success,"RegisterClassA failed, error: %lu\n", GetLastError());
for(i = 0; i < NUMBER_OF_THICK_CHILD_TESTS; i++)
{
@@ -9484,13 +9485,13 @@ static void test_thick_child_size(HWND parentWindow)
SetLastError(0xdeadbeef);
childWindow = CreateWindowExA( exStyles[i], className, "", styles[i], 0, 0, 0, 0, parentWindow, 0, GetModuleHandleA(0), NULL );
- ok(childWindow != NULL, "Failed to create child window, error: %u\n", GetLastError());
+ ok(childWindow != NULL, "Failed to create child window, error: %lu\n", GetLastError());
ok(test_thick_child_got_minmax, "Got no WM_GETMINMAXINFO\n");
SetLastError(0xdeadbeef);
success = GetWindowRect(childWindow, &childRect);
- ok(success,"GetWindowRect call failed, error: %u\n", GetLastError());
+ ok(success,"GetWindowRect call failed, error: %lu\n", GetLastError());
childWidth = childRect.right - childRect.left;
childHeight = childRect.bottom - childRect.top;
@@ -9513,12 +9514,12 @@ static void test_thick_child_size(HWND parentWindow)
}
ok((childWidth == expectedWidth) && (childHeight == expectedHeight),
- "size of window (%s) is wrong: expected size %dx%d != actual size %dx%d\n",
+ "size of window (%s) is wrong: expected size %ldx%ld != actual size %ldx%ld\n",
test_thick_child_name, expectedWidth, expectedHeight, childWidth, childHeight);
SetLastError(0xdeadbeef);
success = DestroyWindow(childWindow);
- ok(success,"DestroyWindow call failed, error: %u\n", GetLastError());
+ ok(success,"DestroyWindow call failed, error: %lu\n", GetLastError());
}
ok(UnregisterClassA(className, GetModuleHandleA(NULL)),"UnregisterClass call failed\n");
}
@@ -9531,7 +9532,7 @@ static void test_handles( HWND full_hwnd )
SetLastError( 0xdeadbeef );
ret = GetWindowRect( hwnd, &rect );
- ok( ret, "GetWindowRect failed for %p err %u\n", hwnd, GetLastError() );
+ ok( ret, "GetWindowRect failed for %p err %lu\n", hwnd, GetLastError() );
#ifdef _WIN64
if ((ULONG_PTR)full_hwnd >> 32)
@@ -9540,24 +9541,24 @@ static void test_handles( HWND full_hwnd )
hwnd = (HWND)((ULONG_PTR)full_hwnd | ((ULONG_PTR)~0u << 32));
SetLastError( 0xdeadbeef );
ret = GetWindowRect( hwnd, &rect );
- ok( ret, "GetWindowRect failed for %p err %u\n", hwnd, GetLastError() );
+ ok( ret, "GetWindowRect failed for %p err %lu\n", hwnd, GetLastError() );
hwnd = (HWND)(((ULONG_PTR)full_hwnd & ~0u) | ((ULONG_PTR)0x1234 << 32));
SetLastError( 0xdeadbeef );
ret = GetWindowRect( hwnd, &rect );
- ok( ret, "GetWindowRect failed for %p err %u\n", hwnd, GetLastError() );
+ ok( ret, "GetWindowRect failed for %p err %lu\n", hwnd, GetLastError() );
hwnd = (HWND)(((ULONG_PTR)full_hwnd & 0xffff) | ((ULONG_PTR)0x9876 << 16));
SetLastError( 0xdeadbeef );
ret = GetWindowRect( hwnd, &rect );
ok( !ret, "GetWindowRect succeeded for %p\n", hwnd );
- ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %lu\n", GetLastError() );
hwnd = (HWND)(((ULONG_PTR)full_hwnd & 0xffff) | ((ULONG_PTR)0x12345678 << 16));
SetLastError( 0xdeadbeef );
ret = GetWindowRect( hwnd, &rect );
ok( !ret, "GetWindowRect succeeded for %p\n", hwnd );
- ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %lu\n", GetLastError() );
#endif
}
@@ -9579,7 +9580,7 @@ static void test_winregion(void)
SetLastError(0xdeadbeef);
ret = pGetWindowRgnBox(hwnd, NULL);
ok( ret == ERROR, "Expected ERROR, got %d\n", ret);
- ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError());
+ ok( GetLastError() == 0xdeadbeef, "Expected , got %ld\n", GetLastError());
hrgn = CreateRectRgn(2, 3, 10, 15);
ok( hrgn != NULL, "Region creation failed\n");
@@ -9590,7 +9591,7 @@ static void test_winregion(void)
SetLastError(0xdeadbeef);
ret = pGetWindowRgnBox(hwnd, NULL);
ok( ret == ERROR, "Expected ERROR, got %d\n", ret);
- ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError());
+ ok( GetLastError() == 0xdeadbeef, "Expected , got %ld\n", GetLastError());
SetRectEmpty(&r);
ret = pGetWindowRgnBox(hwnd, &r);
@@ -9649,7 +9650,7 @@ static void test_rtl_layout(void)
ok( r.left == 30 && r.right == 10, "wrong rect %s\n", wine_dbgstr_rect( &r ));
pt.x = pt.y = 12;
MapWindowPoints( child, parent, &pt, 1 );
- ok( pt.x == 22 && pt.y == 22, "wrong point %d,%d\n", pt.x, pt.y );
+ ok( pt.x == 22 && pt.y == 22, "wrong point %ld,%ld\n", pt.x, pt.y );
SetWindowPos( parent, 0, 0, 0, 250, 250, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE );
GetWindowRect( parent, &r );
ok( r.left == 100 && r.right == 350, "wrong rect %s\n", wine_dbgstr_rect( &r ));
@@ -9686,13 +9687,13 @@ static void test_FlashWindow(void)
hwnd = CreateWindowExA( 0, "MainWindowClass", "FlashWindow", WS_POPUP,
0, 0, 0, 0, 0, 0, 0, NULL );
- ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() );
+ ok( hwnd != 0, "CreateWindowExA error %ld\n", GetLastError() );
SetLastError( 0xdeadbeef );
ret = pFlashWindow( NULL, TRUE );
ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER ||
GetLastError() == ERROR_INVALID_WINDOW_HANDLE),
- "FlashWindow returned with %d\n", GetLastError() );
+ "FlashWindow returned with %ld\n", GetLastError() );
DestroyWindow( hwnd );
@@ -9700,7 +9701,7 @@ static void test_FlashWindow(void)
ret = pFlashWindow( hwnd, TRUE );
ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER ||
GetLastError() == ERROR_INVALID_WINDOW_HANDLE),
- "FlashWindow returned with %d\n", GetLastError() );
+ "FlashWindow returned with %ld\n", GetLastError() );
}
static void test_FlashWindowEx(void)
@@ -9717,7 +9718,7 @@ static void test_FlashWindowEx(void)
hwnd = CreateWindowExA( 0, "MainWindowClass", "FlashWindow", WS_POPUP,
0, 0, 0, 0, 0, 0, 0, NULL );
- ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() );
+ ok( hwnd != 0, "CreateWindowExA error %ld\n", GetLastError() );
finfo.cbSize = sizeof(FLASHWINFO);
finfo.dwFlags = FLASHW_TIMER;
@@ -9728,13 +9729,13 @@ static void test_FlashWindowEx(void)
ret = pFlashWindowEx(&finfo);
ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER ||
GetLastError() == ERROR_INVALID_WINDOW_HANDLE),
- "FlashWindowEx returned with %d\n", GetLastError());
+ "FlashWindowEx returned with %ld\n", GetLastError());
finfo.hwnd = hwnd;
SetLastError(0xdeadbeef);
ret = pFlashWindowEx(NULL);
ok(!ret && GetLastError() == ERROR_NOACCESS,
- "FlashWindowEx returned with %d\n", GetLastError());
+ "FlashWindowEx returned with %ld\n", GetLastError());
SetLastError(0xdeadbeef);
ret = pFlashWindowEx(&finfo);
@@ -9759,32 +9760,32 @@ static void test_FlashWindowEx(void)
ret = pFlashWindowEx(&finfo);
ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER ||
GetLastError() == ERROR_INVALID_WINDOW_HANDLE),
- "FlashWindowEx returned with %d\n", GetLastError());
+ "FlashWindowEx returned with %ld\n", GetLastError());
ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize);
ok(finfo.hwnd == hwnd, "FlashWindowEx modified hwnd to %p\n", finfo.hwnd);
- ok(finfo.dwFlags == FLASHW_TIMER, "FlashWindowEx modified dwFlags to %x\n", finfo.dwFlags);
+ ok(finfo.dwFlags == FLASHW_TIMER, "FlashWindowEx modified dwFlags to %lx\n", finfo.dwFlags);
ok(finfo.uCount == 3, "FlashWindowEx modified uCount to %x\n", finfo.uCount);
- ok(finfo.dwTimeout == 200, "FlashWindowEx modified dwTimeout to %x\n", finfo.dwTimeout);
+ ok(finfo.dwTimeout == 200, "FlashWindowEx modified dwTimeout to %lx\n", finfo.dwTimeout);
hwnd = CreateWindowExA( 0, "MainWindowClass", "FlashWindow", WS_VISIBLE | WS_POPUPWINDOW,
0, 0, 0, 0, 0, 0, 0, NULL );
- ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() );
+ ok( hwnd != 0, "CreateWindowExA error %ld\n", GetLastError() );
finfo.hwnd = hwnd;
SetLastError(0xdeadbeef);
ret = pFlashWindowEx(NULL);
ok(!ret && GetLastError() == ERROR_NOACCESS,
- "FlashWindowEx returned with %d\n", GetLastError());
+ "FlashWindowEx returned with %ld\n", GetLastError());
SetLastError(0xdeadbeef);
prev = pFlashWindowEx(&finfo);
ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize);
ok(finfo.hwnd == hwnd, "FlashWindowEx modified hwnd to %p\n", finfo.hwnd);
- ok(finfo.dwFlags == FLASHW_TIMER, "FlashWindowEx modified dwFlags to %x\n", finfo.dwFlags);
+ ok(finfo.dwFlags == FLASHW_TIMER, "FlashWindowEx modified dwFlags to %lx\n", finfo.dwFlags);
ok(finfo.uCount == 3, "FlashWindowEx modified uCount to %x\n", finfo.uCount);
- ok(finfo.dwTimeout == 200, "FlashWindowEx modified dwTimeout to %x\n", finfo.dwTimeout);
+ ok(finfo.dwTimeout == 200, "FlashWindowEx modified dwTimeout to %lx\n", finfo.dwTimeout);
finfo.dwFlags = FLASHW_STOP;
SetLastError(0xdeadbeef);
@@ -9799,47 +9800,47 @@ static void test_FindWindowEx(void)
HWND hwnd, found;
hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0,0,0,0, 0, 0, 0, NULL );
- ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() );
+ ok( hwnd != 0, "CreateWindowExA error %ld\n", GetLastError() );
num_gettext_msgs = 0;
found = FindWindowExA( 0, 0, "ClassThatDoesntExist", "" );
ok( found == NULL, "expected a NULL hwnd\n" );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
found = FindWindowExA( 0, 0, "ClassThatDoesntExist", NULL );
ok( found == NULL, "expected a NULL hwnd\n" );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
found = FindWindowExA( 0, 0, "MainWindowClass", "" );
ok( found == NULL, "expected a NULL hwnd\n" );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
found = FindWindowExA( 0, 0, "MainWindowClass", NULL );
ok( found == hwnd, "found is %p, expected a valid hwnd\n", found );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
found = FindWindowExA( 0, 0, "MainWindowClass", "caption" );
ok( found == hwnd, "found is %p, expected a valid hwnd\n", found );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
DestroyWindow( hwnd );
hwnd = CreateWindowExA( 0, "MainWindowClass", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL );
- ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() );
+ ok( hwnd != 0, "CreateWindowExA error %ld\n", GetLastError() );
num_gettext_msgs = 0;
found = FindWindowExA( 0, 0, "MainWindowClass", "" );
ok( found == hwnd, "found is %p, expected a valid hwnd\n", found );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
found = FindWindowExA( 0, 0, "MainWindowClass", NULL );
ok( found == hwnd, "found is %p, expected a valid hwnd\n", found );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
DestroyWindow( hwnd );
@@ -9855,47 +9856,47 @@ static void test_FindWindow(void)
HWND hwnd, found;
hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0,0,0,0, 0, 0, 0, NULL );
- ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() );
+ ok( hwnd != 0, "CreateWindowExA error %ld\n", GetLastError() );
num_gettext_msgs = 0;
found = FindWindowA( "ClassThatDoesntExist", "" );
ok( found == NULL, "expected a NULL hwnd\n" );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
found = FindWindowA( "ClassThatDoesntExist", NULL );
ok( found == NULL, "expected a NULL hwnd\n" );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
found = FindWindowA( "MainWindowClass", "" );
ok( found == NULL, "expected a NULL hwnd\n" );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
found = FindWindowA( "MainWindowClass", NULL );
ok( found == hwnd, "found is %p, expected a valid hwnd\n", found );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
found = FindWindowA( "MainWindowClass", "caption" );
ok( found == hwnd, "found is %p, expected a valid hwnd\n", found );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
DestroyWindow( hwnd );
hwnd = CreateWindowExA( 0, "MainWindowClass", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL );
- ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() );
+ ok( hwnd != 0, "CreateWindowExA error %ld\n", GetLastError() );
num_gettext_msgs = 0;
found = FindWindowA( "MainWindowClass", "" );
ok( found == hwnd, "found is %p, expected a valid hwnd\n", found );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
num_gettext_msgs = 0;
found = FindWindowA( "MainWindowClass", NULL );
ok( found == hwnd, "found is %p, expected a valid hwnd\n", found );
- ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs );
+ ok( num_gettext_msgs == 0, "got %lu WM_GETTEXT messages\n", num_gettext_msgs );
DestroyWindow( hwnd );
@@ -10238,7 +10239,7 @@ static void window_from_point_proc(HWND parent)
ok(got_click, "button under static window didn't get WM_LBUTTONUP\n");
ret = WaitForSingleObject(end_event, 5000);
- ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret);
+ ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %lx\n", ret);
CloseHandle(start_event);
CloseHandle(end_event);
@@ -10341,15 +10342,15 @@ static void test_map_points(void)
/* Verify window rect and client rect (they should have the same width and height) */
GetWindowRect(wnd, &window_rect);
- ok(window_rect.left == pos.x, "left is %d instead of %d\n", window_rect.left, pos.x);
- ok(window_rect.top == pos.y, "top is %d instead of %d\n", window_rect.top, pos.y);
- ok(window_rect.right == pos.x + width, "right is %d instead of %d\n", window_rect.right, pos.x + width);
- ok(window_rect.bottom == pos.y + height, "bottom is %d instead of %d\n", window_rect.bottom, pos.y + height);
+ ok(window_rect.left == pos.x, "left is %ld instead of %ld\n", window_rect.left, pos.x);
+ ok(window_rect.top == pos.y, "top is %ld instead of %ld\n", window_rect.top, pos.y);
+ ok(window_rect.right == pos.x + width, "right is %ld instead of %ld\n", window_rect.right, pos.x + width);
+ ok(window_rect.bottom == pos.y + height, "bottom is %ld instead of %ld\n", window_rect.bottom, pos.y + height);
GetClientRect(wnd, &client_rect);
- ok(client_rect.left == 0, "left is %d instead of 0\n", client_rect.left);
- ok(client_rect.top == 0, "top is %d instead of 0\n", client_rect.top);
- ok(client_rect.right == width, "right is %d instead of %d\n", client_rect.right, width);
- ok(client_rect.bottom == height, "bottom is %d instead of %d\n", client_rect.bottom, height);
+ ok(client_rect.left == 0, "left is %ld instead of 0\n", client_rect.left);
+ ok(client_rect.top == 0, "top is %ld instead of 0\n", client_rect.top);
+ ok(client_rect.right == width, "right is %ld instead of %d\n", client_rect.right, width);
+ ok(client_rect.bottom == height, "bottom is %ld instead of %d\n", client_rect.bottom, height);
/* Test MapWindowPoints */
@@ -10359,20 +10360,20 @@ static void test_map_points(void)
n = MapWindowPoints(NULL, NULL, NULL, 0);
err = GetLastError();
ok(n == 0, "Got %d, expected %d\n", n, 0);
- ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef);
+ ok(err == 0xdeadbeef, "Got %lx, expected %x\n", err, 0xdeadbeef);
SetLastError(0xdeadbeef);
n = MapWindowPoints(wnd, wnd, NULL, 0);
err = GetLastError();
ok(n == 0, "Got %d, expected %d\n", n, 0);
- ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef);
+ ok(err == 0xdeadbeef, "Got %lx, expected %x\n", err, 0xdeadbeef);
n = MapWindowPoints(wnd, NULL, NULL, 0);
- ok(n == MAKELONG(window_rect.left, window_rect.top), "Got %x, expected %x\n",
+ ok(n == MAKELONG(window_rect.left, window_rect.top), "Got %x, expected %lx\n",
n, MAKELONG(window_rect.left, window_rect.top));
n = MapWindowPoints(NULL, wnd, NULL, 0);
- ok(n == MAKELONG(-window_rect.left, -window_rect.top), "Got %x, expected %x\n",
+ ok(n == MAKELONG(-window_rect.left, -window_rect.top), "Got %x, expected %lx\n",
n, MAKELONG(-window_rect.left, -window_rect.top));
SetLastError(0xdeadbeef);
@@ -10380,69 +10381,69 @@ static void test_map_points(void)
n = MapWindowPoints(dwnd, NULL, &p, 1);
err = GetLastError();
ok(n == 0, "Got %d, expected %d\n", n, 0);
- ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100);
- ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
+ ok(p.x == 100 && p.y == 100, "Failed got(%ld, %ld), expected (%d, %d)\n", p.x, p.y, 100, 100);
+ ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %lx, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
SetLastError(0xdeadbeef);
p.x = p.y = 100;
n = MapWindowPoints(dwnd, wnd, &p, 1);
err = GetLastError();
ok(n == 0, "Got %d, expected %d\n", n, 0);
- ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100);
- ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
+ ok(p.x == 100 && p.y == 100, "Failed got(%ld, %ld), expected (%d, %d)\n", p.x, p.y, 100, 100);
+ ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %lx, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
SetLastError(0xdeadbeef);
p.x = p.y = 100;
n = MapWindowPoints(NULL, dwnd, &p, 1);
err = GetLastError();
ok(n == 0, "Got %d, expected %d\n", n, 0);
- ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100);
- ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
+ ok(p.x == 100 && p.y == 100, "Failed got(%ld, %ld), expected (%d, %d)\n", p.x, p.y, 100, 100);
+ ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %lx, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
SetLastError(0xdeadbeef);
p.x = p.y = 100;
n = MapWindowPoints(wnd, dwnd, &p, 1);
err = GetLastError();
ok(n == 0, "Got %d, expected %d\n", n, 0);
- ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100);
- ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
+ ok(p.x == 100 && p.y == 100, "Failed got(%ld, %ld), expected (%d, %d)\n", p.x, p.y, 100, 100);
+ ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %lx, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
SetLastError(0xdeadbeef);
p.x = p.y = 100;
n = MapWindowPoints(dwnd, dwnd, &p, 1);
err = GetLastError();
ok(n == 0, "Got %d, expected %d\n", n, 0);
- ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100);
- ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
+ ok(p.x == 100 && p.y == 100, "Failed got(%ld, %ld), expected (%d, %d)\n", p.x, p.y, 100, 100);
+ ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %lx, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
SetLastError(0xdeadbeef);
p.x = p.y = 100;
n = MapWindowPoints(NULL, NULL, &p, 1);
err = GetLastError();
ok(n == 0, "Got %d, expected %d\n", n, 0);
- ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100);
- ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef);
+ ok(p.x == 100 && p.y == 100, "Failed got(%ld, %ld), expected (%d, %d)\n", p.x, p.y, 100, 100);
+ ok(err == 0xdeadbeef, "Got %lx, expected %x\n", err, 0xdeadbeef);
SetLastError(0xdeadbeef);
p.x = p.y = 100;
n = MapWindowPoints(wnd, wnd, &p, 1);
err = GetLastError();
ok(n == 0, "Got %d, expected %d\n", n, 0);
- ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100);
- ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef);
+ ok(p.x == 100 && p.y == 100, "Failed got(%ld, %ld), expected (%d, %d)\n", p.x, p.y, 100, 100);
+ ok(err == 0xdeadbeef, "Got %lx, expected %x\n", err, 0xdeadbeef);
p.x = p.y = 100;
n = MapWindowPoints(wnd, NULL, &p, 1);
- ok(n == MAKELONG(window_rect.left, window_rect.top), "Got %x, expected %x\n",
+ ok(n == MAKELONG(window_rect.left, window_rect.top), "Got %x, expected %lx\n",
n, MAKELONG(window_rect.left, window_rect.top));
- ok((p.x == (window_rect.left + 100)) && (p.y == (window_rect.top + 100)), "Failed got (%d, %d), expected (%d, %d)\n",
+ ok((p.x == (window_rect.left + 100)) && (p.y == (window_rect.top + 100)), "Failed got (%ld, %ld), expected (%ld, %ld)\n",
p.x, p.y, window_rect.left + 100, window_rect.top + 100);
p.x = p.y = 100;
n = MapWindowPoints(NULL, wnd, &p, 1);
- ok(n == MAKELONG(-window_rect.left, -window_rect.top), "Got %x, expected %x\n",
+ ok(n == MAKELONG(-window_rect.left, -window_rect.top), "Got %x, expected %lx\n",
n, MAKELONG(-window_rect.left, -window_rect.top));
- ok((p.x == (-window_rect.left + 100)) && (p.y == (-window_rect.top + 100)), "Failed got (%d, %d), expected (%d, %d)\n",
+ ok((p.x == (-window_rect.left + 100)) && (p.y == (-window_rect.top + 100)), "Failed got (%ld, %ld), expected (%ld, %ld)\n",
p.x, p.y, -window_rect.left + 100, -window_rect.top + 100);
SetLastError(0xdeadbeef);
@@ -10450,16 +10451,16 @@ static void test_map_points(void)
n = MapWindowPoints(wnd0, NULL, &p, 1);
err = GetLastError();
ok(n == 0, "Got %x, expected 0\n", n);
- ok((p.x == 0) && (p.y == 0), "Failed got (%d, %d), expected (0, 0)\n", p.x, p.y);
- ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef);
+ ok((p.x == 0) && (p.y == 0), "Failed got (%ld, %ld), expected (0, 0)\n", p.x, p.y);
+ ok(err == 0xdeadbeef, "Got %lx, expected %x\n", err, 0xdeadbeef);
SetLastError(0xdeadbeef);
p.x = p.y = 0;
n = MapWindowPoints(NULL, wnd0, &p, 1);
err = GetLastError();
ok(n == 0, "Got %x, expected 0\n", n);
- ok((p.x == 0) && (p.y == 0), "Failed got (%d, %d), expected (0, 0)\n", p.x, p.y);
- ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef);
+ ok((p.x == 0) && (p.y == 0), "Failed got (%ld, %ld), expected (0, 0)\n", p.x, p.y);
+ ok(err == 0xdeadbeef, "Got %lx, expected %x\n", err, 0xdeadbeef);
/* Test ClientToScreen */
@@ -10469,34 +10470,34 @@ static void test_map_points(void)
ret = ClientToScreen(NULL, NULL);
err = GetLastError();
ok(!ret, "Should fail\n");
- ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
+ ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %lx, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
SetLastError(0xdeadbeef);
p.x = p.y = 100;
ret = ClientToScreen(NULL, &p);
err = GetLastError();
ok(!ret, "Should fail\n");
- ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100);
- ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
+ ok(p.x == 100 && p.y == 100, "Failed got(%ld, %ld), expected (%d, %d)\n", p.x, p.y, 100, 100);
+ ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %lx, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
SetLastError(0xdeadbeef);
p.x = p.y = 100;
ret = ClientToScreen(dwnd, &p);
err = GetLastError();
ok(!ret, "Should fail\n");
- ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100);
- ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
+ ok(p.x == 100 && p.y == 100, "Failed got(%ld, %ld), expected (%d, %d)\n", p.x, p.y, 100, 100);
+ ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %lx, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
p.x = p.y = 100;
ret = ClientToScreen(wnd, &p);
- ok(ret, "Failed with error %u\n", GetLastError());
- ok((p.x == (window_rect.left + 100)) && (p.y == (window_rect.top + 100)), "Failed got (%d, %d), expected (%d, %d)\n",
+ ok(ret, "Failed with error %lu\n", GetLastError());
+ ok((p.x == (window_rect.left + 100)) && (p.y == (window_rect.top + 100)), "Failed got (%ld, %ld), expected (%ld, %ld)\n",
p.x, p.y, window_rect.left + 100, window_rect.top + 100);
p.x = p.y = 0;
ret = ClientToScreen(wnd0, &p);
- ok(ret, "Failed with error %u\n", GetLastError());
- ok((p.x == 0) && (p.y == 0), "Failed got (%d, %d), expected (0, 0)\n", p.x, p.y);
+ ok(ret, "Failed with error %lu\n", GetLastError());
+ ok((p.x == 0) && (p.y == 0), "Failed got (%ld, %ld), expected (0, 0)\n", p.x, p.y);
/* Test ScreenToClient */
@@ -10506,34 +10507,34 @@ static void test_map_points(void)
ret = ScreenToClient(NULL, NULL);
err = GetLastError();
ok(!ret, "Should fail\n");
- ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
+ ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %lx, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
SetLastError(0xdeadbeef);
p.x = p.y = 100;
ret = ScreenToClient(NULL, &p);
err = GetLastError();
ok(!ret, "Should fail\n");
- ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100);
- ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
+ ok(p.x == 100 && p.y == 100, "Failed got(%ld, %ld), expected (%d, %d)\n", p.x, p.y, 100, 100);
+ ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %lx, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
SetLastError(0xdeadbeef);
p.x = p.y = 100;
ret = ScreenToClient(dwnd, &p);
err = GetLastError();
ok(!ret, "Should fail\n");
- ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100);
- ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
+ ok(p.x == 100 && p.y == 100, "Failed got(%ld, %ld), expected (%d, %d)\n", p.x, p.y, 100, 100);
+ ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %lx, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE);
p.x = p.y = 100;
ret = ScreenToClient(wnd, &p);
- ok(ret, "Failed with error %u\n", GetLastError());
- ok((p.x == (-window_rect.left + 100)) && (p.y == (-window_rect.top + 100)), "Failed got(%d, %d), expected (%d, %d)\n",
+ ok(ret, "Failed with error %lu\n", GetLastError());
+ ok((p.x == (-window_rect.left + 100)) && (p.y == (-window_rect.top + 100)), "Failed got(%ld, %ld), expected (%ld, %ld)\n",
p.x, p.y, -window_rect.left + 100, -window_rect.top + 100);
p.x = p.y = 0;
ret = ScreenToClient(wnd0, &p);
- ok(ret, "Failed with error %u\n", GetLastError());
- ok((p.x == 0) && (p.y == 0), "Failed got (%d, %d), expected (0, 0)\n", p.x, p.y);
+ ok(ret, "Failed with error %lu\n", GetLastError());
+ ok((p.x == 0) && (p.y == 0), "Failed got (%ld, %ld), expected (0, 0)\n", p.x, p.y);
DestroyWindow(wnd);
DestroyWindow(wnd0);
@@ -10673,7 +10674,7 @@ static LRESULT WINAPI smresult_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARA
/* Send another message while we have a reply queued for the current one. */
res = SendMessageA(data->thread_hwnd, WM_APP+2, 0, lparam);
- ok(res == 0x449b0190, "unexpected result %lx\n", res);
+ ok(res == 0x449b0190, "unexpected result %Ix\n", res);
return 0;
}
@@ -10771,12 +10772,12 @@ static void test_smresult(void)
100, 100, 200, 200, 0, 0, 0, NULL);
hThread = CreateThread(NULL, 0, smresult_thread_proc, &data, 0, &tid);
- ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError());
+ ok(hThread != NULL, "CreateThread failed, error %ld\n", GetLastError());
ok(WaitForSingleObject(data.thread_started, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
res = SendMessageA(data.thread_hwnd, WM_APP, 0, (LPARAM)&data);
- ok(res == 0x240408ea, "unexpected result %lx\n", res);
+ ok(res == 0x240408ea, "unexpected result %Ix\n", res);
SendMessageA(data.thread_hwnd, WM_CLOSE, 0, 0);
@@ -10804,42 +10805,42 @@ static void test_GetMessagePos(void)
SetCursorPos(120, 140);
flush_events(TRUE);
pos = GetMessagePos();
- ok(pos == MAKELONG(120, 140), "pos = %08x\n", pos);
+ ok(pos == MAKELONG(120, 140), "pos = %08lx\n", pos);
SetCursorPos(340, 320);
pos = GetMessagePos();
- ok(pos == MAKELONG(120, 140), "pos = %08x\n", pos);
+ ok(pos == MAKELONG(120, 140), "pos = %08lx\n", pos);
SendMessageW(button, WM_APP, 0, 0);
pos = GetMessagePos();
- ok(pos == MAKELONG(120, 140), "pos = %08x\n", pos);
+ ok(pos == MAKELONG(120, 140), "pos = %08lx\n", pos);
PostMessageA(button, WM_APP, 0, 0);
GetMessageA(&msg, button, 0, 0);
ok(msg.message == WM_APP, "msg.message = %x\n", msg.message);
pos = GetMessagePos();
- ok(pos == MAKELONG(340, 320), "pos = %08x\n", pos);
+ ok(pos == MAKELONG(340, 320), "pos = %08lx\n", pos);
PostMessageA(button, WM_APP, 0, 0);
SetCursorPos(350, 330);
GetMessageA(&msg, button, 0, 0);
ok(msg.message == WM_APP, "msg.message = %x\n", msg.message);
pos = GetMessagePos();
- ok(pos == MAKELONG(340, 320), "pos = %08x\n", pos);
+ ok(pos == MAKELONG(340, 320), "pos = %08lx\n", pos);
PostMessageA(button, WM_APP, 0, 0);
SetCursorPos(320, 340);
PostMessageA(button, WM_APP+1, 0, 0);
pos = GetMessagePos();
- ok(pos == MAKELONG(340, 320), "pos = %08x\n", pos);
+ ok(pos == MAKELONG(340, 320), "pos = %08lx\n", pos);
GetMessageA(&msg, button, 0, 0);
ok(msg.message == WM_APP, "msg.message = %x\n", msg.message);
pos = GetMessagePos();
- ok(pos == MAKELONG(350, 330), "pos = %08x\n", pos);
+ ok(pos == MAKELONG(350, 330), "pos = %08lx\n", pos);
GetMessageA(&msg, button, 0, 0);
ok(msg.message == WM_APP+1, "msg.message = %x\n", msg.message);
pos = GetMessagePos();
- ok(pos == MAKELONG(320, 340), "pos = %08x\n", pos);
+ ok(pos == MAKELONG(320, 340), "pos = %08lx\n", pos);
SetTimer(button, 1, 250, NULL);
SetCursorPos(330, 350);
@@ -10851,7 +10852,7 @@ static void test_GetMessagePos(void)
}
ok(msg.message == WM_TIMER, "msg.message = %x\n", msg.message);
pos = GetMessagePos();
- ok(pos == MAKELONG(330, 350), "pos = %08x\n", pos);
+ ok(pos == MAKELONG(330, 350), "pos = %08lx\n", pos);
KillTimer(button, 1);
DestroyWindow(button);
@@ -11090,7 +11091,7 @@ static LRESULT WINAPI winproc_convA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM l
{
const char *text = (const char*)lparam;
- ok(!wparam, "wparam = %08lx\n", wparam);
+ ok(!wparam, "wparam = %08Ix\n", wparam);
ok(!strcmp(text, "text"), "WM_SETTEXT lparam = %s\n", text);
return 1;
}
@@ -11104,7 +11105,7 @@ static LRESULT WINAPI winproc_convW(HWND hwnd, UINT msg, WPARAM wparam, LPARAM l
{
const WCHAR *text = (const WCHAR*)lparam;
- ok(!wparam, "wparam = %08lx\n", wparam);
+ ok(!wparam, "wparam = %08Ix\n", wparam);
ok(!lstrcmpW(text, textW), "WM_SETTEXT lparam = %s\n", wine_dbgstr_w(text));
return 1;
}
@@ -11127,10 +11128,10 @@ static void test_winproc_handles(const char *argv0)
wnd_classA.lpszClassName = "winproc_test";
wnd_classA.lpfnWndProc = winproc;
ret = RegisterClassA(&wnd_classA);
- ok(ret, "RegisterClass failed with error %d\n", GetLastError());
+ ok(ret, "RegisterClass failed with error %ld\n", GetLastError());
ret = GetClassInfoW(hinst, winproc_testW, &wnd_classW);
- ok(ret, "GetClassInfoW failed with error %d\n", GetLastError());
+ ok(ret, "GetClassInfoW failed with error %ld\n", GetLastError());
ok(wnd_classA.lpfnWndProc != wnd_classW.lpfnWndProc,
"winproc pointers should not be identical\n");
@@ -11142,7 +11143,7 @@ static void test_winproc_handles(const char *argv0)
ok(count == 1, "winproc should be called once (%d)\n", count);
ret = UnregisterClassW(winproc_testW, hinst);
- ok(ret, "UnregisterClass failed with error %d\n", GetLastError());
+ ok(ret, "UnregisterClass failed with error %ld\n", GetLastError());
/* crashes on 64-bit windows because lpfnWndProc handle is already freed */
if (sizeof(void*) == 4)
@@ -11189,12 +11190,12 @@ static void test_winproc_limit(void)
ok(i != 0xffff, "unable to run out of winproc slots\n");
ret = SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc_convA);
- ok(ret, "SetWindowLongPtr failed with error %d\n", GetLastError());
+ ok(ret, "SetWindowLongPtr failed with error %ld\n", GetLastError());
ok(SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"text"), "WM_SETTEXT failed\n");
ok(SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW), "WM_SETTEXT with conversion failed\n");
ret = SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc_convW);
- ok(ret, "SetWindowLongPtr failed with error %d\n", GetLastError());
+ ok(ret, "SetWindowLongPtr failed with error %ld\n", GetLastError());
ok(SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"text"), "WM_SETTEXT failed\n");
ok(SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW), "WM_SETTEXT with conversion failed\n");
@@ -11236,21 +11237,21 @@ static void test_deferwindowpos(void)
hdwp2 = DeferWindowPos(NULL, NULL, NULL, 0, 0, 10, 10, 0);
todo_wine
ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) ||
- broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError());
+ broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %ld\n", hdwp2, GetLastError());
hdwp2 = DeferWindowPos((HDWP)0xdead, GetDesktopWindow(), NULL, 0, 0, 10, 10, 0);
todo_wine
ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) ||
- broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError());
+ broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %ld\n", hdwp2, GetLastError());
hdwp2 = DeferWindowPos(hdwp, NULL, NULL, 0, 0, 10, 10, 0);
- ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError());
+ ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %ld\n", hdwp2, GetLastError());
hdwp2 = DeferWindowPos(hdwp, GetDesktopWindow(), NULL, 0, 0, 10, 10, 0);
- ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError());
+ ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %ld\n", hdwp2, GetLastError());
hdwp2 = DeferWindowPos(hdwp, (HWND)0xdead, NULL, 0, 0, 10, 10, 0);
- ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError());
+ ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %ld\n", hdwp2, GetLastError());
ret = EndDeferWindowPos(hdwp);
ok(ret, "got %d\n", ret);
@@ -11259,7 +11260,7 @@ static void test_deferwindowpos(void)
hwnd = create_tool_window(WS_POPUP, 0);
hdwp2 = DeferWindowPos(hdwp, hwnd, NULL, 0, 0, 10, 10, 0);
- ok(hdwp2 != NULL, "got %p, error %d\n", hdwp2, GetLastError());
+ ok(hdwp2 != NULL, "got %p, error %ld\n", hdwp2, GetLastError());
DestroyWindow(hwnd);
ret = EndDeferWindowPos(hdwp);
@@ -11314,7 +11315,7 @@ static void test_LockWindowUpdate(HWND parent)
COLORREF c = GetPixel(hdc, p.x, p.y); \
COLORREF e = tests[i].expect_valid ? (c_valid) : (c_invalid); \
todo_wine_if(!tests[i].expect_valid) \
- ok(c == e, "%u: GetPixel: got %08x, expected %08x\n", i, c, e); \
+ ok(c == e, "%u: GetPixel: got %08lx, expected %08lx\n", i, c, e); \
} while (0)
SetPixel(hdc, p.x, p.y, c1);
@@ -11568,13 +11569,13 @@ static void test_desktop( void )
{
SetLastError( 0xdeadbeef );
result = GetWindowLongPtrW( desktop, tests[i].offset );
- ok( result == tests[i].expect, "offset %d, got %08lx expect %08lx\n",
+ ok( result == tests[i].expect, "offset %d, got %08Ix expect %08Ix\n",
tests[i].offset, result, tests[i].expect );
if (tests[i].error)
- ok( GetLastError() == tests[i].error, "offset %d: error %d expect %d\n",
+ ok( GetLastError() == tests[i].error, "offset %d: error %ld expect %ld\n",
tests[i].offset, GetLastError(), tests[i].error );
else
- ok( GetLastError() == 0xdeadbeef, "offset %d: error %d expect unchanged\n",
+ ok( GetLastError() == 0xdeadbeef, "offset %d: error %ld expect unchanged\n",
tests[i].offset, GetLastError() );
}
}
@@ -11616,7 +11617,7 @@ static void test_topmost(void)
owner = create_tool_window(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX |
WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE, 0);
- ok(owner != 0, "Failed to create owner window (%d)\n", GetLastError());
+ ok(owner != 0, "Failed to create owner window (%ld)\n", GetLastError());
/* Give current thread foreground state otherwise the tests may fail. */
if (!SetForegroundWindow(owner))
@@ -11628,10 +11629,10 @@ static void test_topmost(void)
hwnd = create_tool_window(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX |
WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE, owner);
- ok(hwnd != 0, "Failed to create popup window (%d)\n", GetLastError());
+ ok(hwnd != 0, "Failed to create popup window (%ld)\n", GetLastError());
hwnd2 = create_tool_window(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX |
WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE, owner);
- ok(hwnd2 != 0, "Failed to create popup window (%d)\n", GetLastError());
+ ok(hwnd2 != 0, "Failed to create popup window (%ld)\n", GetLastError());
flush_events( TRUE );
@@ -11738,11 +11739,11 @@ static void test_topmost(void)
reset_window_state(state, ARRAY_SIZE(state));
hwnd_child2 = create_tool_window(WS_VISIBLE|WS_POPUP, hwnd);
- ok(hwnd_child2 != 0, "Failed to create popup window (%d)\n", GetLastError());
+ ok(hwnd_child2 != 0, "Failed to create popup window (%ld)\n", GetLastError());
hwnd_child = create_tool_window(WS_VISIBLE|WS_POPUP, hwnd);
- ok(hwnd_child != 0, "Failed to create popup window (%d)\n", GetLastError());
+ ok(hwnd_child != 0, "Failed to create popup window (%ld)\n", GetLastError());
hwnd_grandchild = create_tool_window(WS_VISIBLE|WS_POPUP, hwnd_child);
- ok(hwnd_grandchild != 0, "Failed to create popup window (%d)\n", GetLastError());
+ ok(hwnd_grandchild != 0, "Failed to create popup window (%ld)\n", GetLastError());
flush_events( TRUE );
@@ -11983,70 +11984,70 @@ static void test_display_affinity( HWND win )
ret = pGetWindowDisplayAffinity(NULL, NULL);
ok(!ret, "GetWindowDisplayAffinity succeeded\n");
- ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "Expected ERROR_INVALID_WINDOW_HANDLE, got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "Expected ERROR_INVALID_WINDOW_HANDLE, got %lu\n", GetLastError());
ret = pGetWindowDisplayAffinity(NULL, &affinity);
ok(!ret, "GetWindowDisplayAffinity succeeded\n");
- ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "Expected ERROR_INVALID_WINDOW_HANDLE, got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "Expected ERROR_INVALID_WINDOW_HANDLE, got %lu\n", GetLastError());
ret = pGetWindowDisplayAffinity(win, NULL);
ok(!ret, "GetWindowDisplayAffinity succeeded\n");
- ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_NOACCESS, got %u\n", GetLastError());
+ ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_NOACCESS, got %lu\n", GetLastError());
styleex = GetWindowLongW(win, GWL_EXSTYLE);
SetWindowLongW(win, GWL_EXSTYLE, styleex & ~WS_EX_LAYERED);
affinity = 0xdeadbeef;
ret = pGetWindowDisplayAffinity(win, &affinity);
- ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError());
- ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity);
+ ok(ret, "GetWindowDisplayAffinity failed with %lu\n", GetLastError());
+ ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%lx\n", affinity);
/* Windows 7 fails with ERROR_NOT_ENOUGH_MEMORY when dwm compositing is disabled */
ret = pSetWindowDisplayAffinity(win, WDA_MONITOR);
ok(ret || GetLastError() == ERROR_NOT_ENOUGH_MEMORY,
- "SetWindowDisplayAffinity failed with %u\n", GetLastError());
+ "SetWindowDisplayAffinity failed with %lu\n", GetLastError());
dwm = ret;
affinity = 0xdeadbeef;
ret = pGetWindowDisplayAffinity(win, &affinity);
- ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError());
- if (dwm) ok(affinity == WDA_MONITOR, "Expected WDA_MONITOR, got 0x%x\n", affinity);
- else ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity);
+ ok(ret, "GetWindowDisplayAffinity failed with %lu\n", GetLastError());
+ if (dwm) ok(affinity == WDA_MONITOR, "Expected WDA_MONITOR, got 0x%lx\n", affinity);
+ else ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%lx\n", affinity);
ret = pSetWindowDisplayAffinity(win, WDA_NONE);
ok(ret || GetLastError() == ERROR_NOT_ENOUGH_MEMORY,
- "SetWindowDisplayAffinity failed with %u\n", GetLastError());
+ "SetWindowDisplayAffinity failed with %lu\n", GetLastError());
affinity = 0xdeadbeef;
ret = pGetWindowDisplayAffinity(win, &affinity);
- ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError());
- ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity);
+ ok(ret, "GetWindowDisplayAffinity failed with %lu\n", GetLastError());
+ ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%lx\n", affinity);
SetWindowLongW(win, GWL_EXSTYLE, styleex | WS_EX_LAYERED);
affinity = 0xdeadbeef;
ret = pGetWindowDisplayAffinity(win, &affinity);
- ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError());
- ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity);
+ ok(ret, "GetWindowDisplayAffinity failed with %lu\n", GetLastError());
+ ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%lx\n", affinity);
ret = pSetWindowDisplayAffinity(win, WDA_MONITOR);
ok(ret || GetLastError() == ERROR_NOT_ENOUGH_MEMORY,
- "SetWindowDisplayAffinity failed with %u\n", GetLastError());
+ "SetWindowDisplayAffinity failed with %lu\n", GetLastError());
affinity = 0xdeadbeef;
ret = pGetWindowDisplayAffinity(win, &affinity);
- ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError());
- if (dwm) ok(affinity == WDA_MONITOR, "Expected WDA_MONITOR, got 0x%x\n", affinity);
- else ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity);
+ ok(ret, "GetWindowDisplayAffinity failed with %lu\n", GetLastError());
+ if (dwm) ok(affinity == WDA_MONITOR, "Expected WDA_MONITOR, got 0x%lx\n", affinity);
+ else ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%lx\n", affinity);
ret = pSetWindowDisplayAffinity(win, WDA_NONE);
ok(ret || GetLastError() == ERROR_NOT_ENOUGH_MEMORY,
- "SetWindowDisplayAffinity failed with %u\n", GetLastError());
+ "SetWindowDisplayAffinity failed with %lu\n", GetLastError());
affinity = 0xdeadbeef;
ret = pGetWindowDisplayAffinity(win, &affinity);
- ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError());
- ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity);
+ ok(ret, "GetWindowDisplayAffinity failed with %lu\n", GetLastError());
+ ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%lx\n", affinity);
SetWindowLongW(win, GWL_EXSTYLE, styleex);
}
@@ -12114,7 +12115,7 @@ static DWORD CALLBACK destroy_thread1(void *user)
destroy_data.thread1_wnd = CreateWindowExA(0, "destroy_test_thread1",
"destroy test thread", WS_CHILD, 100, 100, 100, 100,
destroy_data.main_wnd, 0, GetModuleHandleA(NULL), NULL);
- ok(destroy_data.thread1_wnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError());
+ ok(destroy_data.thread1_wnd != NULL, "CreateWindowEx failed with error %ld\n", GetLastError());
PostThreadMessageW(destroy_data.main_tid, WM_USER, 0, 0);
while (GetMessageA(&msg, 0, 0, 0))
@@ -12135,7 +12136,7 @@ static DWORD CALLBACK destroy_thread2(void *user)
destroy_data.thread2_wnd = CreateWindowExA(0, "destroy_test_thread2",
"destroy test thread", WS_CHILD, 100, 100, 100, 100,
destroy_data.main_wnd, 0, GetModuleHandleA(NULL), NULL);
- ok(destroy_data.thread2_wnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError());
+ ok(destroy_data.thread2_wnd != NULL, "CreateWindowEx failed with error %ld\n", GetLastError());
PostThreadMessageW(destroy_data.main_tid, WM_USER + 1, 0, 0);
Sleep( 100 );
@@ -12165,22 +12166,22 @@ static void test_destroy_quit(void)
wnd_classA.lpszClassName = "destroy_test_main";
wnd_classA.lpfnWndProc = destroy_main_wndproc;
ret = RegisterClassA(&wnd_classA);
- ok(ret, "RegisterClass failed with error %d\n", GetLastError());
+ ok(ret, "RegisterClass failed with error %ld\n", GetLastError());
wnd_classA.lpszClassName = "destroy_test_thread1";
wnd_classA.lpfnWndProc = destroy_thread1_wndproc;
ret = RegisterClassA(&wnd_classA);
- ok(ret, "RegisterClass failed with error %d\n", GetLastError());
+ ok(ret, "RegisterClass failed with error %ld\n", GetLastError());
wnd_classA.lpszClassName = "destroy_test_thread2";
wnd_classA.lpfnWndProc = destroy_thread2_wndproc;
ret = RegisterClassA(&wnd_classA);
- ok(ret, "RegisterClass failed with error %d\n", GetLastError());
+ ok(ret, "RegisterClass failed with error %ld\n", GetLastError());
destroy_data.main_wnd = CreateWindowExA(0, "destroy_test_main",
"destroy test main", WS_OVERLAPPED | WS_CAPTION, 100, 100, 100, 100,
0, 0, GetModuleHandleA(NULL), NULL);
- ok(destroy_data.main_wnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError());
+ ok(destroy_data.main_wnd != NULL, "CreateWindowEx failed with error %ld\n", GetLastError());
if (!destroy_data.main_wnd)
{
CloseHandle(destroy_data.evt);
@@ -12248,141 +12249,141 @@ static void test_window_placement(void)
hwnd = CreateWindowA("MainWindowClass", "wp", WS_OVERLAPPEDWINDOW,
orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0);
- ok(!!hwnd, "failed to create window, error %u\n", GetLastError());
+ ok(!!hwnd, "failed to create window, error %lu\n", GetLastError());
mon_info.cbSize = sizeof(mon_info);
GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info);
work_rect = mon_info.rcWork;
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -1 && wp.ptMinPosition.y == -1,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
ShowWindow(hwnd, SW_MINIMIZE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(!wp.flags, "got flags %#x\n", wp.flags);
ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
ShowWindow(hwnd, SW_RESTORE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
ShowWindow(hwnd, SW_MAXIMIZE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
SetWindowPos(hwnd, 0, 100, 100, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == 100 && wp.ptMaxPosition.y == 100,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left,
work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left - 1,
work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left,
work_rect.bottom - work_rect.top - 1, SWP_NOZORDER | SWP_NOACTIVATE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
ShowWindow(hwnd, SW_MINIMIZE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.flags == WPF_RESTORETOMAXIMIZED, "got flags %#x\n", wp.flags);
ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
ShowWindow(hwnd, SW_RESTORE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
ShowWindow(hwnd, SW_RESTORE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
@@ -12391,15 +12392,15 @@ static void test_window_placement(void)
wp.ptMaxPosition.x = wp.ptMaxPosition.y = 100;
wp.rcNormalPosition = orig2;
ret = SetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to set window placement, error %u\n", GetLastError());
+ ok(ret, "failed to set window placement, error %lu\n", GetLastError());
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
GetWindowRect(hwnd, &rect);
@@ -12408,13 +12409,13 @@ static void test_window_placement(void)
ShowWindow(hwnd, SW_MINIMIZE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(!wp.flags, "got flags %#x\n", wp.flags);
ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
@@ -12426,16 +12427,16 @@ static void test_window_placement(void)
wp.ptMaxPosition.x = wp.ptMaxPosition.y = 100;
wp.rcNormalPosition = orig;
ret = SetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to set window placement, error %u\n", GetLastError());
+ ok(ret, "failed to set window placement, error %lu\n", GetLastError());
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(!wp.flags, "got flags %#x\n", wp.flags);
ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
@@ -12447,15 +12448,15 @@ static void test_window_placement(void)
wp.ptMaxPosition.x = wp.ptMaxPosition.y = 100;
wp.rcNormalPosition = orig;
ret = SetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to set window placement, error %u\n", GetLastError());
+ ok(ret, "failed to set window placement, error %lu\n", GetLastError());
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
@@ -12465,30 +12466,30 @@ static void test_window_placement(void)
wp.ptMaxPosition.x = wp.ptMaxPosition.y = 100;
wp.rcNormalPosition = orig;
ret = SetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to set window placement, error %u\n", GetLastError());
+ ok(ret, "failed to set window placement, error %lu\n", GetLastError());
ShowWindow(hwnd, SW_MINIMIZE);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
ret = SetWindowPos(hwnd, NULL, 100, 100, 151, 151, SWP_NOACTIVATE | SWP_NOZORDER);
- ok(ret, "failed to set window pos, error %u\n", GetLastError());
+ ok(ret, "failed to set window pos, error %lu\n", GetLastError());
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
GetWindowRect(hwnd, &rect);
@@ -12497,12 +12498,12 @@ static void test_window_placement(void)
ShowWindow(hwnd, SW_SHOWNORMAL);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "failed to get window placement, error %u\n", GetLastError());
+ ok(ret, "failed to get window placement, error %lu\n", GetLastError());
ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd);
ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000,
- "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
+ "got minimized pos (%ld,%ld)\n", wp.ptMinPosition.x, wp.ptMinPosition.y);
ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1,
- "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
+ "got maximized pos (%ld,%ld)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y);
ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n",
wine_dbgstr_rect(&wp.rcNormalPosition));
GetWindowRect(hwnd, &rect);
@@ -12522,7 +12523,7 @@ static void test_arrange_iconic_windows(void)
parent = CreateWindowA("MainWindowClass", "parent", WS_OVERLAPPEDWINDOW,
100, 200, 500, 300, NULL, 0, 0, NULL);
- ok(!!parent, "failed to create window, error %u\n", GetLastError());
+ ok(!!parent, "failed to create window, error %lu\n", GetLastError());
GetClientRect(parent, &parent_rect);
ClientToScreen(parent, &pt);
@@ -12533,25 +12534,25 @@ static void test_arrange_iconic_windows(void)
mm.iVertGap = 3;
mm.iArrange = ARW_TOPLEFT | ARW_RIGHT;
ret = SystemParametersInfoA(SPI_SETMINIMIZEDMETRICS, sizeof(mm), &mm, 0);
- ok(ret, "failed to set minimized metrics, error %u\n", GetLastError());
+ ok(ret, "failed to set minimized metrics, error %lu\n", GetLastError());
SetLastError(0xdeadbeef);
ret = ArrangeIconicWindows(parent);
ok(!ret, "wrong ret %u\n", ret);
- ok(GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError());
for (i = 0; i < ARRAY_SIZE(hwnds); ++i)
{
hwnds[i] = CreateWindowA("MainWindowClass", "child", WS_CHILD |
WS_OVERLAPPEDWINDOW, orig.left, orig.top, orig.right - orig.left,
orig.bottom - orig.top, parent, 0, 0, NULL);
- ok(!!hwnds[i], "failed to create window %u, error %u\n", i, GetLastError());
+ ok(!!hwnds[i], "failed to create window %u, error %lu\n", i, GetLastError());
}
SetLastError(0xdeadbeef);
ret = ArrangeIconicWindows(parent);
ok(!ret, "wrong ret %u\n", ret);
- ok(GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError());
for (i = 0; i < ARRAY_SIZE(hwnds); ++i)
{
@@ -12568,7 +12569,7 @@ static void test_arrange_iconic_windows(void)
{
ret = SetWindowPos(hwnds[i], 0, orig.left, orig.top, 0, 0,
SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
- ok(ret, "hwnd %u: failed to move window, error %u\n", i, GetLastError());
+ ok(ret, "hwnd %u: failed to move window, error %lu\n", i, GetLastError());
}
ret = ArrangeIconicWindows(parent);
@@ -12595,7 +12596,7 @@ static void test_arrange_iconic_windows(void)
ShowWindow(hwnds[i], SW_MINIMIZE);
ret = SetWindowPos(hwnds[i], 0, orig.left, orig.top, 0, 0,
SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
- ok(ret, "hwnd %u: failed to move window, error %u\n", i, GetLastError());
+ ok(ret, "hwnd %u: failed to move window, error %lu\n", i, GetLastError());
}
ret = ArrangeIconicWindows(parent);
@@ -12624,13 +12625,13 @@ static void test_arrange_iconic_windows(void)
mm.iArrange = ARW_BOTTOMRIGHT | ARW_UP;
mm.iVertGap = 10;
ret = SystemParametersInfoA(SPI_SETMINIMIZEDMETRICS, sizeof(mm), &mm, 0);
- ok(ret, "failed to set minimized metrics, error %u\n", GetLastError());
+ ok(ret, "failed to set minimized metrics, error %lu\n", GetLastError());
for (i = 0; i < ARRAY_SIZE(hwnds); ++i)
{
ret = SetWindowPos(hwnds[i], 0, orig.left, orig.top, 0, 0,
SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
- ok(ret, "hwnd %u: failed to move window, error %u\n", i, GetLastError());
+ ok(ret, "hwnd %u: failed to move window, error %lu\n", i, GetLastError());
}
ret = ArrangeIconicWindows(parent);
@@ -12661,7 +12662,7 @@ static void test_arrange_iconic_windows(void)
DestroyWindow(parent);
ret = SystemParametersInfoA(SPI_SETMINIMIZEDMETRICS, sizeof(oldmm), &oldmm, 0);
- ok(ret, "failed to restore minimized metrics, error %u\n", GetLastError());
+ ok(ret, "failed to restore minimized metrics, error %lu\n", GetLastError());
}
static void other_process_proc(HWND hwnd)
@@ -12677,36 +12678,36 @@ static void other_process_proc(HWND hwnd)
/* SW_SHOW */
ret = WaitForSingleObject(window_ready_event, 5000);
- ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret);
+ ok(ret == WAIT_OBJECT_0, "Unexpected ret %lx.\n", ret);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "Unexpected ret %#x.\n", ret);
+ ok(ret, "Unexpected ret %#lx.\n", ret);
ok(wp.showCmd == SW_SHOWNORMAL, "Unexpected showCmd %#x.\n", wp.showCmd);
ok(!wp.flags, "Unexpected flags %#x.\n", wp.flags);
SetEvent(test_done_event);
/* SW_SHOWMAXIMIZED */
ret = WaitForSingleObject(window_ready_event, 5000);
- ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret);
+ ok(ret == WAIT_OBJECT_0, "Unexpected ret %lx.\n", ret);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "Unexpected ret %#x.\n", ret);
+ ok(ret, "Unexpected ret %#lx.\n", ret);
ok(wp.showCmd == SW_SHOWMAXIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd);
todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags);
SetEvent(test_done_event);
/* SW_SHOWMINIMIZED */
ret = WaitForSingleObject(window_ready_event, 5000);
- ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret);
+ ok(ret == WAIT_OBJECT_0, "Unexpected ret %lx.\n", ret);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "Unexpected ret %#x.\n", ret);
+ ok(ret, "Unexpected ret %#lx.\n", ret);
ok(wp.showCmd == SW_SHOWMINIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd);
todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags);
SetEvent(test_done_event);
/* SW_RESTORE */
ret = WaitForSingleObject(window_ready_event, 5000);
- ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret);
+ ok(ret == WAIT_OBJECT_0, "Unexpected ret %lx.\n", ret);
ret = GetWindowPlacement(hwnd, &wp);
- ok(ret, "Unexpected ret %#x.\n", ret);
+ ok(ret, "Unexpected ret %#lx.\n", ret);
ok(wp.showCmd == SW_SHOWMAXIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd);
todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags);
SetEvent(test_done_event);
@@ -12726,10 +12727,10 @@ static void test_SC_SIZE(void)
ok(!!hwnd, "CreateWindowEx failed.\n");
GetWindowRect(hwnd, &rect);
- ok(rect.left == 100, "rect.left = %d\n", rect.left);
- ok(rect.top == 100, "rect.top = %d\n", rect.top);
- ok(rect.right == 200, "rect.right = %d\n", rect.right);
- ok(rect.bottom == 200, "rect.bottom = %d\n", rect.bottom);
+ ok(rect.left == 100, "rect.left = %ld\n", rect.left);
+ ok(rect.top == 100, "rect.top = %ld\n", rect.top);
+ ok(rect.right == 200, "rect.right = %ld\n", rect.right);
+ ok(rect.bottom == 200, "rect.bottom = %ld\n", rect.bottom);
SetCursorPos(100, 100);
PostMessageA(hwnd, WM_SYSCOMMAND, SC_SIZE | 9, MAKELONG(100, 100));
@@ -12746,10 +12747,10 @@ static void test_SC_SIZE(void)
}
GetWindowRect(hwnd, &rect);
- ok(rect.left == 110, "rect.left = %d\n", rect.left);
- ok(rect.top == 100, "rect.top = %d\n", rect.top);
- ok(rect.right == 210, "rect.right = %d\n", rect.right);
- ok(rect.bottom == 200, "rect.bottom = %d\n", rect.bottom);
+ ok(rect.left == 110, "rect.left = %ld\n", rect.left);
+ ok(rect.top == 100, "rect.top = %ld\n", rect.top);
+ ok(rect.right == 210, "rect.right = %ld\n", rect.right);
+ ok(rect.bottom == 200, "rect.bottom = %ld\n", rect.bottom);
DestroyWindow(hwnd);
}
@@ -12825,11 +12826,11 @@ static void test_cancel_mode(void)
ok(GetCapture() == hwnd1, "got capture %p\n", GetCapture());
ret = SendMessageA(hwnd2, WM_CANCELMODE, 0, 0);
- ok(!ret, "got %ld\n", ret);
+ ok(!ret, "got %Id\n", ret);
ok(GetCapture() == hwnd1, "got capture %p\n", GetCapture());
ret = SendMessageA(hwnd1, WM_CANCELMODE, 0, 0);
- ok(!ret, "got %ld\n", ret);
+ ok(!ret, "got %Id\n", ret);
ok(!GetCapture(), "got capture %p\n", GetCapture());
child = CreateWindowA("MainWindowClass", "child", WS_CHILD,
@@ -12839,15 +12840,15 @@ static void test_cancel_mode(void)
ok(GetCapture() == child, "got capture %p\n", GetCapture());
ret = SendMessageA(hwnd2, WM_CANCELMODE, 0, 0);
- ok(!ret, "got %ld\n", ret);
+ ok(!ret, "got %Id\n", ret);
ok(GetCapture() == child, "got capture %p\n", GetCapture());
ret = SendMessageA(hwnd1, WM_CANCELMODE, 0, 0);
- ok(!ret, "got %ld\n", ret);
+ ok(!ret, "got %Id\n", ret);
ok(GetCapture() == child, "got capture %p\n", GetCapture());
ret = SendMessageA(child, WM_CANCELMODE, 0, 0);
- ok(!ret, "got %ld\n", ret);
+ ok(!ret, "got %Id\n", ret);
ok(!GetCapture(), "got capture %p\n", GetCapture());
DestroyWindow(child);
@@ -12885,23 +12886,23 @@ static LRESULT WINAPI ncdestroy_test_proc( HWND hwnd, UINT msg, WPARAM wp, LPARA
todo_wine
ok( !ret, "SetWindowPos succeeded\n" );
todo_wine
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "SetWindowPos returned error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "SetWindowPos returned error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
parent = SetParent( hwnd, hwndMain );
ok( parent == 0, "SetParent returned %p\n", parent );
- ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() );
ret = GetWindowRect( hwnd, &rect );
- ok( ret, "GetWindowRect failed: %u\n", GetLastError() );
+ ok( ret, "GetWindowRect failed: %lu\n", GetLastError() );
SetRect( &exp, 10, 20, 110, 220 );
ok( EqualRect( &rect, &exp ), "unexpected rect %s, expected %s\n", wine_dbgstr_rect( &rect ),
wine_dbgstr_rect( &exp ));
ret = MoveWindow( hwnd, 11, 12, 20, 30, FALSE );
- ok( ret, "MoveWindow failed: %u\n", GetLastError() );
+ ok( ret, "MoveWindow failed: %lu\n", GetLastError() );
ret = GetWindowRect( hwnd, &rect );
- ok( ret, "GetWindowRect failed: %u\n", GetLastError() );
+ ok( ret, "GetWindowRect failed: %lu\n", GetLastError() );
SetRect( &exp, 11, 12, 31, 42 );
ok( EqualRect( &rect, &exp ), "unexpected rect %s, expected %s\n", wine_dbgstr_rect( &rect ),
wine_dbgstr_rect( &exp ));
@@ -12909,7 +12910,7 @@ static LRESULT WINAPI ncdestroy_test_proc( HWND hwnd, UINT msg, WPARAM wp, LPARA
child = CreateWindowExA( 0, "ToolWindowClass", "Tool window 1", WS_CHILD,
0, 0, 100, 100, hwnd, 0, 0, NULL );
ok( !child && GetLastError() == ERROR_INVALID_PARAMETER,
- "CreateWindowExA returned %p %u\n", child, GetLastError() );
+ "CreateWindowExA returned %p %lu\n", child, GetLastError() );
break;
}
@@ -12945,12 +12946,12 @@ static void test_WM_NCCALCSIZE(void)
cls.lpszMenuName = NULL;
cls.lpszClassName = "dummy_window_class";
ret = RegisterClassA(&cls);
- ok(ret, "RegisterClass error %u\n", GetLastError());
+ ok(ret, "RegisterClass error %lu\n", GetLastError());
hwnd = CreateWindowExA(0, "dummy_window_class", NULL,
WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP,
100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL);
- ok(hwnd != 0, "CreateWindowEx error %u\n", GetLastError());
+ ok(hwnd != 0, "CreateWindowEx error %lu\n", GetLastError());
GetWindowRect(hwnd, &window_rect);
params.rgrc[0] = window_rect;
@@ -12969,22 +12970,22 @@ static void test_WM_NCCALCSIZE(void)
params.lppos = &winpos;
ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)¶ms);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
ok(EqualRect(¶ms.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(¶ms.rgrc[0]));
params.rgrc[0] = window_rect;
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)¶ms);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
ok(EqualRect(¶ms.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(¶ms.rgrc[0]));
GetWindowRect(hwnd, &window_rect);
ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect));
GetWindowRect(hwnd, &window_rect);
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect);
- ok(!ret, "got %08lx\n", ret);
+ ok(!ret, "got %08Ix\n", ret);
ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect));
DestroyWindow(hwnd);
2
1
17 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/user32/tests/wsprintf.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c
index 567ed2ff10b..7dfe46ed3bc 100644
--- a/dlls/user32/tests/wsprintf.c
+++ b/dlls/user32/tests/wsprintf.c
@@ -16,6 +16,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>
@@ -79,7 +80,7 @@ static void wsprintfATest(void)
int rc;
rc=wsprintfA(buf, "%010ld", -1);
- ok(rc == 10, "wsprintfA length failure: rc=%d error=%d\n",rc,GetLastError());
+ ok(rc == 10, "wsprintfA length failure: rc=%d error=%ld\n",rc,GetLastError());
ok((lstrcmpA(buf, "-000000001") == 0),
"wsprintfA zero padded negative value failure: buf=[%s]\n",buf);
rc = wsprintfA(buf, "%I64X", (ULONGLONG)0);
@@ -157,7 +158,7 @@ static void wsprintfWTest(void)
win_skip("wsprintfW is not implemented\n");
return;
}
- ok(rc == 10, "wsPrintfW length failure: rc=%d error=%d\n",rc,GetLastError());
+ ok(rc == 10, "wsPrintfW length failure: rc=%d error=%ld\n",rc,GetLastError());
ok((lstrcmpW(buf, L"-000000001") == 0),
"wsprintfW zero padded negative value failure\n");
rc = wsprintfW(buf, L"%I64x", (ULONGLONG)0 );
@@ -246,7 +247,7 @@ static void CharUpperTest(void)
break;
}
}
- ok(!failed,"CharUpper failed - 16bit input (0x%0lx) returned 32bit result (0x%0lx)\n",i,out);
+ ok(!failed,"CharUpper failed - 16bit input (0x%0Ix) returned 32bit result (0x%0Ix)\n",i,out);
}
static void CharLowerTest(void)
@@ -263,7 +264,7 @@ static void CharLowerTest(void)
break;
}
}
- ok(!failed,"CharLower failed - 16bit input (0x%0lx) returned 32bit result (0x%0lx)\n",i,out);
+ ok(!failed,"CharLower failed - 16bit input (0x%0Ix) returned 32bit result (0x%0Ix)\n",i,out);
}
1
0
[PATCH] dlls/user32/tests/winstation.c: enable compilation with long types
by Eric Pouech 17 Mar '22
by Eric Pouech 17 Mar '22
17 Mar '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/user32/tests/winstation.c | 159 ++++++++++++++++++++--------------------
1 file changed, 80 insertions(+), 79 deletions(-)
diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c
index 9899b6c7f7b..80bd33f9f9f 100644
--- a/dlls/user32/tests/winstation.c
+++ b/dlls/user32/tests/winstation.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 "wine/test.h"
#include "winbase.h"
@@ -81,11 +82,11 @@ static DWORD CALLBACK thread( LPVOID arg )
SetLastError( 0xdeadbeef );
ok( !CloseHandle( d1 ), "CloseHandle succeeded\n" );
- ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %d\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %ld\n", GetLastError() );
SetLastError( 0xdeadbeef );
ok( !CloseDesktop( d1 ), "CloseDesktop succeeded\n" );
ok( GetLastError() == ERROR_BUSY || broken(GetLastError() == 0xdeadbeef), /* wow64 */
- "bad last error %d\n", GetLastError() );
+ "bad last error %ld\n", GetLastError() );
print_object( d1 );
d2 = CreateDesktopA( "foobar2", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL );
trace( "created desktop %p\n", d2 );
@@ -94,7 +95,7 @@ static DWORD CALLBACK thread( LPVOID arg )
SetLastError( 0xdeadbeef );
ok( !SetThreadDesktop( d2 ), "set thread desktop succeeded with existing window\n" );
ok( GetLastError() == ERROR_BUSY || broken(GetLastError() == 0xdeadbeef), /* wow64 */
- "bad last error %d\n", GetLastError() );
+ "bad last error %ld\n", GetLastError() );
DestroyWindow( hwnd );
ok( SetThreadDesktop( d2 ), "set thread desktop failed\n" );
@@ -130,7 +131,7 @@ static void test_handles(void)
ok( !CloseWindowStation(w1), "closing process win station succeeded\n" );
SetLastError( 0xdeadbeef );
ok( !CloseHandle(w1), "closing process win station handle succeeded\n" );
- ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %d\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %ld\n", GetLastError() );
print_object( w1 );
flags = 0;
@@ -149,14 +150,14 @@ static void test_handles(void)
w2 = CreateWindowStationA("WinSta0", 0, WINSTA_ALL_ACCESS, NULL );
le = GetLastError();
- ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", le );
+ ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%lu)\n", le );
if (w2 != 0)
{
ok( w2 != w1, "CreateWindowStation returned default handle\n" );
SetLastError( 0xdeadbeef );
ok( !CloseDesktop( (HDESK)w2 ), "CloseDesktop succeeded on win station\n" );
ok( GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == 0xdeadbeef), /* wow64 */
- "bad last error %d\n", GetLastError() );
+ "bad last error %ld\n", GetLastError() );
ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" );
w2 = CreateWindowStationA("WinSta0", 0, WINSTA_ALL_ACCESS, NULL );
@@ -176,7 +177,7 @@ static void test_handles(void)
CreateMutexA( NULL, 0, "foobar" );
w2 = CreateWindowStationA("foobar", 0, WINSTA_ALL_ACCESS, NULL );
le = GetLastError();
- ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "create foobar station failed (%u)\n", le );
+ ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "create foobar station failed (%lu)\n", le );
if (w2 != 0)
{
@@ -216,35 +217,35 @@ static void test_handles(void)
SetLastError( 0xdeadbeef );
w2 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS );
ok( !w2, "open station succeeded\n" );
- ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
w2 = CreateWindowStationA( "", 0, WINSTA_ALL_ACCESS, NULL );
- ok( w2 != 0, "create station failed err %u\n", GetLastError() );
+ ok( w2 != 0, "create station failed err %lu\n", GetLastError() );
memset( buffer, 0, sizeof(buffer) );
ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size );
- ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() );
+ ok( ret, "GetUserObjectInformationA failed with error %lu\n", GetLastError() );
/* Get the logon session LUID */
ret = GetTokenInformation( GetCurrentProcessToken(), TokenStatistics, &token_stats, sizeof(token_stats), NULL );
if (ret)
- sprintf( default_name, "Service-0x%x-%x$", token_stats.AuthenticationId.HighPart,
+ sprintf( default_name, "Service-0x%lx-%lx$", token_stats.AuthenticationId.HighPart,
token_stats.AuthenticationId.LowPart );
if (*default_name)
ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name );
SetLastError( 0xdeadbeef );
w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS );
- ok( w3 != 0, "open station failed err %u\n", GetLastError() );
+ ok( w3 != 0, "open station failed err %lu\n", GetLastError() );
CloseWindowStation( w3 );
CloseWindowStation( w2 );
w2 = CreateWindowStationA( NULL, 0, WINSTA_ALL_ACCESS, NULL );
- ok( w2 != 0, "create station failed err %u\n", GetLastError() );
+ ok( w2 != 0, "create station failed err %lu\n", GetLastError() );
memset( buffer, 0, sizeof(buffer) );
ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size );
- ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() );
+ ok( ret, "GetUserObjectInformationA failed with error %lu\n", GetLastError() );
if (*default_name)
ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name );
CloseWindowStation( w2 );
@@ -253,12 +254,12 @@ static void test_handles(void)
w2 = CreateWindowStationA( "foo\\bar", 0, WINSTA_ALL_ACCESS, NULL );
ok( !w2, "create station succeeded\n" );
ok( GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED,
- "wrong error %u\n", GetLastError() );
+ "wrong error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
w2 = OpenWindowStationA( "foo\\bar", TRUE, WINSTA_ALL_ACCESS );
ok( !w2, "create station succeeded\n" );
- ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %lu\n", GetLastError() );
/* desktops */
d1 = GetThreadDesktop(GetCurrentThreadId());
@@ -273,7 +274,7 @@ static void test_handles(void)
SetLastError( 0xdeadbeef );
ok( !CloseDesktop(d1), "closing thread desktop succeeded\n" );
ok( GetLastError() == ERROR_BUSY || broken(GetLastError() == 0xdeadbeef), /* wow64 */
- "bad last error %d\n", GetLastError() );
+ "bad last error %ld\n", GetLastError() );
SetLastError( 0xdeadbeef );
if (CloseHandle( d1 )) /* succeeds on nt4 */
@@ -281,7 +282,7 @@ static void test_handles(void)
win_skip( "NT4 desktop handle management is completely different\n" );
return;
}
- ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %d\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %ld\n", GetLastError() );
ok( DuplicateHandle( GetCurrentProcess(), d1, GetCurrentProcess(), (PHANDLE)&d2, 0,
TRUE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" );
@@ -297,34 +298,34 @@ static void test_handles(void)
SetLastError( 0xdeadbeef );
d2 = CreateDesktopA( "", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL );
ok( !d2, "create empty desktop succeeded\n" );
- ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
d2 = OpenDesktopA( "", 0, TRUE, DESKTOP_ALL_ACCESS );
ok( !d2, "open empty desktop succeeded\n" );
- ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
d2 = CreateDesktopA( "foo\\bar", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL );
ok( !d2, "create desktop succeeded\n" );
- ok( GetLastError() == ERROR_BAD_PATHNAME, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_BAD_PATHNAME, "wrong error %lu\n", GetLastError() );
SetLastError( 0xdeadbeef );
d2 = OpenDesktopA( "foo\\bar", 0, TRUE, DESKTOP_ALL_ACCESS );
ok( !d2, "open desktop succeeded\n" );
- ok( GetLastError() == ERROR_BAD_PATHNAME, "wrong error %u\n", GetLastError() );
+ ok( GetLastError() == ERROR_BAD_PATHNAME, "wrong error %lu\n", GetLastError() );
d2 = CreateDesktopA( "foobar", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL );
ok( d2 != 0, "create foobar desktop failed\n" );
SetLastError( 0xdeadbeef );
ok( !CloseWindowStation( (HWINSTA)d2 ), "CloseWindowStation succeeded on desktop\n" );
ok( GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == 0xdeadbeef), /* wow64 */
- "bad last error %d\n", GetLastError() );
+ "bad last error %ld\n", GetLastError() );
SetLastError( 0xdeadbeef );
d3 = CreateDesktopA( "foobar", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL );
ok( d3 != 0, "create foobar desktop again failed\n" );
- ok( GetLastError() == 0xdeadbeef, "bad last error %d\n", GetLastError() );
+ ok( GetLastError() == 0xdeadbeef, "bad last error %ld\n", GetLastError() );
ok( CloseDesktop( d3 ), "CloseDesktop failed\n" );
d3 = OpenDesktopA( "foobar", 0, TRUE, DESKTOP_ALL_ACCESS );
@@ -383,12 +384,12 @@ static void test_enumstations(void)
SetLastError(0xbabefeed);
ret = EnumWindowStationsA(NULL, 0);
ok(!ret, "EnumWindowStationsA returned successfully!\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08x\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08lx\n", GetLastError());
}
hwinsta = CreateWindowStationA("winsta_test", 0, WINSTA_ALL_ACCESS, NULL);
ret = GetLastError();
- ok(hwinsta != NULL || ret == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", ret);
+ ok(hwinsta != NULL || ret == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%lu)\n", ret);
if (!hwinsta)
{
win_skip("Not enough privileges for CreateWindowStation\n");
@@ -397,13 +398,13 @@ static void test_enumstations(void)
SetLastError(0xdeadbeef);
ret = EnumWindowStationsA(open_window_station_callbackA, 0x12345);
- ok(ret == 0x12345, "EnumWindowStationsA returned %x\n", ret);
- ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError());
+ ok(ret == 0x12345, "EnumWindowStationsA returned %lx\n", ret);
+ ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError());
SetLastError(0xdeadbeef);
ret = EnumWindowStationsA(window_station_callbackA, 0);
- ok(!ret, "EnumWindowStationsA returned %x\n", ret);
- ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError());
+ ok(!ret, "EnumWindowStationsA returned %lx\n", ret);
+ ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError());
}
static BOOL CALLBACK desktop_callbackA(LPSTR desktop, LPARAM lp)
@@ -438,28 +439,28 @@ static void test_enumdesktops(void)
SetLastError(0xbabefeed);
ret = EnumDesktopsA(GetProcessWindowStation(), NULL, 0);
ok(!ret, "EnumDesktopsA returned successfully!\n");
- ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08x\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08lx\n", GetLastError());
}
SetLastError(0xdeadbeef);
ret = EnumDesktopsA(NULL, desktop_callbackA, 0x12345);
ok(ret == 0x12345, "EnumDesktopsA returned %x\n", ret);
- ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError());
SetLastError(0xdeadbeef);
ret = EnumDesktopsA(GetProcessWindowStation(), open_desktop_callbackA, 0x12345);
ok(ret == 0x12345, "EnumDesktopsA returned %x\n", ret);
- ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError());
SetLastError(0xdeadbeef);
ret = EnumDesktopsA(INVALID_HANDLE_VALUE, desktop_callbackA, 0x12345);
ok(!ret, "EnumDesktopsA returned %x\n", ret);
- ok(GetLastError() == ERROR_INVALID_HANDLE, "LastError is set to %08x\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_HANDLE, "LastError is set to %08lx\n", GetLastError());
SetLastError(0xdeadbeef);
ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0);
ok(!ret, "EnumDesktopsA returned %x\n", ret);
- ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError());
}
/* Miscellaneous tests */
@@ -489,8 +490,8 @@ static void test_getuserobjectinformation(void)
ret = GetUserObjectInformationA(desk, UOI_NAME, NULL, 0, &size);
ok(!ret, "GetUserObjectInformationA returned %x\n", ret);
- ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError());
- ok(size == 22, "size is set to %d\n", size); /* Windows returns Unicode length (11*2) */
+ ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08lx\n", GetLastError());
+ ok(size == 22, "size is set to %ld\n", size); /* Windows returns Unicode length (11*2) */
/* Get string */
SetLastError(0xdeadbeef);
@@ -498,10 +499,10 @@ static void test_getuserobjectinformation(void)
ret = GetUserObjectInformationA(desk, UOI_NAME, buffer, sizeof(buffer), &size);
ok(ret, "GetUserObjectInformationA returned %x\n", ret);
- ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError());
ok(strcmp(buffer, "foobarTest") == 0, "Buffer is set to '%s'\n", buffer);
- ok(size == 11, "size is set to %d\n", size); /* 11 bytes in 'foobarTest\0' */
+ ok(size == 11, "size is set to %ld\n", size); /* 11 bytes in 'foobarTest\0' */
/* Get size, test size and return value/error code (Unicode) */
SetLastError(0xdeadbeef);
@@ -509,8 +510,8 @@ static void test_getuserobjectinformation(void)
ret = GetUserObjectInformationW(desk, UOI_NAME, NULL, 0, &size);
ok(!ret, "GetUserObjectInformationW returned %x\n", ret);
- ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError());
- ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */
+ ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08lx\n", GetLastError());
+ ok(size == 22, "size is set to %ld\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */
/* Get string (Unicode) */
SetLastError(0xdeadbeef);
@@ -518,15 +519,15 @@ static void test_getuserobjectinformation(void)
ret = GetUserObjectInformationW(desk, UOI_NAME, bufferW, sizeof(bufferW), &size);
ok(ret, "GetUserObjectInformationW returned %x\n", ret);
- ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError());
ok(lstrcmpW(bufferW, foobarTestW + 1) == 0, "Buffer is not set to 'foobarTest'\n");
- ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */
+ ok(size == 22, "size is set to %ld\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */
/* ObjectNameInformation does not return the full desktop name */
name_info = (OBJECT_NAME_INFORMATION *)buffer;
status = pNtQueryObject(desk, ObjectNameInformation, name_info, sizeof(buffer), NULL);
- ok(!status, "expected STATUS_SUCCESS, got %08x\n", status);
+ ok(!status, "expected STATUS_SUCCESS, got %08lx\n", status);
ok(lstrcmpW(name_info->Name.Buffer, foobarTestW) == 0,
"expected '\\foobarTest', got %s\n", wine_dbgstr_w(name_info->Name.Buffer));
@@ -538,8 +539,8 @@ static void test_getuserobjectinformation(void)
ret = GetUserObjectInformationA(desk, UOI_TYPE, NULL, 0, &size);
ok(!ret, "GetUserObjectInformationA returned %x\n", ret);
- ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError());
- ok(size == 16, "size is set to %d\n", size); /* Windows returns Unicode length (8*2) */
+ ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08lx\n", GetLastError());
+ ok(size == 16, "size is set to %ld\n", size); /* Windows returns Unicode length (8*2) */
/* Get string */
SetLastError(0xdeadbeef);
@@ -547,10 +548,10 @@ static void test_getuserobjectinformation(void)
ret = GetUserObjectInformationA(desk, UOI_TYPE, buffer, sizeof(buffer), &size);
ok(ret, "GetUserObjectInformationA returned %x\n", ret);
- ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError());
ok(strcmp(buffer, "Desktop") == 0, "Buffer is set to '%s'\n", buffer);
- ok(size == 8, "size is set to %d\n", size); /* 8 bytes in 'Desktop\0' */
+ ok(size == 8, "size is set to %ld\n", size); /* 8 bytes in 'Desktop\0' */
/* Get size, test size and return value/error code (Unicode) */
size = 0xdeadbeef;
@@ -558,8 +559,8 @@ static void test_getuserobjectinformation(void)
ret = GetUserObjectInformationW(desk, UOI_TYPE, NULL, 0, &size);
ok(!ret, "GetUserObjectInformationW returned %x\n", ret);
- ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError());
- ok(size == 16, "size is set to %d\n", size); /* 16 bytes in 'Desktop\0' in Unicode */
+ ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08lx\n", GetLastError());
+ ok(size == 16, "size is set to %ld\n", size); /* 16 bytes in 'Desktop\0' in Unicode */
/* Get string (Unicode) */
SetLastError(0xdeadbeef);
@@ -567,10 +568,10 @@ static void test_getuserobjectinformation(void)
ret = GetUserObjectInformationW(desk, UOI_TYPE, bufferW, sizeof(bufferW), &size);
ok(ret, "GetUserObjectInformationW returned %x\n", ret);
- ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError());
+ ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError());
ok(lstrcmpW(bufferW, DesktopW) == 0, "Buffer is not set to 'Desktop'\n");
- ok(size == 16, "size is set to %d\n", size); /* 16 bytes in 'Desktop\0' in Unicode */
+ ok(size == 16, "size is set to %ld\n", size); /* 16 bytes in 'Desktop\0' in Unicode */
ok(CloseDesktop(desk), "CloseDesktop failed\n");
}
@@ -615,8 +616,8 @@ static void test_inputdesktop(void)
SetLastError(0xdeadbeef);
ret = SendInput(1, inputs, sizeof(INPUT));
- ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError());
- ok(ret == 1, "unexpected return count %d\n", ret);
+ ok(GetLastError() == 0xdeadbeef, "unexpected last error %08lx\n", GetLastError());
+ ok(ret == 1, "unexpected return count %ld\n", ret);
/* Set thread desktop to the new desktop, SendInput should fail. */
new_desk = CreateDesktopA("new_desk", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL);
@@ -641,8 +642,8 @@ static void test_inputdesktop(void)
return;
}
todo_wine
- ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08x\n", GetLastError());
- ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %d\n", ret);
+ ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08lx\n", GetLastError());
+ ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %ld\n", ret);
/* Set thread desktop back to the old thread desktop, SendInput should success. */
ret = SetThreadDesktop(old_thread_desk);
@@ -655,8 +656,8 @@ static void test_inputdesktop(void)
SetLastError(0xdeadbeef);
ret = SendInput(1, inputs, sizeof(INPUT));
- ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError());
- ok(ret == 1, "unexpected return count %d\n", ret);
+ ok(GetLastError() == 0xdeadbeef, "unexpected last error %08lx\n", GetLastError());
+ ok(ret == 1, "unexpected return count %ld\n", ret);
/* Set thread desktop to the input desktop, SendInput should success. */
ret = SetThreadDesktop(old_input_desk);
@@ -669,8 +670,8 @@ static void test_inputdesktop(void)
SetLastError(0xdeadbeef);
ret = SendInput(1, inputs, sizeof(INPUT));
- ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError());
- ok(ret == 1, "unexpected return count %d\n", ret);
+ ok(GetLastError() == 0xdeadbeef, "unexpected last error %08lx\n", GetLastError());
+ ok(ret == 1, "unexpected return count %ld\n", ret);
/* Switch input desktop to the new desktop, SendInput should fail. */
ret = SwitchDesktop(new_desk);
@@ -689,8 +690,8 @@ static void test_inputdesktop(void)
SetLastError(0xdeadbeef);
ret = SendInput(1, inputs, sizeof(INPUT));
todo_wine
- ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08x\n", GetLastError());
- ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %d\n", ret);
+ ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08lx\n", GetLastError());
+ ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %ld\n", ret);
/* Set thread desktop to the new desktop, SendInput should success. */
ret = SetThreadDesktop(new_desk);
@@ -703,8 +704,8 @@ static void test_inputdesktop(void)
SetLastError(0xdeadbeef);
ret = SendInput(1, inputs, sizeof(INPUT));
- ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError());
- ok(ret == 1, "unexpected return count %d\n", ret);
+ ok(GetLastError() == 0xdeadbeef, "unexpected last error %08lx\n", GetLastError());
+ ok(ret == 1, "unexpected return count %ld\n", ret);
/* Switch input desktop to the old input desktop, set thread desktop to the old
* thread desktop, clean side effects. SendInput should success. */
@@ -727,8 +728,8 @@ static void test_inputdesktop(void)
SetLastError(0xdeadbeef);
ret = SendInput(1, inputs, sizeof(INPUT));
- ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError());
- ok(ret == 1, "unexpected return count %d\n", ret);
+ ok(GetLastError() == 0xdeadbeef, "unexpected last error %08lx\n", GetLastError());
+ ok(ret == 1, "unexpected return count %ld\n", ret);
/* free resources */
ret = CloseDesktop(input_desk);
@@ -752,7 +753,7 @@ static void test_inputdesktop2(void)
SetLastError(0xdeadbeef);
w2 = CreateWindowStationA("winsta_test", 0, WINSTA_ALL_ACCESS, NULL);
ret = GetLastError();
- ok(w2 != NULL || ret == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", ret);
+ ok(w2 != NULL || ret == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%lu)\n", ret);
if (!w2)
{
win_skip("Not enough privileges for CreateWindowStation\n");
@@ -780,7 +781,7 @@ static void test_inputdesktop2(void)
SetLastError(0xdeadbeef);
input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS);
ok(input_desk == NULL, "OpenInputDesktop should fail on non default winstation!\n");
- ok(GetLastError() == ERROR_INVALID_FUNCTION || broken(GetLastError() == 0xdeadbeef), "last error %08x\n", GetLastError());
+ ok(GetLastError() == ERROR_INVALID_FUNCTION || broken(GetLastError() == 0xdeadbeef), "last error %08lx\n", GetLastError());
hdesk = OpenDesktopA("desk_test", 0, TRUE, DESKTOP_ALL_ACCESS);
ok(hdesk != NULL, "OpenDesktop failed!\n");
@@ -789,7 +790,7 @@ static void test_inputdesktop2(void)
todo_wine
ok(!ret, "Switch to desktop belong to non default winstation should fail!\n");
todo_wine
- ok(GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == 0xdeadbeef), "last error %08x\n", GetLastError());
+ ok(GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == 0xdeadbeef), "last error %08lx\n", GetLastError());
ret = SetThreadDesktop(hdesk);
ok(ret, "SetThreadDesktop failed!\n");
@@ -860,17 +861,17 @@ static DWORD set_foreground(HWND hwnd)
GetWindowTextA(hwnd_fore, win_text, 1024);
set_id = GetWindowThreadProcessId(hwnd, NULL);
fore_id = GetWindowThreadProcessId(hwnd_fore, NULL);
- trace("\"%s\" %p %08x hwnd %p %08x\n", win_text, hwnd_fore, fore_id, hwnd, set_id);
+ trace("\"%s\" %p %08lx hwnd %p %08lx\n", win_text, hwnd_fore, fore_id, hwnd, set_id);
ret = AttachThreadInput(set_id, fore_id, TRUE);
- trace("AttachThreadInput returned %08x\n", ret);
+ trace("AttachThreadInput returned %08lx\n", ret);
ret = ShowWindow(hwnd, SW_SHOWNORMAL);
- trace("ShowWindow returned %08x\n", ret);
+ trace("ShowWindow returned %08lx\n", ret);
ret = SetWindowPos(hwnd, HWND_TOPMOST, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE);
- trace("set topmost returned %08x\n", ret);
+ trace("set topmost returned %08lx\n", ret);
ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE);
- trace("set notopmost returned %08x\n", ret);
+ trace("set notopmost returned %08lx\n", ret);
ret = SetForegroundWindow(hwnd);
- trace("SetForegroundWindow returned %08x\n", ret);
+ trace("SetForegroundWindow returned %08lx\n", ret);
Sleep(250);
AttachThreadInput(set_id, fore_id, FALSE);
return ret;
@@ -899,7 +900,7 @@ static void test_foregroundwindow(void)
SetLastError(0xdeadbeef);
hdesks[1] = CreateDesktopA("desk2", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL);
ret = GetLastError();
- ok(hdesks[1] != NULL || ret == ERROR_ACCESS_DENIED, "CreateDesktop failed (%u)\n", ret);
+ ok(hdesks[1] != NULL || ret == ERROR_ACCESS_DENIED, "CreateDesktop failed (%lu)\n", ret);
if(!hdesks[1])
{
win_skip("Not enough privileges for CreateDesktop\n");
@@ -913,13 +914,13 @@ static void test_foregroundwindow(void)
CloseDesktop(hdesks[1]);
return;
}
- trace("old timeout %d\n", timeout_old);
+ trace("old timeout %ld\n", timeout_old);
timeout = 0;
ret = SystemParametersInfoA(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
ok(ret, "set foreground lock timeout failed!\n");
ret = SystemParametersInfoA(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout, 0);
ok(ret, "get foreground lock timeout failed!\n");
- ok(timeout == 0, "unexpected timeout %d\n", timeout);
+ ok(timeout == 0, "unexpected timeout %ld\n", timeout);
for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++)
{
@@ -1011,7 +1012,7 @@ static void test_foregroundwindow(void)
ok(ret, "set foreground lock timeout failed!\n");
ret = SystemParametersInfoA(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout, 0);
ok(ret, "get foreground lock timeout failed!\n");
- ok(timeout == timeout_old, "unexpected timeout %d\n", timeout);
+ ok(timeout == timeout_old, "unexpected timeout %ld\n", timeout);
}
START_TEST(winstation)
1
0
[PATCH 1/4] winedbg: Set thread->name from MSVC exception when in GDB proxy mode.
by Brendan Shanks 17 Mar '22
by Brendan Shanks 17 Mar '22
17 Mar '22
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
---
programs/winedbg/gdbproxy.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c
index 0268a288481..bcde120adeb 100644
--- a/programs/winedbg/gdbproxy.c
+++ b/programs/winedbg/gdbproxy.c
@@ -482,7 +482,6 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e
{
const THREADNAME_INFO *threadname = (const THREADNAME_INFO *)rec->ExceptionInformation;
struct dbg_thread *thread;
- char name[9];
SIZE_T read;
if (threadname->dwType != 0x1000)
@@ -494,10 +493,12 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e
if (thread)
{
if (gdbctx->process->process_io->read( gdbctx->process->handle,
- threadname->szName, name, sizeof(name), &read) && read == sizeof(name))
+ threadname->szName, thread->name, sizeof(thread->name), &read) &&
+ read == sizeof(thread->name))
{
- fprintf(stderr, "Thread ID=%04lx renamed to \"%.9s\"\n",
- threadname->dwThreadID, name);
+ thread->name[sizeof(thread->name) - 1] = '\0';
+ fprintf(stderr, "Thread ID=%04lx renamed to \"%s\"\n",
+ threadname->dwThreadID, thread->name);
}
}
else
--
2.34.1
2
7
[PATCH 1/6] mfplat/tests: Check that Lock() and Lock2D() see the same content.
by Giovanni Mascellani 17 Mar '22
by Giovanni Mascellani 17 Mar '22
17 Mar '22
Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com>
---
dlls/mfplat/tests/mfplat.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index 83877041694..7e72abbde22 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -5725,6 +5725,8 @@ static void test_MFCreate2DMediaBuffer(void)
{ 1, 4, D3DFMT_A8R8G8B8, 16, 64 },
{ 4, 1, D3DFMT_A8R8G8B8, 16, 64 },
};
+ static const char two_aas[] = { 0xaa, 0xaa };
+ static const char eight_bbs[] = { 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb };
DWORD max_length, length, length2;
BYTE *buffer_start, *data, *data2;
LONG pitch, pitch2, stride;
@@ -5783,6 +5785,8 @@ static void test_MFCreate2DMediaBuffer(void)
ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr);
ok(max_length == length, "Unexpected length.\n");
+ memset(data, 0xaa, length);
+
length = 0;
pMFGetPlaneSize(MAKEFOURCC('N','V','1','2'), 2, 3, &length);
ok(max_length == length && length == 9, "Unexpected length %lu.\n", length);
@@ -5835,6 +5839,10 @@ static void test_MFCreate2DMediaBuffer(void)
ok(!!data, "Expected data pointer.\n");
ok(pitch == 64, "Unexpected pitch %ld.\n", pitch);
+ for (i = 0; i < 4; i++)
+ ok(memcmp(&data[64 * i], two_aas, sizeof(two_aas)) == 0, "Invalid data instead of 0xaa.\n");
+ memset(data, 0xbb, 194);
+
hr = IMF2DBuffer_Lock2D(_2dbuffer, &data2, &pitch);
ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr);
ok(data == data2, "Expected data pointer.\n");
@@ -5861,6 +5869,15 @@ static void test_MFCreate2DMediaBuffer(void)
hr = IMF2DBuffer_Unlock2D(_2dbuffer);
ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#lx.\n", hr);
+ hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL);
+ ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr);
+
+ todo_wine
+ ok(memcmp(data, eight_bbs, sizeof(eight_bbs)) == 0, "Invalid data instead of 0xbb.\n");
+
+ hr = IMFMediaBuffer_Unlock(buffer);
+ ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr);
+
hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&_2dbuffer2);
ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Failed to get interface, hr %#lx.\n", hr);
--
2.35.1
2
11
Fitting the translated timezone names in 31 characters is a challenge.
To save space, I expressed all of them in the format
"[<region>, ]<zone>[, <season>]". This format has the additional small
benefit of sorting similarly to the original English strings.
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
---
po/ca.po | 682 ++++++++++++++++++++++---------------------------------
1 file changed, 272 insertions(+), 410 deletions(-)
diff --git a/po/ca.po b/po/ca.po
index 7a5e102cb89..f87187f0161 100644
--- a/po/ca.po
+++ b/po/ca.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-28 21:33-0700\n"
+"PO-Revision-Date: 2022-03-16 22:20-0600\n"
"Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
#: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90
#: programs/winefile/winefile.rc:114
@@ -6976,54 +6976,40 @@ msgid "This network connection does not exist.\n"
msgstr "Aquesta connexió de xarxa no existeix.\n"
#: dlls/kernel32/winerror.mc:3748
-#, fuzzy
-#| msgid "Invalid at interrupt time.\n"
msgid "Call interrupted.\n"
-msgstr "No era vàlid a l'hora d'interrupció.\n"
+msgstr "S'ha interromput la trucada.\n"
#: dlls/kernel32/winerror.mc:3753
-#, fuzzy
-#| msgid "Invalid handle.\n"
msgid "Invalid file handle.\n"
-msgstr "L'identificador no és vàlid.\n"
+msgstr "L'identificador de fitxer no és vàlid.\n"
#: dlls/kernel32/winerror.mc:3763
-#, fuzzy
-#| msgid "Invalid network address.\n"
msgid "Invalid pointer address.\n"
-msgstr "L'adreça de xarxa no és vàlida.\n"
+msgstr "L'identificador de punter no és vàlid.\n"
#: dlls/kernel32/winerror.mc:3768
-#, fuzzy
-#| msgid "Invalid name.\n"
msgid "Invalid argument.\n"
-msgstr "El nom no és vàlid.\n"
+msgstr "L'argument no és vàlid.\n"
#: dlls/kernel32/winerror.mc:3778
msgid "Connection reset by peer.\n"
msgstr "Un igual ha restablert la connexió.\n"
#: dlls/kernel32/winerror.mc:3788
-#, fuzzy
-#| msgid "Point not found.\n"
msgid "Host not found.\n"
-msgstr "No s'ha trobat el punt.\n"
+msgstr "No s'ha trobat l'amfitrió.\n"
#: dlls/kernel32/winerror.mc:3793
-#, fuzzy
-#| msgid "Attribute is not found.\n"
msgid "Nonauthoritative host not found.\n"
-msgstr "No s'ha trobat l'atribut.\n"
+msgstr "No s'ha trobat l'amfitrió no autoritzat.\n"
#: dlls/kernel32/winerror.mc:3798
-#, fuzzy
-#| msgid "Unrecoverable error occurred.\n"
msgid "Nonrecoverable error.\n"
-msgstr "Ha ocorregut un error no recuperable.\n"
+msgstr "No es pot recuperar de l'error.\n"
#: dlls/kernel32/winerror.mc:3803
msgid "Name valid, no data record.\n"
-msgstr ""
+msgstr "El nom és vàlid però no hi ha dades.\n"
#: dlls/kernel32/winerror.mc:3817
msgid "Not implemented.\n"
@@ -10391,28 +10377,26 @@ msgstr "Seleccionar font"
#: dlls/tzres/tzres.rc:126
msgctxt "maximum 31 characters"
msgid "China Standard Time"
-msgstr "Hora estàndard de la Xina"
+msgstr "Xina, hora estàndard"
#: dlls/tzres/tzres.rc:127
msgctxt "maximum 31 characters"
msgid "China Daylight Time"
-msgstr "Hora d'estiu de la Xina"
+msgstr "Xina, hora d'estiu"
#: dlls/tzres/tzres.rc:128
msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi"
msgstr "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi"
#: dlls/tzres/tzres.rc:267
-#, fuzzy
-#| msgid "North Asia Standard Time"
msgctxt "maximum 31 characters"
msgid "North Asia Standard Time"
-msgstr "Hora estàndard de l'Àsia del Nord"
+msgstr "Àsia del nord, hora estàndard"
#: dlls/tzres/tzres.rc:268
msgctxt "maximum 31 characters"
msgid "North Asia Daylight Time"
-msgstr "Hora d'estiu de l'Àsia del Nord"
+msgstr "Àsia del nord, hora d'estiu"
#: dlls/tzres/tzres.rc:269
msgid "(UTC+07:00) Krasnoyarsk"
@@ -10421,12 +10405,12 @@ msgstr "(UTC+07:00) Krasnoiarsk"
#: dlls/tzres/tzres.rc:168
msgctxt "maximum 31 characters"
msgid "Georgian Standard Time"
-msgstr "Hora estàndard de Geòrgia"
+msgstr "Geòrgia, hora estàndard"
#: dlls/tzres/tzres.rc:169
msgctxt "maximum 31 characters"
msgid "Georgian Daylight Time"
-msgstr "Hora d'estiu de Geòrgia"
+msgstr "Geòrgia, hora d'estiu"
#: dlls/tzres/tzres.rc:170
msgid "(UTC+04:00) Tbilisi"
@@ -10444,12 +10428,12 @@ msgstr "(UTC+12:00) Temps universal coordinat+12"
#: dlls/tzres/tzres.rc:252
msgctxt "maximum 31 characters"
msgid "Nepal Standard Time"
-msgstr "Hora estàndard del Nepal"
+msgstr "Nepal, hora estàndard"
#: dlls/tzres/tzres.rc:253
msgctxt "maximum 31 characters"
msgid "Nepal Daylight Time"
-msgstr "Hora d'estiu del Nepal"
+msgstr "Nepal, hora d'estiu"
#: dlls/tzres/tzres.rc:254
msgid "(UTC+05:45) Kathmandu"
@@ -10458,12 +10442,12 @@ msgstr "(UTC+05:45) Katmandú"
#: dlls/tzres/tzres.rc:90
msgctxt "maximum 31 characters"
msgid "Cape Verde Standard Time"
-msgstr "Hora estàndard de Cap Verd"
+msgstr "Cap Verd, hora estàndard"
#: dlls/tzres/tzres.rc:91
msgctxt "maximum 31 characters"
msgid "Cape Verde Daylight Time"
-msgstr "Hora d'estiu de Cap Verd"
+msgstr "Cap Verd, hora d'estiu"
#: dlls/tzres/tzres.rc:92
msgid "(UTC-01:00) Cabo Verde Is."
@@ -10472,30 +10456,26 @@ msgstr "(UTC-01:00) Illes del Cap Verd"
#: dlls/tzres/tzres.rc:183
msgctxt "maximum 31 characters"
msgid "Haiti Standard Time"
-msgstr "Hora estàndard de Haití"
+msgstr "Haití, hora estàndard"
#: dlls/tzres/tzres.rc:184
msgctxt "maximum 31 characters"
msgid "Haiti Daylight Time"
-msgstr "Hora d'estiu de Haití"
+msgstr "Haití, hora d'estiu"
#: dlls/tzres/tzres.rc:185
msgid "(UTC-05:00) Haiti"
msgstr "(UTC-05:00) Haití"
#: dlls/tzres/tzres.rc:111
-#, fuzzy
-#| msgid "Central European Standard Time"
msgctxt "maximum 31 characters"
msgid "Central European Standard Time"
-msgstr "Hora estàndard de l'Europa central"
+msgstr "Europa, central, hora estàndard"
#: dlls/tzres/tzres.rc:112
-#, fuzzy
-#| msgid "Central European Daylight Time"
msgctxt "maximum 31 characters"
msgid "Central European Daylight Time"
-msgstr "Hora d'estiu de l'Europa central"
+msgstr "Europa, central, hora d'estiu"
#: dlls/tzres/tzres.rc:113
msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb"
@@ -10504,12 +10484,12 @@ msgstr "(UTC+01:00) Sarajevo, Skopje, Varsòvia, Zagreb"
#: dlls/tzres/tzres.rc:234
msgctxt "maximum 31 characters"
msgid "Morocco Standard Time"
-msgstr "Hora estàndard del Marroc"
+msgstr "Marroc, hora estàndard"
#: dlls/tzres/tzres.rc:235
msgctxt "maximum 31 characters"
msgid "Morocco Daylight Time"
-msgstr "Hora d'estiu del Marroc"
+msgstr "Marroc, hora d'estiu"
#: dlls/tzres/tzres.rc:236
msgid "(UTC+01:00) Casablanca"
@@ -10527,30 +10507,26 @@ msgstr "(UTC-08:00) Temps universal coordinat-08"
#: dlls/tzres/tzres.rc:39
msgctxt "maximum 31 characters"
msgid "Altai Standard Time"
-msgstr "Hora estàndard de l'Altai"
+msgstr "Altai, hora estàndard"
#: dlls/tzres/tzres.rc:40
msgctxt "maximum 31 characters"
msgid "Altai Daylight Time"
-msgstr "Hora d'estiu de l'Altai"
+msgstr "Altai, hora d'estiu"
#: dlls/tzres/tzres.rc:41
msgid "(UTC+07:00) Barnaul, Gorno-Altaysk"
msgstr "(UTC+07:00) Barnaül, Gorno-Altaisk"
#: dlls/tzres/tzres.rc:108
-#, fuzzy
-#| msgid "Central Europe Standard Time"
msgctxt "maximum 31 characters"
msgid "Central Europe Standard Time"
-msgstr "Hora estàndard de l'Europa central"
+msgstr "Europa, central, hora estàndard"
#: dlls/tzres/tzres.rc:109
-#, fuzzy
-#| msgid "Central Europe Daylight Time"
msgctxt "maximum 31 characters"
msgid "Central Europe Daylight Time"
-msgstr "Hora d'estiu de l'Europa central"
+msgstr "Europa, central, hora d'estiu"
#: dlls/tzres/tzres.rc:110
msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague"
@@ -10559,12 +10535,12 @@ msgstr "(UTC+01:00) Belgrad, Bratislava, Budapest, Ljubljana, Praga"
#: dlls/tzres/tzres.rc:192
msgctxt "maximum 31 characters"
msgid "Iran Standard Time"
-msgstr "Hora estàndard d'Iran"
+msgstr "Iran, hora estàndard"
#: dlls/tzres/tzres.rc:193
msgctxt "maximum 31 characters"
msgid "Iran Daylight Time"
-msgstr "Hora d'estiu d'Iran"
+msgstr "Iran, hora d'estiu"
#: dlls/tzres/tzres.rc:194
msgid "(UTC+03:30) Tehran"
@@ -10573,12 +10549,12 @@ msgstr "(UTC+03:30) Teheran"
#: dlls/tzres/tzres.rc:318
msgctxt "maximum 31 characters"
msgid "Saint Pierre Standard Time"
-msgstr "Hora estàndard de Sant Pere"
+msgstr "Sant Pere, hora estàndard"
#: dlls/tzres/tzres.rc:319
msgctxt "maximum 31 characters"
msgid "Saint Pierre Daylight Time"
-msgstr "Hora d'estiu de Sant Pere"
+msgstr "Sant Pere, hora d'estiu"
#: dlls/tzres/tzres.rc:320
msgid "(UTC-03:00) Saint Pierre and Miquelon"
@@ -10587,12 +10563,12 @@ msgstr "(UTC-03:00) Sant Pere i Miquelon"
#: dlls/tzres/tzres.rc:327
msgctxt "maximum 31 characters"
msgid "Sao Tome Standard Time"
-msgstr "Hora estàndard de São Tomé"
+msgstr "São Tomé, hora estàndard"
#: dlls/tzres/tzres.rc:328
msgctxt "maximum 31 characters"
msgid "Sao Tome Daylight Time"
-msgstr "Hora d'estiu de São Tomé"
+msgstr "São Tomé, hora d'estiu"
#: dlls/tzres/tzres.rc:329
msgid "(UTC+00:00) Sao Tome"
@@ -10601,12 +10577,12 @@ msgstr "(UTC+00:00) São Tomé"
#: dlls/tzres/tzres.rc:249
msgctxt "maximum 31 characters"
msgid "Namibia Standard Time"
-msgstr "Hora estàndard de Namíbia"
+msgstr "Namíbia, hora estàndard"
#: dlls/tzres/tzres.rc:250
msgctxt "maximum 31 characters"
msgid "Namibia Daylight Time"
-msgstr "Hora d'estiu de Namíbia"
+msgstr "Namíbia, hora d'estiu"
#: dlls/tzres/tzres.rc:251
msgid "(UTC+02:00) Windhoek"
@@ -10615,30 +10591,26 @@ msgstr "(UTC+02:00) Windhoek"
#: dlls/tzres/tzres.rc:369
msgctxt "maximum 31 characters"
msgid "Tonga Standard Time"
-msgstr "Hora estàndard de Tonga"
+msgstr "Tonga, hora estàndard"
#: dlls/tzres/tzres.rc:370
msgctxt "maximum 31 characters"
msgid "Tonga Daylight Time"
-msgstr "Hora d'estiu de Tonga"
+msgstr "Tonga, hora d'estiu"
#: dlls/tzres/tzres.rc:371
msgid "(UTC+13:00) Nuku'alofa"
msgstr "(UTC+13:00) Nuku'alofa"
#: dlls/tzres/tzres.rc:240
-#, fuzzy
-#| msgid "Mountain Standard Time (Mexico)"
msgctxt "maximum 31 characters"
msgid "Mountain Standard Time (Mexico)"
-msgstr "Hora estàndard de les muntanyes (Mèxic)"
+msgstr "Mèxic, muntanyenc, hora estànd."
#: dlls/tzres/tzres.rc:241
-#, fuzzy
-#| msgid "Mountain Daylight Time (Mexico)"
msgctxt "maximum 31 characters"
msgid "Mountain Daylight Time (Mexico)"
-msgstr "Hora d'estiu de les muntanyes (Mèxic)"
+msgstr "Mèxic, muntanyenc, hora d'estiu"
#: dlls/tzres/tzres.rc:242
msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan"
@@ -10661,28 +10633,26 @@ msgstr "(UTC+00:00) Dublín, Edimburg, Lisboa, Londres"
#: dlls/tzres/tzres.rc:342
msgctxt "maximum 31 characters"
msgid "South Sudan Standard Time"
-msgstr "Hora estàndard de Sudan del Sud"
+msgstr "Sudan del sud, hora estàndard"
#: dlls/tzres/tzres.rc:343
msgctxt "maximum 31 characters"
msgid "South Sudan Daylight Time"
-msgstr "Hora d'estiu de Sudan del Sud"
+msgstr "Sudan del sud, hora d'estiu"
#: dlls/tzres/tzres.rc:344
msgid "(UTC+02:00) Juba"
msgstr "(UTC+02:00) Juba"
#: dlls/tzres/tzres.rc:102
-#, fuzzy
-#| msgid "Central Asia Standard Time"
msgctxt "maximum 31 characters"
msgid "Central Asia Standard Time"
-msgstr "Hora estàndard de l'Àsia central"
+msgstr "Àsia central, hora estàndard"
#: dlls/tzres/tzres.rc:103
msgctxt "maximum 31 characters"
msgid "Central Asia Daylight Time"
-msgstr "Hora d'estiu de l'Àsia central"
+msgstr "Àsia central, hora d'estiu"
#: dlls/tzres/tzres.rc:104
msgid "(UTC+06:00) Astana"
@@ -10691,12 +10661,12 @@ msgstr "(UTC+06:00) Astanà"
#: dlls/tzres/tzres.rc:213
msgctxt "maximum 31 characters"
msgid "Lord Howe Standard Time"
-msgstr "Hora estàndard de Lord Howe"
+msgstr "Lord Howe, hora estàndard"
#: dlls/tzres/tzres.rc:214
msgctxt "maximum 31 characters"
msgid "Lord Howe Daylight Time"
-msgstr "Hora d'estiu de Lord Howe"
+msgstr "Lord Howe, hora d'estiu"
#: dlls/tzres/tzres.rc:215
msgid "(UTC+10:30) Lord Howe Island"
@@ -10705,12 +10675,12 @@ msgstr "(UTC+10:30) Illa de Lord Howe"
#: dlls/tzres/tzres.rc:48
msgctxt "maximum 31 characters"
msgid "Arabic Standard Time"
-msgstr "Hora estàndard àrab"
+msgstr "Aràbia, hora estàndard"
#: dlls/tzres/tzres.rc:49
msgctxt "maximum 31 characters"
msgid "Arabic Daylight Time"
-msgstr "Hora d'estiu àrab"
+msgstr "Aràbia, hora d'estiu"
#: dlls/tzres/tzres.rc:50
msgid "(UTC+03:00) Baghdad"
@@ -10728,12 +10698,12 @@ msgstr "(UTC+13:00) Temps universal coordinat+13"
#: dlls/tzres/tzres.rc:216
msgctxt "maximum 31 characters"
msgid "Magadan Standard Time"
-msgstr "Hora estàndard de Magadan"
+msgstr "Magadan, hora estàndard"
#: dlls/tzres/tzres.rc:217
msgctxt "maximum 31 characters"
msgid "Magadan Daylight Time"
-msgstr "Hora d'estiu de Magadan"
+msgstr "Magadan, hora d'estiu"
#: dlls/tzres/tzres.rc:218
msgid "(UTC+11:00) Magadan"
@@ -10742,12 +10712,12 @@ msgstr "(UTC+11:00) Magadan"
#: dlls/tzres/tzres.rc:258
msgctxt "maximum 31 characters"
msgid "Newfoundland Standard Time"
-msgstr "Hora estàndard de Terranova"
+msgstr "Terranova, hora estàndard"
#: dlls/tzres/tzres.rc:259
msgctxt "maximum 31 characters"
msgid "Newfoundland Daylight Time"
-msgstr "Hora d'estiu de Terranova"
+msgstr "Terranova, hora d'estiu"
#: dlls/tzres/tzres.rc:260
msgid "(UTC-03:30) Newfoundland"
@@ -10756,30 +10726,26 @@ msgstr "(UTC-03:30) Terranova"
#: dlls/tzres/tzres.rc:348
msgctxt "maximum 31 characters"
msgid "Sudan Standard Time"
-msgstr "Hora estàndard de Sudan"
+msgstr "Sudan, hora estàndard"
#: dlls/tzres/tzres.rc:349
msgctxt "maximum 31 characters"
msgid "Sudan Daylight Time"
-msgstr "Hora d'estiu de Sudan"
+msgstr "Sudan, hora d'estiu"
#: dlls/tzres/tzres.rc:350
msgid "(UTC+02:00) Khartoum"
msgstr "(UTC+02:00) Khartum"
#: dlls/tzres/tzres.rc:438
-#, fuzzy
-#| msgid "West Pacific Standard Time"
msgctxt "maximum 31 characters"
msgid "West Pacific Standard Time"
-msgstr "Hora estàndard del Pacífic occidental"
+msgstr "Pacífic de l'oest, hora estànd."
#: dlls/tzres/tzres.rc:439
-#, fuzzy
-#| msgid "West Pacific Daylight Time"
msgctxt "maximum 31 characters"
msgid "West Pacific Daylight Time"
-msgstr "Hora d'estiu del Pacífic occidental"
+msgstr "Pacífic, oest, hora d'estiu"
#: dlls/tzres/tzres.rc:440
msgid "(UTC+10:00) Guam, Port Moresby"
@@ -10788,26 +10754,26 @@ msgstr "(UTC+10:00) Guam, Port Moresby"
#: dlls/tzres/tzres.rc:279
msgctxt "maximum 31 characters"
msgid "Pacific Standard Time"
-msgstr "Hora estàndard del Pacífic"
+msgstr "Am. d. nord, Pacífic, h. estàn."
#: dlls/tzres/tzres.rc:280
msgctxt "maximum 31 characters"
msgid "Pacific Daylight Time"
-msgstr "Hora d'estiu del Pacífic"
+msgstr "Am. d. nord, Pacífic, h. estàn."
#: dlls/tzres/tzres.rc:281
msgid "(UTC-08:00) Pacific Time (US & Canada)"
-msgstr "(UTC-08:00) Hora del Pacífic (EU i Canadà)"
+msgstr "(UTC-08:00) Hora del Pacífic (EUA i Canadà)"
#: dlls/tzres/tzres.rc:69
msgctxt "maximum 31 characters"
msgid "Azerbaijan Standard Time"
-msgstr "Hora estàndard de l'Azerbaidjan"
+msgstr "Azerbaidjan, hora estàndard"
#: dlls/tzres/tzres.rc:70
msgctxt "maximum 31 characters"
msgid "Azerbaijan Daylight Time"
-msgstr "Hora d'estiu de l'Azerbaidjan"
+msgstr "Azerbaidjan, hora d'estiu"
#: dlls/tzres/tzres.rc:71
msgid "(UTC+04:00) Baku"
@@ -10816,12 +10782,12 @@ msgstr "(UTC+04:00) Bakú"
#: dlls/tzres/tzres.rc:219
msgctxt "maximum 31 characters"
msgid "Magallanes Standard Time"
-msgstr "Hora estàndard de Magallanes"
+msgstr "Magallanes, hora estàndard"
#: dlls/tzres/tzres.rc:220
msgctxt "maximum 31 characters"
msgid "Magallanes Daylight Time"
-msgstr "Hora d'estiu de Magallanes"
+msgstr "Magallanes, hora d'estiu"
#: dlls/tzres/tzres.rc:221
msgid "(UTC-03:00) Punta Arenas"
@@ -10830,12 +10796,12 @@ msgstr "(UTC-03:00) Punta Arenas"
#: dlls/tzres/tzres.rc:324
msgctxt "maximum 31 characters"
msgid "Samoa Standard Time"
-msgstr "Hora estàndard de Samoa"
+msgstr "Samoa, hora estàndard"
#: dlls/tzres/tzres.rc:325
msgctxt "maximum 31 characters"
msgid "Samoa Daylight Time"
-msgstr "Hora d'estiu de Samoa"
+msgstr "Samoa, hora d'estiu"
#: dlls/tzres/tzres.rc:326
msgid "(UTC+13:00) Samoa"
@@ -10844,46 +10810,40 @@ msgstr "(UTC+13:00) Samoa"
#: dlls/tzres/tzres.rc:201
msgctxt "maximum 31 characters"
msgid "Kaliningrad Standard Time"
-msgstr "Hora estàndard de Kaliningrad"
+msgstr "Kaliningrad, hora estàndard"
#: dlls/tzres/tzres.rc:202
msgctxt "maximum 31 characters"
msgid "Kaliningrad Daylight Time"
-msgstr "Hora d'estiu de Kaliningrad"
+msgstr "Kaliningrad, hora d'estiu"
#: dlls/tzres/tzres.rc:203
msgid "(UTC+02:00) Kaliningrad"
msgstr "(UTC+02:00) Kaliningrad"
#: dlls/tzres/tzres.rc:282
-#, fuzzy
-#| msgid "Pacific Standard Time (Mexico)"
msgctxt "maximum 31 characters"
msgid "Pacific Standard Time (Mexico)"
-msgstr "Hora estàndard del Pacífic (Mèxic)"
+msgstr "Mèxic, Pacífic, hora estàndard"
#: dlls/tzres/tzres.rc:283
-#, fuzzy
-#| msgid "Pacific Daylight Time (Mexico)"
msgctxt "maximum 31 characters"
msgid "Pacific Daylight Time (Mexico)"
-msgstr "Hora d'estiu del Pacífic (Mèxic)"
+msgstr "Mèxic, Pacífic, hora d'estiu"
#: dlls/tzres/tzres.rc:284
msgid "(UTC-08:00) Baja California"
msgstr "(UTC-08:00) Baixa Califòrnia"
#: dlls/tzres/tzres.rc:228
-#, fuzzy
-#| msgid "Middle East Standard Time"
msgctxt "maximum 31 characters"
msgid "Middle East Standard Time"
-msgstr "Hora estàndard de l'Orient Mitjà"
+msgstr "Orient Mitjà, hora estàndard"
#: dlls/tzres/tzres.rc:229
msgctxt "maximum 31 characters"
msgid "Middle East Daylight Time"
-msgstr "Hora d'estiu de l'Orient Mitjà"
+msgstr "Orient Mitjà, hora d'estiu"
#: dlls/tzres/tzres.rc:230
msgid "(UTC+02:00) Beirut"
@@ -10892,30 +10852,26 @@ msgstr "(UTC+02:00) Beirut"
#: dlls/tzres/tzres.rc:363
msgctxt "maximum 31 characters"
msgid "Tokyo Standard Time"
-msgstr "Hora estàndard de Tokyo"
+msgstr "Tokyo, hora estàndard"
#: dlls/tzres/tzres.rc:364
msgctxt "maximum 31 characters"
msgid "Tokyo Daylight Time"
-msgstr "Hora d'estiu de Tokyo"
+msgstr "Tokyo, hora d'estiu"
#: dlls/tzres/tzres.rc:365
msgid "(UTC+09:00) Osaka, Sapporo, Tokyo"
msgstr "(UTC+09:00) Osaka, Sapporo, Tòquio"
#: dlls/tzres/tzres.rc:210
-#, fuzzy
-#| msgid "Line Islands Standard Time"
msgctxt "maximum 31 characters"
msgid "Line Islands Standard Time"
-msgstr "Hora estàndard de les Illes de la Línia"
+msgstr "Illes de la Línia, hora estànd."
#: dlls/tzres/tzres.rc:211
-#, fuzzy
-#| msgid "Line Islands Daylight Time"
msgctxt "maximum 31 characters"
msgid "Line Islands Daylight Time"
-msgstr "Hora d'estiu de les Illes de la Línia"
+msgstr "Illes de la Línia, hora d'estiu"
#: dlls/tzres/tzres.rc:212
msgid "(UTC+14:00) Kiritimati Island"
@@ -10924,12 +10880,12 @@ msgstr "(UTC+14:00) Illa de Kiritimati"
#: dlls/tzres/tzres.rc:129
msgctxt "maximum 31 characters"
msgid "Cuba Standard Time"
-msgstr "Hora estàndard de Cuba"
+msgstr "Cuba, hora estàndard"
#: dlls/tzres/tzres.rc:130
msgctxt "maximum 31 characters"
msgid "Cuba Daylight Time"
-msgstr "Hora d'estiu de Cuba"
+msgstr "Cuba, hora d'estiu"
#: dlls/tzres/tzres.rc:131
msgid "(UTC-05:00) Havana"
@@ -10938,12 +10894,12 @@ msgstr "(UTC-05:00) L'Havana"
#: dlls/tzres/tzres.rc:198
msgctxt "maximum 31 characters"
msgid "Jordan Standard Time"
-msgstr "Hora estàndard de Jordània"
+msgstr "Jordània, hora estàndard"
#: dlls/tzres/tzres.rc:199
msgctxt "maximum 31 characters"
msgid "Jordan Daylight Time"
-msgstr "Hora d'estiu de Jordània"
+msgstr "Jordània, hora d'estiu"
#: dlls/tzres/tzres.rc:200
msgid "(UTC+02:00) Amman"
@@ -10952,21 +10908,21 @@ msgstr "(UTC+02:00) Amman"
#: dlls/tzres/tzres.rc:117
msgctxt "maximum 31 characters"
msgid "Central Standard Time"
-msgstr "Hora estàndard central"
+msgstr "Am. d. nord, central, h. estàn."
#: dlls/tzres/tzres.rc:118
msgctxt "maximum 31 characters"
msgid "Central Daylight Time"
-msgstr "Hora d'estiu central"
+msgstr "Am. d. nord, centr., h. d'estiu"
#: dlls/tzres/tzres.rc:119
msgid "(UTC-06:00) Central Time (US & Canada)"
-msgstr "(UTC-06:00) Hora central (EU i Canadà)"
+msgstr "(UTC-06:00) Hora central (EUA i Canadà)"
#: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304
msgctxt "maximum 31 characters"
msgid "Russia Time Zone 3"
-msgstr "Zona horària russa 3"
+msgstr "Rússia, zona horària 3"
#: dlls/tzres/tzres.rc:305
msgid "(UTC+04:00) Izhevsk, Samara"
@@ -10975,12 +10931,12 @@ msgstr "(UTC+04:00) Ijevsk, Samara"
#: dlls/tzres/tzres.rc:417
msgctxt "maximum 31 characters"
msgid "Volgograd Standard Time"
-msgstr "Hora estàndard de Volgograd"
+msgstr "Volgograd, hora estàndard"
#: dlls/tzres/tzres.rc:418
msgctxt "maximum 31 characters"
msgid "Volgograd Daylight Time"
-msgstr "Hora d'estiu de Volgograd"
+msgstr "Volgograd, hora d'estiu"
#: dlls/tzres/tzres.rc:419
msgid "(UTC+04:00) Volgograd"
@@ -10989,12 +10945,12 @@ msgstr "(UTC+04:00) Volgograd"
#: dlls/tzres/tzres.rc:72
msgctxt "maximum 31 characters"
msgid "Azores Standard Time"
-msgstr "Hora estàndard de les Açores"
+msgstr "Açores, hora estàndard"
#: dlls/tzres/tzres.rc:73
msgctxt "maximum 31 characters"
msgid "Azores Daylight Time"
-msgstr "Hora d'estiu de les Açores"
+msgstr "Açores, hora d'estiu"
#: dlls/tzres/tzres.rc:74
msgid "(UTC-01:00) Azores"
@@ -11003,12 +10959,12 @@ msgstr "(UTC-01:00) Açores"
#: dlls/tzres/tzres.rc:264
msgctxt "maximum 31 characters"
msgid "North Asia East Standard Time"
-msgstr "Hora estàndard d'Àsia del nord"
+msgstr "Àsia, nord-est, hora estàndard"
#: dlls/tzres/tzres.rc:265
msgctxt "maximum 31 characters"
msgid "North Asia East Daylight Time"
-msgstr "Hora d'estiu d'Àsia del norest"
+msgstr "Àsia, nord-est, hora d'estiu"
#: dlls/tzres/tzres.rc:266
msgid "(UTC+08:00) Irkutsk"
@@ -11026,28 +10982,26 @@ msgstr "(UTC-11:00) Temps universal coordinat-11"
#: dlls/tzres/tzres.rc:51
msgctxt "maximum 31 characters"
msgid "Argentina Standard Time"
-msgstr "Hora estàndard de l'Argentina"
+msgstr "Argentina, hora estàndard"
#: dlls/tzres/tzres.rc:52
msgctxt "maximum 31 characters"
msgid "Argentina Daylight Time"
-msgstr "Hora d'estiu de l'Argentina"
+msgstr "Argentina, hora d'estiu"
#: dlls/tzres/tzres.rc:53
msgid "(UTC-03:00) City of Buenos Aires"
msgstr "(UTC-03:00) Ciutat de Buenos Aires"
#: dlls/tzres/tzres.rc:378
-#, fuzzy
-#| msgid "Turks And Caicos Standard Time"
msgctxt "maximum 31 characters"
msgid "Turks And Caicos Standard Time"
-msgstr "Hora estàndard de Turks i Caicos"
+msgstr "Turks i Caicos, hora estàndard"
#: dlls/tzres/tzres.rc:379
msgctxt "maximum 31 characters"
msgid "Turks And Caicos Daylight Time"
-msgstr "Hora d'estiu de Turks i Caicos"
+msgstr "Turks i Caicos, hora d'estiu"
#: dlls/tzres/tzres.rc:380
msgid "(UTC-05:00) Turks and Caicos"
@@ -11056,12 +11010,12 @@ msgstr "(UTC-05:00) Turks i Caicos"
#: dlls/tzres/tzres.rc:222
msgctxt "maximum 31 characters"
msgid "Marquesas Standard Time"
-msgstr "Hora estàndard de Marqueses"
+msgstr "Marqueses, hora estàndard"
#: dlls/tzres/tzres.rc:223
msgctxt "maximum 31 characters"
msgid "Marquesas Daylight Time"
-msgstr "Hora d'estiu de Marqueses"
+msgstr "Marqueses, hora d'estiu"
#: dlls/tzres/tzres.rc:224
msgid "(UTC-09:30) Marquesas Islands"
@@ -11070,12 +11024,12 @@ msgstr "(UTC-09:30) Illes Marqueses"
#: dlls/tzres/tzres.rc:243
msgctxt "maximum 31 characters"
msgid "Myanmar Standard Time"
-msgstr "Hora estàndard de Birmània"
+msgstr "Birmània, hora estàndard"
#: dlls/tzres/tzres.rc:244
msgctxt "maximum 31 characters"
msgid "Myanmar Daylight Time"
-msgstr "Hora d'estiu de Birmània"
+msgstr "Birmània, hora d'estiu"
#: dlls/tzres/tzres.rc:245
msgid "(UTC+06:30) Yangon (Rangoon)"
@@ -11093,12 +11047,12 @@ msgstr "(UTC) Temps universal coordinat"
#: dlls/tzres/tzres.rc:189
msgctxt "maximum 31 characters"
msgid "India Standard Time"
-msgstr "Hora estàndard de l'Índia"
+msgstr "Índia, hora estàndard"
#: dlls/tzres/tzres.rc:190
msgctxt "maximum 31 characters"
msgid "India Daylight Time"
-msgstr "Hora d'estiu de l'Índia"
+msgstr "Índia, hora d'estiu"
#: dlls/tzres/tzres.rc:191
msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi"
@@ -11107,12 +11061,12 @@ msgstr "(UTC+05:30) Chennai, Kolkata, Mumbai, Nova Delhi"
#: dlls/tzres/tzres.rc:180
msgctxt "maximum 31 characters"
msgid "GTB Standard Time"
-msgstr "Hora estàndard GTB"
+msgstr "Europa, central, hora estàndard"
#: dlls/tzres/tzres.rc:181
msgctxt "maximum 31 characters"
msgid "GTB Daylight Time"
-msgstr "Hora d'estiu GTB"
+msgstr "Europa, central, hora d'estiu"
#: dlls/tzres/tzres.rc:182
msgid "(UTC+02:00) Athens, Bucharest"
@@ -11121,12 +11075,12 @@ msgstr "(UTC+02:00) Atenes, Bucarest"
#: dlls/tzres/tzres.rc:375
msgctxt "maximum 31 characters"
msgid "Turkey Standard Time"
-msgstr "Hora estàndard de Turquia"
+msgstr "Turquia, hora estàndard"
#: dlls/tzres/tzres.rc:376
msgctxt "maximum 31 characters"
msgid "Turkey Daylight Time"
-msgstr "Hora d'estiu de Turquia"
+msgstr "Turquia, hora d'estiu"
#: dlls/tzres/tzres.rc:377
msgid "(UTC+03:00) Istanbul"
@@ -11135,12 +11089,12 @@ msgstr "(UTC+03:00) Istanbul"
#: dlls/tzres/tzres.rc:54
msgctxt "maximum 31 characters"
msgid "Astrakhan Standard Time"
-msgstr "Hora estàndard d'Àstrakhan"
+msgstr "Àstrakhan, hora estàndard"
#: dlls/tzres/tzres.rc:55
msgctxt "maximum 31 characters"
msgid "Astrakhan Daylight Time"
-msgstr "Hora d'estiu d'Àstrakhan"
+msgstr "Àstrakhan, hora d'estiu"
#: dlls/tzres/tzres.rc:56
msgid "(UTC+04:00) Astrakhan, Ulyanovsk"
@@ -11149,28 +11103,26 @@ msgstr "(UTC+04:00) Àstrakhan, Uliànovsk"
#: dlls/tzres/tzres.rc:162
msgctxt "maximum 31 characters"
msgid "Fiji Standard Time"
-msgstr "Hora estàndard de Fiji"
+msgstr "Fiji, hora estàndard"
#: dlls/tzres/tzres.rc:163
msgctxt "maximum 31 characters"
msgid "Fiji Daylight Time"
-msgstr "Hora d'estiu de Fiji"
+msgstr "Fiji, hora d'estiu"
#: dlls/tzres/tzres.rc:164
msgid "(UTC+12:00) Fiji"
msgstr "(UTC+12:00) Fiji"
#: dlls/tzres/tzres.rc:87
-#, fuzzy
-#| msgid "Canada Central Standard Time"
msgctxt "maximum 31 characters"
msgid "Canada Central Standard Time"
-msgstr "Hora estàndard del Canadà central"
+msgstr "Canadà, central, hora estàndard"
#: dlls/tzres/tzres.rc:88
msgctxt "maximum 31 characters"
msgid "Canada Central Daylight Time"
-msgstr "Hora d'estiu del Canadà central"
+msgstr "Canadà, central, hora d'estiu"
#: dlls/tzres/tzres.rc:89
msgid "(UTC-06:00) Saskatchewan"
@@ -11179,12 +11131,12 @@ msgstr "(UTC-06:00) Saskatchewan"
#: dlls/tzres/tzres.rc:444
msgctxt "maximum 31 characters"
msgid "Yukon Standard Time"
-msgstr "Hora estàndard de Yukon"
+msgstr "Yukon, hora estàndard"
#: dlls/tzres/tzres.rc:445
msgctxt "maximum 31 characters"
msgid "Yukon Daylight Time"
-msgstr "Hora d'estiu de Yukon"
+msgstr "Yukon, hora d'estiu"
#: dlls/tzres/tzres.rc:446
msgid "(UTC-07:00) Yukon"
@@ -11193,28 +11145,26 @@ msgstr "(UTC-07:00) Yukon"
#: dlls/tzres/tzres.rc:354
msgctxt "maximum 31 characters"
msgid "Taipei Standard Time"
-msgstr "Hora estàndard de Taipei"
+msgstr "Taipei, hora estàndard"
#: dlls/tzres/tzres.rc:355
msgctxt "maximum 31 characters"
msgid "Taipei Daylight Time"
-msgstr "Hora d'estiu de Taipei"
+msgstr "Taipei, hora d'estiu"
#: dlls/tzres/tzres.rc:356
msgid "(UTC+08:00) Taipei"
msgstr "(UTC+08:00) Taipei"
#: dlls/tzres/tzres.rc:426
-#, fuzzy
-#| msgid "W. Europe Standard Time"
msgctxt "maximum 31 characters"
msgid "W. Europe Standard Time"
-msgstr "Hora estàndard d'Europa de l'oest"
+msgstr "Europa, oest, hora estàndard"
#: dlls/tzres/tzres.rc:427
msgctxt "maximum 31 characters"
msgid "W. Europe Daylight Time"
-msgstr "Hora d'estiu d'Europa de l'oest"
+msgstr "Europa, oest, hora d'estiu"
#: dlls/tzres/tzres.rc:428
msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"
@@ -11223,12 +11173,12 @@ msgstr "(UTC+01:00) Amsterdam, Berlín, Berna, Roma, Estocolm, Viena"
#: dlls/tzres/tzres.rc:231
msgctxt "maximum 31 characters"
msgid "Montevideo Standard Time"
-msgstr "Hora estàndard de Montevideo"
+msgstr "Montevideo, hora estàndard"
#: dlls/tzres/tzres.rc:232
msgctxt "maximum 31 characters"
msgid "Montevideo Daylight Time"
-msgstr "Hora d'estiu de Montevideo"
+msgstr "Montevideo, hora d'estiu"
#: dlls/tzres/tzres.rc:233
msgid "(UTC-03:00) Montevideo"
@@ -11237,12 +11187,12 @@ msgstr "(UTC-03:00) Montevideo"
#: dlls/tzres/tzres.rc:285
msgctxt "maximum 31 characters"
msgid "Pakistan Standard Time"
-msgstr "Hora estàndard del Pakistan"
+msgstr "Pakistan, hora estàndard"
#: dlls/tzres/tzres.rc:286
msgctxt "maximum 31 characters"
msgid "Pakistan Daylight Time"
-msgstr "Hora d'estiu del Pakistan"
+msgstr "Pakistan, hora d'estiu"
#: dlls/tzres/tzres.rc:287
msgid "(UTC+05:00) Islamabad, Karachi"
@@ -11251,12 +11201,12 @@ msgstr "(UTC+05:00) Islamabad, Karachi"
#: dlls/tzres/tzres.rc:366
msgctxt "maximum 31 characters"
msgid "Tomsk Standard Time"
-msgstr "Hora estàndard de Tomsk"
+msgstr "Tomsk, hora estàndard"
#: dlls/tzres/tzres.rc:367
msgctxt "maximum 31 characters"
msgid "Tomsk Daylight Time"
-msgstr "Hora d'estiu de Tomsk"
+msgstr "Tomsk, hora d'estiu"
#: dlls/tzres/tzres.rc:368
msgid "(UTC+07:00) Tomsk"
@@ -11265,12 +11215,12 @@ msgstr "(UTC+07:00) Tomsk"
#: dlls/tzres/tzres.rc:93
msgctxt "maximum 31 characters"
msgid "Caucasus Standard Time"
-msgstr "Hora estàndard del Caucas"
+msgstr "Caucas, hora estàndard"
#: dlls/tzres/tzres.rc:94
msgctxt "maximum 31 characters"
msgid "Caucasus Daylight Time"
-msgstr "Hora d'estiu del Caucas"
+msgstr "Caucas, hora d'estiu"
#: dlls/tzres/tzres.rc:95
msgid "(UTC+04:00) Yerevan"
@@ -11279,30 +11229,26 @@ msgstr "(UTC+04:00) Erevan"
#: dlls/tzres/tzres.rc:66
msgctxt "maximum 31 characters"
msgid "AUS Eastern Standard Time"
-msgstr "Hora estàndard oriental AUS"
+msgstr "Austràlia, est, hora estàndard"
#: dlls/tzres/tzres.rc:67
msgctxt "maximum 31 characters"
msgid "AUS Eastern Daylight Time"
-msgstr "Hora d'estiu de l'est AUS"
+msgstr "Austràlia, est, hora d'estiu"
#: dlls/tzres/tzres.rc:68
msgid "(UTC+10:00) Canberra, Melbourne, Sydney"
msgstr "(UTC+10:00) Canberra, Melbourne, Sydney"
#: dlls/tzres/tzres.rc:246
-#, fuzzy
-#| msgid "N. Central Asia Standard Time"
msgctxt "maximum 31 characters"
msgid "N. Central Asia Standard Time"
-msgstr "Hora estàndard d'Àsia del centre-nord"
+msgstr "Àsia del mig-nord, hora estànd."
#: dlls/tzres/tzres.rc:247
-#, fuzzy
-#| msgid "N. Central Asia Daylight Time"
msgctxt "maximum 31 characters"
msgid "N. Central Asia Daylight Time"
-msgstr "Hora d'estiu d'Àsia del centre-nord"
+msgstr "Àsia del mig-nord, hora d'estiu"
#: dlls/tzres/tzres.rc:248
msgid "(UTC+07:00) Novosibirsk"
@@ -11311,12 +11257,12 @@ msgstr "(UTC+07:00) Novossibirsk"
#: dlls/tzres/tzres.rc:150
msgctxt "maximum 31 characters"
msgid "Eastern Standard Time"
-msgstr "Hora estàndard de l'est"
+msgstr "Am. del nord, est, hora estànd."
#: dlls/tzres/tzres.rc:151
msgctxt "maximum 31 characters"
msgid "Eastern Daylight Time"
-msgstr "Hora d'estiu de l'est"
+msgstr "Am. del nord, est, hora d'estiu"
#: dlls/tzres/tzres.rc:152
msgid "(UTC-05:00) Eastern Time (US & Canada)"
@@ -11325,28 +11271,26 @@ msgstr "(UTC-05:00) Hora de l'est (EU i Canadà)"
#: dlls/tzres/tzres.rc:372
msgctxt "maximum 31 characters"
msgid "Transbaikal Standard Time"
-msgstr "Hora estàndard de Transbaikal"
+msgstr "Transbaikal, hora estàndard"
#: dlls/tzres/tzres.rc:373
msgctxt "maximum 31 characters"
msgid "Transbaikal Daylight Time"
-msgstr "Hora d'estiu de Transbaikal"
+msgstr "Transbaikal, hora d'estiu"
#: dlls/tzres/tzres.rc:374
msgid "(UTC+09:00) Chita"
msgstr "(UTC+09:00) Txità"
#: dlls/tzres/tzres.rc:141
-#, fuzzy
-#| msgid "E. Europe Standard Time"
msgctxt "maximum 31 characters"
msgid "E. Europe Standard Time"
-msgstr "Hora estàndard d'Europa de l'est"
+msgstr "Europa, est, hora estàndard"
#: dlls/tzres/tzres.rc:142
msgctxt "maximum 31 characters"
msgid "E. Europe Daylight Time"
-msgstr "Hora d'estiu d'Europa de l'est"
+msgstr "Europa, est, hora d'estiu"
#: dlls/tzres/tzres.rc:143
msgid "(UTC+02:00) Chisinau"
@@ -11355,12 +11299,12 @@ msgstr "(UTC+02:00) Chisinau"
#: dlls/tzres/tzres.rc:120
msgctxt "maximum 31 characters"
msgid "Central Standard Time (Mexico)"
-msgstr "Hora estàndard central (Mèxic)"
+msgstr "Mèxic, central, hora estàndard"
#: dlls/tzres/tzres.rc:121
msgctxt "maximum 31 characters"
msgid "Central Daylight Time (Mexico)"
-msgstr "Hora d'estiu central (Mèxic)"
+msgstr "Mèxic, central, hora d'estiu"
#: dlls/tzres/tzres.rc:122
msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey"
@@ -11369,12 +11313,12 @@ msgstr "(UTC-06:00) Guadalajara, Ciutat de Mèxic, Monterrey"
#: dlls/tzres/tzres.rc:330
msgctxt "maximum 31 characters"
msgid "Saratov Standard Time"
-msgstr "Hora estàndard de Saràtov"
+msgstr "Saràtov, hora estàndard"
#: dlls/tzres/tzres.rc:331
msgctxt "maximum 31 characters"
msgid "Saratov Daylight Time"
-msgstr "Hora d'estiu de Saràtov"
+msgstr "Saràtov, hora d'estiu"
#: dlls/tzres/tzres.rc:332
msgid "(UTC+04:00) Saratov"
@@ -11383,12 +11327,12 @@ msgstr "(UTC+04:00) Saràtov"
#: dlls/tzres/tzres.rc:57
msgctxt "maximum 31 characters"
msgid "Atlantic Standard Time"
-msgstr "Hora estàndard de l'Atlàntic"
+msgstr "Atlàntic, hora estàndard"
#: dlls/tzres/tzres.rc:58
msgctxt "maximum 31 characters"
msgid "Atlantic Daylight Time"
-msgstr "Hora d'estiu de l'Atlàntic"
+msgstr "Atlàntic, hora d'estiu"
#: dlls/tzres/tzres.rc:59
msgid "(UTC-04:00) Atlantic Time (Canada)"
@@ -11397,26 +11341,26 @@ msgstr "(UTC-04:00) Hora de l'Atlàntic (Canadà)"
#: dlls/tzres/tzres.rc:237
msgctxt "maximum 31 characters"
msgid "Mountain Standard Time"
-msgstr "Hora estàndard de les muntanyes"
+msgstr "Am. d. n., muntany., h. estàn."
#: dlls/tzres/tzres.rc:238
msgctxt "maximum 31 characters"
msgid "Mountain Daylight Time"
-msgstr "Hora d'estiu de les muntanyes"
+msgstr "Am. d. n., muntany., h. d'estiu"
#: dlls/tzres/tzres.rc:239
msgid "(UTC-07:00) Mountain Time (US & Canada)"
-msgstr "(UTC-07:00) Hora de les muntanyes (EU i Canadà)"
+msgstr "(UTC-07:00) Hora de les muntanyes (EUA i Canadà)"
#: dlls/tzres/tzres.rc:384
msgctxt "maximum 31 characters"
msgid "US Eastern Standard Time"
-msgstr "Hora estàndard de l'est EUA"
+msgstr "Indiana, est, hora estànd."
#: dlls/tzres/tzres.rc:385
msgctxt "maximum 31 characters"
msgid "US Eastern Daylight Time"
-msgstr "Hora d'estiu de l'est EUA"
+msgstr "Indiana, est, hora d'estiu"
#: dlls/tzres/tzres.rc:386
msgid "(UTC-05:00) Indiana (East)"
@@ -11425,28 +11369,26 @@ msgstr "(UTC-05:00) Indiana (est)"
#: dlls/tzres/tzres.rc:321
msgctxt "maximum 31 characters"
msgid "Sakhalin Standard Time"
-msgstr "Hora estàndard de Sakhalín"
+msgstr "Sakhalín, hora estàndard"
#: dlls/tzres/tzres.rc:322
msgctxt "maximum 31 characters"
msgid "Sakhalin Daylight Time"
-msgstr "Hora d'estiu de Sakhalín"
+msgstr "Sakhalín, hora d'estiu"
#: dlls/tzres/tzres.rc:323
msgid "(UTC+11:00) Sakhalin"
msgstr "(UTC+11:00) Sakhalín"
#: dlls/tzres/tzres.rc:270
-#, fuzzy
-#| msgid "North Korea Standard Time"
msgctxt "maximum 31 characters"
msgid "North Korea Standard Time"
-msgstr "Hora estàndard de Corea del Nord"
+msgstr "Corea del Nord, hora estàndard"
#: dlls/tzres/tzres.rc:271
msgctxt "maximum 31 characters"
msgid "North Korea Daylight Time"
-msgstr "Hora d'estiu de Corea del Nord"
+msgstr "Corea del Nord, hora d'estiu"
#: dlls/tzres/tzres.rc:272
msgid "(UTC+09:00) Pyongyang"
@@ -11455,30 +11397,26 @@ msgstr "(UTC+09:00) Pyongyang"
#: dlls/tzres/tzres.rc:357
msgctxt "maximum 31 characters"
msgid "Tasmania Standard Time"
-msgstr "Hora estàndard de Tasmània"
+msgstr "Tasmània, hora estàndard"
#: dlls/tzres/tzres.rc:358
msgctxt "maximum 31 characters"
msgid "Tasmania Daylight Time"
-msgstr "Hora d'estiu de Tasmània"
+msgstr "Tasmània, hora d'estiu"
#: dlls/tzres/tzres.rc:359
msgid "(UTC+10:00) Hobart"
msgstr "(UTC+10:00) Hobart"
#: dlls/tzres/tzres.rc:99
-#, fuzzy
-#| msgid "Central America Standard Time"
msgctxt "maximum 31 characters"
msgid "Central America Standard Time"
-msgstr "Hora estàndard de l'Àmerica central"
+msgstr "Àmerica central, hora estàndard"
#: dlls/tzres/tzres.rc:100
-#, fuzzy
-#| msgid "Central America Daylight Time"
msgctxt "maximum 31 characters"
msgid "Central America Daylight Time"
-msgstr "Hora d'estiu de l'Àmerica central"
+msgstr "Àmerica central, hora d'estiu"
#: dlls/tzres/tzres.rc:101
msgid "(UTC-06:00) Central America"
@@ -11494,54 +11432,42 @@ msgid "(UTC-02:00) Coordinated Universal Time-02"
msgstr "(UTC-02:00) Temps universal coordinat-02"
#: dlls/tzres/tzres.rc:387
-#, fuzzy
-#| msgid "US Mountain Standard Time"
msgctxt "maximum 31 characters"
msgid "US Mountain Standard Time"
-msgstr "Hora estàndard de les muntanyes EUA"
+msgstr "Arizona, muntanyenc, h. estànd."
#: dlls/tzres/tzres.rc:388
-#, fuzzy
-#| msgid "US Mountain Daylight Time"
msgctxt "maximum 31 characters"
msgid "US Mountain Daylight Time"
-msgstr "Hora d'estiu de les muntanyes EUA"
+msgstr "Arizona, muntanyenc, h. d'estiu"
#: dlls/tzres/tzres.rc:389
msgid "(UTC-07:00) Arizona"
msgstr "(UTC-07:00) Arizona"
#: dlls/tzres/tzres.rc:339
-#, fuzzy
-#| msgid "South Africa Standard Time"
msgctxt "maximum 31 characters"
msgid "South Africa Standard Time"
-msgstr "Hora estàndard de l'Àfrica del Sud"
+msgstr "Àfrica del Sud, hora estàndard"
#: dlls/tzres/tzres.rc:340
-#, fuzzy
-#| msgid "South Africa Daylight Time"
msgctxt "maximum 31 characters"
msgid "South Africa Daylight Time"
-msgstr "Hora d'estiu de l'Àfrica del Sud"
+msgstr "Àfrica del Sud, hora d'estiu"
#: dlls/tzres/tzres.rc:341
msgid "(UTC+02:00) Harare, Pretoria"
msgstr "(UTC+02:00) Harare, Pretòria"
#: dlls/tzres/tzres.rc:96
-#, fuzzy
-#| msgid "Cen. Australia Standard Time"
msgctxt "maximum 31 characters"
msgid "Cen. Australia Standard Time"
-msgstr "Hora estàndard de l'Austràlia central"
+msgstr "Austràlia, central, hora estàn."
#: dlls/tzres/tzres.rc:97
-#, fuzzy
-#| msgid "Cen. Australia Daylight Time"
msgctxt "maximum 31 characters"
msgid "Cen. Australia Daylight Time"
-msgstr "Hora d'estiu de l'Austràlia central"
+msgstr "Austràlia central, hora d'estiu"
#: dlls/tzres/tzres.rc:98
msgid "(UTC+09:30) Adelaide"
@@ -11559,12 +11485,12 @@ msgstr "(UTC-09:00) Temps universal coordinat-09"
#: dlls/tzres/tzres.rc:345
msgctxt "maximum 31 characters"
msgid "Sri Lanka Standard Time"
-msgstr "Hora estàndard de Sri Lanka"
+msgstr "Sri Lanka, hora estàndard"
#: dlls/tzres/tzres.rc:346
msgctxt "maximum 31 characters"
msgid "Sri Lanka Daylight Time"
-msgstr "Hora d'estiu de Sri Lanka"
+msgstr "Sri Lanka, hora d'estiu"
#: dlls/tzres/tzres.rc:347
msgid "(UTC+05:30) Sri Jayawardenepura"
@@ -11573,12 +11499,12 @@ msgstr "(UTC+05:30) Sri Jayewardenepura"
#: dlls/tzres/tzres.rc:30
msgctxt "maximum 31 characters"
msgid "Afghanistan Standard Time"
-msgstr "Hora estàndard de l'Afganistan"
+msgstr "Afganistan, hora estàndard"
#: dlls/tzres/tzres.rc:31
msgctxt "maximum 31 characters"
msgid "Afghanistan Daylight Time"
-msgstr "Hora d'estiu de l'Afganistan"
+msgstr "Afganistan, hora d'estiu"
#: dlls/tzres/tzres.rc:32
msgid "(UTC+04:30) Kabul"
@@ -11587,30 +11513,26 @@ msgstr "(UTC+04:30) Kabul"
#: dlls/tzres/tzres.rc:441
msgctxt "maximum 31 characters"
msgid "Yakutsk Standard Time"
-msgstr "Hora estàndard de Iakutsk"
+msgstr "Iakutsk, hora estàndard"
#: dlls/tzres/tzres.rc:442
msgctxt "maximum 31 characters"
msgid "Yakutsk Daylight Time"
-msgstr "Hora d'estiu de Iakutsk"
+msgstr "Iakutsk, hora d'estiu"
#: dlls/tzres/tzres.rc:443
msgid "(UTC+09:00) Yakutsk"
msgstr "(UTC+09:00) Iakutsk"
#: dlls/tzres/tzres.rc:309
-#, fuzzy
-#| msgid "SA Eastern Standard Time"
msgctxt "maximum 31 characters"
msgid "SA Eastern Standard Time"
-msgstr "Hora estàndard d'Àmerica del sud-est"
+msgstr "Am. del sud, est, hora estànd."
#: dlls/tzres/tzres.rc:310
-#, fuzzy
-#| msgid "SA Eastern Daylight Time"
msgctxt "maximum 31 characters"
msgid "SA Eastern Daylight Time"
-msgstr "Hora d'estiu d'Àmerica del sud-est"
+msgstr "Am. del sud, est, hora d'estiu"
#: dlls/tzres/tzres.rc:311
msgid "(UTC-03:00) Cayenne, Fortaleza"
@@ -11619,12 +11541,12 @@ msgstr "(UTC-03:00) Caiena, Fortaleza"
#: dlls/tzres/tzres.rc:42
msgctxt "maximum 31 characters"
msgid "Arab Standard Time"
-msgstr "Hora estàndard àrab"
+msgstr "Aràbia, hora estàndard"
#: dlls/tzres/tzres.rc:43
msgctxt "maximum 31 characters"
msgid "Arab Daylight Time"
-msgstr "Hora d'estiu àrab"
+msgstr "Aràbia, hora d'estiu"
#: dlls/tzres/tzres.rc:44
msgid "(UTC+03:00) Kuwait, Riyadh"
@@ -11633,12 +11555,12 @@ msgstr "(UTC+03:00) Kuwait, Riad"
#: dlls/tzres/tzres.rc:45
msgctxt "maximum 31 characters"
msgid "Arabian Standard Time"
-msgstr "Hora estàndard de l'Àrabia"
+msgstr "Àrabia, hora estàndard"
#: dlls/tzres/tzres.rc:46
msgctxt "maximum 31 characters"
msgid "Arabian Daylight Time"
-msgstr "Hora d'estiu de l'Àrabia"
+msgstr "Àrabia, hora d'estiu"
#: dlls/tzres/tzres.rc:47
msgid "(UTC+04:00) Abu Dhabi, Muscat"
@@ -11647,12 +11569,12 @@ msgstr "(UTC+04:00) Abu Dhabi, Masqat"
#: dlls/tzres/tzres.rc:360
msgctxt "maximum 31 characters"
msgid "Tocantins Standard Time"
-msgstr "Hora estàndard de Tocantins"
+msgstr "Tocantins, hora estàndard"
#: dlls/tzres/tzres.rc:361
msgctxt "maximum 31 characters"
msgid "Tocantins Daylight Time"
-msgstr "Hora d'estiu de Tocantins"
+msgstr "Tocantins, hora d'estiu"
#: dlls/tzres/tzres.rc:362
msgid "(UTC-03:00) Araguaina"
@@ -11661,30 +11583,26 @@ msgstr "(UTC-03:00) Araguaína"
#: dlls/tzres/tzres.rc:306
msgctxt "maximum 31 characters"
msgid "Russian Standard Time"
-msgstr "Hora estàndard de Rússia"
+msgstr "Rússia, hora estàndard"
#: dlls/tzres/tzres.rc:307
msgctxt "maximum 31 characters"
msgid "Russian Daylight Time"
-msgstr "Hora d'estiu de Rússia"
+msgstr "Rússia, hora d'estiu"
#: dlls/tzres/tzres.rc:308
msgid "(UTC+03:00) Moscow, St. Petersburg"
msgstr "(UTC+03:00) Moscou, Sant Petersburg"
#: dlls/tzres/tzres.rc:63
-#, fuzzy
-#| msgid "Aus Central W. Standard Time"
msgctxt "maximum 31 characters"
msgid "Aus Central W. Standard Time"
-msgstr "Hora estàndard d'Austràlia del centre-oest"
+msgstr "Austràlia, mig-oest, h. estànd."
#: dlls/tzres/tzres.rc:64
-#, fuzzy
-#| msgid "Aus Central W. Daylight Time"
msgctxt "maximum 31 characters"
msgid "Aus Central W. Daylight Time"
-msgstr "Hora d'estiu d'Austràlia del centre-oest"
+msgstr "Austràlia, mig-oest, h. d'estiu"
#: dlls/tzres/tzres.rc:65
msgid "(UTC+08:45) Eucla"
@@ -11693,12 +11611,12 @@ msgstr "(UTC+08:45) Eucla"
#: dlls/tzres/tzres.rc:294
msgctxt "maximum 31 characters"
msgid "Romance Standard Time"
-msgstr "Hora estàndard romànic"
+msgstr "Europa, central, hora estàndard"
#: dlls/tzres/tzres.rc:295
msgctxt "maximum 31 characters"
msgid "Romance Daylight Time"
-msgstr "Hora d'estiu romànic"
+msgstr "Europa, central, hora d'estiu"
#: dlls/tzres/tzres.rc:296
msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris"
@@ -11707,12 +11625,12 @@ msgstr "(UTC+01:00) Brussel·les, Copenhaguen, Madrid, París"
#: dlls/tzres/tzres.rc:159
msgctxt "maximum 31 characters"
msgid "Ekaterinburg Standard Time"
-msgstr "Hora estàndard de Iekaterinburg"
+msgstr "Iekaterinburg, hora estàndard"
#: dlls/tzres/tzres.rc:160
msgctxt "maximum 31 characters"
msgid "Ekaterinburg Daylight Time"
-msgstr "Hora d'estiu de Iekaterinburg"
+msgstr "Iekaterinburg, hora d'estiu"
#: dlls/tzres/tzres.rc:161
msgid "(UTC+05:00) Ekaterinburg"
@@ -11721,7 +11639,7 @@ msgstr "(UTC+05:00) Iekaterinburg"
#: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301
msgctxt "maximum 31 characters"
msgid "Russia Time Zone 11"
-msgstr "Zona horària russa 11"
+msgstr "Rússia, zona horària 11"
#: dlls/tzres/tzres.rc:302
msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky"
@@ -11730,12 +11648,12 @@ msgstr "(UTC+12:00) Anàdir, Petropàvlovsk-Kamtxatski"
#: dlls/tzres/tzres.rc:435
msgctxt "maximum 31 characters"
msgid "West Bank Standard Time"
-msgstr "Hora estàndard de Cisjordània"
+msgstr "Cisjordània, hora estàndard"
#: dlls/tzres/tzres.rc:436
msgctxt "maximum 31 characters"
msgid "West Bank Daylight Time"
-msgstr "Hora d'estiu de Cisjordània"
+msgstr "Cisjordània, hora d'estiu"
#: dlls/tzres/tzres.rc:437
msgid "(UTC+02:00) Gaza, Hebron"
@@ -11744,12 +11662,12 @@ msgstr "(UTC+02:00) Gaza, Hebron"
#: dlls/tzres/tzres.rc:351
msgctxt "maximum 31 characters"
msgid "Syria Standard Time"
-msgstr "Hora estàndard de Síria"
+msgstr "Síria, hora estàndard"
#: dlls/tzres/tzres.rc:352
msgctxt "maximum 31 characters"
msgid "Syria Daylight Time"
-msgstr "Hora d'estiu de Síria"
+msgstr "Síria, hora d'estiu"
#: dlls/tzres/tzres.rc:353
msgid "(UTC+02:00) Damascus"
@@ -11758,12 +11676,12 @@ msgstr "(UTC+02:00) Damasc"
#: dlls/tzres/tzres.rc:60
msgctxt "maximum 31 characters"
msgid "AUS Central Standard Time"
-msgstr "Hora estàndard central AUS"
+msgstr "Austràlia, central, hora estàn."
#: dlls/tzres/tzres.rc:61
msgctxt "maximum 31 characters"
msgid "AUS Central Daylight Time"
-msgstr "Hora d'estiu central AUS"
+msgstr "Austràlia, centre, hora d'estiu"
#: dlls/tzres/tzres.rc:62
msgid "(UTC+09:30) Darwin"
@@ -11786,12 +11704,12 @@ msgstr "(UTC+00:00) Monròvia, Reykjavík"
#: dlls/tzres/tzres.rc:381
msgctxt "maximum 31 characters"
msgid "Ulaanbaatar Standard Time"
-msgstr "Hora estàndard d'Ulan Bator"
+msgstr "Ulan Bator, hora estàndard"
#: dlls/tzres/tzres.rc:382
msgctxt "maximum 31 characters"
msgid "Ulaanbaatar Daylight Time"
-msgstr "Hora d'estiu d'Ulan Bator"
+msgstr "Ulan Bator, hora d'estiu"
#: dlls/tzres/tzres.rc:383
msgid "(UTC+08:00) Ulaanbaatar"
@@ -11800,12 +11718,12 @@ msgstr "(UTC+08:00) Ulaanbaatar"
#: dlls/tzres/tzres.rc:261
msgctxt "maximum 31 characters"
msgid "Norfolk Standard Time"
-msgstr "Hora estàndard de Norfolk"
+msgstr "Norfolk, hora estàndard"
#: dlls/tzres/tzres.rc:262
msgctxt "maximum 31 characters"
msgid "Norfolk Daylight Time"
-msgstr "Hora d'estiu de Norfolk"
+msgstr "Norfolk, hora d'estiu"
#: dlls/tzres/tzres.rc:263
msgid "(UTC+11:00) Norfolk Island"
@@ -11814,12 +11732,12 @@ msgstr "(UTC+11:00) Illa Norfolk"
#: dlls/tzres/tzres.rc:195
msgctxt "maximum 31 characters"
msgid "Israel Standard Time"
-msgstr "Hora estàndard d'Israel"
+msgstr "Israel, hora estàndard"
#: dlls/tzres/tzres.rc:196
msgctxt "maximum 31 characters"
msgid "Israel Daylight Time"
-msgstr "Hora d'estiu d'Israel"
+msgstr "Israel, hora d'estiu"
#: dlls/tzres/tzres.rc:197
msgid "(UTC+02:00) Jerusalem"
@@ -11828,30 +11746,26 @@ msgstr "(UTC+02:00) Jerusalem"
#: dlls/tzres/tzres.rc:78
msgctxt "maximum 31 characters"
msgid "Bangladesh Standard Time"
-msgstr "Hora estàndard de Bangla Desh"
+msgstr "Bangla Desh, hora estàndard"
#: dlls/tzres/tzres.rc:79
msgctxt "maximum 31 characters"
msgid "Bangladesh Daylight Time"
-msgstr "Hora d'estiu de Bangla Desh"
+msgstr "Bangla Desh, hora d'estiu"
#: dlls/tzres/tzres.rc:80
msgid "(UTC+06:00) Dhaka"
msgstr "(UTC+06:00) Dhaka"
#: dlls/tzres/tzres.rc:312
-#, fuzzy
-#| msgid "SA Pacific Standard Time"
msgctxt "maximum 31 characters"
msgid "SA Pacific Standard Time"
-msgstr "Hora estàndard del Pacífic de l'Amèrica del Sud"
+msgstr "Am. del sud, Pacífic, h. estàn."
#: dlls/tzres/tzres.rc:313
-#, fuzzy
-#| msgid "SA Pacific Daylight Time"
msgctxt "maximum 31 characters"
msgid "SA Pacific Daylight Time"
-msgstr "Hora d'estiu del Pacífic de l'Amèrica del Sud"
+msgstr "Am. d. sud, Pacífic, h. d'estiu"
#: dlls/tzres/tzres.rc:314
msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco"
@@ -11860,12 +11774,12 @@ msgstr "(UTC-05:00) Bogotà, Lima, Quito, Rio Branco"
#: dlls/tzres/tzres.rc:432
msgctxt "maximum 31 characters"
msgid "West Asia Standard Time"
-msgstr "Hora estàndard d'Àsia de l'oest"
+msgstr "Àsia de l'oest, hora estàndard"
#: dlls/tzres/tzres.rc:433
msgctxt "maximum 31 characters"
msgid "West Asia Daylight Time"
-msgstr "Hora d'estiu d'Àsia de l'oest"
+msgstr "Àsia de l'oest, hora d'estiu"
#: dlls/tzres/tzres.rc:434
msgid "(UTC+05:00) Ashgabat, Tashkent"
@@ -11874,12 +11788,12 @@ msgstr "(UTC+05:00) Aixkhabad, Taixkent"
#: dlls/tzres/tzres.rc:33
msgctxt "maximum 31 characters"
msgid "Alaskan Standard Time"
-msgstr "Hora estàndard d'Alaska"
+msgstr "Alaska, hora estàndard"
#: dlls/tzres/tzres.rc:34
msgctxt "maximum 31 characters"
msgid "Alaskan Daylight Time"
-msgstr "Hora d'estiu d'Alaska"
+msgstr "Alaska, hora d'estiu"
#: dlls/tzres/tzres.rc:35
msgid "(UTC-09:00) Alaska"
@@ -11888,30 +11802,26 @@ msgstr "(UTC-09:00) Alaska"
#: dlls/tzres/tzres.rc:288
msgctxt "maximum 31 characters"
msgid "Paraguay Standard Time"
-msgstr "Hora estàndard del Paraguai"
+msgstr "Paraguai, hora estàndard"
#: dlls/tzres/tzres.rc:289
msgctxt "maximum 31 characters"
msgid "Paraguay Daylight Time"
-msgstr "Hora d'estiu del Paraguai"
+msgstr "Paraguai, hora d'estiu"
#: dlls/tzres/tzres.rc:290
msgid "(UTC-04:00) Asuncion"
msgstr "(UTC-04:00) Asunción"
#: dlls/tzres/tzres.rc:132
-#, fuzzy
-#| msgid "Dateline Standard Time"
msgctxt "maximum 31 characters"
msgid "Dateline Standard Time"
-msgstr "Hora estàndard de la línia de canvi de data"
+msgstr "Línia de data, hora estàndard"
#: dlls/tzres/tzres.rc:133
-#, fuzzy
-#| msgid "Dateline Daylight Time"
msgctxt "maximum 31 characters"
msgid "Dateline Daylight Time"
-msgstr "Hora d'estiu de la línia de canvi de data"
+msgstr "Línia de data, hora d'estiu"
#: dlls/tzres/tzres.rc:134
msgid "(UTC-12:00) International Date Line West"
@@ -11920,12 +11830,12 @@ msgstr "(UTC-12:00) Línia internacional de canvi de data occidental"
#: dlls/tzres/tzres.rc:207
msgctxt "maximum 31 characters"
msgid "Libya Standard Time"
-msgstr "Hora estàndard de Líbia"
+msgstr "Líbia, hora estàndard"
#: dlls/tzres/tzres.rc:208
msgctxt "maximum 31 characters"
msgid "Libya Daylight Time"
-msgstr "Hora d'estiu de Líbia"
+msgstr "Líbia, hora d'estiu"
#: dlls/tzres/tzres.rc:209
msgid "(UTC+02:00) Tripoli"
@@ -11934,12 +11844,12 @@ msgstr "(UTC+02:00) Trípoli"
#: dlls/tzres/tzres.rc:75
msgctxt "maximum 31 characters"
msgid "Bahia Standard Time"
-msgstr "Hora estàndard de Bahia"
+msgstr "Bahia, hora estàndard"
#: dlls/tzres/tzres.rc:76
msgctxt "maximum 31 characters"
msgid "Bahia Daylight Time"
-msgstr "Hora d'estiu de Bahia"
+msgstr "Bahia, hora d'estiu"
#: dlls/tzres/tzres.rc:77
msgid "(UTC-03:00) Salvador"
@@ -11948,12 +11858,12 @@ msgstr "(UTC-03:00) Salvador"
#: dlls/tzres/tzres.rc:411
msgctxt "maximum 31 characters"
msgid "Venezuela Standard Time"
-msgstr "Hora estàndard de Veneçuela"
+msgstr "Veneçuela, hora estàndard"
#: dlls/tzres/tzres.rc:412
msgctxt "maximum 31 characters"
msgid "Venezuela Daylight Time"
-msgstr "Hora d'estiu de Veneçuela"
+msgstr "Veneçuela, hora d'estiu"
#: dlls/tzres/tzres.rc:413
msgid "(UTC-04:00) Caracas"
@@ -11962,12 +11872,12 @@ msgstr "(UTC-04:00) Caracas"
#: dlls/tzres/tzres.rc:84
msgctxt "maximum 31 characters"
msgid "Bougainville Standard Time"
-msgstr "Hora estàndard de Bougainville"
+msgstr "Bougainville, hora estàndard"
#: dlls/tzres/tzres.rc:85
msgctxt "maximum 31 characters"
msgid "Bougainville Daylight Time"
-msgstr "Hora d'estiu de Bougainville"
+msgstr "Bougainville, hora d'estiu"
#: dlls/tzres/tzres.rc:86
msgid "(UTC+11:00) Bougainville Island"
@@ -11976,30 +11886,26 @@ msgstr "(UTC+11:00) Illa de Bougainville"
#: dlls/tzres/tzres.rc:186
msgctxt "maximum 31 characters"
msgid "Hawaiian Standard Time"
-msgstr "Hora estàndard de Hawaii"
+msgstr "Hawaii, hora estàndard"
#: dlls/tzres/tzres.rc:187
msgctxt "maximum 31 characters"
msgid "Hawaiian Daylight Time"
-msgstr "Hora d'estiu de Hawaii"
+msgstr "Hawaii, hora d'estiu"
#: dlls/tzres/tzres.rc:188
msgid "(UTC-10:00) Hawaii"
msgstr "(UTC-10:00) Hawaii"
#: dlls/tzres/tzres.rc:333
-#, fuzzy
-#| msgid "SE Asia Standard Time"
msgctxt "maximum 31 characters"
msgid "SE Asia Standard Time"
-msgstr "Hora estàndard de l'Àsia del Sud-est"
+msgstr "Àsia del sud-est, hora estànd."
#: dlls/tzres/tzres.rc:334
-#, fuzzy
-#| msgid "SE Asia Daylight Time"
msgctxt "maximum 31 characters"
msgid "SE Asia Daylight Time"
-msgstr "Hora d'estiu de l'Àsia del Sud-est"
+msgstr "Àsia del sud-est, hora d'estiu"
#: dlls/tzres/tzres.rc:335
msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta"
@@ -12008,30 +11914,26 @@ msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta"
#: dlls/tzres/tzres.rc:291
msgctxt "maximum 31 characters"
msgid "Qyzylorda Standard Time"
-msgstr "Hora estàndard de Khizilordà"
+msgstr "Khizilordà, hora estàndard"
#: dlls/tzres/tzres.rc:292
msgctxt "maximum 31 characters"
msgid "Qyzylorda Daylight Time"
-msgstr "Hora d'estiu de Khizilordà"
+msgstr "Khizilordà, hora d'estiu"
#: dlls/tzres/tzres.rc:293
msgid "(UTC+05:00) Qyzylorda"
msgstr "(UTC+05:00) Khizilordà"
#: dlls/tzres/tzres.rc:429
-#, fuzzy
-#| msgid "W. Mongolia Standard Time"
msgctxt "maximum 31 characters"
msgid "W. Mongolia Standard Time"
-msgstr "Hora estàndard de Mongòlia de l'oest"
+msgstr "Mongòlia, oest, hora estàndard"
#: dlls/tzres/tzres.rc:430
-#, fuzzy
-#| msgid "W. Mongolia Daylight Time"
msgctxt "maximum 31 characters"
msgid "W. Mongolia Daylight Time"
-msgstr "Hora d'estiu de Mongòlia de l'oest"
+msgstr "Mongòlia, oest, hora d'estiu"
#: dlls/tzres/tzres.rc:431
msgid "(UTC+07:00) Hovd"
@@ -12040,12 +11942,12 @@ msgstr "(UTC+07:00) Hovd"
#: dlls/tzres/tzres.rc:255
msgctxt "maximum 31 characters"
msgid "New Zealand Standard Time"
-msgstr "Hora estàndard de Nova Zelanda"
+msgstr "Nova Zelanda, hora estàndard"
#: dlls/tzres/tzres.rc:256
msgctxt "maximum 31 characters"
msgid "New Zealand Daylight Time"
-msgstr "Hora d'estiu de Nova Zelanda"
+msgstr "Nova Zelanda, hora d'estiu"
#: dlls/tzres/tzres.rc:257
msgid "(UTC+12:00) Auckland, Wellington"
@@ -12054,12 +11956,12 @@ msgstr "(UTC+12:00) Auckland, Wellington"
#: dlls/tzres/tzres.rc:36
msgctxt "maximum 31 characters"
msgid "Aleutian Standard Time"
-msgstr "Hora estàndard aleutiana"
+msgstr "Aleutia, hora estàndard"
#: dlls/tzres/tzres.rc:37
msgctxt "maximum 31 characters"
msgid "Aleutian Daylight Time"
-msgstr "Hora d'estiu aleutiana"
+msgstr "Aleutia, hora d'estiu"
#: dlls/tzres/tzres.rc:38
msgid "(UTC-10:00) Aleutian Islands"
@@ -12068,28 +11970,26 @@ msgstr "(UTC-10:00) Illes Aleutianes"
#: dlls/tzres/tzres.rc:273
msgctxt "maximum 31 characters"
msgid "Omsk Standard Time"
-msgstr "Hora estàndard d'Omsk"
+msgstr "Omsk, hora estàndard"
#: dlls/tzres/tzres.rc:274
msgctxt "maximum 31 characters"
msgid "Omsk Daylight Time"
-msgstr "Hora d'estiu d'Omsk"
+msgstr "Omsk, hora d'estiu"
#: dlls/tzres/tzres.rc:275
msgid "(UTC+06:00) Omsk"
msgstr "(UTC+06:00) Omsk"
#: dlls/tzres/tzres.rc:105
-#, fuzzy
-#| msgid "Central Brazilian Standard Time"
msgctxt "maximum 31 characters"
msgid "Central Brazilian Standard Time"
-msgstr "Hora estàndard del Brasil central"
+msgstr "Brasil, central, hora estàndard"
#: dlls/tzres/tzres.rc:106
msgctxt "maximum 31 characters"
msgid "Central Brazilian Daylight Time"
-msgstr "Hora d'estiu del Brasil central"
+msgstr "Brasil, central, hora d'estiu"
#: dlls/tzres/tzres.rc:107
msgid "(UTC-04:00) Cuiaba"
@@ -12098,30 +11998,26 @@ msgstr "(UTC-04:00) Cuiabá"
#: dlls/tzres/tzres.rc:81
msgctxt "maximum 31 characters"
msgid "Belarus Standard Time"
-msgstr "Hora estàndard de Bielorússia"
+msgstr "Bielorússia, hora estàndard"
#: dlls/tzres/tzres.rc:82
msgctxt "maximum 31 characters"
msgid "Belarus Daylight Time"
-msgstr "Hora d'estiu de Bielorússia"
+msgstr "Bielorússia, hora d'estiu"
#: dlls/tzres/tzres.rc:83
msgid "(UTC+03:00) Minsk"
msgstr "(UTC+03:00) Minsk"
#: dlls/tzres/tzres.rc:315
-#, fuzzy
-#| msgid "SA Western Standard Time"
msgctxt "maximum 31 characters"
msgid "SA Western Standard Time"
-msgstr "Hora estàndard d'Àmerica del sud-oest"
+msgstr "Am. del sud, oest, hora estànd."
#: dlls/tzres/tzres.rc:316
-#, fuzzy
-#| msgid "SA Western Daylight Time"
msgctxt "maximum 31 characters"
msgid "SA Western Daylight Time"
-msgstr "Hora d'estiu d'Àmerica del sud-oest"
+msgstr "Am. del sud, oest, hora d'estiu"
#: dlls/tzres/tzres.rc:317
msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan"
@@ -12130,30 +12026,26 @@ msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan"
#: dlls/tzres/tzres.rc:174
msgctxt "maximum 31 characters"
msgid "Greenland Standard Time"
-msgstr "Hora estàndard de Groenlàndia"
+msgstr "Groenlàndia, hora estàndard"
#: dlls/tzres/tzres.rc:175
msgctxt "maximum 31 characters"
msgid "Greenland Daylight Time"
-msgstr "Hora d'estiu de Groenlàndia"
+msgstr "Groenlàndia, hora d'estiu"
#: dlls/tzres/tzres.rc:176
msgid "(UTC-03:00) Greenland"
msgstr "(UTC-03:00) Groenlàndia"
#: dlls/tzres/tzres.rc:147
-#, fuzzy
-#| msgid "Easter Island Standard Time"
msgctxt "maximum 31 characters"
msgid "Easter Island Standard Time"
-msgstr "Hora estàndard de l'Illa de Pasqua"
+msgstr "Illa de Pasqua, hora estàndard"
#: dlls/tzres/tzres.rc:148
-#, fuzzy
-#| msgid "Easter Island Daylight Time"
msgctxt "maximum 31 characters"
msgid "Easter Island Daylight Time"
-msgstr "Hora d'estiu de l'Illa de Pasqua"
+msgstr "Illa de Pasqua, hora d'estiu"
#: dlls/tzres/tzres.rc:149
msgid "(UTC-06:00) Easter Island"
@@ -12162,7 +12054,7 @@ msgstr "(UTC-06:00) Illa de Pasqua"
#: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298
msgctxt "maximum 31 characters"
msgid "Russia Time Zone 10"
-msgstr "Zona horària russa 10"
+msgstr "Rússia, zona horària 10"
#: dlls/tzres/tzres.rc:299
msgid "(UTC+11:00) Chokurdakh"
@@ -12171,12 +12063,12 @@ msgstr "(UTC+11:00) Txokurdakh"
#: dlls/tzres/tzres.rc:156
msgctxt "maximum 31 characters"
msgid "Egypt Standard Time"
-msgstr "Hora estàndard d'Egipte"
+msgstr "Egipte, hora estàndard"
#: dlls/tzres/tzres.rc:157
msgctxt "maximum 31 characters"
msgid "Egypt Daylight Time"
-msgstr "Hora d'estiu d'Egipte"
+msgstr "Egipte, hora d'estiu"
#: dlls/tzres/tzres.rc:158
msgid "(UTC+02:00) Cairo"
@@ -12185,12 +12077,12 @@ msgstr "(UTC+02:00) El Caire"
#: dlls/tzres/tzres.rc:153
msgctxt "maximum 31 characters"
msgid "Eastern Standard Time (Mexico)"
-msgstr "Hora estàndard de l'est (Mèxic)"
+msgstr "Mèxic, est, hora estàndard"
#: dlls/tzres/tzres.rc:154
msgctxt "maximum 31 characters"
msgid "Eastern Daylight Time (Mexico)"
-msgstr "Hora d'estiu de l'est (Mèxic)"
+msgstr "Mèxic, est, hora d'estiu"
#: dlls/tzres/tzres.rc:155
msgid "(UTC-05:00) Chetumal"
@@ -12199,12 +12091,12 @@ msgstr "(UTC-05:00) Chetumal"
#: dlls/tzres/tzres.rc:225
msgctxt "maximum 31 characters"
msgid "Mauritius Standard Time"
-msgstr "Hora estàndard de Maurici"
+msgstr "Maurici, hora estàndard"
#: dlls/tzres/tzres.rc:226
msgctxt "maximum 31 characters"
msgid "Mauritius Daylight Time"
-msgstr "Hora d'estiu de Maurici"
+msgstr "Maurici, hora d'estiu"
#: dlls/tzres/tzres.rc:227
msgid "(UTC+04:00) Port Louis"
@@ -12213,12 +12105,12 @@ msgstr "(UTC+04:00) Port Louis"
#: dlls/tzres/tzres.rc:414
msgctxt "maximum 31 characters"
msgid "Vladivostok Standard Time"
-msgstr "Hora estàndard de Vladivostok"
+msgstr "Vladivostok, hora estàndard"
#: dlls/tzres/tzres.rc:415
msgctxt "maximum 31 characters"
msgid "Vladivostok Daylight Time"
-msgstr "Hora d'estiu de Vladivostok"
+msgstr "Vladivostok, hora d'estiu"
#: dlls/tzres/tzres.rc:416
msgid "(UTC+10:00) Vladivostok"
@@ -12227,12 +12119,12 @@ msgstr "(UTC+10:00) Vladivostok"
#: dlls/tzres/tzres.rc:336
msgctxt "maximum 31 characters"
msgid "Singapore Standard Time"
-msgstr "Hora estàndard de Singapur"
+msgstr "Singapur, hora estàndard"
#: dlls/tzres/tzres.rc:337
msgctxt "maximum 31 characters"
msgid "Singapore Daylight Time"
-msgstr "Hora d'estiu de Singapur"
+msgstr "Singapur, hora d'estiu"
#: dlls/tzres/tzres.rc:338
msgid "(UTC+08:00) Kuala Lumpur, Singapore"
@@ -12241,46 +12133,40 @@ msgstr "(UTC+08:00) Kuala Lumpur, Singapur"
#: dlls/tzres/tzres.rc:204
msgctxt "maximum 31 characters"
msgid "Korea Standard Time"
-msgstr "Hora estàndard de Corea"
+msgstr "Corea del Sud, hora estàndard"
#: dlls/tzres/tzres.rc:205
msgctxt "maximum 31 characters"
msgid "Korea Daylight Time"
-msgstr "Hora d'estiu de Corea"
+msgstr "Corea del Sud, hora d'estiu"
#: dlls/tzres/tzres.rc:206
msgid "(UTC+09:00) Seoul"
msgstr "(UTC+09:00) Seül"
#: dlls/tzres/tzres.rc:123
-#, fuzzy
-#| msgid "Chatham Islands Standard Time"
msgctxt "maximum 31 characters"
msgid "Chatham Islands Standard Time"
-msgstr "Hora estàndard de les Illes de Chatham"
+msgstr "Illes de Chatham, hora estànd."
#: dlls/tzres/tzres.rc:124
-#, fuzzy
-#| msgid "Chatham Islands Daylight Time"
msgctxt "maximum 31 characters"
msgid "Chatham Islands Daylight Time"
-msgstr "Hora d'estiu de les Illes de Chatham"
+msgstr "Illes de Chatham, hora d'estiu"
#: dlls/tzres/tzres.rc:125
msgid "(UTC+12:45) Chatham Islands"
msgstr "(UTC+12:45) Illes Chatham"
#: dlls/tzres/tzres.rc:135
-#, fuzzy
-#| msgid "E. Africa Standard Time"
msgctxt "maximum 31 characters"
msgid "E. Africa Standard Time"
-msgstr "Hora estàndard d'Àfrica de l'est"
+msgstr "Àfrica, est, hora estàndard"
#: dlls/tzres/tzres.rc:136
msgctxt "maximum 31 characters"
msgid "E. Africa Daylight Time"
-msgstr "Hora d'estiu d'Àfrica de l'est"
+msgstr "Àfrica, est, hora d'estiu"
#: dlls/tzres/tzres.rc:137
msgid "(UTC+03:00) Nairobi"
@@ -12289,120 +12175,96 @@ msgstr "(UTC+03:00) Nairobi"
#: dlls/tzres/tzres.rc:165
msgctxt "maximum 31 characters"
msgid "FLE Standard Time"
-msgstr "Hora estàndard FLE"
+msgstr "Europa, central, hora estàndard"
#: dlls/tzres/tzres.rc:166
msgctxt "maximum 31 characters"
msgid "FLE Daylight Time"
-msgstr "Hora d'estiu FLE"
+msgstr "Europa, central, hora d'estiu"
#: dlls/tzres/tzres.rc:167
msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius"
msgstr "(UTC+02:00) Hèlsinki, Kíev, Riga, Sofia, Tallinn, Vílnius"
#: dlls/tzres/tzres.rc:144
-#, fuzzy
-#| msgid "E. South America Standard Time"
msgctxt "maximum 31 characters"
msgid "E. South America Standard Time"
-msgstr "Hora estàndard d'Àmerica del sudest"
+msgstr "Am. del sud, est, hora estànd."
#: dlls/tzres/tzres.rc:145
-#, fuzzy
-#| msgid "E. South America Daylight Time"
msgctxt "maximum 31 characters"
msgid "E. South America Daylight Time"
-msgstr "Hora d'estiu d'Àmerica del sudest"
+msgstr "Am. del sud, est, hora d'estiu"
#: dlls/tzres/tzres.rc:146
msgid "(UTC-03:00) Brasilia"
msgstr "(UTC-03:00) Brasília"
#: dlls/tzres/tzres.rc:114
-#, fuzzy
-#| msgid "Central Pacific Standard Time"
msgctxt "maximum 31 characters"
msgid "Central Pacific Standard Time"
-msgstr "Hora estàndard del Pacífic central"
+msgstr "Pacífic central, hora estàndard"
#: dlls/tzres/tzres.rc:115
-#, fuzzy
-#| msgid "Central Pacific Daylight Time"
msgctxt "maximum 31 characters"
msgid "Central Pacific Daylight Time"
-msgstr "Hora d'estiu del Pacífic central"
+msgstr "Pacífic central, hora d'estiu"
#: dlls/tzres/tzres.rc:116
msgid "(UTC+11:00) Solomon Is., New Caledonia"
msgstr "(UTC+11:00) Illes de Salomó, Nova Caledònia"
#: dlls/tzres/tzres.rc:423
-#, fuzzy
-#| msgid "W. Central Africa Standard Time"
msgctxt "maximum 31 characters"
msgid "W. Central Africa Standard Time"
-msgstr "Hora estàndard d'Àfrica del centre-oest"
+msgstr "Àfrica central, oest, h. estàn."
#: dlls/tzres/tzres.rc:424
-#, fuzzy
-#| msgid "W. Central Africa Daylight Time"
msgctxt "maximum 31 characters"
msgid "W. Central Africa Daylight Time"
-msgstr "Hora d'estiu d'Àfrica del centre-oest"
+msgstr "Àfrica centr., oest, h. d'estiu"
#: dlls/tzres/tzres.rc:425
msgid "(UTC+01:00) West Central Africa"
msgstr "(UTC+01:00) Àfrica del centre-oest"
#: dlls/tzres/tzres.rc:276
-#, fuzzy
-#| msgid "Pacific SA Standard Time"
msgctxt "maximum 31 characters"
msgid "Pacific SA Standard Time"
-msgstr "Hora estàndard del Pacífic de l'Amèrica del Sud"
+msgstr "Am. del sud, Pacífic, h. estàn."
#: dlls/tzres/tzres.rc:277
-#, fuzzy
-#| msgid "Pacific SA Daylight Time"
msgctxt "maximum 31 characters"
msgid "Pacific SA Daylight Time"
-msgstr "Hora d'estiu del Pacífic de l'Amèrica del Sud"
+msgstr "Am. d. sud, Pacífic, h. d'estiu"
#: dlls/tzres/tzres.rc:278
msgid "(UTC-04:00) Santiago"
msgstr "(UTC-04:00) Santiago"
#: dlls/tzres/tzres.rc:138
-#, fuzzy
-#| msgid "E. Australia Standard Time"
msgctxt "maximum 31 characters"
msgid "E. Australia Standard Time"
-msgstr "Hora estàndard d'Austràlia de l'est"
+msgstr "Austràlia, est, hora estàndard"
#: dlls/tzres/tzres.rc:139
-#, fuzzy
-#| msgid "E. Australia Daylight Time"
msgctxt "maximum 31 characters"
msgid "E. Australia Daylight Time"
-msgstr "Hora d'estiu d'Austràlia de l'est"
+msgstr "Austràlia, est, hora d'estiu"
#: dlls/tzres/tzres.rc:140
msgid "(UTC+10:00) Brisbane"
msgstr "(UTC+10:00) Brisbane"
#: dlls/tzres/tzres.rc:420
-#, fuzzy
-#| msgid "W. Australia Standard Time"
msgctxt "maximum 31 characters"
msgid "W. Australia Standard Time"
-msgstr "Hora estàndard d'Austràlia de l'oest"
+msgstr "Austràlia, oest, hora estàndard"
#: dlls/tzres/tzres.rc:421
-#, fuzzy
-#| msgid "W. Australia Daylight Time"
msgctxt "maximum 31 characters"
msgid "W. Australia Daylight Time"
-msgstr "Hora d'estiu d'Austràlia de l'oest"
+msgstr "Austràlia, oest, hora d'estiu"
#: dlls/tzres/tzres.rc:422
msgid "(UTC+08:00) Perth"
@@ -18935,8 +18797,8 @@ msgid ""
msgstr ""
"Si aquest problema no està present en el Windows i encara no s'ha reportat, "
"podeu desar la informació detallada a un fitxer utilitzant el botó "
-"\"Anomenar i Desar\", i llavors <a href=\"https://wiki.winehq.org/"
-"Bugs\">presentar un informe d'error</a> i ajuntar aquest fitxer a l'informe."
+"\"Anomenar i Desar\", i llavors <a href=\"https://wiki.winehq.org/Bugs"
+"\">presentar un informe d'error</a> i ajuntar aquest fitxer a l'informe."
#: programs/winedbg/winedbg.rc:40
msgid ""
--
2.35.1
1
0
1
0
16 Mar '22
1
0
1
0
[PATCH 2/2] ntdll: Treat INVALID_HANDLE_VALUE as success in CloseHandle.
by Daniel Lehman 16 Mar '22
by Daniel Lehman 16 Mar '22
16 Mar '22
2
2
[PATCH v2 1/6] winedbg: memory_get_string(_indirect) should take a const src address.
by Brendan Shanks 16 Mar '22
by Brendan Shanks 16 Mar '22
16 Mar '22
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
---
programs/winedbg/debugger.h | 6 ++++--
programs/winedbg/memory.c | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h
index 0cc2f8b7a6c..d275182c4f9 100644
--- a/programs/winedbg/debugger.h
+++ b/programs/winedbg/debugger.h
@@ -402,8 +402,10 @@ extern void memory_examine(const struct dbg_lvalue *lvalue, int coun
extern void* memory_to_linear_addr(const ADDRESS64* address);
extern BOOL memory_get_current_pc(ADDRESS64* address);
extern BOOL memory_get_current_stack(ADDRESS64* address);
-extern BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, BOOL unicode, char* buffer, int size);
-extern BOOL memory_get_string_indirect(struct dbg_process* pcs, void* addr, BOOL unicode, WCHAR* buffer, int size);
+extern BOOL memory_get_string(struct dbg_process* pcs, const void* addr, BOOL in_debuggee, BOOL unicode,
+ char* buffer, int size);
+extern BOOL memory_get_string_indirect(struct dbg_process* pcs, const void* addr, BOOL unicode,
+ WCHAR* buffer, int size);
extern BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len);
extern void memory_disassemble(const struct dbg_lvalue*, const struct dbg_lvalue*, int instruction_count);
extern BOOL memory_disasm_one_insn(ADDRESS64* addr);
diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c
index faa5ac9ddcb..7fe3d342b33 100644
--- a/programs/winedbg/memory.c
+++ b/programs/winedbg/memory.c
@@ -371,7 +371,7 @@ BOOL memory_store_float(const struct dbg_lvalue* lvalue, double *ret)
return memory_write_value(lvalue, size, ret);
}
-BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee,
+BOOL memory_get_string(struct dbg_process* pcs, const void* addr, BOOL in_debuggee,
BOOL unicode, char* buffer, int size)
{
SIZE_T sz;
@@ -402,7 +402,7 @@ BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee,
return TRUE;
}
-BOOL memory_get_string_indirect(struct dbg_process* pcs, void* addr, BOOL unicode, WCHAR* buffer, int size)
+BOOL memory_get_string_indirect(struct dbg_process* pcs, const void* addr, BOOL unicode, WCHAR* buffer, int size)
{
void* ad = 0;
SIZE_T sz;
--
2.34.1
1
5
[PATCH v3 1/2] user32/tests: Test that ShowWindow(SW_SHOWMINIMIZED) shouldn't make a window visible.
by Zhiyi Zhang 16 Mar '22
by Zhiyi Zhang 16 Mar '22
16 Mar '22
This bug can be triggered on Mutter because it unminimizes windows when handling map requests.
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>
---
v3: Supersede 227676~227677. Fix test failures.
dlls/user32/tests/win.c | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index cfcec5cc78f..f47fcd2fe65 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -7420,7 +7420,9 @@ static void test_ShowWindow(void)
RECT rcMain, rc, rcMinimized, rcClient, rcEmpty, rcMaximized, rcResized, rcNonClient, rcBroken;
LPARAM ret;
MONITORINFO mon_info;
- unsigned int i;
+ unsigned int i, timeout = 0;
+ COLORREF color;
+ HDC hdc;
DWORD test_style[] =
{
@@ -7693,6 +7695,30 @@ static void test_ShowWindow(void)
flush_events(TRUE);
+ /* Test SW_SHOWMINIMIZED shouldn't restore windows from minimized state */
+ SetWindowPos(hwndMain, 0, 100, 100, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+ hwnd = CreateWindowA("static", "test", WS_POPUP, 100, 100, 200, 200, NULL, NULL, NULL, NULL);
+ ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError());
+ ShowWindow(hwnd, SW_SHOWMINIMIZED);
+ flush_events(TRUE);
+
+ hdc = GetDC(0);
+ color = GetPixel(hdc, 150, 150);
+ /* Desktop pixels may take a while to update */
+ while (color != 0xffffff && timeout < 1000)
+ {
+ Sleep(100);
+ timeout += 100;
+ color = GetPixel(hdc, 150, 150);
+ }
+ /* 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);
+
/* test maximize and restore windows without setting WS_CAPTION */
for (i = 0; i < ARRAY_SIZE(test_style); ++i)
--
2.32.0
3
2
[PATCH 1/5] windows.media.speech: Implement ISpeechRecognitionConstraint isEnabled.
by Bernhard Kölbl 16 Mar '22
by Bernhard Kölbl 16 Mar '22
16 Mar '22
Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com>
---
dlls/windows.media.speech/listconstraint.c | 14 ++++++++++----
dlls/windows.media.speech/tests/speech.c | 8 ++++----
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c
index 33fe9d4ae51..d641902f4bc 100644
--- a/dlls/windows.media.speech/listconstraint.c
+++ b/dlls/windows.media.speech/listconstraint.c
@@ -34,6 +34,8 @@ struct list_constraint
ISpeechRecognitionListConstraint ISpeechRecognitionListConstraint_iface;
ISpeechRecognitionConstraint ISpeechRecognitionConstraint_iface;
LONG ref;
+
+ BOOLEAN enabled;
};
/*
@@ -142,14 +144,18 @@ DEFINE_IINSPECTABLE(constraint, ISpeechRecognitionConstraint, struct list_constr
static HRESULT WINAPI constraint_get_IsEnabled( ISpeechRecognitionConstraint *iface, BOOLEAN *value )
{
- FIXME("iface %p, value %p stub!\n", iface, value);
- return E_NOTIMPL;
+ struct list_constraint *impl = impl_from_ISpeechRecognitionConstraint(iface);
+ TRACE("iface %p, value %p.\n", iface, value);
+ *value = impl->enabled;
+ return S_OK;
}
static HRESULT WINAPI constraint_put_IsEnabled( ISpeechRecognitionConstraint *iface, BOOLEAN value )
{
- FIXME("iface %p, value %u stub!\n", iface, value);
- return E_NOTIMPL;
+ struct list_constraint *impl = impl_from_ISpeechRecognitionConstraint(iface);
+ TRACE("iface %p, value %u.\n", iface, value);
+ impl->enabled = value;
+ return S_OK;
}
static HRESULT WINAPI constraint_get_Tag( ISpeechRecognitionConstraint *iface, HSTRING *value )
diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c
index a88b8aae3d2..66869a164d2 100644
--- a/dlls/windows.media.speech/tests/speech.c
+++ b/dlls/windows.media.speech/tests/speech.c
@@ -797,13 +797,13 @@ static void test_SpeechRecognitionListConstraint(void)
hr = WindowsDeleteString(tag_out);
todo_wine ok(hr == S_OK, "WindowsDeleteString failed, hr %#lx.\n", hr);
+skip_tests:
hr = ISpeechRecognitionConstraint_put_IsEnabled(constraint, TRUE);
- todo_wine ok(hr == S_OK, "ISpeechRecognitionConstraint_put_IsEnabled failed, hr %#lx.\n", hr);
+ ok(hr == S_OK, "ISpeechRecognitionConstraint_put_IsEnabled failed, hr %#lx.\n", hr);
hr = ISpeechRecognitionConstraint_get_IsEnabled(constraint, &enabled);
- todo_wine ok(hr == S_OK, "ISpeechRecognitionConstraint_get_IsEnabled failed, hr %#lx.\n", hr);
- todo_wine ok(enabled, "ListConstraint didn't get enabled.\n");
+ ok(hr == S_OK, "ISpeechRecognitionConstraint_get_IsEnabled failed, hr %#lx.\n", hr);
+ ok(enabled, "ListConstraint didn't get enabled.\n");
-skip_tests:
ref = ISpeechRecognitionConstraint_Release(constraint);
ok(ref == 1, "Got unexpected ref %lu.\n", ref);
--
2.35.1
2
9
16 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/edit.c | 2 +-
dlls/user32/message.c | 19 -------------------
dlls/user32/user32.spec | 2 +-
dlls/win32u/message.c | 18 ++++++++++++++++++
dlls/win32u/syscall.c | 1 +
dlls/win32u/win32u.spec | 2 +-
dlls/wow64win/syscall.h | 1 +
dlls/wow64win/user.c | 8 ++++++++
include/ntuser.h | 1 +
9 files changed, 32 insertions(+), 22 deletions(-)
3
2
16 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/message.c | 12 +-----------
dlls/win32u/message.c | 16 ++++++++++++++++
dlls/win32u/win32u_private.h | 1 +
dlls/win32u/window.c | 2 ++
include/ntuser.h | 1 +
5 files changed, 21 insertions(+), 11 deletions(-)
2
1
16 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/caret.c | 4 ++--
dlls/user32/input.c | 3 ++-
dlls/user32/listbox.c | 2 +-
dlls/user32/message.c | 33 ---------------------------------
dlls/user32/scroll.c | 16 ++++++++--------
dlls/user32/user32.spec | 2 +-
dlls/user32/user_private.h | 4 ----
dlls/user32/winproc.c | 2 +-
dlls/win32u/message.c | 32 ++++++++++++++++++++++++++++++++
dlls/win32u/ntuser_private.h | 3 +++
dlls/win32u/syscall.c | 1 +
dlls/win32u/win32u.spec | 2 +-
dlls/wow64win/syscall.h | 1 +
dlls/wow64win/user.c | 10 ++++++++++
include/ntuser.h | 1 +
15 files changed, 64 insertions(+), 52 deletions(-)
2
1
16 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/message.c | 35 +----------------------------------
dlls/user32/user32.spec | 2 +-
dlls/win32u/message.c | 32 ++++++++++++++++++++++++++++++++
dlls/win32u/syscall.c | 1 +
dlls/win32u/win32u.spec | 2 +-
dlls/wow64win/syscall.h | 1 +
dlls/wow64win/user.c | 11 +++++++++++
include/ntuser.h | 1 +
8 files changed, 49 insertions(+), 36 deletions(-)
3
2
[PATCH 3/7] win32u: Move __wine_set_pixel_format implementation from user32.
by Jacek Caban 16 Mar '22
by Jacek Caban 16 Mar '22
16 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/win.c | 39 +--------------------------------------
dlls/win32u/window.c | 18 ++++++++++++++++++
include/ntuser.h | 1 +
3 files changed, 20 insertions(+), 38 deletions(-)
2
1
16 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/driver.c | 7 +-
dlls/user32/message.c | 2 -
dlls/user32/user32.spec | 2 +-
dlls/user32/win.c | 307 +--------------------------------
dlls/user32/win.h | 1 -
dlls/win32u/class.c | 11 ++
dlls/win32u/gdiobj.c | 3 +
dlls/win32u/message.c | 2 +
dlls/win32u/ntuser_private.h | 1 +
dlls/win32u/win32u.spec | 6 +-
dlls/win32u/win32u_private.h | 5 +
dlls/win32u/window.c | 317 +++++++++++++++++++++++++++++++++++
dlls/win32u/wrappers.c | 18 ++
include/ntuser.h | 3 +
14 files changed, 369 insertions(+), 316 deletions(-)
2
1
16 Mar '22
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
dlls/user32/message.c | 3 --
dlls/user32/win.c | 49 +++---------------------------
dlls/win32u/driver.c | 1 +
dlls/win32u/message.c | 3 ++
dlls/win32u/win32u_private.h | 1 +
dlls/win32u/window.c | 59 ++++++++++++++++++++++++++++++++++++
include/ntuser.h | 1 +
7 files changed, 69 insertions(+), 48 deletions(-)
2
1
[PATCH vkd3d 1/2] tests: Acknowledge buggy UAV clearing on NVIDIA.
by Giovanni Mascellani 16 Mar '22
by Giovanni Mascellani 16 Mar '22
16 Mar '22
The buggy test in test_clear_unordered_access_view_buffer() fails with
this log line:
d3d12:5036:Test 22: Test failed: Got 0xffff7fff, expected 0xffff8000 at (0, 0, 0).
It seems that NVIDIA drivers convert float 0.5 to unorm 0x7fff instead of
0x8000 when writing to the UAV.
Something similar happens for the test in
test_clear_unordered_access_view_image().
Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com>
---
Actually, I am not completely sure of what's happening here (and therefore
the commit message might be wrong). My understanding is that in that test
the shader cs_uav_clear_buffer_float_code is used, where the buffer is declared
as "RWBuffer<float4> dst", while the underlying UAV is declared of format
DXGI_FORMAT_R16G16_UNORM. I suppose that is interpreted by D3D12 as a
conversion from float to a normalized uint16, and therefore the value 0.5
is converted to something in the middle of the range of uint16.
Whether 0x7fff or 0x8000 should be taken thus depends on the subtlety of
how the range of uint16 is defined. Should it be half of 0x10000 or of
0xffff? It seems that Linux Vulkan NVIDIA drivers choose the second
interpretation. Could somebody help me understanding if Vulkan specifications
mandate which of the two behavior should be considered correct?
---
tests/d3d12.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 5067dd97..d32e4cba 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -4878,6 +4878,7 @@ static void test_clear_unordered_access_view_buffer(void)
unsigned int expected;
bool is_float;
bool is_todo;
+ bool bug_on_nvidia;
}
tests[] =
{
@@ -4930,7 +4931,7 @@ static void test_clear_unordered_access_view_buffer(void)
{DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
{0x1234, 0xabcd, 0, 0}, 0xabcd1234},
{DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
- {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true, false, true},
{DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
{0x40000000 /* 2.0f */, 0 /* 0.0f */, 0, 0}, 0x0000ffff, true},
{DXGI_FORMAT_R16G16_UNORM, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE},
@@ -5032,6 +5033,7 @@ static void test_clear_unordered_access_view_buffer(void)
check_readback_data_uint(&rb, &box, clear_value[0], 0);
box.left = uav_desc.Buffer.FirstElement;
box.right = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements;
+ bug_if(tests[i].bug_on_nvidia && is_nvidia_device(device))
todo_if(tests[i].is_todo)
check_readback_data_uint(&rb, &box, tests[i].expected, tests[i].is_float ? 1 : 0);
box.left = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements;
@@ -5086,6 +5088,7 @@ static void test_clear_unordered_access_view_image(void)
unsigned int expected;
bool is_float;
bool is_todo;
+ bool bug_on_nvidia;
}
tests[] =
{
@@ -5124,7 +5127,7 @@ static void test_clear_unordered_access_view_image(void)
{DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001},
/* Test float clears with formats. */
{DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {},
- {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true},
+ {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true, false, true},
{DXGI_FORMAT_R16G16_FLOAT, 1, 1, 0, 0, 1, 0, {},
{0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0x3c003800, true},
{DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {},
@@ -5308,6 +5311,7 @@ static void test_clear_unordered_access_view_image(void)
actual_colour = get_readback_uint(&rb, x, y, z);
success = compare_color(actual_colour, expected_colour, tests[i].is_float ? 1 : 0);
+ bug_if(tests[i].bug_on_nvidia && is_nvidia_device(device))
todo_if(tests[i].is_todo && expected_colour)
ok(success, "At layer %u, (%u,%u,%u), expected %#x, got %#x.\n",
layer, x, y, z, expected_colour, actual_colour);
--
2.35.1
1
1
[PATCH vkd3d v2 1/2] vkd3d: Use Vulkan timeline semaphores for D3D12 fences.
by Conor McCarthy 16 Mar '22
by Conor McCarthy 16 Mar '22
16 Mar '22
D3D12 supports signalling a fence to a lower value, while Vulkan timeline
semaphores do not. On the GPU side this is handled by simply submitting
the signal anyway, because working around this is impractical and it
currently works. For CPU signals the Vulkan semaphore is replaced with a
new one at the lower value only if no waits and/or signals are pending on
the GPU. Otherwise, a fixme is emitted.
Partly based on a vkd3d-proton patch by Hans-Kristian Arntzen (not
including the handling of lower fence values).
The old implementation is used if KHR_timeline_semaphore is not
available.
Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
---
libs/vkd3d/command.c | 562 ++++++++++++++++++++++++++++++++++---
libs/vkd3d/device.c | 14 +
libs/vkd3d/vkd3d_private.h | 25 ++
libs/vkd3d/vulkan_procs.h | 5 +
tests/d3d12.c | 11 +-
5 files changed, 576 insertions(+), 41 deletions(-)
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index e7375fb8..cef6d022 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -22,11 +22,31 @@
static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence);
+static VkResult vkd3d_create_timeline_semaphore(const struct d3d12_device *device, uint64_t initial_value,
+ VkSemaphore *timeline_semaphore)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ VkSemaphoreTypeCreateInfoKHR type_info;
+ VkSemaphoreCreateInfo info;
+
+ info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
+ info.pNext = &type_info;
+ info.flags = 0;
+
+ type_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO_KHR;
+ type_info.pNext = NULL;
+ type_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR;
+ type_info.initialValue = initial_value;
+
+ return VK_CALL(vkCreateSemaphore(device->vk_device, &info, NULL, timeline_semaphore));
+}
+
HRESULT vkd3d_queue_create(struct d3d12_device *device,
uint32_t family_index, const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
struct vkd3d_queue *object;
+ VkResult vr;
int rc;
if (!(object = vkd3d_malloc(sizeof(*object))))
@@ -46,6 +66,15 @@ HRESULT vkd3d_queue_create(struct d3d12_device *device,
object->vk_queue_flags = properties->queueFlags;
object->timestamp_bits = properties->timestampValidBits;
+ object->wait_completion_semaphore = VK_NULL_HANDLE;
+ object->pending_wait_completion_value = 0;
+ if (device->vk_info.KHR_timeline_semaphore && (vr = vkd3d_create_timeline_semaphore(device, 0,
+ &object->wait_completion_semaphore)) < 0)
+ {
+ WARN("Failed to create timeline semaphore, vr %d.\n", vr);
+ return hresult_from_vk_result(vr);
+ }
+
object->semaphores = NULL;
object->semaphores_size = 0;
object->semaphore_count = 0;
@@ -75,6 +104,8 @@ void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device)
vkd3d_free(queue->semaphores);
+ VK_CALL(vkDestroySemaphore(device->vk_device, queue->wait_completion_semaphore, NULL));
+
for (i = 0; i < ARRAY_SIZE(queue->old_vk_semaphores); ++i)
{
if (queue->old_vk_semaphores[i])
@@ -268,6 +299,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker,
}
worker->enqueued_fences[worker->enqueued_fence_count].vk_fence = vk_fence;
+ worker->enqueued_fences[worker->enqueued_fence_count].vk_semaphore = VK_NULL_HANDLE;
waiting_fence = &worker->enqueued_fences[worker->enqueued_fence_count].waiting_fence;
waiting_fence->fence = fence;
waiting_fence->value = value;
@@ -317,6 +349,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s
static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_worker *worker)
{
unsigned int i;
+ bool timeline;
size_t count;
bool ret;
@@ -325,8 +358,18 @@ static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_wo
count = worker->fence_count + worker->enqueued_fence_count;
- ret = vkd3d_array_reserve((void **)&worker->vk_fences, &worker->vk_fences_size,
- count, sizeof(*worker->vk_fences));
+ if ((timeline = worker->device->vk_info.KHR_timeline_semaphore))
+ {
+ ret = vkd3d_array_reserve((void **) &worker->vk_semaphores, &worker->vk_semaphores_size,
+ count, sizeof(*worker->vk_semaphores));
+ ret &= vkd3d_array_reserve((void **) &worker->semaphore_wait_values, &worker->semaphore_wait_values_size,
+ count, sizeof(*worker->semaphore_wait_values));
+ }
+ else
+ {
+ ret = vkd3d_array_reserve((void **)&worker->vk_fences, &worker->vk_fences_size,
+ count, sizeof(*worker->vk_fences));
+ }
ret &= vkd3d_array_reserve((void **)&worker->fences, &worker->fences_size,
count, sizeof(*worker->fences));
if (!ret)
@@ -339,7 +382,16 @@ static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_wo
{
struct vkd3d_enqueued_fence *current = &worker->enqueued_fences[i];
- worker->vk_fences[worker->fence_count] = current->vk_fence;
+ if (timeline)
+ {
+ worker->vk_semaphores[worker->fence_count] = current->vk_semaphore;
+ worker->semaphore_wait_values[worker->fence_count] = current->waiting_fence.value;
+ }
+ else
+ {
+ worker->vk_fences[worker->fence_count] = current->vk_fence;
+ }
+
worker->fences[worker->fence_count] = current->waiting_fence;
++worker->fence_count;
}
@@ -347,6 +399,66 @@ static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_wo
worker->enqueued_fence_count = 0;
}
+static void vkd3d_wait_for_gpu_timeline_semaphores(struct vkd3d_fence_worker *worker)
+{
+ const struct d3d12_device *device = worker->device;
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ VkSemaphoreWaitInfoKHR wait_info;
+ VkSemaphore vk_semaphore;
+ uint64_t counter_value;
+ unsigned int i, j;
+ HRESULT hr;
+ int vr;
+
+ if (!worker->fence_count)
+ return;
+
+ wait_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO_KHR;
+ wait_info.pNext = NULL;
+ wait_info.flags = VK_SEMAPHORE_WAIT_ANY_BIT_KHR;
+ wait_info.pSemaphores = worker->vk_semaphores;
+ wait_info.semaphoreCount = worker->fence_count;
+ wait_info.pValues = worker->semaphore_wait_values;
+
+ vr = VK_CALL(vkWaitSemaphoresKHR(device->vk_device, &wait_info, ~(uint64_t)0));
+ if (vr == VK_TIMEOUT)
+ return;
+ if (vr != VK_SUCCESS)
+ {
+ ERR("Failed to wait for Vulkan timeline semaphores, vr %d.\n", vr);
+ return;
+ }
+
+ for (i = 0, j = 0; i < worker->fence_count; ++i)
+ {
+ struct vkd3d_waiting_fence *current = &worker->fences[i];
+
+ vk_semaphore = worker->vk_semaphores[i];
+ if ((vr = VK_CALL(vkGetSemaphoreCounterValueKHR(device->vk_device, vk_semaphore, &counter_value))) < 0)
+ {
+ ERR("Failed to get Vulkan semaphore value, vr %d.\n", vr);
+ }
+ else if (counter_value >= current->value)
+ {
+ TRACE("Signaling fence %p value %#"PRIx64".\n", current->fence, current->value);
+ if (FAILED(hr = d3d12_fence_signal(current->fence, counter_value, VK_NULL_HANDLE)))
+ ERR("Failed to signal D3D12 fence, hr %#x.\n", hr);
+
+ InterlockedDecrement(¤t->fence->pending_worker_operation_count);
+ continue;
+ }
+
+ if (i != j)
+ {
+ worker->vk_semaphores[j] = worker->vk_semaphores[i];
+ worker->semaphore_wait_values[j] = worker->semaphore_wait_values[i];
+ worker->fences[j] = worker->fences[i];
+ }
+ ++j;
+ }
+ worker->fence_count = j;
+}
+
static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker)
{
struct d3d12_device *device = worker->device;
@@ -408,7 +520,7 @@ static void *vkd3d_fence_worker_main(void *arg)
for (;;)
{
- vkd3d_wait_for_gpu_fences(worker);
+ worker->wait_for_gpu_fences(worker);
if (!worker->fence_count || InterlockedAdd(&worker->enqueued_fence_count, 0))
{
@@ -473,6 +585,13 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker,
worker->vk_fences_size = 0;
worker->fences = NULL;
worker->fences_size = 0;
+ worker->vk_semaphores = NULL;
+ worker->vk_semaphores_size = 0;
+ worker->semaphore_wait_values = NULL;
+ worker->semaphore_wait_values_size = 0;
+
+ worker->wait_for_gpu_fences = device->vk_info.KHR_timeline_semaphore
+ ? vkd3d_wait_for_gpu_timeline_semaphores : vkd3d_wait_for_gpu_fences;
if ((rc = vkd3d_mutex_init(&worker->mutex)))
{
@@ -535,6 +654,8 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker,
vkd3d_free(worker->enqueued_fences);
vkd3d_free(worker->vk_fences);
vkd3d_free(worker->fences);
+ vkd3d_free(worker->vk_semaphores);
+ vkd3d_free(worker->semaphore_wait_values);
return S_OK;
}
@@ -684,6 +805,7 @@ static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence)
}
d3d12_fence_garbage_collect_vk_semaphores_locked(fence, true);
+ VK_CALL(vkDestroySemaphore(device->vk_device, fence->timeline_semaphore, NULL));
vkd3d_mutex_unlock(&fence->mutex);
}
@@ -802,31 +924,21 @@ static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence,
return hr;
}
-static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence)
+static bool d3d12_fence_signal_external_events_locked(struct d3d12_fence *fence)
{
struct d3d12_device *device = fence->device;
- struct vkd3d_signaled_semaphore *current;
bool signal_null_event_cond = false;
unsigned int i, j;
- int rc;
-
- if ((rc = vkd3d_mutex_lock(&fence->mutex)))
- {
- ERR("Failed to lock mutex, error %d.\n", rc);
- return hresult_from_errno(rc);
- }
-
- fence->value = value;
for (i = 0, j = 0; i < fence->event_count; ++i)
{
struct vkd3d_waiting_event *current = &fence->events[i];
- if (current->value <= value)
+ if (current->value <= fence->value)
{
if (current->event)
{
- fence->device->signal_event(current->event);
+ device->signal_event(current->event);
}
else
{
@@ -841,9 +953,28 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF
++j;
}
}
+
fence->event_count = j;
- if (signal_null_event_cond)
+ return signal_null_event_cond;
+}
+
+static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence)
+{
+ struct d3d12_device *device = fence->device;
+ struct vkd3d_signaled_semaphore *current;
+ unsigned int i;
+ int rc;
+
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return hresult_from_errno(rc);
+ }
+
+ fence->value = value;
+
+ if (d3d12_fence_signal_external_events_locked(fence))
vkd3d_cond_broadcast(&fence->null_event_cond);
if (vk_fence)
@@ -1069,12 +1200,158 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i
return S_OK;
}
+static inline bool d3d12_fence_gpu_wait_is_completed(const struct d3d12_fence *fence, unsigned int i)
+{
+ const struct d3d12_device *device = fence->device;
+ const struct vkd3d_vk_device_procs *vk_procs;
+ uint64_t value;
+ VkResult vr;
+
+ vk_procs = &device->vk_procs;
+
+ if ((vr = VK_CALL(vkGetSemaphoreCounterValueKHR(device->vk_device,
+ fence->gpu_waits[i].queue->wait_completion_semaphore, &value))) >= 0)
+ {
+ return value >= fence->gpu_waits[i].pending_value;
+ }
+
+ ERR("Failed to get Vulkan semaphore status, vr %d.\n", vr);
+ return true;
+}
+
+static inline bool d3d12_fence_has_pending_gpu_ops_locked(struct d3d12_fence *fence)
+{
+ const struct d3d12_device *device = fence->device;
+ const struct vkd3d_vk_device_procs *vk_procs;
+ uint64_t value;
+ unsigned int i;
+ VkResult vr;
+
+ for (i = 0; i < fence->gpu_wait_count; ++i)
+ {
+ if (d3d12_fence_gpu_wait_is_completed(fence, i) && i < --fence->gpu_wait_count)
+ fence->gpu_waits[i] = fence->gpu_waits[fence->gpu_wait_count];
+ }
+ if (fence->gpu_wait_count)
+ return true;
+
+ /* Check for pending signals too. */
+ if (fence->value >= fence->pending_timeline_value)
+ return false;
+
+ vk_procs = &device->vk_procs;
+
+ /* Check the actual semaphore value in case fence->value update is lagging. */
+ if ((vr = VK_CALL(vkGetSemaphoreCounterValueKHR(device->vk_device, fence->timeline_semaphore, &value))) < 0)
+ {
+ ERR("Failed to get Vulkan semaphore status, vr %d.\n", vr);
+ return false;
+ }
+
+ return value < fence->pending_timeline_value;
+}
+
+/* Replace the VkSemaphore with a new one to allow a lower value to be set. Ideally apps will
+ * only use this to reset the fence when no operations are pending on the queue. */
+static VkResult d3d12_fence_reinit_timeline_semaphore_locked(struct d3d12_fence *fence, uint64_t value)
+{
+ const struct d3d12_device *device = fence->device;
+ const struct vkd3d_vk_device_procs *vk_procs;
+ VkSemaphore timeline_semaphore;
+ VkResult vr;
+
+ if (d3d12_fence_has_pending_gpu_ops_locked(fence))
+ {
+ /* This situation is not very likely because it means a fence with pending waits and/or signals was
+ * signalled on the CPU to a lower value. For now, emit a fixme so it can be patched if necessary.
+ * A patch already exists for this but it's not pretty. */
+ FIXME("Unable to re-initialise timeline semaphore to a lower value due to pending GPU ops.\n");
+ return VK_ERROR_UNKNOWN;
+ }
+
+ if ((vr = vkd3d_create_timeline_semaphore(device, value, &timeline_semaphore)) < 0)
+ {
+ WARN("Failed to create timeline semaphore, vr %d.\n", vr);
+ return vr;
+ }
+
+ fence->value = value;
+ fence->pending_timeline_value = value;
+
+ WARN("Replacing timeline semaphore with a new object.\n");
+
+ vk_procs = &device->vk_procs;
+
+ VK_CALL(vkDestroySemaphore(device->vk_device, fence->timeline_semaphore, NULL));
+ fence->timeline_semaphore = timeline_semaphore;
+
+ return VK_SUCCESS;
+}
+
+static HRESULT d3d12_fence_signal_cpu_timeline_semaphore(struct d3d12_fence *fence, uint64_t value)
+{
+ const struct d3d12_device *device = fence->device;
+ VkSemaphoreSignalInfoKHR info;
+ VkResult vr = VK_SUCCESS;
+ int rc;
+
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return hresult_from_errno(rc);
+ }
+
+ /* We must only signal a value which is greater than the current value.
+ * That value can be in the range of current known value (fence->value), or as large as pending_timeline_value.
+ * Pending timeline value signal might be blocked by another synchronization primitive, and thus statically
+ * cannot be that value, so the safest thing to do is to check the current value which is updated by the fence
+ * wait thread continuously. This check is technically racy since the value might be immediately out of date,
+ * but there is no way to avoid this. */
+ if (value > fence->value)
+ {
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+
+ /* Sanity check against the delta limit. */
+ if (value - fence->value > device->vk_info.timeline_semaphore_properties.maxTimelineSemaphoreValueDifference)
+ {
+ FIXME("Timeline semaphore delta is %"PRIu64", but implementation only supports a delta of %"PRIu64".\n",
+ value - fence->value, device->vk_info.timeline_semaphore_properties.maxTimelineSemaphoreValueDifference);
+ }
+
+ info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO_KHR;
+ info.pNext = NULL;
+ info.semaphore = fence->timeline_semaphore;
+ info.value = value;
+ if ((vr = VK_CALL(vkSignalSemaphoreKHR(device->vk_device, &info))) >= 0)
+ {
+ fence->value = value;
+ if (value > fence->pending_timeline_value)
+ fence->pending_timeline_value = value;
+ }
+ else
+ {
+ ERR("Failed to signal timeline semaphore, vr %d.\n", vr);
+ }
+ }
+ else if (value < fence->value)
+ {
+ vr = d3d12_fence_reinit_timeline_semaphore_locked(fence, value);
+ }
+
+ d3d12_fence_signal_external_events_locked(fence);
+
+ vkd3d_mutex_unlock(&fence->mutex);
+ return hresult_from_vk_result(vr);
+}
+
static HRESULT STDMETHODCALLTYPE d3d12_fence_Signal(ID3D12Fence *iface, UINT64 value)
{
struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
TRACE("iface %p, value %#"PRIx64".\n", iface, value);
+ if (fence->timeline_semaphore)
+ return d3d12_fence_signal_cpu_timeline_semaphore(fence, value);
return d3d12_fence_signal(fence, value, VK_NULL_HANDLE);
}
@@ -1108,6 +1385,7 @@ static struct d3d12_fence *unsafe_impl_from_ID3D12Fence(ID3D12Fence *iface)
static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device,
UINT64 initial_value, D3D12_FENCE_FLAGS flags)
{
+ VkResult vr;
HRESULT hr;
int rc;
@@ -1136,6 +1414,16 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *
fence->events_size = 0;
fence->event_count = 0;
+ fence->timeline_semaphore = VK_NULL_HANDLE;
+ if (device->vk_info.KHR_timeline_semaphore && (vr = vkd3d_create_timeline_semaphore(device, initial_value,
+ &fence->timeline_semaphore)) < 0)
+ {
+ WARN("Failed to create timeline semaphore, vr %d.\n", vr);
+ return hresult_from_vk_result(vr);
+ }
+ fence->pending_timeline_value = initial_value;
+ fence->gpu_wait_count = 0;
+
list_init(&fence->semaphores);
fence->semaphore_count = 0;
@@ -5991,18 +6279,88 @@ static void STDMETHODCALLTYPE d3d12_command_queue_EndEvent(ID3D12CommandQueue *i
FIXME("iface %p stub!\n", iface);
}
+static HRESULT d3d12_fence_update_gpu_signal_timeline_semaphore(struct d3d12_fence *fence, uint64_t value)
+{
+ const struct d3d12_device *device = fence->device;
+ int rc;
+
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return hresult_from_errno(rc);
+ }
+
+ /* If we're attempting to async signal a fence with a value which is not monotonically increasing the payload value,
+ * warn about this case. Do not treat this as an error since it works at least with RADV and Nvidia drivers and
+ * there's no workaround on the GPU side. */
+ if (value <= fence->pending_timeline_value)
+ {
+ WARN("Fence %p is being signalled non-monotonically. Old pending value %"PRIu64", new pending value %"PRIu64".\n",
+ fence, fence->pending_timeline_value, value);
+ }
+ /* Sanity check against the delta limit. Use the current fence value. */
+ else if (value - fence->value > device->vk_info.timeline_semaphore_properties.maxTimelineSemaphoreValueDifference)
+ {
+ FIXME("Timeline semaphore delta is %"PRIu64", but implementation only supports a delta of %"PRIu64".\n",
+ value - fence->value, device->vk_info.timeline_semaphore_properties.maxTimelineSemaphoreValueDifference);
+ }
+ fence->pending_timeline_value = value;
+
+ vkd3d_mutex_unlock(&fence->mutex);
+
+ return S_OK;
+}
+
+static HRESULT vkd3d_enqueue_timeline_semaphore(struct vkd3d_fence_worker *worker, VkSemaphore vk_semaphore,
+ struct d3d12_fence *fence, uint64_t value, struct vkd3d_queue *queue)
+{
+ struct vkd3d_waiting_fence *waiting_fence;
+ int rc;
+
+ TRACE("worker %p, fence %p, value %#"PRIx64".\n", worker, fence, value);
+
+ if ((rc = vkd3d_mutex_lock(&worker->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return hresult_from_errno(rc);
+ }
+
+ if (!vkd3d_array_reserve((void **)&worker->enqueued_fences, &worker->enqueued_fences_size,
+ worker->enqueued_fence_count + 1, sizeof(*worker->enqueued_fences)))
+ {
+ ERR("Failed to add GPU timeline semaphore.\n");
+ vkd3d_mutex_unlock(&worker->mutex);
+ return E_OUTOFMEMORY;
+ }
+
+ worker->enqueued_fences[worker->enqueued_fence_count].vk_semaphore = vk_semaphore;
+ waiting_fence = &worker->enqueued_fences[worker->enqueued_fence_count].waiting_fence;
+ waiting_fence->fence = fence;
+ waiting_fence->value = value;
+ waiting_fence->queue = queue;
+ ++worker->enqueued_fence_count;
+
+ InterlockedIncrement(&fence->pending_worker_operation_count);
+
+ vkd3d_cond_signal(&worker->cond);
+ vkd3d_mutex_unlock(&worker->mutex);
+
+ return S_OK;
+}
+
static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *iface,
ID3D12Fence *fence_iface, UINT64 value)
{
struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+ VkTimelineSemaphoreSubmitInfoKHR timeline_submit_info;
const struct vkd3d_vk_device_procs *vk_procs;
VkSemaphore vk_semaphore = VK_NULL_HANDLE;
VkFence vk_fence = VK_NULL_HANDLE;
struct vkd3d_queue *vkd3d_queue;
+ uint64_t sequence_number = 0;
struct d3d12_device *device;
struct d3d12_fence *fence;
VkSubmitInfo submit_info;
- uint64_t sequence_number;
VkQueue vk_queue;
VkResult vr;
HRESULT hr;
@@ -6015,10 +6373,21 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *
fence = unsafe_impl_from_ID3D12Fence(fence_iface);
- if ((vr = d3d12_fence_create_vk_fence(fence, &vk_fence)) < 0)
+ if (device->vk_info.KHR_timeline_semaphore)
{
- WARN("Failed to create Vulkan fence, vr %d.\n", vr);
- goto fail_vkresult;
+ if (FAILED(hr = d3d12_fence_update_gpu_signal_timeline_semaphore(fence, value)))
+ return hr;
+
+ vk_semaphore = fence->timeline_semaphore;
+ assert(vk_semaphore);
+ }
+ else
+ {
+ if ((vr = d3d12_fence_create_vk_fence(fence, &vk_fence)) < 0)
+ {
+ WARN("Failed to create Vulkan fence, vr %d.\n", vr);
+ goto fail_vkresult;
+ }
}
if (!(vk_queue = vkd3d_queue_acquire(vkd3d_queue)))
@@ -6028,7 +6397,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *
goto fail;
}
- if ((vr = vkd3d_queue_create_vk_semaphore_locked(vkd3d_queue, device, &vk_semaphore)) < 0)
+ if (!device->vk_info.KHR_timeline_semaphore && (vr = vkd3d_queue_create_vk_semaphore_locked(vkd3d_queue,
+ device, &vk_semaphore)) < 0)
{
ERR("Failed to create Vulkan semaphore, vr %d.\n", vr);
vk_semaphore = VK_NULL_HANDLE;
@@ -6044,7 +6414,19 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *
submit_info.signalSemaphoreCount = vk_semaphore ? 1 : 0;
submit_info.pSignalSemaphores = &vk_semaphore;
- if ((vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, vk_fence))) >= 0)
+ if (device->vk_info.KHR_timeline_semaphore)
+ {
+ timeline_submit_info.sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR;
+ timeline_submit_info.pNext = NULL;
+ timeline_submit_info.pSignalSemaphoreValues = &value;
+ timeline_submit_info.signalSemaphoreValueCount = submit_info.signalSemaphoreCount;
+ timeline_submit_info.waitSemaphoreValueCount = 0;
+ timeline_submit_info.pWaitSemaphoreValues = NULL;
+ submit_info.pNext = &timeline_submit_info;
+ }
+
+ vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, vk_fence));
+ if (!device->vk_info.KHR_timeline_semaphore && vr >= 0)
{
sequence_number = ++vkd3d_queue->submitted_sequence_number;
@@ -6061,6 +6443,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *
goto fail_vkresult;
}
+ if (device->vk_info.KHR_timeline_semaphore)
+ return vkd3d_enqueue_timeline_semaphore(&device->fence_worker, vk_semaphore, fence, value, vkd3d_queue);
+
if (vk_semaphore && SUCCEEDED(hr = d3d12_fence_add_vk_semaphore(fence, vk_semaphore, vk_fence, value)))
vk_semaphore = VK_NULL_HANDLE;
@@ -6096,32 +6481,27 @@ fail_vkresult:
hr = hresult_from_vk_result(vr);
fail:
VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL));
- VK_CALL(vkDestroySemaphore(device->vk_device, vk_semaphore, NULL));
+ if (!device->vk_info.KHR_timeline_semaphore)
+ VK_CALL(vkDestroySemaphore(device->vk_device, vk_semaphore, NULL));
return hr;
}
-static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *iface,
- ID3D12Fence *fence_iface, UINT64 value)
+static HRESULT d3d12_command_queue_wait_binary_semaphore(struct d3d12_command_queue *command_queue,
+ struct d3d12_fence *fence, uint64_t value)
{
static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
- struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
const struct vkd3d_vk_device_procs *vk_procs;
struct vkd3d_signaled_semaphore *semaphore;
uint64_t completed_value = 0;
struct vkd3d_queue *queue;
- struct d3d12_fence *fence;
VkSubmitInfo submit_info;
VkQueue vk_queue;
VkResult vr;
HRESULT hr;
- TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence_iface, value);
-
vk_procs = &command_queue->device->vk_procs;
queue = command_queue->vkd3d_queue;
- fence = unsafe_impl_from_ID3D12Fence(fence_iface);
-
semaphore = d3d12_fence_acquire_vk_semaphore(fence, value, &completed_value);
if (!semaphore && completed_value >= value)
{
@@ -6199,6 +6579,122 @@ fail:
return hr;
}
+static inline void d3d12_fence_update_gpu_wait(struct d3d12_fence *fence, const struct vkd3d_queue *queue)
+{
+ unsigned int i;
+ bool found;
+ int rc;
+
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
+ {
+ ERR("Failed to lock mutex, error %d.\n", rc);
+ return;
+ }
+
+ for (i = 0, found = false; i < fence->gpu_wait_count; ++i)
+ {
+ if (fence->gpu_waits[i].queue == queue)
+ {
+ fence->gpu_waits[i].pending_value = queue->pending_wait_completion_value;
+ found = true;
+ }
+ else if (d3d12_fence_gpu_wait_is_completed(fence, i) && i < --fence->gpu_wait_count)
+ {
+ fence->gpu_waits[i] = fence->gpu_waits[fence->gpu_wait_count];
+ }
+ }
+
+ if (!found)
+ {
+ if (fence->gpu_wait_count < ARRAY_SIZE(fence->gpu_waits))
+ {
+ fence->gpu_waits[fence->gpu_wait_count].queue = queue;
+ fence->gpu_waits[fence->gpu_wait_count++].pending_value = queue->pending_wait_completion_value;
+ }
+ else
+ {
+ FIXME("Unable to track GPU fence wait.\n");
+ }
+ }
+
+ vkd3d_mutex_unlock(&fence->mutex);
+}
+
+static HRESULT d3d12_command_queue_wait_timeline_semaphore(struct d3d12_command_queue *command_queue,
+ struct d3d12_fence *fence, uint64_t value)
+{
+ static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
+ VkTimelineSemaphoreSubmitInfoKHR timeline_submit_info;
+ const struct vkd3d_vk_device_procs *vk_procs;
+ struct vkd3d_queue *queue;
+ VkSubmitInfo submit_info;
+ VkQueue vk_queue;
+ VkResult vr;
+
+ vk_procs = &command_queue->device->vk_procs;
+ queue = command_queue->vkd3d_queue;
+
+ assert(fence->timeline_semaphore);
+ timeline_submit_info.sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR;
+ timeline_submit_info.pNext = NULL;
+ timeline_submit_info.signalSemaphoreValueCount = 0;
+ timeline_submit_info.pSignalSemaphoreValues = NULL;
+ timeline_submit_info.waitSemaphoreValueCount = 1;
+ timeline_submit_info.pWaitSemaphoreValues = &value;
+
+ if (!(vk_queue = vkd3d_queue_acquire(queue)))
+ {
+ ERR("Failed to acquire queue %p.\n", queue);
+ return E_FAIL;
+ }
+
+ submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+ submit_info.pNext = &timeline_submit_info;
+ submit_info.waitSemaphoreCount = 1;
+ submit_info.pWaitSemaphores = &fence->timeline_semaphore;
+ submit_info.pWaitDstStageMask = &wait_stage_mask;
+ submit_info.commandBufferCount = 0;
+ submit_info.pCommandBuffers = NULL;
+ submit_info.signalSemaphoreCount = 0;
+ submit_info.pSignalSemaphores = NULL;
+
+ ++queue->pending_wait_completion_value;
+
+ submit_info.signalSemaphoreCount = 1;
+ submit_info.pSignalSemaphores = &queue->wait_completion_semaphore;
+ timeline_submit_info.signalSemaphoreValueCount = 1;
+ timeline_submit_info.pSignalSemaphoreValues = &queue->pending_wait_completion_value;
+
+ d3d12_fence_update_gpu_wait(fence, queue);
+
+ vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE));
+
+ vkd3d_queue_release(queue);
+
+ if (vr < 0)
+ {
+ WARN("Failed to submit wait operation, vr %d.\n", vr);
+ return hresult_from_vk_result(vr);
+ }
+
+ return S_OK;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *iface,
+ ID3D12Fence *fence_iface, UINT64 value)
+{
+ struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface);
+ struct d3d12_fence *fence = unsafe_impl_from_ID3D12Fence(fence_iface);
+
+ TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence_iface, value);
+
+ if (command_queue->device->vk_info.KHR_timeline_semaphore)
+ return d3d12_command_queue_wait_timeline_semaphore(command_queue, fence, value);
+
+ FIXME_ONCE("KHR_timeline_semaphore is not available. Some wait commands may be unsupported.\n");
+ return d3d12_command_queue_wait_binary_semaphore(command_queue, fence, value);
+}
+
static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetTimestampFrequency(ID3D12CommandQueue *iface,
UINT64 *frequency)
{
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 59fa9af9..0c5278c0 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -129,6 +129,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] =
VK_EXTENSION(KHR_MAINTENANCE3, KHR_maintenance3),
VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor),
VK_EXTENSION(KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, KHR_sampler_mirror_clamp_to_edge),
+ VK_EXTENSION(KHR_TIMELINE_SEMAPHORE, KHR_timeline_semaphore),
/* EXT extensions */
VK_EXTENSION(EXT_CALIBRATED_TIMESTAMPS, EXT_calibrated_timestamps),
VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering),
@@ -683,6 +684,7 @@ struct vkd3d_physical_device_info
VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties;
VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties;
VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties;
+ VkPhysicalDeviceTimelineSemaphorePropertiesKHR timeline_semaphore_properties;
VkPhysicalDeviceProperties2KHR properties2;
@@ -694,6 +696,7 @@ struct vkd3d_physical_device_info
VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT texel_buffer_alignment_features;
VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features;
VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features;
+ VkPhysicalDeviceTimelineSemaphoreFeaturesKHR timeline_semaphore_features;
VkPhysicalDeviceFeatures2 features2;
};
@@ -705,10 +708,12 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i
VkPhysicalDeviceDescriptorIndexingPropertiesEXT *descriptor_indexing_properties;
VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties;
VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT *buffer_alignment_properties;
+ VkPhysicalDeviceTimelineSemaphorePropertiesKHR *timeline_semaphore_properties;
VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features;
VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features;
VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *buffer_alignment_features;
VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT *demote_features;
+ VkPhysicalDeviceTimelineSemaphoreFeaturesKHR *timeline_semaphore_features;
VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features;
VkPhysicalDeviceMaintenance3Properties *maintenance3_properties;
VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb_properties;
@@ -727,6 +732,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i
buffer_alignment_properties = &info->texel_buffer_alignment_properties;
vertex_divisor_features = &info->vertex_divisor_features;
vertex_divisor_properties = &info->vertex_divisor_properties;
+ timeline_semaphore_features = &info->timeline_semaphore_features;
+ timeline_semaphore_properties = &info->timeline_semaphore_properties;
xfb_features = &info->xfb_features;
xfb_properties = &info->xfb_properties;
@@ -746,6 +753,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i
vk_prepend_struct(&info->features2, xfb_features);
vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT;
vk_prepend_struct(&info->features2, vertex_divisor_features);
+ timeline_semaphore_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR;
+ vk_prepend_struct(&info->features2, timeline_semaphore_features);
if (vulkan_info->KHR_get_physical_device_properties2)
VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &info->features2));
@@ -764,6 +773,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i
vk_prepend_struct(&info->properties2, xfb_properties);
vertex_divisor_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT;
vk_prepend_struct(&info->properties2, vertex_divisor_properties);
+ timeline_semaphore_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR;
+ vk_prepend_struct(&info->properties2, timeline_semaphore_properties);
if (vulkan_info->KHR_get_physical_device_properties2)
VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &info->properties2));
@@ -1322,6 +1333,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device,
vulkan_info->rasterization_stream = physical_device_info->xfb_properties.transformFeedbackRasterizationStreamSelect;
vulkan_info->transform_feedback_queries = physical_device_info->xfb_properties.transformFeedbackQueries;
vulkan_info->max_vertex_attrib_divisor = max(physical_device_info->vertex_divisor_properties.maxVertexAttribDivisor, 1);
+ vulkan_info->timeline_semaphore_properties = physical_device_info->timeline_semaphore_properties;
device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64;
device->feature_options.OutputMergerLogicOp = features->logicOp;
@@ -1444,6 +1456,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device,
vulkan_info->EXT_shader_demote_to_helper_invocation = false;
if (!physical_device_info->texel_buffer_alignment_features.texelBufferAlignment)
vulkan_info->EXT_texel_buffer_alignment = false;
+ if (!physical_device_info->timeline_semaphore_features.timelineSemaphore)
+ vulkan_info->KHR_timeline_semaphore = false;
vulkan_info->texel_buffer_alignment_properties = physical_device_info->texel_buffer_alignment_properties;
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index ac0d5ce1..48777aac 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -59,6 +59,7 @@
#define VKD3D_MAX_SHADER_EXTENSIONS 3u
#define VKD3D_MAX_SHADER_STAGES 5u
#define VKD3D_MAX_VK_SYNC_OBJECTS 4u
+#define VKD3D_MAX_FENCE_WAITING_QUEUES 4u
#define VKD3D_MAX_DESCRIPTOR_SETS 64u
/* D3D12 binding tier 3 has a limit of 2048 samplers. */
#define VKD3D_MAX_DESCRIPTOR_SET_SAMPLERS 2048u
@@ -123,6 +124,7 @@ struct vkd3d_vulkan_info
bool KHR_maintenance3;
bool KHR_push_descriptor;
bool KHR_sampler_mirror_clamp_to_edge;
+ bool KHR_timeline_semaphore;
/* EXT device extensions */
bool EXT_calibrated_timestamps;
bool EXT_conditional_rendering;
@@ -147,6 +149,8 @@ struct vkd3d_vulkan_info
VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties;
+ VkPhysicalDeviceTimelineSemaphorePropertiesKHR timeline_semaphore_properties;
+
unsigned int shader_extension_count;
enum vkd3d_shader_spirv_extension shader_extensions[VKD3D_MAX_SHADER_EXTENSIONS];
@@ -344,6 +348,7 @@ struct vkd3d_fence_worker
struct vkd3d_enqueued_fence
{
VkFence vk_fence;
+ VkSemaphore vk_semaphore;
struct vkd3d_waiting_fence waiting_fence;
} *enqueued_fences;
size_t enqueued_fences_size;
@@ -353,6 +358,12 @@ struct vkd3d_fence_worker
size_t vk_fences_size;
struct vkd3d_waiting_fence *fences;
size_t fences_size;
+ VkSemaphore *vk_semaphores;
+ size_t vk_semaphores_size;
+ uint64_t *semaphore_wait_values;
+ size_t semaphore_wait_values_size;
+
+ void (*wait_for_gpu_fences)(struct vkd3d_fence_worker *worker);
struct d3d12_device *device;
};
@@ -507,6 +518,12 @@ struct vkd3d_signaled_semaphore
bool is_acquired;
};
+struct vkd3d_pending_fence_wait
+{
+ const struct vkd3d_queue *queue;
+ uint64_t pending_value;
+};
+
/* ID3D12Fence */
struct d3d12_fence
{
@@ -526,6 +543,11 @@ struct d3d12_fence
size_t events_size;
size_t event_count;
+ VkSemaphore timeline_semaphore;
+ uint64_t pending_timeline_value;
+ struct vkd3d_pending_fence_wait gpu_waits[VKD3D_MAX_FENCE_WAITING_QUEUES];
+ unsigned int gpu_wait_count;
+
struct list semaphores;
unsigned int semaphore_count;
@@ -1200,6 +1222,9 @@ struct vkd3d_queue
VkQueueFlags vk_queue_flags;
uint32_t timestamp_bits;
+ VkSemaphore wait_completion_semaphore;
+ uint64_t pending_wait_completion_value;
+
struct
{
VkSemaphore vk_semaphore;
diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h
index 60556735..34e0ab4b 100644
--- a/libs/vkd3d/vulkan_procs.h
+++ b/libs/vkd3d/vulkan_procs.h
@@ -195,6 +195,11 @@ VK_DEVICE_EXT_PFN(vkGetDescriptorSetLayoutSupportKHR)
/* VK_KHR_push_descriptor */
VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR)
+/* VK_KHR_timeline_semaphore */
+VK_DEVICE_EXT_PFN(vkGetSemaphoreCounterValueKHR)
+VK_DEVICE_EXT_PFN(vkWaitSemaphoresKHR)
+VK_DEVICE_EXT_PFN(vkSignalSemaphoreKHR)
+
/* VK_EXT_calibrated_timestamps */
VK_DEVICE_EXT_PFN(vkGetCalibratedTimestampsEXT)
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 5067dd97..ea64918f 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -33233,7 +33233,9 @@ static void test_queue_wait(void)
command_list = context.list;
queue = context.queue;
- queue2 = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL);
+ /* 'queue2' must not map to the same command queue as 'queue', or Wait() before GPU signal will fail.
+ * Using a compute queue fixes this on most hardware, but it may still fail on low spec hardware. */
+ queue2 = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COMPUTE, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL);
event = create_event();
ok(event, "Failed to create event.\n");
@@ -33298,12 +33300,6 @@ static void test_queue_wait(void)
check_readback_data_uint(&rb, NULL, 0xff00ff00, 0);
release_resource_readback(&rb);
- if (!vkd3d_test_platform_is_windows())
- {
- skip("Wait() is not implemented yet.\n"); /* FIXME */
- goto skip_tests;
- }
-
/* Wait() before CPU signal */
update_buffer_data(cb, 0, sizeof(blue), &blue);
queue_wait(queue, fence, 2);
@@ -33379,7 +33375,6 @@ static void test_queue_wait(void)
check_readback_data_uint(&rb, NULL, 0xff00ff00, 0);
release_resource_readback(&rb);
-skip_tests:
/* Signal() and Wait() in the same command queue */
update_buffer_data(cb, 0, sizeof(blue), &blue);
queue_signal(queue, fence, 7);
--
2.34.1
2
4
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsamidi.c | 57 ++++++++++++++++++++++++++++++++++++
dlls/winealsa.drv/midi.c | 47 -----------------------------
2 files changed, 57 insertions(+), 47 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index a7a5a211484..a92c08793af 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -471,6 +471,60 @@ static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, stru
return MMSYSERR_NOERROR;
}
+static UINT midi_out_close(WORD dev_id, struct notify_context *notify)
+{
+ struct midi_dest *dest;
+
+ TRACE("(%04X);\n", dev_id);
+
+ if (dev_id >= num_dests)
+ {
+ WARN("bad device ID : %d\n", dev_id);
+ return MMSYSERR_BADDEVICEID;
+ }
+
+ dest = dests + dev_id;
+
+ if (dest->midiDesc.hMidi == 0)
+ {
+ WARN("device not opened !\n");
+ return MMSYSERR_ERROR;
+ }
+
+ /* FIXME: should test that no pending buffer is still in the queue for
+ * playing */
+
+ if (dest->seq == NULL)
+ {
+ WARN("can't close !\n");
+ return MMSYSERR_ERROR;
+ }
+
+ switch (dest->caps.wTechnology)
+ {
+ case MOD_FMSYNTH:
+ case MOD_MIDIPORT:
+ case MOD_SYNTH:
+ seq_lock();
+ TRACE("Deleting port :%d, connected to %d:%d\n", dest->port_out, dest->addr.client, dest->addr.port);
+ snd_seq_delete_simple_port(dest->seq, dest->port_out);
+ dest->port_out = -1;
+ seq_unlock();
+ seq_close();
+ dest->seq = NULL;
+ break;
+ default:
+ WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology);
+ return MMSYSERR_NOTENABLED;
+ }
+
+ set_out_notify(notify, dest, dev_id, MOM_CLOSE, 0, 0);
+
+ dest->midiDesc.hMidi = 0;
+
+ return MMSYSERR_NOERROR;
+}
+
NTSTATUS midi_out_message(void *args)
{
struct midi_out_message_params *params = args;
@@ -488,6 +542,9 @@ NTSTATUS midi_out_message(void *args)
case MODM_OPEN:
*params->err = midi_out_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify);
break;
+ case MODM_CLOSE:
+ *params->err = midi_out_close(params->dev_id, params->notify);
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index c77d479162b..5f8d855c9fb 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -122,7 +122,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg,
wDevID, wMsg, dwParam1, dwParam2);
switch (wMsg) {
- case MOM_CLOSE:
case MOM_DONE:
case MOM_POSITIONCB:
if (wDevID > MODM_NumDevs) return;
@@ -631,50 +630,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize)
return MMSYSERR_NOERROR;
}
-/**************************************************************************
- * modClose [internal]
- */
-static DWORD modClose(WORD wDevID)
-{
- int ret = MMSYSERR_NOERROR;
-
- TRACE("(%04X);\n", wDevID);
-
- if (MidiOutDev[wDevID].midiDesc.hMidi == 0) {
- WARN("device not opened !\n");
- return MMSYSERR_ERROR;
- }
- /* FIXME: should test that no pending buffer is still in the queue for
- * playing */
-
- if (MidiOutDev[wDevID].seq == NULL) {
- WARN("can't close !\n");
- return MMSYSERR_ERROR;
- }
-
- switch (MidiOutDev[wDevID].caps.wTechnology) {
- case MOD_FMSYNTH:
- case MOD_MIDIPORT:
- case MOD_SYNTH:
- seq_lock();
- TRACE("Deleting port :%d, connected to %d:%d\n", MidiOutDev[wDevID].port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port);
- snd_seq_delete_simple_port(MidiOutDev[wDevID].seq, MidiOutDev[wDevID].port_out);
- MidiOutDev[wDevID].port_out = -1;
- seq_unlock();
- midiCloseSeq();
- MidiOutDev[wDevID].seq = NULL;
- break;
- default:
- WARN("Technology not supported (yet) %d !\n",
- MidiOutDev[wDevID].caps.wTechnology);
- return MMSYSERR_NOTENABLED;
- }
-
- MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L);
- MidiOutDev[wDevID].midiDesc.hMidi = 0;
- return ret;
-}
-
/**************************************************************************
* modData [internal]
*/
@@ -1051,8 +1006,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
case DRVM_INIT:
ALSA_MidiInit();
return 0;
- case MODM_CLOSE:
- return modClose(wDevID);
case MODM_DATA:
return modData(wDevID, dwParam1);
case MODM_LONGDATA:
--
2.25.1
2
1
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsa.c | 1 +
dlls/winealsa.drv/alsamidi.c | 133 +++++++++++++++++++++++++++++++++++
dlls/winealsa.drv/midi.c | 127 +++++++--------------------------
dlls/winealsa.drv/unixlib.h | 26 +++++++
4 files changed, 186 insertions(+), 101 deletions(-)
diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 16c0c7c387d..6d307eb84bf 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -2445,6 +2445,7 @@ unixlib_entry_t __wine_unix_call_funcs[] =
is_started,
get_prop_value,
midi_init,
+ midi_out_message,
midi_seq_lock, /* temporary */
midi_seq_open,
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index e1fca85b3b4..a7a5a211484 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -362,3 +362,136 @@ NTSTATUS midi_init(void *args)
return STATUS_SUCCESS;
}
+
+static void set_out_notify(struct notify_context *notify, struct midi_dest *dest, WORD dev_id, WORD msg,
+ UINT_PTR param_1, UINT_PTR param_2)
+{
+ notify->send_notify = TRUE;
+ notify->dev_id = dev_id;
+ notify->msg = msg;
+ notify->param_1 = param_1;
+ notify->param_2 = param_2;
+ notify->callback = dest->midiDesc.dwCallback;
+ notify->flags = dest->wFlags;
+ notify->device = dest->midiDesc.hMidi;
+ notify->instance = dest->midiDesc.dwInstance;
+}
+
+static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, struct notify_context *notify)
+{
+ int ret;
+ int port_out;
+ char port_out_name[32];
+ snd_seq_t *midi_seq;
+ struct midi_dest *dest;
+
+ TRACE("(%04X, %p, %08X);\n", dev_id, midi_desc, flags);
+
+ if (midi_desc == NULL)
+ {
+ WARN("Invalid Parameter !\n");
+ return MMSYSERR_INVALPARAM;
+ }
+ if (dev_id >= num_dests)
+ {
+ TRACE("MAX_MIDIOUTDRV reached !\n");
+ return MMSYSERR_BADDEVICEID;
+ }
+ dest = dests + dev_id;
+ if (dest->midiDesc.hMidi != 0)
+ {
+ WARN("device already open !\n");
+ return MMSYSERR_ALLOCATED;
+ }
+ if (!dest->bEnabled)
+ {
+ WARN("device disabled !\n");
+ return MIDIERR_NODEVICE;
+ }
+ if ((flags & ~CALLBACK_TYPEMASK) != 0)
+ {
+ WARN("bad dwFlags\n");
+ return MMSYSERR_INVALFLAG;
+ }
+
+ switch (dest->caps.wTechnology)
+ {
+ case MOD_FMSYNTH:
+ case MOD_MIDIPORT:
+ case MOD_SYNTH:
+ if (!(midi_seq = seq_open(NULL)))
+ return MMSYSERR_ALLOCATED;
+ break;
+ default:
+ WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology);
+ return MMSYSERR_NOTENABLED;
+ }
+
+ dest->wFlags = HIWORD(flags & CALLBACK_TYPEMASK);
+ dest->midiDesc = *midi_desc;
+ dest->seq = midi_seq;
+
+ seq_lock();
+ /* Create a port dedicated to a specific device */
+ /* Keep the old name without a number for the first port */
+ if (dev_id)
+ sprintf(port_out_name, "WINE ALSA Output #%d", dev_id);
+
+ port_out = snd_seq_create_simple_port(midi_seq, dev_id ? port_out_name : "WINE ALSA Output",
+ SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ | SND_SEQ_PORT_CAP_SUBS_WRITE,
+ SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION);
+
+ if (port_out < 0)
+ {
+ TRACE("Unable to create output port\n");
+ dest->port_out = -1;
+ }
+ else
+ {
+ TRACE("Output port %d created successfully\n", port_out);
+ dest->port_out = port_out;
+
+ /* Connect our app port to the device port */
+ ret = snd_seq_connect_to(midi_seq, port_out, dest->addr.client, dest->addr.port);
+
+ /* usually will happen when the port is already connected */
+ /* other errors should not be fatal either */
+ if (ret < 0)
+ WARN("Could not connect port %d to %d:%d: %s\n", dev_id, dest->addr.client,
+ dest->addr.port, snd_strerror(ret));
+ }
+ seq_unlock();
+
+ if (port_out < 0)
+ return MMSYSERR_NOTENABLED;
+
+ TRACE("Output port :%d connected %d:%d\n", port_out, dest->addr.client, dest->addr.port);
+
+ set_out_notify(notify, dest, dev_id, MOM_OPEN, 0, 0);
+ return MMSYSERR_NOERROR;
+}
+
+NTSTATUS midi_out_message(void *args)
+{
+ struct midi_out_message_params *params = args;
+
+ params->notify->send_notify = FALSE;
+
+ switch (params->msg)
+ {
+ case DRVM_EXIT:
+ case DRVM_ENABLE:
+ case DRVM_DISABLE:
+ /* FIXME: Pretend this is supported */
+ *params->err = MMSYSERR_NOERROR;
+ break;
+ case MODM_OPEN:
+ *params->err = midi_out_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify);
+ 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 535f3dbd348..c77d479162b 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -79,6 +79,14 @@ static void seq_unlock(void)
ALSA_CALL(midi_seq_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);
+
+ DriverCallback(notify->callback, notify->flags, notify->device, notify->msg,
+ notify->instance, notify->param_1, notify->param_2);
+}
+
/*======================================================================*
* Low level MIDI implementation *
*======================================================================*/
@@ -114,7 +122,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg,
wDevID, wMsg, dwParam1, dwParam2);
switch (wMsg) {
- case MOM_OPEN:
case MOM_CLOSE:
case MOM_DONE:
case MOM_POSITIONCB:
@@ -624,96 +631,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize)
return MMSYSERR_NOERROR;
}
-/**************************************************************************
- * modOpen [internal]
- */
-static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
-{
- int ret;
- int port_out;
- char port_out_name[32];
- snd_seq_t *midi_seq;
-
- TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags);
- if (lpDesc == NULL) {
- WARN("Invalid Parameter !\n");
- return MMSYSERR_INVALPARAM;
- }
- if (wDevID >= MODM_NumDevs) {
- TRACE("MAX_MIDIOUTDRV reached !\n");
- return MMSYSERR_BADDEVICEID;
- }
- if (MidiOutDev[wDevID].midiDesc.hMidi != 0) {
- WARN("device already open !\n");
- return MMSYSERR_ALLOCATED;
- }
- if (!MidiOutDev[wDevID].bEnabled) {
- WARN("device disabled !\n");
- return MIDIERR_NODEVICE;
- }
- if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) {
- WARN("bad dwFlags\n");
- return MMSYSERR_INVALFLAG;
- }
-
- switch (MidiOutDev[wDevID].caps.wTechnology) {
- case MOD_FMSYNTH:
- case MOD_MIDIPORT:
- case MOD_SYNTH:
- if (!(midi_seq = midiOpenSeq(NULL))) {
- return MMSYSERR_ALLOCATED;
- }
- break;
- default:
- WARN("Technology not supported (yet) %d !\n",
- MidiOutDev[wDevID].caps.wTechnology);
- return MMSYSERR_NOTENABLED;
- }
-
- MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
- MidiOutDev[wDevID].midiDesc = *lpDesc;
- MidiOutDev[wDevID].seq = midi_seq;
-
- seq_lock();
- /* Create a port dedicated to a specific device */
- /* Keep the old name without a number for the first port */
- if (wDevID)
- sprintf(port_out_name, "WINE ALSA Output #%d", wDevID);
-
- port_out = snd_seq_create_simple_port(midi_seq, wDevID?port_out_name:"WINE ALSA Output",
- SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE,
- SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION);
-
- if (port_out < 0) {
- TRACE("Unable to create output port\n");
- MidiOutDev[wDevID].port_out = -1;
- } else {
- TRACE("Output port %d created successfully\n", port_out);
- MidiOutDev[wDevID].port_out = port_out;
-
- /* Connect our app port to the device port */
- ret = snd_seq_connect_to(midi_seq, port_out, MidiOutDev[wDevID].addr.client,
- MidiOutDev[wDevID].addr.port);
-
- /* usually will happen when the port is already connected */
- /* other errors should not be fatal either */
- if (ret < 0)
- WARN("Could not connect port %d to %d:%d: %s\n",
- wDevID, MidiOutDev[wDevID].addr.client,
- MidiOutDev[wDevID].addr.port, snd_strerror(ret));
- }
- seq_unlock();
-
- if (port_out < 0)
- return MMSYSERR_NOTENABLED;
-
- TRACE("Output port :%d connected %d:%d\n",port_out,MidiOutDev[wDevID].addr.client,MidiOutDev[wDevID].addr.port);
-
- MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L);
- return MMSYSERR_NOERROR;
-}
-
-
/**************************************************************************
* modClose [internal]
*/
@@ -1123,6 +1040,10 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
+ struct midi_out_message_params params;
+ struct notify_context notify;
+ UINT err;
+
TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2);
@@ -1130,13 +1051,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
case DRVM_INIT:
ALSA_MidiInit();
return 0;
- case DRVM_EXIT:
- case DRVM_ENABLE:
- case DRVM_DISABLE:
- /* FIXME: Pretend this is supported */
- return 0;
- case MODM_OPEN:
- return modOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2);
case MODM_CLOSE:
return modClose(wDevID);
case MODM_DATA:
@@ -1157,10 +1071,21 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return 0;
case MODM_RESET:
return modReset(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;
+ params.notify = ¬ify;
+
+ ALSA_CALL(midi_out_message, ¶ms);
+
+ if (!err && notify.send_notify) notify_client(¬ify);
+
+ return err;
}
/**************************************************************************
diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h
index d69ab980f42..e3cd7123101 100644
--- a/dlls/winealsa.drv/unixlib.h
+++ b/dlls/winealsa.drv/unixlib.h
@@ -241,6 +241,30 @@ struct midi_init_params
void *dests, *srcs;
};
+struct notify_context
+{
+ BOOL send_notify;
+ WORD dev_id;
+ WORD msg;
+ UINT_PTR param_1;
+ UINT_PTR param_2;
+ UINT_PTR callback;
+ UINT flags;
+ HANDLE device;
+ UINT_PTR instance;
+};
+
+struct midi_out_message_params
+{
+ UINT dev_id;
+ UINT msg;
+ UINT_PTR user;
+ UINT_PTR param_1;
+ UINT_PTR param_2;
+ UINT *err;
+ struct notify_context *notify;
+};
+
struct midi_seq_open_params
{
int close;
@@ -274,12 +298,14 @@ enum alsa_funcs
alsa_is_started,
alsa_get_prop_value,
alsa_midi_init,
+ alsa_midi_out_message,
alsa_midi_seq_lock, /* temporary */
alsa_midi_seq_open,
};
NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN;
+NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN;
NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN;
NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN;
--
2.25.1
2
1
[PATCH v2 3/5] winealsa: Add a temporary syscall to return the snd_seq handle.
by Huw Davies 16 Mar '22
by Huw Davies 16 Mar '22
16 Mar '22
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsa.c | 1 +
dlls/winealsa.drv/alsamidi.c | 51 ++++++++++++++++++++++++++++++------
dlls/winealsa.drv/midi.c | 49 ++++++++--------------------------
dlls/winealsa.drv/unixlib.h | 9 +++++++
4 files changed, 64 insertions(+), 46 deletions(-)
diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 76e4b98caaf..16c0c7c387d 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -2447,4 +2447,5 @@ unixlib_entry_t __wine_unix_call_funcs[] =
midi_init,
midi_seq_lock, /* temporary */
+ midi_seq_open,
};
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index 86e092bd977..e1fca85b3b4 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -55,6 +55,7 @@ static struct midi_dest dests[MAX_MIDIOUTDRV];
static struct midi_src srcs[MAX_MIDIINDRV];
static snd_seq_t *midi_seq;
static unsigned int seq_refs;
+static int port_in = -1;
static void seq_lock(void)
{
@@ -74,7 +75,7 @@ NTSTATUS midi_seq_lock(void *args)
return STATUS_SUCCESS;
}
-static int seq_open(void)
+static snd_seq_t *seq_open(int *port_in_ret)
{
static int midi_warn;
@@ -87,12 +88,28 @@ static int seq_open(void)
WARN("Error opening ALSA sequencer.\n");
midi_warn = 1;
seq_unlock();
- return -1;
+ return NULL;
}
+ snd_seq_set_client_name(midi_seq, "WINE midi driver");
}
seq_refs++;
+
+ if (port_in_ret)
+ {
+ if (port_in < 0)
+ {
+ port_in = snd_seq_create_simple_port(midi_seq, "WINE ALSA Input",
+ SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_READ | SND_SEQ_PORT_CAP_SUBS_WRITE,
+ SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION);
+ if (port_in < 0)
+ TRACE("Unable to create input port\n");
+ else
+ TRACE("Input port %d created successfully\n", port_in);
+ }
+ *port_in_ret = port_in;
+ }
seq_unlock();
- return 0;
+ return midi_seq;
}
static void seq_close(void)
@@ -100,12 +117,29 @@ static void seq_close(void)
seq_lock();
if (--seq_refs == 0)
{
+ if (port_in >= 0)
+ {
+ snd_seq_delete_simple_port(midi_seq, port_in);
+ port_in = -1;
+ }
snd_seq_close(midi_seq);
midi_seq = NULL;
}
seq_unlock();
}
+NTSTATUS midi_seq_open(void *args)
+{
+ struct midi_seq_open_params *params = args;
+
+ if (!params->close)
+ params->seq = seq_open(params->port_in);
+ else
+ seq_close();
+
+ return STATUS_SUCCESS;
+}
+
static int alsa_to_win_device_type(unsigned int type)
{
/* MOD_MIDIPORT output port
@@ -270,6 +304,7 @@ NTSTATUS midi_init(void *args)
static BOOL init_done;
snd_seq_client_info_t *cinfo;
snd_seq_port_info_t *pinfo;
+ snd_seq_t *seq;
if (init_done) {
*params->err = ERROR_ALREADY_INITIALIZED;
@@ -280,7 +315,7 @@ NTSTATUS midi_init(void *args)
init_done = TRUE;
/* try to open device */
- if (seq_open() == -1) {
+ if (!(seq = seq_open(NULL))) {
*params->err = ERROR_OPEN_FAILED;
return STATUS_SUCCESS;
}
@@ -290,10 +325,10 @@ NTSTATUS midi_init(void *args)
/* First, search for all internal midi devices */
snd_seq_client_info_set_client(cinfo, -1);
- while (snd_seq_query_next_client(midi_seq, cinfo) >= 0) {
+ while (snd_seq_query_next_client(seq, cinfo) >= 0) {
snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
snd_seq_port_info_set_port(pinfo, -1);
- while (snd_seq_query_next_port(midi_seq, pinfo) >= 0) {
+ while (snd_seq_query_next_port(seq, pinfo) >= 0) {
unsigned int cap = snd_seq_port_info_get_capability(pinfo);
unsigned int type = snd_seq_port_info_get_type(pinfo);
if (!(type & SND_SEQ_PORT_TYPE_PORT))
@@ -303,10 +338,10 @@ NTSTATUS midi_init(void *args)
/* Second, search for all external ports */
snd_seq_client_info_set_client(cinfo, -1);
- while (snd_seq_query_next_client(midi_seq, cinfo) >= 0) {
+ while (snd_seq_query_next_client(seq, cinfo) >= 0) {
snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
snd_seq_port_info_set_port(pinfo, -1);
- while (snd_seq_query_next_port(midi_seq, pinfo) >= 0) {
+ while (snd_seq_query_next_port(seq, pinfo) >= 0) {
unsigned int cap = snd_seq_port_info_get_capability(pinfo);
unsigned int type = snd_seq_port_info_get_type(pinfo);
if (type & SND_SEQ_PORT_TYPE_PORT)
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index fae6ddf8615..535f3dbd348 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -55,12 +55,8 @@ static int MODM_NumDevs = 0;
/* this is the total number of MIDI out devices found */
static int MIDM_NumDevs = 0;
-static snd_seq_t* midiSeq = NULL;
-static int numOpenMidiSeq = 0;
static int numStartedMidiIn = 0;
-static int port_in;
-
static CRITICAL_SECTION crit_sect; /* protects all MidiIn buffer queues */
static CRITICAL_SECTION_DEBUG critsect_debug =
{
@@ -152,40 +148,18 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg,
DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2);
}
-static BOOL midi_warn = TRUE;
/**************************************************************************
* midiOpenSeq [internal]
*/
static snd_seq_t *midiOpenSeq(int *port_in_ret)
{
- seq_lock();
- if (numOpenMidiSeq == 0) {
- if (snd_seq_open(&midiSeq, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0)
- {
- if (midi_warn)
- {
- WARN("Error opening ALSA sequencer.\n");
- }
- midi_warn = FALSE;
- seq_unlock();
- return NULL;
- }
+ struct midi_seq_open_params params;
- /* Setting the client name is the only init to do */
- snd_seq_set_client_name(midiSeq, "WINE midi driver");
+ params.port_in = port_in_ret;
+ params.close = 0;
+ ALSA_CALL(midi_seq_open, ¶ms);
- port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input",
- SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE,
- SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION);
- if (port_in < 0)
- TRACE("Unable to create input port\n");
- else
- TRACE("Input port %d created successfully\n", port_in);
- }
- numOpenMidiSeq++;
- seq_unlock();
- if (port_in_ret) *port_in_ret = port_in;
- return midiSeq;
+ return params.seq;
}
/**************************************************************************
@@ -193,13 +167,12 @@ static snd_seq_t *midiOpenSeq(int *port_in_ret)
*/
static int midiCloseSeq(void)
{
- seq_lock();
- if (--numOpenMidiSeq == 0) {
- snd_seq_delete_simple_port(midiSeq, port_in);
- snd_seq_close(midiSeq);
- midiSeq = NULL;
- }
- seq_unlock();
+ struct midi_seq_open_params params;
+
+ params.port_in = NULL;
+ params.close = 1;
+ ALSA_CALL(midi_seq_open, ¶ms);
+
return 0;
}
diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h
index e0ae16b97d9..d69ab980f42 100644
--- a/dlls/winealsa.drv/unixlib.h
+++ b/dlls/winealsa.drv/unixlib.h
@@ -241,6 +241,13 @@ struct midi_init_params
void *dests, *srcs;
};
+struct midi_seq_open_params
+{
+ int close;
+ snd_seq_t *seq;
+ int *port_in;
+};
+
enum alsa_funcs
{
alsa_get_endpoint_ids,
@@ -269,11 +276,13 @@ enum alsa_funcs
alsa_midi_init,
alsa_midi_seq_lock, /* temporary */
+ alsa_midi_seq_open,
};
NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN;
NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN;
+NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN;
extern unixlib_handle_t alsa_handle;
--
2.25.1
2
1
[PATCH v2 2/5] winealsa: Store the snd_seq handle and the input port in the device data.
by Huw Davies 16 Mar '22
by Huw Davies 16 Mar '22
16 Mar '22
This is to avoid accessing more global variables and generally
makes things a bit cleaner.
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/midi.c | 85 ++++++++++++++++++++-----------------
dlls/winealsa.drv/unixlib.h | 3 ++
2 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 988429ab934..fae6ddf8615 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -156,7 +156,7 @@ static BOOL midi_warn = TRUE;
/**************************************************************************
* midiOpenSeq [internal]
*/
-static int midiOpenSeq(BOOL create_client)
+static snd_seq_t *midiOpenSeq(int *port_in_ret)
{
seq_lock();
if (numOpenMidiSeq == 0) {
@@ -168,25 +168,24 @@ static int midiOpenSeq(BOOL create_client)
}
midi_warn = FALSE;
seq_unlock();
- return -1;
+ return NULL;
}
- if (create_client) {
- /* Setting the client name is the only init to do */
- snd_seq_set_client_name(midiSeq, "WINE midi driver");
-
- port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input",
- SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE,
- SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION);
- if (port_in < 0)
- TRACE("Unable to create input port\n");
- else
- TRACE("Input port %d created successfully\n", port_in);
- }
+ /* Setting the client name is the only init to do */
+ snd_seq_set_client_name(midiSeq, "WINE midi driver");
+
+ port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input",
+ SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE,
+ SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION);
+ if (port_in < 0)
+ TRACE("Unable to create input port\n");
+ else
+ TRACE("Input port %d created successfully\n", port_in);
}
numOpenMidiSeq++;
seq_unlock();
- return 0;
+ if (port_in_ret) *port_in_ret = port_in;
+ return midiSeq;
}
/**************************************************************************
@@ -314,8 +313,9 @@ static void handle_midi_event(snd_seq_event_t *ev)
}
}
-static DWORD WINAPI midRecThread(LPVOID arg)
+static DWORD WINAPI midRecThread(void *arg)
{
+ snd_seq_t *midi_seq = arg;
int npfd;
struct pollfd *pfd;
int ret;
@@ -325,9 +325,9 @@ static DWORD WINAPI midRecThread(LPVOID arg)
while(!end_thread) {
TRACE("Thread loop\n");
seq_lock();
- npfd = snd_seq_poll_descriptors_count(midiSeq, POLLIN);
+ npfd = snd_seq_poll_descriptors_count(midi_seq, POLLIN);
pfd = HeapAlloc(GetProcessHeap(), 0, npfd * sizeof(struct pollfd));
- snd_seq_poll_descriptors(midiSeq, pfd, npfd, POLLIN);
+ snd_seq_poll_descriptors(midi_seq, pfd, npfd, POLLIN);
seq_unlock();
/* Check if an event is present */
@@ -337,9 +337,9 @@ static DWORD WINAPI midRecThread(LPVOID arg)
}
/* Note: This definitely does not work.
- * while(snd_seq_event_input_pending(midiSeq, 0) > 0) {
+ * while(snd_seq_event_input_pending(midi_seq, 0) > 0) {
snd_seq_event_t* ev;
- snd_seq_event_input(midiSeq, &ev);
+ snd_seq_event_input(midi_seq, &ev);
....................
snd_seq_free_event(ev);
}*/
@@ -348,7 +348,7 @@ static DWORD WINAPI midRecThread(LPVOID arg)
snd_seq_event_t *ev;
seq_lock();
- snd_seq_event_input(midiSeq, &ev);
+ snd_seq_event_input(midi_seq, &ev);
seq_unlock();
if (ev) {
@@ -357,10 +357,10 @@ static DWORD WINAPI midRecThread(LPVOID arg)
}
seq_lock();
- ret = snd_seq_event_input_pending(midiSeq, 0);
+ ret = snd_seq_event_input_pending(midi_seq, 0);
seq_unlock();
} while(ret > 0);
-
+
HeapFree(GetProcessHeap(), 0, pfd);
}
return 0;
@@ -387,7 +387,8 @@ static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize)
*/
static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
{
- int ret = 0;
+ int ret = 0, port_in;
+ snd_seq_t *midi_seq;
TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags);
@@ -420,7 +421,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
return MMSYSERR_INVALFLAG;
}
- if (midiOpenSeq(TRUE) < 0) {
+ if (!(midi_seq = midiOpenSeq(&port_in))) {
return MMSYSERR_ERROR;
}
@@ -430,10 +431,12 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
MidiInDev[wDevID].midiDesc = *lpDesc;
MidiInDev[wDevID].state = 0;
MidiInDev[wDevID].startTime = 0;
+ MidiInDev[wDevID].seq = midi_seq;
+ MidiInDev[wDevID].port_in = port_in;
/* Connect our app port to the device port */
seq_lock();
- ret = snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client,
+ ret = snd_seq_connect_from(midi_seq, port_in, MidiInDev[wDevID].addr.client,
MidiInDev[wDevID].addr.port);
seq_unlock();
if (ret < 0)
@@ -443,7 +446,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
if (numStartedMidiIn++ == 0) {
end_thread = 0;
- hThread = CreateThread(NULL, 0, midRecThread, NULL, 0, NULL);
+ hThread = CreateThread(NULL, 0, midRecThread, midi_seq, 0, NULL);
if (!hThread) {
numStartedMidiIn = 0;
WARN("Couldn't create thread for midi-in\n");
@@ -479,7 +482,7 @@ static DWORD midClose(WORD wDevID)
return MIDIERR_STILLPLAYING;
}
- if (midiSeq == NULL) {
+ if (MidiInDev[wDevID].seq == NULL) {
WARN("ooops !\n");
return MMSYSERR_ERROR;
}
@@ -494,12 +497,13 @@ static DWORD midClose(WORD wDevID)
}
seq_lock();
- snd_seq_disconnect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port);
+ snd_seq_disconnect_from(MidiInDev[wDevID].seq, MidiInDev[wDevID].port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port);
seq_unlock();
midiCloseSeq();
MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L);
MidiInDev[wDevID].midiDesc.hMidi = 0;
+ MidiInDev[wDevID].seq = NULL;
return ret;
}
@@ -655,6 +659,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
int ret;
int port_out;
char port_out_name[32];
+ snd_seq_t *midi_seq;
TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags);
if (lpDesc == NULL) {
@@ -682,7 +687,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
case MOD_FMSYNTH:
case MOD_MIDIPORT:
case MOD_SYNTH:
- if (midiOpenSeq(TRUE) < 0) {
+ if (!(midi_seq = midiOpenSeq(NULL))) {
return MMSYSERR_ALLOCATED;
}
break;
@@ -694,6 +699,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
MidiOutDev[wDevID].midiDesc = *lpDesc;
+ MidiOutDev[wDevID].seq = midi_seq;
seq_lock();
/* Create a port dedicated to a specific device */
@@ -701,7 +707,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
if (wDevID)
sprintf(port_out_name, "WINE ALSA Output #%d", wDevID);
- port_out = snd_seq_create_simple_port(midiSeq, wDevID?port_out_name:"WINE ALSA Output",
+ port_out = snd_seq_create_simple_port(midi_seq, wDevID?port_out_name:"WINE ALSA Output",
SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE,
SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION);
@@ -713,7 +719,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
MidiOutDev[wDevID].port_out = port_out;
/* Connect our app port to the device port */
- ret = snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client,
+ ret = snd_seq_connect_to(midi_seq, port_out, MidiOutDev[wDevID].addr.client,
MidiOutDev[wDevID].addr.port);
/* usually will happen when the port is already connected */
@@ -751,7 +757,7 @@ static DWORD modClose(WORD wDevID)
/* FIXME: should test that no pending buffer is still in the queue for
* playing */
- if (midiSeq == NULL) {
+ if (MidiOutDev[wDevID].seq == NULL) {
WARN("can't close !\n");
return MMSYSERR_ERROR;
}
@@ -762,10 +768,11 @@ static DWORD modClose(WORD wDevID)
case MOD_SYNTH:
seq_lock();
TRACE("Deleting port :%d, connected to %d:%d\n", MidiOutDev[wDevID].port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port);
- snd_seq_delete_simple_port(midiSeq, MidiOutDev[wDevID].port_out);
+ snd_seq_delete_simple_port(MidiOutDev[wDevID].seq, MidiOutDev[wDevID].port_out);
MidiOutDev[wDevID].port_out = -1;
seq_unlock();
- midiCloseSeq();
+ midiCloseSeq();
+ MidiOutDev[wDevID].seq = NULL;
break;
default:
WARN("Technology not supported (yet) %d !\n",
@@ -792,7 +799,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam)
if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE;
- if (midiSeq == NULL) {
+ if (MidiOutDev[wDevID].seq == NULL) {
WARN("can't play !\n");
return MIDIERR_NODEVICE;
}
@@ -886,7 +893,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam)
}
if (handled) {
seq_lock();
- snd_seq_event_output_direct(midiSeq, &event);
+ snd_seq_event_output_direct(MidiOutDev[wDevID].seq, &event);
seq_unlock();
}
}
@@ -919,7 +926,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE;
- if (midiSeq == NULL) {
+ if (MidiOutDev[wDevID].seq == NULL) {
WARN("can't play !\n");
return MIDIERR_NODEVICE;
}
@@ -977,7 +984,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
snd_seq_ev_set_subs(&event);
snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData);
seq_lock();
- snd_seq_event_output_direct(midiSeq, &event);
+ snd_seq_event_output_direct(MidiOutDev[wDevID].seq, &event);
seq_unlock();
HeapFree(GetProcessHeap(), 0, lpNewData);
break;
diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h
index adac72183ee..e0ae16b97d9 100644
--- a/dlls/winealsa.drv/unixlib.h
+++ b/dlls/winealsa.drv/unixlib.h
@@ -218,7 +218,9 @@ typedef struct midi_src
MIDIHDR *lpQueueHdr;
UINT startTime;
MIDIINCAPSW caps;
+ snd_seq_t *seq;
snd_seq_addr_t addr;
+ int port_in;
} WINE_MIDIIN;
typedef struct midi_dest
@@ -227,6 +229,7 @@ typedef struct midi_dest
MIDIOPENDESC midiDesc;
WORD wFlags;
MIDIOUTCAPSW caps;
+ snd_seq_t *seq;
snd_seq_addr_t addr;
int port_out;
} WINE_MIDIOUT;
--
2.25.1
2
1
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/winealsa.drv/alsa.c | 1 +
dlls/winealsa.drv/alsamidi.c | 265 +++++++++++++++++++++++++++++++++++
dlls/winealsa.drv/midi.c | 250 ++-------------------------------
dlls/winealsa.drv/unixlib.h | 34 +++++
4 files changed, 314 insertions(+), 236 deletions(-)
diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index cdc3d81d8cc..76e4b98caaf 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -2444,6 +2444,7 @@ unixlib_entry_t __wine_unix_call_funcs[] =
set_event_handle,
is_started,
get_prop_value,
+ midi_init,
midi_seq_lock, /* temporary */
};
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index ab4de4f7f9e..86e092bd977 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -31,6 +31,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <pthread.h>
+#include <alsa/asoundlib.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
@@ -38,13 +39,23 @@
#include "winbase.h"
#include "winternl.h"
#include "mmdeviceapi.h"
+#include "mmddk.h"
+#include "wine/debug.h"
#include "wine/unixlib.h"
#include "unixlib.h"
+WINE_DEFAULT_DEBUG_CHANNEL(midi);
+
static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER;
+static unsigned int num_dests, num_srcs;
+static struct midi_dest dests[MAX_MIDIOUTDRV];
+static struct midi_src srcs[MAX_MIDIINDRV];
+static snd_seq_t *midi_seq;
+static unsigned int seq_refs;
+
static void seq_lock(void)
{
pthread_mutex_lock(&seq_mutex);
@@ -62,3 +73,257 @@ NTSTATUS midi_seq_lock(void *args)
return STATUS_SUCCESS;
}
+
+static int seq_open(void)
+{
+ static int midi_warn;
+
+ seq_lock();
+ if (seq_refs == 0)
+ {
+ if (snd_seq_open(&midi_seq, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0)
+ {
+ if (!midi_warn)
+ WARN("Error opening ALSA sequencer.\n");
+ midi_warn = 1;
+ seq_unlock();
+ return -1;
+ }
+ }
+ seq_refs++;
+ seq_unlock();
+ return 0;
+}
+
+static void seq_close(void)
+{
+ seq_lock();
+ if (--seq_refs == 0)
+ {
+ snd_seq_close(midi_seq);
+ midi_seq = NULL;
+ }
+ seq_unlock();
+}
+
+static int alsa_to_win_device_type(unsigned int type)
+{
+ /* MOD_MIDIPORT output port
+ * MOD_SYNTH generic internal synth
+ * MOD_SQSYNTH square wave internal synth
+ * MOD_FMSYNTH FM internal synth
+ * MOD_MAPPER MIDI mapper
+ * MOD_WAVETABLE hardware wavetable internal synth
+ * MOD_SWSYNTH software internal synth
+ */
+
+ /* FIXME Is this really the correct equivalence from ALSA to
+ Windows Sound type? */
+
+ if (type & SND_SEQ_PORT_TYPE_SYNTH)
+ return MOD_FMSYNTH;
+
+ if (type & (SND_SEQ_PORT_TYPE_DIRECT_SAMPLE|SND_SEQ_PORT_TYPE_SAMPLE))
+ return MOD_SYNTH;
+
+ if (type & (SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION))
+ return MOD_MIDIPORT;
+
+ ERR("Cannot determine the type (alsa type is %x) of this midi device. Assuming FM Synth\n", type);
+ return MOD_FMSYNTH;
+}
+
+static void port_add(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, unsigned int cap, unsigned int type)
+{
+ char name[MAXPNAMELEN];
+ unsigned int len;
+ struct midi_dest *dest;
+ struct midi_src *src;
+
+ if (cap & SND_SEQ_PORT_CAP_WRITE) {
+ TRACE("OUT (%d:%s:%s:%d:%s:%x)\n",snd_seq_client_info_get_client(cinfo),
+ snd_seq_client_info_get_name(cinfo),
+ snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT ? "user" : "kernel",
+ snd_seq_port_info_get_port(pinfo),
+ snd_seq_port_info_get_name(pinfo),
+ type);
+
+ if (num_dests >= MAX_MIDIOUTDRV)
+ return;
+ if (!type)
+ return;
+
+ dest = dests + num_dests;
+ dest->addr = *snd_seq_port_info_get_addr(pinfo);
+
+ /* Manufac ID. We do not have access to this with soundcard.h
+ * Does not seem to be a problem, because in mmsystem.h only
+ * Microsoft's ID is listed.
+ */
+ dest->caps.wMid = 0x00FF;
+ dest->caps.wPid = 0x0001; /* FIXME Product ID */
+ /* Product Version. We simply say "1" */
+ dest->caps.vDriverVersion = 0x001;
+ /* The following are mandatory for MOD_MIDIPORT */
+ dest->caps.wChannelMask = 0xFFFF;
+ dest->caps.wVoices = 0;
+ dest->caps.wNotes = 0;
+ dest->caps.dwSupport = 0;
+
+ /* Try to use both client and port names, if this is too long take the port name only.
+ In the second case the port name should be explicit enough due to its big size.
+ */
+ len = strlen(snd_seq_port_info_get_name(pinfo));
+ if ( (strlen(snd_seq_client_info_get_name(cinfo)) + len + 3) < sizeof(name) ) {
+ sprintf(name, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo));
+ len = strlen(name);
+ } else {
+ len = min(len, sizeof(name) - 1);
+ memcpy(name, snd_seq_port_info_get_name(pinfo), len);
+ name[len] = '\0';
+ }
+ ntdll_umbstowcs( name, len + 1, dest->caps.szPname, ARRAY_SIZE(dest->caps.szPname));
+
+ dest->caps.wTechnology = alsa_to_win_device_type(type);
+
+ if (MOD_MIDIPORT != dest->caps.wTechnology) {
+ /* FIXME Do we have this information?
+ * Assuming the soundcards can handle
+ * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but
+ * not MIDICAPS_CACHE.
+ */
+ dest->caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME;
+ dest->caps.wVoices = 16;
+
+ /* FIXME Is it possible to know the maximum
+ * number of simultaneous notes of a soundcard ?
+ * I believe we don't have this information, but
+ * it's probably equal or more than wVoices
+ */
+ dest->caps.wNotes = 16;
+ }
+ dest->bEnabled = TRUE;
+ dest->port_out = -1;
+
+ TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n"
+ "\tALSA info: midi dev-type=%x, capa=0\n",
+ num_dests, wine_dbgstr_w(dest->caps.szPname),
+ dest->caps.wTechnology,
+ dest->caps.wVoices, dest->caps.wNotes,
+ dest->caps.wChannelMask, dest->caps.dwSupport,
+ type);
+
+ num_dests++;
+ }
+ if (cap & SND_SEQ_PORT_CAP_READ) {
+ TRACE("IN (%d:%s:%s:%d:%s:%x)\n",snd_seq_client_info_get_client(cinfo),
+ snd_seq_client_info_get_name(cinfo),
+ snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT ? "user" : "kernel",
+ snd_seq_port_info_get_port(pinfo),
+ snd_seq_port_info_get_name(pinfo),
+ type);
+
+ if (num_srcs >= MAX_MIDIINDRV)
+ return;
+ if (!type)
+ return;
+
+ src = srcs + num_srcs;
+ src->addr = *snd_seq_port_info_get_addr(pinfo);
+
+ /* Manufac ID. We do not have access to this with soundcard.h
+ * Does not seem to be a problem, because in mmsystem.h only
+ * Microsoft's ID is listed.
+ */
+ src->caps.wMid = 0x00FF;
+ src->caps.wPid = 0x0001; /* FIXME Product ID */
+ /* Product Version. We simply say "1" */
+ src->caps.vDriverVersion = 0x001;
+ src->caps.dwSupport = 0; /* mandatory with MIDIINCAPS */
+
+ /* Try to use both client and port names, if this is too long take the port name only.
+ In the second case the port name should be explicit enough due to its big size.
+ */
+ len = strlen(snd_seq_port_info_get_name(pinfo));
+ if ( (strlen(snd_seq_client_info_get_name(cinfo)) + len + 3) < sizeof(name) ) {
+ sprintf(name, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo));
+ len = strlen(name);
+ } else {
+ len = min(len, sizeof(name) - 1);
+ memcpy(name, snd_seq_port_info_get_name(pinfo), len);
+ name[len] = '\0';
+ }
+ ntdll_umbstowcs( name, len + 1, src->caps.szPname, ARRAY_SIZE(src->caps.szPname));
+ src->state = 0;
+
+ TRACE("MidiIn [%d]\tname='%s' support=%d\n"
+ "\tALSA info: midi dev-type=%x, capa=0\n",
+ num_srcs, wine_dbgstr_w(src->caps.szPname), src->caps.dwSupport, type);
+
+ num_srcs++;
+ }
+}
+
+NTSTATUS midi_init(void *args)
+{
+ struct midi_init_params *params = args;
+ static BOOL init_done;
+ snd_seq_client_info_t *cinfo;
+ snd_seq_port_info_t *pinfo;
+
+ if (init_done) {
+ *params->err = ERROR_ALREADY_INITIALIZED;
+ return STATUS_SUCCESS;
+ }
+
+ TRACE("Initializing the MIDI variables.\n");
+ init_done = TRUE;
+
+ /* try to open device */
+ if (seq_open() == -1) {
+ *params->err = ERROR_OPEN_FAILED;
+ return STATUS_SUCCESS;
+ }
+
+ cinfo = calloc( 1, snd_seq_client_info_sizeof() );
+ pinfo = calloc( 1, snd_seq_port_info_sizeof() );
+
+ /* First, search for all internal midi devices */
+ snd_seq_client_info_set_client(cinfo, -1);
+ while (snd_seq_query_next_client(midi_seq, cinfo) >= 0) {
+ snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
+ snd_seq_port_info_set_port(pinfo, -1);
+ while (snd_seq_query_next_port(midi_seq, pinfo) >= 0) {
+ unsigned int cap = snd_seq_port_info_get_capability(pinfo);
+ unsigned int type = snd_seq_port_info_get_type(pinfo);
+ if (!(type & SND_SEQ_PORT_TYPE_PORT))
+ port_add(cinfo, pinfo, cap, type);
+ }
+ }
+
+ /* Second, search for all external ports */
+ snd_seq_client_info_set_client(cinfo, -1);
+ while (snd_seq_query_next_client(midi_seq, cinfo) >= 0) {
+ snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
+ snd_seq_port_info_set_port(pinfo, -1);
+ while (snd_seq_query_next_port(midi_seq, pinfo) >= 0) {
+ unsigned int cap = snd_seq_port_info_get_capability(pinfo);
+ unsigned int type = snd_seq_port_info_get_type(pinfo);
+ if (type & SND_SEQ_PORT_TYPE_PORT)
+ port_add(cinfo, pinfo, cap, type);
+ }
+ }
+ seq_close();
+ free( cinfo );
+ free( pinfo );
+
+ *params->err = NOERROR;
+ params->num_dests = num_dests;
+ params->num_srcs = num_srcs;
+ params->dests = dests;
+ params->srcs = srcs;
+
+ TRACE("End\n");
+
+ return STATUS_SUCCESS;
+}
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index dff77ce88d8..988429ab934 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -43,33 +43,12 @@
#include "wine/debug.h"
#include "wine/unixlib.h"
-#include <alsa/asoundlib.h>
-
#include "unixlib.h"
WINE_DEFAULT_DEBUG_CHANNEL(midi);
-typedef struct {
- int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */
- MIDIOPENDESC midiDesc;
- WORD wFlags;
- LPMIDIHDR lpQueueHdr;
- DWORD startTime;
- MIDIINCAPSW caps;
- snd_seq_addr_t addr;
-} WINE_MIDIIN;
-
-typedef struct {
- BOOL bEnabled;
- MIDIOPENDESC midiDesc;
- WORD wFlags;
- MIDIOUTCAPSW caps;
- snd_seq_addr_t addr;
- int port_out;
-} WINE_MIDIOUT;
-
-static WINE_MIDIIN MidiInDev [MAX_MIDIINDRV ];
-static WINE_MIDIOUT MidiOutDev[MAX_MIDIOUTDRV];
+static WINE_MIDIIN *MidiInDev;
+static WINE_MIDIOUT *MidiOutDev;
/* this is the total number of MIDI out devices found (synth and port) */
static int MODM_NumDevs = 0;
@@ -124,39 +103,6 @@ static void error_handler(const char* file, int line, const char* function, int
}
#endif
-/**************************************************************************
- * MIDI_unixToWindowsDeviceType [internal]
- *
- * return the Windows equivalent to a Unix Device Type
- *
- */
-static int MIDI_AlsaToWindowsDeviceType(unsigned int type)
-{
- /* MOD_MIDIPORT output port
- * MOD_SYNTH generic internal synth
- * MOD_SQSYNTH square wave internal synth
- * MOD_FMSYNTH FM internal synth
- * MOD_MAPPER MIDI mapper
- * MOD_WAVETABLE hardware wavetable internal synth
- * MOD_SWSYNTH software internal synth
- */
-
- /* FIXME Is this really the correct equivalence from ALSA to
- Windows Sound type? */
-
- if (type & SND_SEQ_PORT_TYPE_SYNTH)
- return MOD_FMSYNTH;
-
- if (type & (SND_SEQ_PORT_TYPE_DIRECT_SAMPLE|SND_SEQ_PORT_TYPE_SAMPLE))
- return MOD_SYNTH;
-
- if (type & (SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION))
- return MOD_MIDIPORT;
-
- ERR("Cannot determine the type (alsa type is %x) of this midi device. Assuming FM Synth\n", type);
- return MOD_FMSYNTH;
-}
-
/**************************************************************************
* MIDI_NotifyClient [internal]
*/
@@ -1121,134 +1067,6 @@ static DWORD modReset(WORD wDevID)
}
-/**************************************************************************
- * ALSA_AddMidiPort [internal]
- *
- * Helper for ALSA_MidiInit
- */
-static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, unsigned int cap, unsigned int type)
-{
- char midiPortName[MAXPNAMELEN];
-
- if (cap & SND_SEQ_PORT_CAP_WRITE) {
- TRACE("OUT (%d:%s:%s:%d:%s:%x)\n",snd_seq_client_info_get_client(cinfo),
- snd_seq_client_info_get_name(cinfo),
- snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT ? "user" : "kernel",
- snd_seq_port_info_get_port(pinfo),
- snd_seq_port_info_get_name(pinfo),
- type);
-
- if (MODM_NumDevs >= MAX_MIDIOUTDRV)
- return;
- if (!type)
- return;
-
- MidiOutDev[MODM_NumDevs].addr = *snd_seq_port_info_get_addr(pinfo);
-
- /* Manufac ID. We do not have access to this with soundcard.h
- * Does not seem to be a problem, because in mmsystem.h only
- * Microsoft's ID is listed.
- */
- MidiOutDev[MODM_NumDevs].caps.wMid = 0x00FF;
- MidiOutDev[MODM_NumDevs].caps.wPid = 0x0001; /* FIXME Product ID */
- /* Product Version. We simply say "1" */
- MidiOutDev[MODM_NumDevs].caps.vDriverVersion = 0x001;
- /* The following are mandatory for MOD_MIDIPORT */
- MidiOutDev[MODM_NumDevs].caps.wChannelMask = 0xFFFF;
- MidiOutDev[MODM_NumDevs].caps.wVoices = 0;
- MidiOutDev[MODM_NumDevs].caps.wNotes = 0;
- MidiOutDev[MODM_NumDevs].caps.dwSupport = 0;
-
- /* Try to use both client and port names, if this is too long take the port name only.
- In the second case the port name should be explicit enough due to its big size.
- */
- if ( (strlen(snd_seq_client_info_get_name(cinfo)) + strlen(snd_seq_port_info_get_name(pinfo)) + 3) < MAXPNAMELEN ) {
- sprintf(midiPortName, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo));
- } else {
- lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN);
- }
- MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiOutDev[MODM_NumDevs].caps.szPname,
- ARRAY_SIZE(MidiOutDev[MODM_NumDevs].caps.szPname));
-
- MidiOutDev[MODM_NumDevs].caps.wTechnology = MIDI_AlsaToWindowsDeviceType(type);
-
- if (MOD_MIDIPORT != MidiOutDev[MODM_NumDevs].caps.wTechnology) {
- /* FIXME Do we have this information?
- * Assuming the soundcards can handle
- * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but
- * not MIDICAPS_CACHE.
- */
- MidiOutDev[MODM_NumDevs].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME;
- MidiOutDev[MODM_NumDevs].caps.wVoices = 16;
-
- /* FIXME Is it possible to know the maximum
- * number of simultaneous notes of a soundcard ?
- * I believe we don't have this information, but
- * it's probably equal or more than wVoices
- */
- MidiOutDev[MODM_NumDevs].caps.wNotes = 16;
- }
- MidiOutDev[MODM_NumDevs].bEnabled = TRUE;
- MidiOutDev[MODM_NumDevs].port_out = -1;
-
- TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n"
- "\tALSA info: midi dev-type=%x, capa=0\n",
- MODM_NumDevs, wine_dbgstr_w(MidiOutDev[MODM_NumDevs].caps.szPname),
- MidiOutDev[MODM_NumDevs].caps.wTechnology,
- MidiOutDev[MODM_NumDevs].caps.wVoices, MidiOutDev[MODM_NumDevs].caps.wNotes,
- MidiOutDev[MODM_NumDevs].caps.wChannelMask, MidiOutDev[MODM_NumDevs].caps.dwSupport,
- type);
-
- MODM_NumDevs++;
- }
- if (cap & SND_SEQ_PORT_CAP_READ) {
- TRACE("IN (%d:%s:%s:%d:%s:%x)\n",snd_seq_client_info_get_client(cinfo),
- snd_seq_client_info_get_name(cinfo),
- snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT ? "user" : "kernel",
- snd_seq_port_info_get_port(pinfo),
- snd_seq_port_info_get_name(pinfo),
- type);
-
- if (MIDM_NumDevs >= MAX_MIDIINDRV)
- return;
- if (!type)
- return;
-
- MidiInDev[MIDM_NumDevs].addr = *snd_seq_port_info_get_addr(pinfo);
-
- /* Manufac ID. We do not have access to this with soundcard.h
- * Does not seem to be a problem, because in mmsystem.h only
- * Microsoft's ID is listed.
- */
- MidiInDev[MIDM_NumDevs].caps.wMid = 0x00FF;
- MidiInDev[MIDM_NumDevs].caps.wPid = 0x0001; /* FIXME Product ID */
- /* Product Version. We simply say "1" */
- MidiInDev[MIDM_NumDevs].caps.vDriverVersion = 0x001;
- MidiInDev[MIDM_NumDevs].caps.dwSupport = 0; /* mandatory with MIDIINCAPS */
-
- /* Try to use both client and port names, if this is too long take the port name only.
- In the second case the port name should be explicit enough due to its big size.
- */
- if ( (strlen(snd_seq_client_info_get_name(cinfo)) + strlen(snd_seq_port_info_get_name(pinfo)) + 3) < MAXPNAMELEN ) {
- sprintf(midiPortName, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo));
- } else {
- lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN);
- }
- MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiInDev[MIDM_NumDevs].caps.szPname,
- ARRAY_SIZE(MidiInDev[MIDM_NumDevs].caps.szPname));
- MidiInDev[MIDM_NumDevs].state = 0;
-
- TRACE("MidiIn [%d]\tname='%s' support=%d\n"
- "\tALSA info: midi dev-type=%x, capa=0\n",
- MIDM_NumDevs, wine_dbgstr_w(MidiInDev[MIDM_NumDevs].caps.szPname),
- MidiInDev[MIDM_NumDevs].caps.dwSupport,
- type);
-
- MIDM_NumDevs++;
- }
-}
-
-
/*======================================================================*
* MIDI entry points *
*======================================================================*/
@@ -1260,59 +1078,19 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t*
*/
static BOOL ALSA_MidiInit(void)
{
- static BOOL bInitDone = FALSE;
- snd_seq_client_info_t *cinfo;
- snd_seq_port_info_t *pinfo;
-
- if (bInitDone)
- return TRUE;
-
- TRACE("Initializing the MIDI variables.\n");
- bInitDone = TRUE;
-
- /* try to open device */
- if (midiOpenSeq(FALSE) == -1) {
- return TRUE;
+ struct midi_init_params params;
+ UINT err;
+
+ params.err = &err;
+ ALSA_CALL(midi_init, ¶ms);
+
+ if (!err)
+ {
+ MODM_NumDevs = params.num_dests;
+ MIDM_NumDevs = params.num_srcs;
+ MidiOutDev = params.dests;
+ MidiInDev = params.srcs;
}
-
-#if 0 /* Debug purpose */
- snd_lib_error_set_handler(error_handler);
-#endif
- cinfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_seq_client_info_sizeof() );
- pinfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_seq_port_info_sizeof() );
-
- /* First, search for all internal midi devices */
- snd_seq_client_info_set_client(cinfo, -1);
- while(snd_seq_query_next_client(midiSeq, cinfo) >= 0) {
- snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
- snd_seq_port_info_set_port(pinfo, -1);
- while (snd_seq_query_next_port(midiSeq, pinfo) >= 0) {
- unsigned int cap = snd_seq_port_info_get_capability(pinfo);
- unsigned int type = snd_seq_port_info_get_type(pinfo);
- if (!(type & SND_SEQ_PORT_TYPE_PORT))
- ALSA_AddMidiPort(cinfo, pinfo, cap, type);
- }
- }
-
- /* Second, search for all external ports */
- snd_seq_client_info_set_client(cinfo, -1);
- while(snd_seq_query_next_client(midiSeq, cinfo) >= 0) {
- snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
- snd_seq_port_info_set_port(pinfo, -1);
- while (snd_seq_query_next_port(midiSeq, pinfo) >= 0) {
- unsigned int cap = snd_seq_port_info_get_capability(pinfo);
- unsigned int type = snd_seq_port_info_get_type(pinfo);
- if (type & SND_SEQ_PORT_TYPE_PORT)
- ALSA_AddMidiPort(cinfo, pinfo, cap, type);
- }
- }
-
- /* close file and exit */
- midiCloseSeq();
- HeapFree( GetProcessHeap(), 0, cinfo );
- HeapFree( GetProcessHeap(), 0, pinfo );
-
- TRACE("End\n");
return TRUE;
}
diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h
index 89afcb71bec..adac72183ee 100644
--- a/dlls/winealsa.drv/unixlib.h
+++ b/dlls/winealsa.drv/unixlib.h
@@ -207,6 +207,37 @@ struct get_prop_value_params
unsigned int *buffer_size;
};
+#include <alsa/asoundlib.h>
+#include "mmddk.h"
+
+typedef struct midi_src
+{
+ int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */
+ MIDIOPENDESC midiDesc;
+ WORD wFlags;
+ MIDIHDR *lpQueueHdr;
+ UINT startTime;
+ MIDIINCAPSW caps;
+ snd_seq_addr_t addr;
+} WINE_MIDIIN;
+
+typedef struct midi_dest
+{
+ BOOL bEnabled;
+ MIDIOPENDESC midiDesc;
+ WORD wFlags;
+ MIDIOUTCAPSW caps;
+ snd_seq_addr_t addr;
+ int port_out;
+} WINE_MIDIOUT;
+
+struct midi_init_params
+{
+ UINT *err;
+ unsigned int num_dests, num_srcs;
+ void *dests, *srcs;
+};
+
enum alsa_funcs
{
alsa_get_endpoint_ids,
@@ -232,10 +263,13 @@ enum alsa_funcs
alsa_set_event_handle,
alsa_is_started,
alsa_get_prop_value,
+ alsa_midi_init,
alsa_midi_seq_lock, /* temporary */
};
+NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN;
+
NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN;
extern unixlib_handle_t alsa_handle;
--
2.25.1
2
1
[PATCH] msvcr110: Make sure we don't hang in _Condition_variable::notify* functions.
by Piotr Caban 16 Mar '22
by Piotr Caban 16 Mar '22
16 Mar '22
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcrt/concurrency.c | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
1
0
16 Mar '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/mf/tests/mf.c | 6 ------
dlls/winegstreamer/h264_decoder.c | 16 ++++++++++++++--
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index e58d8278b82..6563ca81b29 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -6790,17 +6790,11 @@ static void test_h264_decoder(void)
flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE;
memset(&input_info, 0xcd, sizeof(input_info));
hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info);
- todo_wine
ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr);
- todo_wine
ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency));
- todo_wine
ok(input_info.dwFlags == flags, "got dwFlags %#lx\n", input_info.dwFlags);
- todo_wine
ok(input_info.cbSize == 0x1000, "got cbSize %lu\n", input_info.cbSize);
- todo_wine
ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead);
- todo_wine
ok(input_info.cbAlignment == 0, "got cbAlignment %#lx\n", input_info.cbAlignment);
flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE;
diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index 2f4b42ed101..f24b07ef496 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -217,8 +217,20 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si
static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info)
{
- FIXME("iface %p, id %#lx, info %p stub!\n", iface, id, info);
- return E_NOTIMPL;
+ struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+
+ TRACE("iface %p, id %#lx, info %p.\n", iface, id, info);
+
+ if (!decoder->input_type)
+ return MF_E_TRANSFORM_TYPE_NOT_SET;
+
+ info->hnsMaxLatency = 0;
+ info->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE;
+ info->cbSize = 0x1000;
+ info->cbMaxLookahead = 0;
+ info->cbAlignment = 0;
+
+ return S_OK;
}
static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info)
--
2.35.1
1
5
As described in bugzilla ticket, when calling CreateProcess:
- with "default" console inheritance (no CREATE_NEW_CONSOLE
nor DETACHED_PROCESS flags),
- when parent is not attached to a console
- and when the child's subsystem is CUI
, native behaves as if CREATE_NEW_CONSOLE was passed.
builtin doesn't...
this serie:
- adds a test case for showing the CUI/GUI discrepancies
- fixes kernelbase accordingly
- but also requires to fix all usage of CreateProcess in Wine Code
that would now generate the creation of a console
+ a couple of programs moved into the GUI subsystem (to avoid console
creation on invocation)
+ when looking to the other usage of CreateProcess, I only convinced
myself to adapt one of them
V1 => V2:
- don't mess up with the number of patches in the serie
- no longer modify makedep for creating cui vs gui test executable, but
copy current *_test.exe executable and adapt its subsystem to the need
V2 => V3:
- removed the hacks in wow64 redirect, and let programs/uninstaller and
programs/wusa belong to the GUI subsystem instead
- force console creation for wine initial process when a) none of the unix
fd are attached to a TTY, b) the initial process is in CUI subsystem
V3 => V4:
- included Jacek's comments:
+ removed unneeded casts
+ move CreateProcess change in programs/services into a separate patch
+ I didn't change programs/start as you suggested. Testing on W10 shows
that 'start /b cui.exe' from a cmd prompt just reuses the current
console.
And Marvin will generate errors for Chinese and Japanese VM in console
testing that are independant of this serie.
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
Eric Pouech (5):
dlls/kernel32/tests: add some console tests about creating cui vs gui processes
programs/wusa: set subsystem to GUI
programs/uninstaller: set subsystem to GUI
programs/services: start services detached from console
dlls/kernelbase: handle corner case in CreateProcess
dlls/kernel32/tests/console.c | 85 ++++++++++++++++++++++++++++++++
dlls/kernelbase/process.c | 6 ++-
programs/services/services.c | 2 +-
programs/uninstaller/Makefile.in | 2 +-
programs/wusa/Makefile.in | 2 +-
5 files changed, 93 insertions(+), 4 deletions(-)
3
8
16 Mar '22
There is no flushing after X11DRV_XIMLookupChars on wine11xdrv. for
this reason, the characters of the GUI are not updated.
In addition, in IME_SetResultString on wine11xdrv, the bInComposition
flag is not deactivated after generating WM_IME_ENDCOMPOSITION, so that
the WM_IME_STARTCOMPOSITION message is not generated in the next
composition.
Also, when WM_IME_COMPOSITION is processed in editor_handle_message on
riched20, the existing selection is removed and the characters being
entered disappear.
WM_IME_STARTCOMPOSITION occurs when attempting to input after full
selection, and ME_DeleteSelection is called, which causes the exact
location of the cursor to be lost.
Signed-off-by: Alex Kwak <take-me-home(a)kakao.com>
---
v2: Fix test breakage.
v3: Fix comment style
---
dlls/riched20/editor.c | 3 +--
dlls/winex11.drv/ime.c | 5 ++---
dlls/winex11.drv/xim.c | 10 ++++++++++
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index a8cf3175591..33437a6d6e3 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -4097,8 +4097,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
return 0;
case WM_IME_STARTCOMPOSITION:
{
- editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]);
ME_DeleteSelection(editor);
+ editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]);
ME_CommitUndo(editor);
ME_UpdateRepaint(editor, FALSE);
return 0;
@@ -4109,7 +4109,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
ME_Style *style = style_get_insert_style( editor, editor->pCursors );
hIMC = ITextHost_TxImmGetContext(editor->texthost);
- ME_DeleteSelection(editor);
ME_SaveTempStyle(editor, style);
if (lParam & (GCS_RESULTSTR|GCS_COMPSTR))
{
diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c
index c1584930861..db2ff5d85cc 100644
--- a/dlls/winex11.drv/ime.c
+++ b/dlls/winex11.drv/ime.c
@@ -1049,10 +1049,9 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen)
GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR);
GenerateIMEMessage(imc, WM_IME_COMPOSITION, lpResult[0], GCS_RESULTSTR|GCS_RESULTCLAUSE);
GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0);
+ myPrivate->bInComposition = FALSE;
- if (!inComp)
- ImmSetOpenStatus(imc, FALSE);
-
+ ImmSetOpenStatus(imc, FALSE);
ImmUnlockIMC(imc);
}
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 3994c2106cc..66c56c177ac 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -117,6 +117,16 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count )
IME_SetResultString(wcOutput, dwOutput);
HeapFree(GetProcessHeap(), 0, wcOutput);
+
+ /*
+ * After then if `CompositionString` is remaining, flushing it.
+ * i.e., Korean
+ */
+ if (CompositionString)
+ {
+ IME_SetCompositionString(SCS_SETSTR, CompositionString,
+ dwCompStringLength, NULL, 0);
+ }
}
static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data)
--
2.32.0
1
0
16 Mar '22
The tests show that if we don't have a global IPv6 address, getaddrinfo()
will not return IPv6 results. Specifing AF_UNSPEC makes it return IPv4 results.
Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com>
---
v2: Remove is_ipv6_local().
dlls/ws2_32/tests/protocol.c | 65 ++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c
index 374fa01789d..8de22cdb586 100644
--- a/dlls/ws2_32/tests/protocol.c
+++ b/dlls/ws2_32/tests/protocol.c
@@ -2035,6 +2035,17 @@ static void compare_addrinfo(ADDRINFO *a, ADDRINFO *b)
ok(!a && !b, "Expected both addresses null (%p != %p)\n", a, b);
}
+static BOOL ipv6_found(ADDRINFOA *addr)
+{
+ ADDRINFOA *p;
+ for (p = addr; p; p = p->ai_next)
+ {
+ if (p->ai_family == AF_INET6)
+ return TRUE;
+ }
+ return FALSE;
+}
+
static void test_getaddrinfo(void)
{
int i, ret;
@@ -2042,6 +2053,7 @@ static void test_getaddrinfo(void)
SOCKADDR_IN *sockaddr;
CHAR name[256], *ip;
DWORD size = sizeof(name);
+ BOOL has_ipv6_addr;
memset(&hint, 0, sizeof(ADDRINFOA));
GetComputerNameExA( ComputerNamePhysicalDnsHostname, name, &size );
@@ -2309,6 +2321,59 @@ static void test_getaddrinfo(void)
ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family);
ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port);
freeaddrinfo(result);
+
+ /* Check whether we have global IPv6 address */
+ result = NULL;
+ ret = getaddrinfo("", NULL, NULL, &result);
+ ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError());
+ has_ipv6_addr = FALSE;
+ for (p = result; p; p = p->ai_next)
+ {
+ if (p->ai_family == AF_INET6)
+ {
+ IN6_ADDR *a = &((SOCKADDR_IN6 *)p->ai_addr)->sin6_addr;
+ if (!IN6_IS_ADDR_LINKLOCAL(a) && !IN6_IS_ADDR_LOOPBACK(a) && !IN6_IS_ADDR_UNSPECIFIED(a))
+ {
+ has_ipv6_addr = TRUE;
+ break;
+ }
+ }
+ }
+ freeaddrinfo(result);
+
+ result = NULL;
+ ret = getaddrinfo("dns.msftncsi.com", NULL, NULL, &result);
+ ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError());
+ if (!has_ipv6_addr)
+ todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n");
+ freeaddrinfo(result);
+
+ for (i = 0; i < ARRAY_SIZE(hinttests); i++)
+ {
+ if (hinttests[i].family != AF_UNSPEC || hinttests[i].error) continue;
+ winetest_push_context("Test %u", i);
+
+ hint.ai_flags = 0;
+ hint.ai_family = hinttests[i].family;
+ hint.ai_socktype = hinttests[i].socktype;
+ hint.ai_protocol = hinttests[i].protocol;
+
+ result = NULL;
+ ret = getaddrinfo("dns.msftncsi.com", NULL, &hint, &result);
+ ok(!ret, "Got unexpected ret %d\n", ret);
+ if (!has_ipv6_addr)
+ todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n");
+ freeaddrinfo(result);
+
+ hint.ai_family = AF_INET6;
+ result = NULL;
+ ret = getaddrinfo("dns.msftncsi.com", NULL, &hint, &result);
+ if (!has_ipv6_addr)
+ todo_wine ok(ret == WSANO_DATA, "Got unexpected ret %d\n", ret);
+ freeaddrinfo(result);
+
+ winetest_pop_context();
+ }
}
static void test_dns(void)
--
2.25.1
2
1
[PATCH 3/3] combase: Execute dllhost.exe for correct architecture in a WoW64 setup.
by Dmitry Timoshkov 16 Mar '22
by Dmitry Timoshkov 16 Mar '22
16 Mar '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/combase/rpc.c | 48 +++++++++++++++++++++++++++++---------
programs/dllhost/dllhost.c | 2 ++
2 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c
index 40f900175dd..f620339f19e 100644
--- a/dlls/combase/rpc.c
+++ b/dlls/combase/rpc.c
@@ -526,18 +526,24 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process)
{
static const WCHAR processidW[] = L" /PROCESSID:";
HKEY key;
+ int arch = (sizeof(void *) > sizeof(int)) ? 64 : 32;
+ REGSAM opposite = (arch == 64) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY;
+ BOOL is_wow64 = FALSE;
HRESULT hr;
WCHAR command[MAX_PATH + ARRAY_SIZE(processidW) + CHARS_IN_GUID];
DWORD size;
- STARTUPINFOW sinfo;
- PROCESS_INFORMATION pinfo;
+ STARTUPINFOW si;
+ PROCESS_INFORMATION pi;
LONG ret;
TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid));
hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key);
- if (FAILED(hr))
- return hr;
+ if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)))
+ {
+ hr = open_appidkey_from_clsid(rclsid, opposite | KEY_READ, &key);
+ if (FAILED(hr)) return hr;
+ }
size = (MAX_PATH + 1) * sizeof(WCHAR);
ret = RegQueryValueExW(key, L"DllSurrogate", NULL, NULL, (LPBYTE)command, &size);
@@ -545,25 +551,45 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process)
if (ret || !size || !command[0])
{
TRACE("No value for DllSurrogate key\n");
- wcscpy(command, L"dllhost.exe");
+
+ if ((sizeof(void *) == 8 || is_wow64) && opposite == KEY_WOW64_32KEY)
+ GetSystemWow64DirectoryW(command, MAX_PATH - ARRAY_SIZE(L"\\dllhost.exe"));
+ else
+ GetSystemDirectoryW(command, MAX_PATH - ARRAY_SIZE(L"\\dllhost.exe"));
+
+ wcscat(command, L"\\dllhost.exe");
}
/* Surrogate EXE servers are started with the /PROCESSID:{GUID} switch. */
wcscat(command, processidW);
StringFromGUID2(rclsid, command + wcslen(command), CHARS_IN_GUID);
- memset(&sinfo, 0, sizeof(sinfo));
- sinfo.cb = sizeof(sinfo);
+ memset(&si, 0, sizeof(si));
+ si.cb = sizeof(si);
TRACE("Activating surrogate local server %s\n", debugstr_w(command));
- if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo))
+ if (is_wow64 && arch == 64)
+ {
+ void *cookie;
+ Wow64DisableWow64FsRedirection(&cookie);
+ if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi))
+ {
+ WARN("failed to run surrogate local server %s\n", debugstr_w(command));
+ hr = HRESULT_FROM_WIN32(GetLastError());
+ }
+ Wow64RevertWow64FsRedirection(cookie);
+ }
+ else if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi))
{
WARN("failed to run surrogate local server %s\n", debugstr_w(command));
- return HRESULT_FROM_WIN32(GetLastError());
+ hr = HRESULT_FROM_WIN32(GetLastError());
}
- *process = pinfo.hProcess;
- CloseHandle(pinfo.hThread);
+
+ if (FAILED(hr)) return hr;
+
+ *process = pi.hProcess;
+ CloseHandle(pi.hThread);
return S_OK;
}
diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c
index dc89c978510..83700826f8b 100644
--- a/programs/dllhost/dllhost.c
+++ b/programs/dllhost/dllhost.c
@@ -327,6 +327,8 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho
CLSID clsid;
struct surrogate surrogate;
+ TRACE("Running as %u-bit\n", (int)sizeof(void *) * 8);
+
if (wcsnicmp(cmdline, L"/PROCESSID:", 11))
return 0;
--
2.35.1
2
1
16 Mar '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/combase/combase.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c
index de2375fba78..8133408559f 100644
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -1249,6 +1249,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *progi
ACTCTX_SECTION_KEYED_DATA data;
LONG progidlen = 0;
HKEY hkey;
+ REGSAM opposite = (sizeof(void *) > sizeof(int)) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY;
+ BOOL is_wow64;
HRESULT hr;
if (!progid)
@@ -1277,8 +1279,12 @@ HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *progi
}
hr = open_key_for_clsid(clsid, L"ProgID", KEY_READ, &hkey);
- if (FAILED(hr))
- return hr;
+ if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)))
+ {
+ hr = open_key_for_clsid(clsid, L"ProgID", opposite | KEY_READ, &hkey);
+ if (FAILED(hr))
+ return hr;
+ }
if (RegQueryValueW(hkey, NULL, NULL, &progidlen))
hr = REGDB_E_CLASSNOTREG;
--
2.35.1
2
1
[PATCH 1/3] combase: Always pass explicit access to the registry helpers.
by Dmitry Timoshkov 16 Mar '22
by Dmitry Timoshkov 16 Mar '22
16 Mar '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/combase/combase.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c
index 3ffd08ab635..de2375fba78 100644
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -315,7 +315,7 @@ HRESULT open_key_for_clsid(REFCLSID clsid, const WCHAR *keyname, REGSAM access,
lstrcpyW(path, clsidW);
StringFromGUID2(clsid, path + lstrlenW(clsidW), CHARS_IN_GUID);
- res = open_classes_key(HKEY_CLASSES_ROOT, path, keyname ? KEY_READ : access, &key);
+ res = open_classes_key(HKEY_CLASSES_ROOT, path, access, &key);
if (res == ERROR_FILE_NOT_FOUND)
return REGDB_E_CLASSNOTREG;
else if (res != ERROR_SUCCESS)
@@ -350,7 +350,7 @@ HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey)
HRESULT hr;
/* read the AppID value under the class's key */
- hr = open_key_for_clsid(clsid, NULL, KEY_READ, &hkey);
+ hr = open_key_for_clsid(clsid, NULL, access, &hkey);
if (FAILED(hr))
return hr;
@@ -2320,9 +2320,9 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid)
StringFromGUID2(riid, path + ARRAY_SIZE(interfaceW) - 1, CHARS_IN_GUID);
lstrcpyW(path + ARRAY_SIZE(interfaceW) - 1 + CHARS_IN_GUID - 1, psW);
- hr = get_ps_clsid_from_registry(path, 0, pclsid);
+ hr = get_ps_clsid_from_registry(path, KEY_READ, pclsid);
if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)))
- hr = get_ps_clsid_from_registry(path, opposite, pclsid);
+ hr = get_ps_clsid_from_registry(path, opposite | KEY_READ, pclsid);
if (hr == S_OK)
TRACE("() Returning CLSID %s\n", debugstr_guid(pclsid));
--
2.35.1
2
1
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52322
Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org>
---
dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index f8e1c24bb49..fca8f1d11a1 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -832,6 +832,7 @@ static NTSTATUS dispatch_volume( struct dispatch_context *context )
irp->Tail.Overlay.Thread = (PETHREAD)KeGetCurrentThread();
irp->Tail.Overlay.OriginalFileObject = file;
irp->RequestorMode = UserMode;
+ HeapFree( GetProcessHeap(), 0, context->in_buff );
context->in_buff = NULL;
irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */
@@ -1044,6 +1045,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event )
if (ret == WAIT_OBJECT_0)
{
HeapFree( GetProcessHeap(), 0, context.in_buff );
+ context.in_buff = NULL;
status = STATUS_SUCCESS;
goto done;
}
--
2.35.1
1
0
16 Mar '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/combase/combase.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c
index 3ffd08ab635..fb8f453661f 100644
--- a/dlls/combase/combase.c
+++ b/dlls/combase/combase.c
@@ -315,7 +315,7 @@ HRESULT open_key_for_clsid(REFCLSID clsid, const WCHAR *keyname, REGSAM access,
lstrcpyW(path, clsidW);
StringFromGUID2(clsid, path + lstrlenW(clsidW), CHARS_IN_GUID);
- res = open_classes_key(HKEY_CLASSES_ROOT, path, keyname ? KEY_READ : access, &key);
+ res = open_classes_key(HKEY_CLASSES_ROOT, path, access, &key);
if (res == ERROR_FILE_NOT_FOUND)
return REGDB_E_CLASSNOTREG;
else if (res != ERROR_SUCCESS)
@@ -1249,6 +1249,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *progi
ACTCTX_SECTION_KEYED_DATA data;
LONG progidlen = 0;
HKEY hkey;
+ REGSAM opposite = (sizeof(void *) > sizeof(int)) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY;
+ BOOL is_wow64;
HRESULT hr;
if (!progid)
@@ -1277,8 +1279,12 @@ HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *progi
}
hr = open_key_for_clsid(clsid, L"ProgID", KEY_READ, &hkey);
- if (FAILED(hr))
- return hr;
+ if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)))
+ {
+ hr = open_key_for_clsid(clsid, L"ProgID", opposite | KEY_READ, &hkey);
+ if (FAILED(hr))
+ return hr;
+ }
if (RegQueryValueW(hkey, NULL, NULL, &progidlen))
hr = REGDB_E_CLASSNOTREG;
@@ -2322,7 +2328,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid)
hr = get_ps_clsid_from_registry(path, 0, pclsid);
if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)))
- hr = get_ps_clsid_from_registry(path, opposite, pclsid);
+ hr = get_ps_clsid_from_registry(path, opposite | KEY_READ, pclsid);
if (hr == S_OK)
TRACE("() Returning CLSID %s\n", debugstr_guid(pclsid));
--
2.35.1
2
4
16 Mar '22
There is no flushing after X11DRV_XIMLookupChars on wine11xdrv. for
this reason, the characters of the GUI are not updated.
In addition, in IME_SetResultString on wine11xdrv, the bInComposition
flag is not deactivated after generating WM_IME_ENDCOMPOSITION, so that
the WM_IME_STARTCOMPOSITION message is not generated in the next
composition.
Also, when WM_IME_COMPOSITION is processed in editor_handle_message on
riched20, the existing selection is removed and the characters being
entered disappear.
WM_IME_STARTCOMPOSITION occurs when attempting to input after full
selection, and ME_DeleteSelection is called, which causes the exact
location of the cursor to be lost.
Signed-off-by: Alex Kwak <take-me-home(a)kakao.com>
---
v2: Fix test breakage.
Signed-off-by: Alex Kwak <take-me-home(a)kakao.com>
---
dlls/riched20/editor.c | 3 +--
dlls/winex11.drv/ime.c | 5 ++---
dlls/winex11.drv/xim.c | 8 ++++++++
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index a8cf3175591..33437a6d6e3 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -4097,8 +4097,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
return 0;
case WM_IME_STARTCOMPOSITION:
{
- editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]);
ME_DeleteSelection(editor);
+ editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]);
ME_CommitUndo(editor);
ME_UpdateRepaint(editor, FALSE);
return 0;
@@ -4109,7 +4109,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
ME_Style *style = style_get_insert_style( editor, editor->pCursors );
hIMC = ITextHost_TxImmGetContext(editor->texthost);
- ME_DeleteSelection(editor);
ME_SaveTempStyle(editor, style);
if (lParam & (GCS_RESULTSTR|GCS_COMPSTR))
{
diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c
index c1584930861..db2ff5d85cc 100644
--- a/dlls/winex11.drv/ime.c
+++ b/dlls/winex11.drv/ime.c
@@ -1049,10 +1049,9 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen)
GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR);
GenerateIMEMessage(imc, WM_IME_COMPOSITION, lpResult[0], GCS_RESULTSTR|GCS_RESULTCLAUSE);
GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0);
+ myPrivate->bInComposition = FALSE;
- if (!inComp)
- ImmSetOpenStatus(imc, FALSE);
-
+ ImmSetOpenStatus(imc, FALSE);
ImmUnlockIMC(imc);
}
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 3994c2106cc..5ce6f7e5e95 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -117,6 +117,14 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count )
IME_SetResultString(wcOutput, dwOutput);
HeapFree(GetProcessHeap(), 0, wcOutput);
+
+ // After then if `CompositionString` is remaining, flushing it.
+ // i.e., Korean
+ if (CompositionString)
+ {
+ IME_SetCompositionString(SCS_SETSTR, CompositionString,
+ dwCompStringLength, NULL, 0);
+ }
}
static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data)
--
2.32.0
1
0
16 Mar '22
2
1
[PATCH v2 1/3] winhttp: Use a single thread pool wrapper callback for async tasks.
by Paul Gofman 16 Mar '22
by Paul Gofman 16 Mar '22
16 Mar '22
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
---
v2:
- no changes.
dlls/winhttp/request.c | 74 +++++++++++++++++++---------------
dlls/winhttp/winhttp_private.h | 15 +++++++
2 files changed, 56 insertions(+), 33 deletions(-)
diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index b409c4cdced..36a3bb909b9 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -146,15 +146,23 @@ void stop_queue( struct queue *queue )
TRACE("stopped %p\n", queue);
}
-static DWORD queue_task( struct queue *queue, PTP_WORK_CALLBACK task, void *ctx )
+static void CALLBACK task_callback( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
+{
+ struct task_header *task_hdr = ctx;
+
+ task_hdr->callback( task_hdr );
+}
+
+static DWORD queue_task( struct queue *queue, TASK_CALLBACK task, struct task_header *task_hdr )
{
TP_WORK *work;
DWORD ret;
if ((ret = start_queue( queue ))) return ret;
- if (!(work = CreateThreadpoolWork( task, ctx, &queue->env ))) return GetLastError();
- TRACE("queueing %p in %p\n", work, queue);
+ if (!(work = CreateThreadpoolWork( task_callback, task_hdr, &queue->env ))) return GetLastError();
+ TRACE("queueing %p in %p\n", task_hdr, queue);
+ task_hdr->callback = task;
SubmitThreadpoolWork( work );
CloseThreadpoolWork( work );
@@ -2167,11 +2175,11 @@ end:
return ret;
}
-static void CALLBACK task_send_request( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
+static void task_send_request( void *ctx )
{
struct send_request *s = ctx;
- TRACE("running %p\n", work);
+ TRACE( "running %p\n", ctx );
send_request( s->request, s->headers, s->headers_len, s->optional, s->optional_len, s->total_len, s->context, TRUE );
release_object( &s->request->hdr );
@@ -2219,7 +2227,7 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, const WCHAR *headers, DWORD
s->context = context;
addref_object( &request->hdr );
- if ((ret = queue_task( &request->queue, task_send_request, s )))
+ if ((ret = queue_task( &request->queue, task_send_request, &s->task_hdr )))
{
release_object( &request->hdr );
free( s->headers );
@@ -2753,11 +2761,11 @@ static DWORD receive_response( struct request *request, BOOL async )
return ret;
}
-static void CALLBACK task_receive_response( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
+static void task_receive_response( void *ctx )
{
struct receive_response *r = ctx;
- TRACE("running %p\n", work);
+ TRACE("running %p\n", ctx);
receive_response( r->request, TRUE );
release_object( &r->request->hdr );
@@ -2794,7 +2802,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved )
r->request = request;
addref_object( &request->hdr );
- if ((ret = queue_task( &request->queue, task_receive_response, r )))
+ if ((ret = queue_task( &request->queue, task_receive_response, &r->task_hdr )))
{
release_object( &request->hdr );
free( r );
@@ -2852,11 +2860,11 @@ done:
return ret;
}
-static void CALLBACK task_query_data_available( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
+static void task_query_data_available( void *ctx )
{
struct query_data *q = ctx;
- TRACE("running %p\n", work);
+ TRACE("running %p\n", ctx);
query_data_available( q->request, q->available, TRUE );
release_object( &q->request->hdr );
@@ -2895,7 +2903,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
q->available = available;
addref_object( &request->hdr );
- if ((ret = queue_task( &request->queue, task_query_data_available, q )))
+ if ((ret = queue_task( &request->queue, task_query_data_available, &q->task_hdr )))
{
release_object( &request->hdr );
free( q );
@@ -2909,11 +2917,11 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available )
return !ret || ret == ERROR_IO_PENDING;
}
-static void CALLBACK task_read_data( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
+static void task_read_data( void *ctx )
{
struct read_data *r = ctx;
- TRACE("running %p\n", work);
+ TRACE("running %p\n", ctx);
read_data( r->request, r->buffer, r->to_read, r->read, TRUE );
release_object( &r->request->hdr );
@@ -2954,7 +2962,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW
r->read = read;
addref_object( &request->hdr );
- if ((ret = queue_task( &request->queue, task_read_data, r )))
+ if ((ret = queue_task( &request->queue, task_read_data, &r->task_hdr )))
{
release_object( &request->hdr );
free( r );
@@ -2990,11 +2998,11 @@ static DWORD write_data( struct request *request, const void *buffer, DWORD to_w
return ret;
}
-static void CALLBACK task_write_data( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
+static void task_write_data( void *ctx )
{
struct write_data *w = ctx;
- TRACE("running %p\n", work);
+ TRACE("running %p\n", ctx);
write_data( w->request, w->buffer, w->to_write, w->written, TRUE );
release_object( &w->request->hdr );
@@ -3034,7 +3042,7 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, const void *buffer, DWORD to_w
w->written = written;
addref_object( &request->hdr );
- if ((ret = queue_task( &request->queue, task_write_data, w )))
+ if ((ret = queue_task( &request->queue, task_write_data, &w->task_hdr )))
{
release_object( &request->hdr );
free( w );
@@ -3392,12 +3400,12 @@ static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE
return send_frame( socket, opcode, 0, buf, len, final, ovr );
}
-static void CALLBACK task_socket_send( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
+static void task_socket_send( void *ctx )
{
struct socket_send *s = ctx;
DWORD ret;
- TRACE("running %p\n", work);
+ TRACE("running %p\n", ctx);
if (s->complete_async) ret = complete_send_frame( s->socket, &s->ovr, s->buf );
else ret = socket_send( s->socket, s->type, s->buf, s->len, NULL );
@@ -3479,7 +3487,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_
s->len = len;
addref_object( &socket->hdr );
- if ((ret = queue_task( &socket->send_q, task_socket_send, s )))
+ if ((ret = queue_task( &socket->send_q, task_socket_send, &s->task_hdr )))
{
InterlockedDecrement( &socket->hdr.pending_sends );
InterlockedExchange( &socket->pending_noncontrol_send, 0 );
@@ -3596,11 +3604,11 @@ static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_o
return ERROR_SUCCESS;
}
-static void CALLBACK task_socket_send_pong( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
+static void task_socket_send_pong( void *ctx )
{
struct socket_send *s = ctx;
- TRACE("running %p\n", work);
+ TRACE("running %p\n", ctx);
if (s->complete_async) complete_send_frame( s->socket, &s->ovr, NULL );
else send_frame( s->socket, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE, NULL );
@@ -3638,7 +3646,7 @@ static DWORD socket_send_pong( struct socket *socket )
s->complete_async = complete_async;
s->socket = socket;
addref_object( &socket->hdr );
- if ((ret = queue_task( &socket->send_q, task_socket_send_pong, s )))
+ if ((ret = queue_task( &socket->send_q, task_socket_send_pong, &s->task_hdr )))
{
InterlockedDecrement( &socket->hdr.pending_sends );
release_object( &socket->hdr );
@@ -3817,13 +3825,13 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD
return ret;
}
-static void CALLBACK task_socket_receive( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
+static void task_socket_receive( void *ctx )
{
struct socket_receive *r = ctx;
DWORD ret, count;
WINHTTP_WEB_SOCKET_BUFFER_TYPE type;
- TRACE("running %p\n", work);
+ TRACE("running %p\n", ctx);
ret = socket_receive( r->socket, r->buf, r->len, &count, &type );
if (receive_io_complete( r->socket ))
@@ -3893,7 +3901,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D
r->len = len;
addref_object( &socket->hdr );
- if ((ret = queue_task( &socket->recv_q, task_socket_receive, r )))
+ if ((ret = queue_task( &socket->recv_q, task_socket_receive, &r->task_hdr )))
{
InterlockedDecrement( &socket->hdr.pending_receives );
release_object( &socket->hdr );
@@ -3919,12 +3927,12 @@ static void socket_shutdown_complete( struct socket *socket, DWORD ret )
}
}
-static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
+static void task_socket_shutdown( void *ctx )
{
struct socket_shutdown *s = ctx;
DWORD ret;
- TRACE("running %p\n", work);
+ TRACE("running %p\n", ctx);
if (s->complete_async) ret = complete_send_frame( s->socket, &s->ovr, s->reason );
else ret = send_frame( s->socket, SOCKET_OPCODE_CLOSE, s->status, s->reason, s->len, TRUE, NULL );
@@ -3971,7 +3979,7 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v
s->send_callback = send_callback;
addref_object( &socket->hdr );
- if ((ret = queue_task( &socket->send_q, task_socket_shutdown, s )))
+ if ((ret = queue_task( &socket->send_q, task_socket_shutdown, &s->task_hdr )))
{
InterlockedDecrement( &socket->hdr.pending_sends );
release_object( &socket->hdr );
@@ -4057,12 +4065,12 @@ static void socket_close_complete( struct socket *socket, DWORD ret )
}
}
-static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
+static void task_socket_close( void *ctx )
{
struct socket_shutdown *s = ctx;
DWORD ret;
- TRACE("running %p\n", work);
+ TRACE("running %p\n", ctx);
ret = socket_close( s->socket );
socket_close_complete( s->socket, ret );
@@ -4132,7 +4140,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas
s->socket = socket;
addref_object( &socket->hdr );
- if ((ret = queue_task( &socket->recv_q, task_socket_close, s )))
+ if ((ret = queue_task( &socket->recv_q, task_socket_close, &s->task_hdr )))
{
release_object( &socket->hdr );
free( s );
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 19ef9a35e2d..96bd7b53747 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -273,8 +273,16 @@ struct socket
BOOL last_receive_final;
};
+typedef void (*TASK_CALLBACK)( void *ctx );
+
+struct task_header
+{
+ TASK_CALLBACK callback;
+};
+
struct send_request
{
+ struct task_header task_hdr;
struct request *request;
WCHAR *headers;
DWORD headers_len;
@@ -286,17 +294,20 @@ struct send_request
struct receive_response
{
+ struct task_header task_hdr;
struct request *request;
};
struct query_data
{
+ struct task_header task_hdr;
struct request *request;
DWORD *available;
};
struct read_data
{
+ struct task_header task_hdr;
struct request *request;
void *buffer;
DWORD to_read;
@@ -305,6 +316,7 @@ struct read_data
struct write_data
{
+ struct task_header task_hdr;
struct request *request;
const void *buffer;
DWORD to_write;
@@ -313,6 +325,7 @@ struct write_data
struct socket_send
{
+ struct task_header task_hdr;
struct socket *socket;
WINHTTP_WEB_SOCKET_BUFFER_TYPE type;
const void *buf;
@@ -323,6 +336,7 @@ struct socket_send
struct socket_receive
{
+ struct task_header task_hdr;
struct socket *socket;
void *buf;
DWORD len;
@@ -330,6 +344,7 @@ struct socket_receive
struct socket_shutdown
{
+ struct task_header task_hdr;
struct socket *socket;
USHORT status;
char reason[123];
--
2.35.1
2
5
16 Mar '22
There is no flushing after X11DRV_XIMLookupChars on wine11xdrv. for
this reason, the characters of the GUI are not updated.
In addition, in IME_SetResultString on wine11xdrv, the bInComposition
flag is not deactivated after generating WM_IME_ENDCOMPOSITION, so that
the WM_IME_STARTCOMPOSITION message is not generated in the next
composition.
Also, when WM_IME_COMPOSITION is processed in editor_handle_message on
riched20, the existing selection is removed and the characters being
entered disappear.
WM_IME_STARTCOMPOSITION occurs when attempting to input after full
selection, and ME_DeleteSelection is called, which causes the exact
location of the cursor to be lost.
Signed-off-by: Alex Kwak <take-me-home(a)kakao.com>
---
dlls/riched20/editor.c | 3 +--
dlls/winex11.drv/ime.c | 5 ++---
dlls/winex11.drv/xim.c | 8 ++++++++
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index a8cf3175591..33437a6d6e3 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -4097,8 +4097,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
return 0;
case WM_IME_STARTCOMPOSITION:
{
- editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]);
ME_DeleteSelection(editor);
+ editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]);
ME_CommitUndo(editor);
ME_UpdateRepaint(editor, FALSE);
return 0;
@@ -4109,7 +4109,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam,
ME_Style *style = style_get_insert_style( editor, editor->pCursors );
hIMC = ITextHost_TxImmGetContext(editor->texthost);
- ME_DeleteSelection(editor);
ME_SaveTempStyle(editor, style);
if (lParam & (GCS_RESULTSTR|GCS_COMPSTR))
{
diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c
index c1584930861..db2ff5d85cc 100644
--- a/dlls/winex11.drv/ime.c
+++ b/dlls/winex11.drv/ime.c
@@ -1049,10 +1049,9 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen)
GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR);
GenerateIMEMessage(imc, WM_IME_COMPOSITION, lpResult[0], GCS_RESULTSTR|GCS_RESULTCLAUSE);
GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0);
+ myPrivate->bInComposition = FALSE;
- if (!inComp)
- ImmSetOpenStatus(imc, FALSE);
-
+ ImmSetOpenStatus(imc, FALSE);
ImmUnlockIMC(imc);
}
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 3994c2106cc..5ce6f7e5e95 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -117,6 +117,14 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count )
IME_SetResultString(wcOutput, dwOutput);
HeapFree(GetProcessHeap(), 0, wcOutput);
+
+ // After then if `CompositionString` is remaining, flushing it.
+ // i.e., Korean
+ if (CompositionString)
+ {
+ IME_SetCompositionString(SCS_SETSTR, CompositionString,
+ dwCompStringLength, NULL, 0);
+ }
}
static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data)
--
2.32.0
1
0
16 Mar '22
Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com>
---
v2: - Add entries to ntdll/unix/loader and ntdll/ntdll.spec.
- Add entry to ntoskrnl.exe/ntoskrnl.exe.spec.
- Add function to wow64/security.
v3: - Add missing parameter.
- Fix formatting.
- Fix access_status type.
---
dlls/ntdll/ntdll.spec | 4 ++--
dlls/ntdll/unix/loader.c | 1 +
dlls/ntdll/unix/security.c | 18 +++++++++++++++
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 +
dlls/wow64/security.c | 34 +++++++++++++++++++++++++++++
dlls/wow64/syscall.h | 1 +
include/winnt.h | 7 ++++++
include/winternl.h | 1 +
8 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index d514bca5e11..90c0f3fb649 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -131,7 +131,7 @@
@ stdcall -syscall NtAccessCheck(ptr long long ptr ptr ptr ptr ptr)
@ stdcall -syscall NtAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr)
# @ stub NtAccessCheckByType
-# @ stub NtAccessCheckByTypeAndAuditAlarm
+@ stdcall -syscall NtAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr)
# @ stub NtAccessCheckByTypeResultList
# @ stub NtAccessCheckByTypeResultListAndAuditAlarm
# @ stub NtAccessCheckByTypeResultListAndAuditAlarmByHandle
@@ -1155,7 +1155,7 @@
@ stdcall -private -syscall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck
@ stdcall -private -syscall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm
# @ stub ZwAccessCheckByType
-# @ stub ZwAccessCheckByTypeAndAuditAlarm
+@ stdcall -private -syscall ZwAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) NtAccessCheckByTypeAndAuditAlarm
# @ stub ZwAccessCheckByTypeResultList
# @ stub ZwAccessCheckByTypeResultListAndAuditAlarm
# @ stub ZwAccessCheckByTypeResultListAndAuditAlarmByHandle
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 5eb201bd90b..4a0c70d5a2c 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -124,6 +124,7 @@ static void * const syscalls[] =
NtAcceptConnectPort,
NtAccessCheck,
NtAccessCheckAndAuditAlarm,
+ NtAccessCheckByTypeAndAuditAlarm,
NtAddAtom,
NtAdjustGroupsToken,
NtAdjustPrivilegesToken,
diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c
index 2955355353e..728ee961aa2 100644
--- a/dlls/ntdll/unix/security.c
+++ b/dlls/ntdll/unix/security.c
@@ -796,6 +796,24 @@ NTSTATUS WINAPI NtAccessCheckAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE ha
}
+/***********************************************************************
+ * NtAccessCheckByTypeAndAuditAlarm (NTDLL.@)
+ */
+NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE handle,
+ UNICODE_STRING *type_name, UNICODE_STRING *name,
+ PSECURITY_DESCRIPTOR descr, PSID sid, ACCESS_MASK access,
+ AUDIT_EVENT_TYPE type, ULONG flags, POBJECT_TYPE_LIST list,
+ ULONG length, GENERIC_MAPPING *mapping, BOOLEAN creation,
+ ACCESS_MASK *access_granted, NTSTATUS *access_status,
+ BOOLEAN *on_close )
+{
+ FIXME( "(%s, %p, %s, %s, %p, %p, 0x%08x, %u, 0x%08x, %p, %u, %p, %d, %p, %p, %p), stub\n",
+ debugstr_us(subsystem), handle, debugstr_us(type_name), debugstr_us(name), descr, sid,
+ access, type, flags, list, length, mapping, creation, access_granted, access_status, on_close );
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+
/***********************************************************************
* NtQuerySecurityObject (NTDLL.@)
*/
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index d445c5a5557..19b27adc891 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -1383,6 +1383,7 @@
@ stub WmiUpdateTrace
@ stub XIPDispatch
@ stdcall -private ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm
+@ stdcall -private ZwAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) NtAccessCheckByTypeAndAuditAlarm
@ stub ZwAddBootEntry
@ stdcall -private ZwAdjustPrivilegesToken(long long ptr long ptr ptr) NtAdjustPrivilegesToken
@ stdcall -private ZwAlertThread(long) NtAlertThread
diff --git a/dlls/wow64/security.c b/dlls/wow64/security.c
index 680f5a6ec56..2d0ef1cd008 100644
--- a/dlls/wow64/security.c
+++ b/dlls/wow64/security.c
@@ -98,6 +98,40 @@ NTSTATUS WINAPI wow64_NtAccessCheckAndAuditAlarm( UINT *args )
}
+/**********************************************************************
+ * wow64_NtAccessCheckByTypeAndAuditAlarm
+ */
+NTSTATUS WINAPI wow64_NtAccessCheckByTypeAndAuditAlarm( UINT *args )
+{
+ UNICODE_STRING32 *subsystem32 = get_ptr( &args );
+ HANDLE handle = get_handle( &args );
+ UNICODE_STRING32 *typename32 = get_ptr( &args );
+ UNICODE_STRING32 *objname32 = get_ptr( &args );
+ SECURITY_DESCRIPTOR *sd32 = get_ptr( &args );
+ SID *sid = get_ptr( &args );
+ ACCESS_MASK access = get_ulong( &args );
+ AUDIT_EVENT_TYPE type = get_ulong( &args );
+ ULONG flags = get_ulong( &args );
+ OBJECT_TYPE_LIST *list = get_ptr( &args );
+ ULONG length = get_ulong( &args );
+ GENERIC_MAPPING *mapping = get_ptr( &args );
+ BOOLEAN creation = get_ulong( &args );
+ ACCESS_MASK *access_granted = get_ptr( &args );
+ NTSTATUS *access_status = get_ptr( &args );
+ BOOLEAN *onclose = get_ptr( &args );
+
+ UNICODE_STRING subsystem, typename, objname;
+ SECURITY_DESCRIPTOR sd;
+
+ return NtAccessCheckByTypeAndAuditAlarm( unicode_str_32to64( &subsystem, subsystem32 ), handle,
+ unicode_str_32to64( &typename, typename32 ),
+ unicode_str_32to64( &objname, objname32 ),
+ secdesc_32to64( &sd, sd32 ), sid, access, type, flags,
+ list, length, mapping, creation, access_granted,
+ access_status, onclose );
+}
+
+
/**********************************************************************
* wow64_NtAdjustGroupsToken
*/
diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h
index 0c2ba574031..17ebde65826 100644
--- a/dlls/wow64/syscall.h
+++ b/dlls/wow64/syscall.h
@@ -25,6 +25,7 @@
SYSCALL_ENTRY( NtAcceptConnectPort ) \
SYSCALL_ENTRY( NtAccessCheck ) \
SYSCALL_ENTRY( NtAccessCheckAndAuditAlarm ) \
+ SYSCALL_ENTRY( NtAccessCheckByTypeAndAuditAlarm ) \
SYSCALL_ENTRY( NtAddAtom ) \
SYSCALL_ENTRY( NtAdjustGroupsToken ) \
SYSCALL_ENTRY( NtAdjustPrivilegesToken ) \
diff --git a/include/winnt.h b/include/winnt.h
index 079858d2f7d..939c2f8d7dd 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -3633,6 +3633,13 @@ typedef PVOID PACCESS_TOKEN;
typedef PVOID PSECURITY_DESCRIPTOR;
typedef PVOID PSID;
+typedef enum _AUDIT_EVENT_TYPE {
+ AuditEventObjectAccess,
+ AuditEventDirectoryServiceAccess
+} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE;
+
+#define AUDIT_ALLOW_NO_PRIVILEGE 0x1
+
typedef enum _TOKEN_ELEVATION_TYPE {
TokenElevationTypeDefault = 1,
TokenElevationTypeFull,
diff --git a/include/winternl.h b/include/winternl.h
index 6a95c4e0fdc..8e236f9d97d 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -3912,6 +3912,7 @@ NTSYSAPI NTSTATUS WINAPI LdrUnregisterDllNotification(void*);
NTSYSAPI NTSTATUS WINAPI NtAcceptConnectPort(PHANDLE,ULONG,PLPC_MESSAGE,BOOLEAN,PLPC_SECTION_WRITE,PLPC_SECTION_READ);
NTSYSAPI NTSTATUS WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*);
NTSYSAPI NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN);
+NTSYSAPI NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,PSID,ACCESS_MASK,AUDIT_EVENT_TYPE,ULONG,POBJECT_TYPE_LIST,ULONG,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,NTSTATUS*,PBOOLEAN);
NTSYSAPI NTSTATUS WINAPI NtAddAtom(const WCHAR*,ULONG,RTL_ATOM*);
NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG,PTOKEN_GROUPS,PULONG);
NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
--
2.35.1
1
3
Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com>
---
dlls/winevulkan/make_vulkan | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 8838200403e..2a3129bacfe 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -64,7 +64,7 @@ from enum import Enum
LOGGER = logging.Logger("vulkan")
LOGGER.addHandler(logging.StreamHandler())
-VK_XML_VERSION = "1.3.207"
+VK_XML_VERSION = "1.3.208"
WINE_VK_VERSION = (1, 3)
# Filenames to create.
--
2.35.1
1
0
It's not just used on the CS queue, but also on packet lists in deferred
contexts.
Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com>
---
dlls/wined3d/cs.c | 24 ++++++++++++------------
dlls/wined3d/wined3d_private.h | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index d0ca29eaedf..9edb002ec9e 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -622,9 +622,9 @@ static const char *debug_cs_op(enum wined3d_cs_op op)
return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op);
}
-static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *offset)
+static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *offset, SIZE_T mask)
{
- struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[WINED3D_CS_QUEUE_MASK(*offset)];
+ struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[*offset & mask];
*offset += offsetof(struct wined3d_cs_packet, data[packet->size]);
@@ -2882,7 +2882,7 @@ static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const vo
while (start < end)
{
- const struct wined3d_cs_packet *packet = wined3d_next_cs_packet(cs_data, &start);
+ const struct wined3d_cs_packet *packet = wined3d_next_cs_packet(cs_data, &start, WINED3D_CS_QUEUE_MASK);
enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data;
if (opcode >= WINED3D_CS_OP_STOP)
@@ -3139,7 +3139,7 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined
struct wined3d_cs_packet *packet;
size_t packet_size;
- packet = (struct wined3d_cs_packet *)&queue->data[WINED3D_CS_QUEUE_MASK(queue->head)];
+ packet = (struct wined3d_cs_packet *)&queue->data[queue->head & WINED3D_CS_QUEUE_MASK];
TRACE("Queuing op %s at %p.\n", debug_cs_op(*(const enum wined3d_cs_op *)packet->data), packet);
packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]);
InterlockedExchange((LONG *)&queue->head, queue->head + packet_size);
@@ -3163,7 +3163,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size
size_t queue_size = ARRAY_SIZE(queue->data);
size_t header_size, packet_size, remaining;
struct wined3d_cs_packet *packet;
- ULONG head = WINED3D_CS_QUEUE_MASK(queue->head);
+ ULONG head = queue->head & WINED3D_CS_QUEUE_MASK;
header_size = FIELD_OFFSET(struct wined3d_cs_packet, data[0]);
packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[size]);
@@ -3190,19 +3190,19 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size
nop->opcode = WINED3D_CS_OP_NOP;
wined3d_cs_queue_submit(queue, cs);
- head = WINED3D_CS_QUEUE_MASK(queue->head);
+ head = queue->head & WINED3D_CS_QUEUE_MASK;
assert(!head);
}
for (;;)
{
- ULONG tail = WINED3D_CS_QUEUE_MASK(*(volatile ULONG *)&queue->tail);
+ ULONG tail = (*(volatile ULONG *)&queue->tail) & WINED3D_CS_QUEUE_MASK;
ULONG new_pos;
/* Empty. */
if (head == tail)
break;
- new_pos = WINED3D_CS_QUEUE_MASK(head + packet_size);
+ new_pos = (head + packet_size) & WINED3D_CS_QUEUE_MASK;
/* Head ahead of tail. We checked the remaining size above, so we only
* need to make sure we don't make head equal to tail. */
if (head > tail && (new_pos != tail))
@@ -3346,7 +3346,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx)
spin_count = 0;
tail = queue->tail;
- packet = wined3d_next_cs_packet(queue->data, &tail);
+ packet = wined3d_next_cs_packet(queue->data, &tail, WINED3D_CS_QUEUE_MASK);
if (packet->size)
{
opcode = *(const enum wined3d_cs_op *)packet->data;
@@ -3998,7 +3998,7 @@ static void wined3d_deferred_context_submit(struct wined3d_device_context *conte
struct wined3d_cs_packet *packet;
assert(queue_id == WINED3D_CS_QUEUE_DEFAULT);
- packet = wined3d_next_cs_packet(deferred->data, &deferred->data_size);
+ packet = wined3d_next_cs_packet(deferred->data, &deferred->data_size, ~(SIZE_T)0);
wined3d_cs_packet_incref_objects(packet);
}
@@ -4241,7 +4241,7 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte
while (offset < deferred->data_size)
{
- packet = wined3d_next_cs_packet(deferred->data, &offset);
+ packet = wined3d_next_cs_packet(deferred->data, &offset, ~(SIZE_T)0);
wined3d_cs_packet_decref_objects(packet);
}
@@ -4372,7 +4372,7 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list)
offset = 0;
while (offset < list->data_size)
{
- packet = wined3d_next_cs_packet(list->data, &offset);
+ packet = wined3d_next_cs_packet(list->data, &offset, ~(SIZE_T)0);
wined3d_cs_packet_decref_objects(packet);
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 577377f8dd4..5b3eb0136b0 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4894,7 +4894,7 @@ enum wined3d_push_constants
#define WINED3D_CS_QUERY_POLL_INTERVAL 10u
#define WINED3D_CS_QUEUE_SIZE 0x100000u
#define WINED3D_CS_SPIN_COUNT 10000000u
-#define WINED3D_CS_QUEUE_MASK(a) ((a) & (WINED3D_CS_QUEUE_SIZE - 1))
+#define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1)
struct wined3d_cs_queue
{
--
2.32.0
2
1