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
ef9a3be8
Commit
ef9a3be8
authored
Oct 30, 2015
by
Piotr Caban
Committed by
Alexandre Julliard
Oct 30, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp110: Fix 64-bit _Getcoll implementation.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
413ad29e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
14 deletions
+25
-14
locale.c
dlls/msvcp90/locale.c
+25
-14
No files found.
dlls/msvcp90/locale.c
View file @
ef9a3be8
...
...
@@ -20,6 +20,7 @@
#include <stdarg.h>
#include "assert.h"
#include "locale.h"
#include "errno.h"
#include "limits.h"
...
...
@@ -649,33 +650,43 @@ _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char
return
_Locinfo__Locinfo_Addcats
(
this
,
category
,
locstr
);
}
/* _Getcoll */
ULONGLONG
__cdecl
_Getcoll
(
void
)
static
_Collvec
*
getcoll
(
_Collvec
*
ret
)
{
union
{
_Collvec
collvec
;
ULONGLONG
ull
;
}
ret
;
TRACE
(
"
\n
"
);
ret
.
collvec
.
page
=
___lc_collate_cp_func
();
ret
->
page
=
___lc_collate_cp_func
();
#if _MSVCP_VER < 110
ret
.
collvec
.
handle
=
___lc_handle_func
()[
LC_COLLATE
];
ret
->
handle
=
___lc_handle_func
()[
LC_COLLATE
];
#else
ret
.
collvec
.
lc_name
=
___lc_locale_name_func
()[
LC_COLLATE
];
ret
->
lc_name
=
___lc_locale_name_func
()[
LC_COLLATE
];
#endif
return
ret
.
ull
;
return
ret
;
}
/* _Getcoll */
#if defined(__i386__) || _MSVCP_VER<110
ULONGLONG
__cdecl
_Getcoll
(
void
)
{
ULONGLONG
ret
;
C_ASSERT
(
sizeof
(
_Collvec
)
<=
sizeof
(
ULONGLONG
));
getcoll
((
_Collvec
*
)
&
ret
);
return
ret
;
}
#else
_Collvec
*
__cdecl
_Getcoll
(
_Collvec
*
ret
)
{
return
getcoll
(
ret
);
}
#endif
/* ?_Getcoll@_Locinfo@std@@QBE?AU_Collvec@@XZ */
/* ?_Getcoll@_Locinfo@std@@QEBA?AU_Collvec@@XZ */
DEFINE_THISCALL_WRAPPER
(
_Locinfo__Getcoll
,
8
)
_Collvec
*
__thiscall
_Locinfo__Getcoll
(
const
_Locinfo
*
this
,
_Collvec
*
ret
)
{
ULONGLONG
ull
=
_Getcoll
();
memcpy
(
ret
,
&
ull
,
sizeof
(
ull
));
return
ret
;
return
getcoll
(
ret
);
}
/* _Getctype */
...
...
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