[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