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
0aead094
Commit
0aead094
authored
May 07, 2018
by
Hugh McMaster
Committed by
Alexandre Julliard
May 08, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reg: Stop exporting REG_SZ data at the first NUL character.
Signed-off-by:
Hugh McMaster
<
hugh.mcmaster@outlook.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
62027322
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
export.c
programs/reg/export.c
+6
-5
reg.c
programs/reg/tests/reg.c
+1
-1
No files found.
programs/reg/export.c
View file @
0aead094
...
...
@@ -39,7 +39,10 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len)
for
(
i
=
0
,
escape_count
=
0
;
i
<
str_len
;
i
++
)
{
WCHAR
c
=
str
[
i
];
if
(
c
==
'\r'
||
c
==
'\n'
||
c
==
'\\'
||
c
==
'"'
||
c
==
'\0'
)
if
(
!
c
)
break
;
if
(
c
==
'\r'
||
c
==
'\n'
||
c
==
'\\'
||
c
==
'"'
)
escape_count
++
;
}
...
...
@@ -49,6 +52,8 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len)
{
WCHAR
c
=
str
[
i
];
if
(
!
c
)
break
;
switch
(
c
)
{
case
'\r'
:
...
...
@@ -67,10 +72,6 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len)
buf
[
pos
++
]
=
'\\'
;
buf
[
pos
]
=
'"'
;
break
;
case
'\0'
:
buf
[
pos
++
]
=
'\\'
;
buf
[
pos
]
=
'0'
;
break
;
default:
buf
[
pos
]
=
c
;
}
...
...
programs/reg/tests/reg.c
View file @
0aead094
...
...
@@ -4679,7 +4679,7 @@ static void test_export(void)
run_reg_exe
(
"reg export HKEY_CURRENT_USER
\\
"
KEY_BASE
" file.reg"
,
&
r
);
ok
(
r
==
REG_EXIT_SUCCESS
,
"got exit code %d, expected 0
\n
"
,
r
);
ok
(
compare_export
(
"file.reg"
,
embedded_null_test
,
TODO_REG_COMPARE
),
"compare_export() failed
\n
"
);
ok
(
compare_export
(
"file.reg"
,
embedded_null_test
,
0
),
"compare_export() failed
\n
"
);
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