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
80d98683
Commit
80d98683
authored
Nov 19, 2014
by
Sebastian Lackner
Committed by
Alexandre Julliard
Nov 19, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shlwapi: Fix incorrect usage of CompareString in StrRStrIA.
parent
2487afa5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
12 deletions
+13
-12
string.c
dlls/shlwapi/string.c
+13
-12
No files found.
dlls/shlwapi/string.c
View file @
80d98683
...
@@ -585,6 +585,7 @@ LPWSTR WINAPI StrStrW(LPCWSTR lpszStr, LPCWSTR lpszSearch)
...
@@ -585,6 +585,7 @@ LPWSTR WINAPI StrStrW(LPCWSTR lpszStr, LPCWSTR lpszSearch)
*/
*/
LPSTR
WINAPI
StrRStrIA
(
LPCSTR
lpszStr
,
LPCSTR
lpszEnd
,
LPCSTR
lpszSearch
)
LPSTR
WINAPI
StrRStrIA
(
LPCSTR
lpszStr
,
LPCSTR
lpszEnd
,
LPCSTR
lpszSearch
)
{
{
LPSTR
lpszRet
=
NULL
;
WORD
ch1
,
ch2
;
WORD
ch1
,
ch2
;
INT
iLen
;
INT
iLen
;
...
@@ -593,28 +594,28 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch)
...
@@ -593,28 +594,28 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch)
if
(
!
lpszStr
||
!
lpszSearch
||
!*
lpszSearch
)
if
(
!
lpszStr
||
!
lpszSearch
||
!*
lpszSearch
)
return
NULL
;
return
NULL
;
if
(
!
lpszEnd
)
lpszEnd
=
lpszStr
+
lstrlenA
(
lpszStr
);
if
(
lpszEnd
==
lpszStr
)
return
NULL
;
if
(
IsDBCSLeadByte
(
*
lpszSearch
))
if
(
IsDBCSLeadByte
(
*
lpszSearch
))
ch1
=
*
lpszSearch
<<
8
|
(
UCHAR
)
lpszSearch
[
1
];
ch1
=
*
lpszSearch
<<
8
|
(
UCHAR
)
lpszSearch
[
1
];
else
else
ch1
=
*
lpszSearch
;
ch1
=
*
lpszSearch
;
iLen
=
lstrlenA
(
lpszSearch
);
iLen
=
lstrlenA
(
lpszSearch
);
do
if
(
!
lpszEnd
)
lpszEnd
=
lpszStr
+
lstrlenA
(
lpszStr
);
else
/* reproduce the broken behaviour on Windows */
lpszEnd
+=
min
(
iLen
-
1
,
lstrlenA
(
lpszEnd
));
while
(
lpszStr
+
iLen
<=
lpszEnd
&&
*
lpszStr
)
{
{
lpszEnd
=
CharPrevA
(
lpszStr
,
lpszEnd
);
ch2
=
IsDBCSLeadByte
(
*
lpszStr
)
?
*
lpszStr
<<
8
|
(
UCHAR
)
lpszStr
[
1
]
:
*
lpszStr
;
ch2
=
IsDBCSLeadByte
(
*
lpszEnd
)
?
*
lpszEnd
<<
8
|
(
UCHAR
)
lpszEnd
[
1
]
:
*
lpszEnd
;
if
(
!
ChrCmpIA
(
ch1
,
ch2
))
if
(
!
ChrCmpIA
(
ch1
,
ch2
))
{
{
if
(
!
StrCmpNIA
(
lpsz
End
,
lpszSearch
,
iLen
))
if
(
!
StrCmpNIA
(
lpsz
Str
,
lpszSearch
,
iLen
))
return
(
LPSTR
)
lpszEnd
;
lpszRet
=
(
LPSTR
)
lpszStr
;
}
}
}
while
(
lpszEnd
>
lpszStr
);
lpszStr
=
CharNextA
(
lpszStr
);
return
NULL
;
}
return
lpszRet
;
}
}
/*************************************************************************
/*************************************************************************
...
...
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