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
733cdaa6
Commit
733cdaa6
authored
Jun 19, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernelbase: Revert some incorrect differences with shlwapi.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a226e2b7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
9 deletions
+8
-9
path.c
dlls/kernelbase/path.c
+8
-9
No files found.
dlls/kernelbase/path.c
View file @
733cdaa6
...
...
@@ -1518,21 +1518,20 @@ LPSTR WINAPI PathCombineA(char *dst, const char *dir, const char *file)
if
(
!
dst
)
return
NULL
;
dst
[
0
]
=
0
;
if
(
!
dir
&&
!
file
)
return
NULL
;
goto
fail
;
if
(
dir
&&
!
MultiByteToWideChar
(
CP_ACP
,
0
,
dir
,
-
1
,
dirW
,
ARRAY_SIZE
(
dirW
)))
return
NULL
;
goto
fail
;
if
(
file
&&
!
MultiByteToWideChar
(
CP_ACP
,
0
,
file
,
-
1
,
fileW
,
ARRAY_SIZE
(
fileW
)))
return
NULL
;
goto
fail
;
if
(
PathCombineW
(
dstW
,
dir
?
dirW
:
NULL
,
file
?
fileW
:
NULL
))
if
(
WideCharToMultiByte
(
CP_ACP
,
0
,
dstW
,
-
1
,
dst
,
MAX_PATH
,
0
,
0
))
return
dst
;
fail:
dst
[
0
]
=
0
;
return
NULL
;
}
...
...
@@ -1945,7 +1944,7 @@ void WINAPI PathRemoveExtensionA(char *path)
return
;
path
=
PathFindExtensionA
(
path
);
if
(
path
&&
!
*
path
)
if
(
path
&&
*
path
)
*
path
=
'\0'
;
}
...
...
@@ -1957,7 +1956,7 @@ void WINAPI PathRemoveExtensionW(WCHAR *path)
return
;
path
=
PathFindExtensionW
(
path
);
if
(
path
&&
!
*
path
)
if
(
path
&&
*
path
)
*
path
=
'\0'
;
}
...
...
@@ -3924,7 +3923,7 @@ static HRESULT url_guess_scheme(const WCHAR *url, WCHAR *out, DWORD *out_len)
BOOL
j
;
MultiByteToWideChar
(
CP_ACP
,
0
,
"Software
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
URL
\\
Prefixes"
,
1
,
reg_path
,
MAX_PATH
);
"Software
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
URL
\\
Prefixes"
,
-
1
,
reg_path
,
MAX_PATH
);
RegOpenKeyExW
(
HKEY_LOCAL_MACHINE
,
reg_path
,
0
,
1
,
&
newkey
);
index
=
0
;
while
(
value_len
=
data_len
=
MAX_PATH
,
...
...
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