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
cd6e9bd1
Commit
cd6e9bd1
authored
Dec 21, 2011
by
Piotr Caban
Committed by
Alexandre Julliard
Dec 21, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp90: Don't crash if NULL is passed to _Strcoll and _Wcscoll.
parent
1a711acd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
2 deletions
+17
-2
locale.c
dlls/msvcp90/locale.c
+17
-2
No files found.
dlls/msvcp90/locale.c
View file @
cd6e9bd1
...
@@ -34,6 +34,7 @@ char* __cdecl _Getdays(void);
...
@@ -34,6 +34,7 @@ char* __cdecl _Getdays(void);
char
*
__cdecl
_Getmonths
(
void
);
char
*
__cdecl
_Getmonths
(
void
);
void
*
__cdecl
_Gettnames
(
void
);
void
*
__cdecl
_Gettnames
(
void
);
unsigned
int
__cdecl
___lc_codepage_func
(
void
);
unsigned
int
__cdecl
___lc_codepage_func
(
void
);
LCID
*
__cdecl
___lc_handle_func
(
void
);
typedef
int
category
;
typedef
int
category
;
...
@@ -746,8 +747,15 @@ MSVCP_size_t __cdecl collate_char__Getcat(const locale_facet **facet, const loca
...
@@ -746,8 +747,15 @@ MSVCP_size_t __cdecl collate_char__Getcat(const locale_facet **facet, const loca
int
__cdecl
_Strcoll
(
const
char
*
first1
,
const
char
*
last1
,
const
char
*
first2
,
int
__cdecl
_Strcoll
(
const
char
*
first1
,
const
char
*
last1
,
const
char
*
first2
,
const
char
*
last2
,
const
_Collvec
*
coll
)
const
char
*
last2
,
const
_Collvec
*
coll
)
{
{
LCID
lcid
;
TRACE
(
"(%s %s)
\n
"
,
debugstr_an
(
first1
,
last1
-
first1
),
debugstr_an
(
first2
,
last2
-
first2
));
TRACE
(
"(%s %s)
\n
"
,
debugstr_an
(
first1
,
last1
-
first1
),
debugstr_an
(
first2
,
last2
-
first2
));
return
CompareStringA
(
coll
->
handle
,
0
,
first1
,
last1
-
first1
,
first2
,
last2
-
first2
)
-
2
;
if
(
coll
)
lcid
=
coll
->
handle
;
else
lcid
=
___lc_handle_func
()[
LC_COLLATE
];
return
CompareStringA
(
lcid
,
0
,
first1
,
last1
-
first1
,
first2
,
last2
-
first2
)
-
2
;
}
}
/* ?do_compare@?$collate@D@std@@MBEHPBD000@Z */
/* ?do_compare@?$collate@D@std@@MBEHPBD000@Z */
...
@@ -992,8 +1000,15 @@ MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const loc
...
@@ -992,8 +1000,15 @@ MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const loc
int
__cdecl
_Wcscoll
(
const
wchar_t
*
first1
,
const
wchar_t
*
last1
,
const
wchar_t
*
first2
,
int
__cdecl
_Wcscoll
(
const
wchar_t
*
first1
,
const
wchar_t
*
last1
,
const
wchar_t
*
first2
,
const
wchar_t
*
last2
,
const
_Collvec
*
coll
)
const
wchar_t
*
last2
,
const
_Collvec
*
coll
)
{
{
LCID
lcid
;
TRACE
(
"(%s %s)
\n
"
,
debugstr_wn
(
first1
,
last1
-
first1
),
debugstr_wn
(
first2
,
last2
-
first2
));
TRACE
(
"(%s %s)
\n
"
,
debugstr_wn
(
first1
,
last1
-
first1
),
debugstr_wn
(
first2
,
last2
-
first2
));
return
CompareStringW
(
coll
->
handle
,
0
,
first1
,
last1
-
first1
,
first2
,
last2
-
first2
)
-
2
;
if
(
coll
)
lcid
=
coll
->
handle
;
else
lcid
=
___lc_handle_func
()[
LC_COLLATE
];
return
CompareStringW
(
lcid
,
0
,
first1
,
last1
-
first1
,
first2
,
last2
-
first2
)
-
2
;
}
}
/* ?do_compare@?$collate@_W@std@@MBEHPB_W000@Z */
/* ?do_compare@?$collate@_W@std@@MBEHPB_W000@Z */
...
...
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