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
cb555215
Commit
cb555215
authored
May 26, 2019
by
Akihiro Sagawa
Committed by
Alexandre Julliard
May 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
advapi32: Fix the error code on parse failure.
Signed-off-by:
Akihiro Sagawa
<
sagawa.aki@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e798d25f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
registry.c
dlls/advapi32/registry.c
+1
-1
registry.c
dlls/advapi32/tests/registry.c
+2
-2
No files found.
dlls/advapi32/registry.c
View file @
cb555215
...
@@ -3273,7 +3273,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer
...
@@ -3273,7 +3273,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer
/* Format of the expanded value is 'path_to_dll,-resId' */
/* Format of the expanded value is 'path_to_dll,-resId' */
if
(
!
pComma
||
pComma
[
1
]
!=
'-'
)
{
if
(
!
pComma
||
pComma
[
1
]
!=
'-'
)
{
result
=
ERROR_
BADKEY
;
result
=
ERROR_
INVALID_DATA
;
goto
cleanup
;
goto
cleanup
;
}
}
...
...
dlls/advapi32/tests/registry.c
View file @
cb555215
...
@@ -3859,7 +3859,7 @@ static void test_RegLoadMUIString(void)
...
@@ -3859,7 +3859,7 @@ static void test_RegLoadMUIString(void)
/* 0 */
/* 0 */
{
""
,
REG_SZ
,
FALSE
,
ERROR_INVALID_DATA
},
{
""
,
REG_SZ
,
FALSE
,
ERROR_INVALID_DATA
},
{
"not a MUI string"
,
REG_SZ
,
FALSE
,
ERROR_INVALID_DATA
},
{
"not a MUI string"
,
REG_SZ
,
FALSE
,
ERROR_INVALID_DATA
},
{
"@unknown.dll"
,
REG_SZ
,
TRUE
,
ERROR_INVALID_DATA
,
0
,
TRUE
},
{
"@unknown.dll"
,
REG_SZ
,
TRUE
,
ERROR_INVALID_DATA
},
{
"@unknown.dll,-10"
,
REG_SZ
,
TRUE
,
ERROR_FILE_NOT_FOUND
},
{
"@unknown.dll,-10"
,
REG_SZ
,
TRUE
,
ERROR_FILE_NOT_FOUND
},
/* 4 */
/* 4 */
{
with_env_var
,
REG_SZ
,
FALSE
,
ERROR_SUCCESS
},
{
with_env_var
,
REG_SZ
,
FALSE
,
ERROR_SUCCESS
},
...
@@ -3867,7 +3867,7 @@ static void test_RegLoadMUIString(void)
...
@@ -3867,7 +3867,7 @@ static void test_RegLoadMUIString(void)
{
"%WineMuiTest1%"
,
REG_EXPAND_SZ
,
TRUE
,
ERROR_INVALID_DATA
},
{
"%WineMuiTest1%"
,
REG_EXPAND_SZ
,
TRUE
,
ERROR_INVALID_DATA
},
{
"@%WineMuiTest2%"
,
REG_EXPAND_SZ
,
TRUE
,
ERROR_SUCCESS
},
{
"@%WineMuiTest2%"
,
REG_EXPAND_SZ
,
TRUE
,
ERROR_SUCCESS
},
/* 8 */
/* 8 */
{
"@%WineMuiExe%,a"
,
REG_SZ
,
FALSE
,
ERROR_INVALID_DATA
,
0
,
TRUE
},
{
"@%WineMuiExe%,a"
,
REG_SZ
,
FALSE
,
ERROR_INVALID_DATA
},
{
"@%WineMuiExe%,-4"
,
REG_SZ
,
FALSE
,
ERROR_NOT_FOUND
,
ERROR_FILE_NOT_FOUND
,
TRUE
},
{
"@%WineMuiExe%,-4"
,
REG_SZ
,
FALSE
,
ERROR_NOT_FOUND
,
ERROR_FILE_NOT_FOUND
,
TRUE
},
{
"@%WineMuiExe%,-39"
,
REG_SZ
,
FALSE
,
ERROR_RESOURCE_NAME_NOT_FOUND
,
0
,
TRUE
},
{
"@%WineMuiExe%,-39"
,
REG_SZ
,
FALSE
,
ERROR_RESOURCE_NAME_NOT_FOUND
,
0
,
TRUE
},
{
"@%WineMuiDat%,-16"
,
REG_EXPAND_SZ
,
FALSE
,
ERROR_BAD_EXE_FORMAT
,
ERROR_FILE_NOT_FOUND
,
TRUE
},
{
"@%WineMuiDat%,-16"
,
REG_EXPAND_SZ
,
FALSE
,
ERROR_BAD_EXE_FORMAT
,
ERROR_FILE_NOT_FOUND
,
TRUE
},
...
...
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