Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
5d8a1283
Commit
5d8a1283
authored
Jul 04, 2017
by
Hugh McMaster
Committed by
Alexandre Julliard
Jul 04, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
regedit: Do not remove lines beginning with '#' from the read buffer.
Signed-off-by:
Hugh McMaster
<
hugh.mcmaster@outlook.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e336c863
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
regproc.c
programs/regedit/regproc.c
+2
-2
regedit.c
programs/regedit/tests/regedit.c
+6
-6
No files found.
programs/regedit/regproc.c
View file @
5d8a1283
...
@@ -991,7 +991,7 @@ static WCHAR *get_lineA(FILE *fp)
...
@@ -991,7 +991,7 @@ static WCHAR *get_lineA(FILE *fp)
next
=
p
+
1
;
next
=
p
+
1
;
if
(
*
p
==
'\r'
&&
*
(
p
+
1
)
==
'\n'
)
next
++
;
if
(
*
p
==
'\r'
&&
*
(
p
+
1
)
==
'\n'
)
next
++
;
*
p
=
0
;
*
p
=
0
;
if
(
*
line
==
';'
||
*
line
==
'#'
)
if
(
*
line
==
';'
)
{
{
line
=
next
;
line
=
next
;
continue
;
continue
;
...
@@ -1054,7 +1054,7 @@ static WCHAR *get_lineW(FILE *fp)
...
@@ -1054,7 +1054,7 @@ static WCHAR *get_lineW(FILE *fp)
next
=
p
+
1
;
next
=
p
+
1
;
if
(
*
p
==
'\r'
&&
*
(
p
+
1
)
==
'\n'
)
next
++
;
if
(
*
p
==
'\r'
&&
*
(
p
+
1
)
==
'\n'
)
next
++
;
*
p
=
0
;
*
p
=
0
;
if
(
*
line
==
';'
||
*
line
==
'#'
)
if
(
*
line
==
';'
)
{
{
line
=
next
;
line
=
next
;
continue
;
continue
;
...
...
programs/regedit/tests/regedit.c
View file @
5d8a1283
...
@@ -909,7 +909,7 @@ static void test_invalid_import(void)
...
@@ -909,7 +909,7 @@ static void test_invalid_import(void)
verify_reg_nonexist
(
hkey
,
"Wine25c"
);
verify_reg_nonexist
(
hkey
,
"Wine25c"
);
verify_reg_nonexist
(
hkey
,
"Wine25d"
);
verify_reg_nonexist
(
hkey
,
"Wine25d"
);
verify_reg_nonexist
(
hkey
,
"Wine25e"
);
verify_reg_nonexist
(
hkey
,
"Wine25e"
);
todo_wine
verify_reg
(
hkey
,
"Wine25f"
,
REG_SZ
,
"Test value"
,
11
,
0
);
verify_reg
(
hkey
,
"Wine25f"
,
REG_SZ
,
"Test value"
,
11
,
0
);
verify_reg_nonexist
(
hkey
,
"Wine25g"
);
verify_reg_nonexist
(
hkey
,
"Wine25g"
);
verify_reg_nonexist
(
hkey
,
"Wine25h"
);
verify_reg_nonexist
(
hkey
,
"Wine25h"
);
verify_reg_nonexist
(
hkey
,
"Wine25i"
);
verify_reg_nonexist
(
hkey
,
"Wine25i"
);
...
@@ -938,7 +938,7 @@ static void test_invalid_import(void)
...
@@ -938,7 +938,7 @@ static void test_invalid_import(void)
verify_reg_nonexist
(
hkey
,
"Wine26c"
);
verify_reg_nonexist
(
hkey
,
"Wine26c"
);
verify_reg_nonexist
(
hkey
,
"Wine26d"
);
verify_reg_nonexist
(
hkey
,
"Wine26d"
);
verify_reg_nonexist
(
hkey
,
"Wine26e"
);
verify_reg_nonexist
(
hkey
,
"Wine26e"
);
todo_wine
verify_reg
(
hkey
,
"Wine26f"
,
REG_DWORD
,
&
dword
,
sizeof
(
dword
),
0
);
verify_reg
(
hkey
,
"Wine26f"
,
REG_DWORD
,
&
dword
,
sizeof
(
dword
),
0
);
verify_reg_nonexist
(
hkey
,
"Wine26g"
);
verify_reg_nonexist
(
hkey
,
"Wine26g"
);
verify_reg_nonexist
(
hkey
,
"Wine26h"
);
verify_reg_nonexist
(
hkey
,
"Wine26h"
);
verify_reg_nonexist
(
hkey
,
"Wine26i"
);
verify_reg_nonexist
(
hkey
,
"Wine26i"
);
...
@@ -967,7 +967,7 @@ static void test_invalid_import(void)
...
@@ -967,7 +967,7 @@ static void test_invalid_import(void)
verify_reg_nonexist
(
hkey
,
"Wine27c"
);
verify_reg_nonexist
(
hkey
,
"Wine27c"
);
verify_reg_nonexist
(
hkey
,
"Wine27d"
);
verify_reg_nonexist
(
hkey
,
"Wine27d"
);
verify_reg_nonexist
(
hkey
,
"Wine27e"
);
verify_reg_nonexist
(
hkey
,
"Wine27e"
);
todo_wine
verify_reg
(
hkey
,
"Wine27f"
,
REG_EXPAND_SZ
,
"%PATH%"
,
7
,
0
);
verify_reg
(
hkey
,
"Wine27f"
,
REG_EXPAND_SZ
,
"%PATH%"
,
7
,
0
);
verify_reg_nonexist
(
hkey
,
"Wine27g"
);
verify_reg_nonexist
(
hkey
,
"Wine27g"
);
verify_reg_nonexist
(
hkey
,
"Wine27h"
);
verify_reg_nonexist
(
hkey
,
"Wine27h"
);
verify_reg_nonexist
(
hkey
,
"Wine27i"
);
verify_reg_nonexist
(
hkey
,
"Wine27i"
);
...
@@ -994,10 +994,10 @@ static void test_invalid_import(void)
...
@@ -994,10 +994,10 @@ static void test_invalid_import(void)
"#comment
\n
"
"#comment
\n
"
"@=
\"
Default value 3
\"\n\n
"
);
"@=
\"
Default value 3
\"\n\n
"
);
verify_reg_nonexist
(
hkey
,
"Wine28c"
);
verify_reg_nonexist
(
hkey
,
"Wine28c"
);
todo_wine
verify_reg
(
hkey
,
NULL
,
REG_SZ
,
"Default value 3"
,
16
,
0
);
verify_reg
(
hkey
,
NULL
,
REG_SZ
,
"Default value 3"
,
16
,
0
);
lr
=
RegDeleteValueW
(
hkey
,
NULL
);
lr
=
RegDeleteValueW
(
hkey
,
NULL
);
todo_wine
ok
(
lr
==
ERROR_SUCCESS
,
"RegDeleteValue failed: %u
\n
"
,
lr
);
ok
(
lr
==
ERROR_SUCCESS
,
"RegDeleteValue failed: %u
\n
"
,
lr
);
exec_import_str
(
"REGEDIT4
\n\n
"
exec_import_str
(
"REGEDIT4
\n\n
"
"[HKEY_CURRENT_USER
\\
"
KEY_BASE
"]
\n
"
"[HKEY_CURRENT_USER
\\
"
KEY_BASE
"]
\n
"
...
@@ -1326,7 +1326,7 @@ static void test_comments(void)
...
@@ -1326,7 +1326,7 @@ static void test_comments(void)
"#comment
\n
"
"#comment
\n
"
" 65,6e,
\\
;comment
\n
"
" 65,6e,
\\
;comment
\n
"
" 61,74,69,6f,6e,00,00
\n\n
"
);
" 61,74,69,6f,6e,00,00
\n\n
"
);
todo_wine
verify_reg_nonexist
(
hkey
,
"Wine29c"
);
verify_reg_nonexist
(
hkey
,
"Wine29c"
);
exec_import_str
(
"REGEDIT4
\n\n
"
exec_import_str
(
"REGEDIT4
\n\n
"
"[HKEY_CURRENT_USER
\\
"
KEY_BASE
"]
\n
"
"[HKEY_CURRENT_USER
\\
"
KEY_BASE
"]
\n
"
...
...
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