Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
51abf02c
Commit
51abf02c
authored
Jan 25, 2022
by
Fabian Maurer
Committed by
Alexandre Julliard
Jan 26, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
advapi32/tests: Avoid "misleading indentation" warnings.
Signed-off-by:
Fabian Maurer
<
dark.shadow4@web.de
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1d178982
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
security.c
dlls/advapi32/tests/security.c
+8
-8
service.c
dlls/advapi32/tests/service.c
+2
-2
No files found.
dlls/advapi32/tests/security.c
View file @
51abf02c
...
...
@@ -1028,7 +1028,7 @@ cleanup:
rc
=
GetFileAttributesA
(
file
);
rc
&=
~
(
FILE_ATTRIBUTE_NOT_CONTENT_INDEXED
|
FILE_ATTRIBUTE_COMPRESSED
);
todo_wine
todo_wine
ok
(
rc
==
(
FILE_ATTRIBUTE_ARCHIVE
|
FILE_ATTRIBUTE_READONLY
),
"expected FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY got %#x
\n
"
,
rc
);
...
...
@@ -1488,10 +1488,10 @@ static void test_AccessCheck(void)
ret
=
AccessCheck
(
SecurityDescriptor
,
Token
,
KEY_READ
,
&
Mapping
,
0
,
&
PrivSetLen
,
&
Access
,
&
AccessStatus
);
err
=
GetLastError
();
todo_wine
todo_wine
ok
(
!
ret
&&
err
==
ERROR_INSUFFICIENT_BUFFER
,
"AccessCheck should have "
"failed with ERROR_INSUFFICIENT_BUFFER, instead of %d
\n
"
,
err
);
todo_wine
todo_wine
ok
(
PrivSetLen
==
sizeof
(
PRIVILEGE_SET
),
"PrivSetLen returns %d
\n
"
,
PrivSetLen
);
ok
(
Access
==
0x1abe11ed
&&
AccessStatus
==
0x1abe11ed
,
"Access and/or AccessStatus were changed!
\n
"
);
...
...
@@ -1600,7 +1600,7 @@ todo_wine
PrivSet
,
&
PrivSetLen
,
&
Access
,
&
AccessStatus
);
err
=
GetLastError
();
ok
(
ret
,
"AccessCheck failed with error %d
\n
"
,
GetLastError
());
todo_wine
todo_wine
ok
(
PrivSetLen
==
sizeof
(
PRIVILEGE_SET
)
+
1
,
"PrivSetLen returns %d
\n
"
,
PrivSetLen
);
ok
(
AccessStatus
&&
(
Access
==
KEY_READ
),
"AccessCheck failed to grant access with error %d
\n
"
,
GetLastError
());
...
...
@@ -5365,9 +5365,9 @@ static void validate_default_security_descriptor(SECURITY_DESCRIPTOR *sd)
SetLastError
(
0xdeadbeef
);
ret
=
GetSecurityDescriptorDacl
(
sd
,
&
present
,
&
acl
,
&
defaulted
);
ok
(
ret
,
"GetSecurityDescriptorDacl error %d
\n
"
,
GetLastError
());
todo_wine
todo_wine
ok
(
present
==
1
,
"acl is not present
\n
"
);
todo_wine
todo_wine
ok
(
acl
!=
(
void
*
)
0xdeadbeef
&&
acl
!=
NULL
,
"acl pointer is not set
\n
"
);
ok
(
defaulted
==
0
,
"defaulted is set to TRUE
\n
"
);
...
...
@@ -5376,7 +5376,7 @@ todo_wine
SetLastError
(
0xdeadbeef
);
ret
=
GetSecurityDescriptorOwner
(
sd
,
&
sid
,
&
defaulted
);
ok
(
ret
,
"GetSecurityDescriptorOwner error %d
\n
"
,
GetLastError
());
todo_wine
todo_wine
ok
(
sid
!=
(
void
*
)
0xdeadbeef
&&
sid
!=
NULL
,
"sid pointer is not set
\n
"
);
ok
(
defaulted
==
0
,
"defaulted is set to TRUE
\n
"
);
...
...
@@ -5385,7 +5385,7 @@ todo_wine
SetLastError
(
0xdeadbeef
);
ret
=
GetSecurityDescriptorGroup
(
sd
,
&
sid
,
&
defaulted
);
ok
(
ret
,
"GetSecurityDescriptorGroup error %d
\n
"
,
GetLastError
());
todo_wine
todo_wine
ok
(
sid
!=
(
void
*
)
0xdeadbeef
&&
sid
!=
NULL
,
"sid pointer is not set
\n
"
);
ok
(
defaulted
==
0
,
"defaulted is set to TRUE
\n
"
);
}
...
...
dlls/advapi32/tests/service.c
View file @
51abf02c
...
...
@@ -2728,7 +2728,7 @@ static void test_EventLog(void)
!
strcmpi
(
config
->
lpBinaryPathName
,
"C:
\\
windows
\\
system32
\\
svchost.exe -k LocalServiceNetworkRestricted"
)
/* Vista+ */
||
!
strcmpi
(
config
->
lpBinaryPathName
,
"C:
\\
windows
\\
system32
\\
svchost.exe -k LocalServiceNetworkRestricted -p"
)
/* Win10 */
,
"got %s
\n
"
,
config
->
lpBinaryPathName
);
todo_wine
todo_wine
ok
(
!
strcmpi
(
config
->
lpLoadOrderGroup
,
"Event Log"
),
"got %s
\n
"
,
config
->
lpLoadOrderGroup
);
ok
(
config
->
dwTagId
==
0
,
"Expected 0, got %d
\n
"
,
config
->
dwTagId
);
ok
(
!
config
->
lpDependencies
[
0
],
"lpDependencies is not empty
\n
"
);
...
...
@@ -2749,7 +2749,7 @@ todo_wine
status
.
dwServiceType
==
(
SERVICE_WIN32_SHARE_PROCESS
|
SERVICE_WIN32_OWN_PROCESS
)
/* Win10 */
,
"got %#x
\n
"
,
status
.
dwServiceType
);
ok
(
status
.
dwCurrentState
==
SERVICE_RUNNING
,
"got %#x
\n
"
,
status
.
dwCurrentState
);
todo_wine
todo_wine
ok
(
status
.
dwControlsAccepted
==
SERVICE_ACCEPT_SHUTDOWN
/* XP */
||
status
.
dwControlsAccepted
==
(
SERVICE_ACCEPT_STOP
|
SERVICE_ACCEPT_SHUTDOWN
)
/* 2008 */
||
status
.
dwControlsAccepted
==
(
SERVICE_ACCEPT_STOP
|
SERVICE_ACCEPT_TIMECHANGE
|
SERVICE_ACCEPT_SHUTDOWN
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment