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
e426c353
Commit
e426c353
authored
Oct 13, 2017
by
Hugh McMaster
Committed by
Alexandre Julliard
Oct 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reg/tests: Delete the export file before returning from compare_export().
Signed-off-by:
Hugh McMaster
<
hugh.mcmaster@outlook.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d3ad7b18
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
16 deletions
+3
-16
reg.c
programs/reg/tests/reg.c
+3
-16
No files found.
programs/reg/tests/reg.c
View file @
e426c353
...
@@ -4309,7 +4309,9 @@ static BOOL compare_export_(unsigned line, const char *filename, const char *exp
...
@@ -4309,7 +4309,9 @@ static BOOL compare_export_(unsigned line, const char *filename, const char *exp
todo_wine_if
(
todo
&
TODO_REG_COMPARE
)
todo_wine_if
(
todo
&
TODO_REG_COMPARE
)
lok
(
!
lstrcmpW
(
fbuf
,
wstr
),
"export data does not match expected data
\n
"
);
lok
(
!
lstrcmpW
(
fbuf
,
wstr
),
"export data does not match expected data
\n
"
);
ret
=
TRUE
;
ret
=
DeleteFileA
(
filename
);
todo_wine
lok
(
ret
,
"DeleteFile failed: %u
\n
"
,
GetLastError
());
exit:
exit:
HeapFree
(
GetProcessHeap
(),
0
,
fbuf
);
HeapFree
(
GetProcessHeap
(),
0
,
fbuf
);
...
@@ -4437,9 +4439,6 @@ static void test_export(void)
...
@@ -4437,9 +4439,6 @@ static void test_export(void)
todo_wine
ok
(
compare_export
(
"file.reg"
,
empty_key_test
,
0
),
"compare_export() failed
\n
"
);
todo_wine
ok
(
compare_export
(
"file.reg"
,
empty_key_test
,
0
),
"compare_export() failed
\n
"
);
err
=
DeleteFileA
(
"file.reg"
);
todo_wine
ok
(
err
,
"DeleteFile failed: %u
\n
"
,
GetLastError
());
/* Test registry export with a simple data structure */
/* Test registry export with a simple data structure */
dword
=
0x100
;
dword
=
0x100
;
add_value
(
hkey
,
"DWORD"
,
REG_DWORD
,
&
dword
,
sizeof
(
dword
));
add_value
(
hkey
,
"DWORD"
,
REG_DWORD
,
&
dword
,
sizeof
(
dword
));
...
@@ -4449,9 +4448,6 @@ static void test_export(void)
...
@@ -4449,9 +4448,6 @@ static void test_export(void)
todo_wine
ok
(
r
==
REG_EXIT_SUCCESS
,
"got exit code %d, expected 0
\n
"
,
r
);
todo_wine
ok
(
r
==
REG_EXIT_SUCCESS
,
"got exit code %d, expected 0
\n
"
,
r
);
todo_wine
ok
(
compare_export
(
"file.reg"
,
simple_test
,
0
),
"compare_export() failed
\n
"
);
todo_wine
ok
(
compare_export
(
"file.reg"
,
simple_test
,
0
),
"compare_export() failed
\n
"
);
err
=
DeleteFileA
(
"file.reg"
);
todo_wine
ok
(
err
,
"DeleteFile failed: %u
\n
"
,
GetLastError
());
/* Test registry export with a complex data structure */
/* Test registry export with a complex data structure */
add_key
(
hkey
,
"Subkey1"
,
&
subkey
);
add_key
(
hkey
,
"Subkey1"
,
&
subkey
);
add_value
(
subkey
,
"Binary"
,
REG_BINARY
,
"
\x11\x22\x33\x44
"
,
4
);
add_value
(
subkey
,
"Binary"
,
REG_BINARY
,
"
\x11\x22\x33\x44
"
,
4
);
...
@@ -4490,9 +4486,6 @@ static void test_export(void)
...
@@ -4490,9 +4486,6 @@ static void test_export(void)
todo_wine
ok
(
r
==
REG_EXIT_SUCCESS
,
"got exit code %d, expected 0
\n
"
,
r
);
todo_wine
ok
(
r
==
REG_EXIT_SUCCESS
,
"got exit code %d, expected 0
\n
"
,
r
);
todo_wine
ok
(
compare_export
(
"file.reg"
,
complex_test
,
0
),
"compare_export() failed
\n
"
);
todo_wine
ok
(
compare_export
(
"file.reg"
,
complex_test
,
0
),
"compare_export() failed
\n
"
);
err
=
DeleteFileA
(
"file.reg"
);
todo_wine
ok
(
err
,
"DeleteFile failed: %u
\n
"
,
GetLastError
());
err
=
delete_tree
(
HKEY_CURRENT_USER
,
KEY_BASE
);
err
=
delete_tree
(
HKEY_CURRENT_USER
,
KEY_BASE
);
ok
(
err
==
ERROR_SUCCESS
,
"delete_tree() failed: %d
\n
"
,
err
);
ok
(
err
==
ERROR_SUCCESS
,
"delete_tree() failed: %d
\n
"
,
err
);
...
@@ -4507,9 +4500,6 @@ static void test_export(void)
...
@@ -4507,9 +4500,6 @@ static void test_export(void)
todo_wine
ok
(
r
==
REG_EXIT_SUCCESS
,
"got exit code %d, expected 0
\n
"
,
r
);
todo_wine
ok
(
r
==
REG_EXIT_SUCCESS
,
"got exit code %d, expected 0
\n
"
,
r
);
todo_wine
ok
(
compare_export
(
"file.reg"
,
key_order_test
,
0
),
"compare_export() failed
\n
"
);
todo_wine
ok
(
compare_export
(
"file.reg"
,
key_order_test
,
0
),
"compare_export() failed
\n
"
);
err
=
DeleteFileA
(
"file.reg"
);
todo_wine
ok
(
err
,
"DeleteFile failed: %u
\n
"
,
GetLastError
());
delete_key
(
hkey
,
"Subkey1"
);
delete_key
(
hkey
,
"Subkey1"
);
delete_key
(
hkey
,
"Subkey2"
);
delete_key
(
hkey
,
"Subkey2"
);
...
@@ -4525,9 +4515,6 @@ static void test_export(void)
...
@@ -4525,9 +4515,6 @@ static void test_export(void)
todo_wine
ok
(
r
==
REG_EXIT_SUCCESS
,
"got exit code %d, expected 0
\n
"
,
r
);
todo_wine
ok
(
r
==
REG_EXIT_SUCCESS
,
"got exit code %d, expected 0
\n
"
,
r
);
todo_wine
ok
(
compare_export
(
"file.reg"
,
value_order_test
,
0
),
"compare_export() failed
\n
"
);
todo_wine
ok
(
compare_export
(
"file.reg"
,
value_order_test
,
0
),
"compare_export() failed
\n
"
);
err
=
DeleteFileA
(
"file.reg"
);
todo_wine
ok
(
err
,
"DeleteFile failed: %u
\n
"
,
GetLastError
());
delete_key
(
HKEY_CURRENT_USER
,
KEY_BASE
);
delete_key
(
HKEY_CURRENT_USER
,
KEY_BASE
);
}
}
...
...
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