Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
91d63c0c
Commit
91d63c0c
authored
20 years ago
by
Lionel Ulmer
Committed by
Alexandre Julliard
20 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add better NULL checks to lstrcmp[i](A/W) functions.
parent
def71887
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/kernel/locale.c
+32
-4
32 additions, 4 deletions
dlls/kernel/locale.c
dlls/kernel/tests/locale.c
+10
-1
10 additions, 1 deletion
dlls/kernel/tests/locale.c
with
42 additions
and
5 deletions
dlls/kernel/locale.c
+
32
−
4
View file @
91d63c0c
...
...
@@ -2356,8 +2356,15 @@ INT WINAPI CompareStringA(LCID lcid, DWORD style,
*/
int
WINAPI
lstrcmpA
(
LPCSTR
str1
,
LPCSTR
str2
)
{
int
ret
=
CompareStringA
(
GetThreadLocale
(),
0
,
str1
,
-
1
,
str2
,
-
1
);
int
ret
;
if
((
str1
==
NULL
)
&&
(
str2
==
NULL
))
return
0
;
if
(
str1
==
NULL
)
return
-
1
;
if
(
str2
==
NULL
)
return
1
;
ret
=
CompareStringA
(
GetThreadLocale
(),
0
,
str1
,
-
1
,
str2
,
-
1
);
if
(
ret
)
ret
-=
2
;
return
ret
;
}
...
...
@@ -2378,8 +2385,15 @@ int WINAPI lstrcmpA(LPCSTR str1, LPCSTR str2)
*/
int
WINAPI
lstrcmpiA
(
LPCSTR
str1
,
LPCSTR
str2
)
{
int
ret
=
CompareStringA
(
GetThreadLocale
(),
NORM_IGNORECASE
,
str1
,
-
1
,
str2
,
-
1
);
int
ret
;
if
((
str1
==
NULL
)
&&
(
str2
==
NULL
))
return
0
;
if
(
str1
==
NULL
)
return
-
1
;
if
(
str2
==
NULL
)
return
1
;
ret
=
CompareStringA
(
GetThreadLocale
(),
NORM_IGNORECASE
,
str1
,
-
1
,
str2
,
-
1
);
if
(
ret
)
ret
-=
2
;
return
ret
;
}
...
...
@@ -2390,8 +2404,15 @@ int WINAPI lstrcmpiA(LPCSTR str1, LPCSTR str2)
*/
int
WINAPI
lstrcmpW
(
LPCWSTR
str1
,
LPCWSTR
str2
)
{
int
ret
=
CompareStringW
(
GetThreadLocale
(),
0
,
str1
,
-
1
,
str2
,
-
1
);
int
ret
;
if
((
str1
==
NULL
)
&&
(
str2
==
NULL
))
return
0
;
if
(
str1
==
NULL
)
return
-
1
;
if
(
str2
==
NULL
)
return
1
;
ret
=
CompareStringW
(
GetThreadLocale
(),
0
,
str1
,
-
1
,
str2
,
-
1
);
if
(
ret
)
ret
-=
2
;
return
ret
;
}
...
...
@@ -2402,8 +2423,15 @@ int WINAPI lstrcmpW(LPCWSTR str1, LPCWSTR str2)
*/
int
WINAPI
lstrcmpiW
(
LPCWSTR
str1
,
LPCWSTR
str2
)
{
int
ret
=
CompareStringW
(
GetThreadLocale
(),
NORM_IGNORECASE
,
str1
,
-
1
,
str2
,
-
1
);
int
ret
;
if
((
str1
==
NULL
)
&&
(
str2
==
NULL
))
return
0
;
if
(
str1
==
NULL
)
return
-
1
;
if
(
str2
==
NULL
)
return
1
;
ret
=
CompareStringW
(
GetThreadLocale
(),
NORM_IGNORECASE
,
str1
,
-
1
,
str2
,
-
1
);
if
(
ret
)
ret
-=
2
;
return
ret
;
}
...
...
This diff is collapsed.
Click to expand it.
dlls/kernel/tests/locale.c
+
10
−
1
View file @
91d63c0c
...
...
@@ -795,8 +795,17 @@ static void test_CompareStringA()
ok
(
!
ret
,
"CompareStringA must fail with invalid flag
\n
"
);
ret
=
lstrcmpA
(
""
,
""
);
ok
(
!
ret
,
"lstrcmpA(
\"\"
,
\"\"
) should return 0, got %d
\n
"
,
ret
);
ok
(
ret
==
0
,
"lstrcmpA(
\"\"
,
\"\"
) should return 0, got %d
\n
"
,
ret
);
ret
=
lstrcmpA
(
NULL
,
NULL
);
ok
(
ret
==
0
,
"lstrcmpA(NULL, NULL) should return 0, got %d
\n
"
,
ret
);
ret
=
lstrcmpA
(
""
,
NULL
);
ok
(
ret
==
1
,
"lstrcmpA(
\"\"
, NULL) should return 1, got %d
\n
"
,
ret
);
ret
=
lstrcmpA
(
NULL
,
""
);
ok
(
ret
==
-
1
,
"lstrcmpA(NULL,
\"\"
) should return -1, got %d
\n
"
,
ret
);
ret
=
CompareStringA
(
LOCALE_SYSTEM_DEFAULT
,
0
,
"EndDialog"
,
-
1
,
"_Property"
,
-
1
);
ok
(
ret
==
3
,
"EndDialog vs _Property ... expected 3, got %d
\n
"
,
ret
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment