system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 11:56:11 +00:00
Code Issues Projects Releases Wiki Activity

msvcp110: Fix _Getcvt implementation.

Browse Source
This commit is contained in:
Piotr Caban 2015-04-22 15:57:40 +02:00 committed by Alexandre Julliard
parent bdf8c7a148
commit d7f6eac058
6 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcp110/msvcp110.spec
View File

@ -3780,7 +3780,7 @@
# extern _FZero
@ cdecl -ret64 _Getcoll()
@ cdecl _Getctype(ptr)
@ cdecl -ret64 _Getcvt()
@ cdecl _Getcvt(ptr)
@ cdecl _Getdateorder()
@ cdecl _Getwctype(long ptr)
@ cdecl _Getwctypes(ptr ptr ptr ptr)

2
dlls/msvcp120/msvcp120.spec
View File

@ -3723,7 +3723,7 @@
# extern _FZero
@ cdecl -ret64 _Getcoll()
@ cdecl _Getctype(ptr)
@ cdecl -ret64 _Getcvt()
@ cdecl _Getcvt(ptr)
@ cdecl _Getdateorder()
@ cdecl _Getwctype(long ptr)
@ cdecl _Getwctypes(ptr ptr ptr ptr)

2
dlls/msvcp120_app/msvcp120_app.spec
View File

@ -3723,7 +3723,7 @@
# extern _FZero
@ cdecl -ret64 _Getcoll() msvcp120._Getcoll
@ cdecl _Getctype(ptr) msvcp120._Getctype
@ cdecl -ret64 _Getcvt() msvcp120._Getcvt
@ cdecl _Getcvt(ptr) msvcp120._Getcvt
@ cdecl _Getdateorder() msvcp120._Getdateorder
@ cdecl _Getwctype(long ptr) msvcp120._Getwctype
@ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp120._Getwctypes

26
dlls/msvcp90/locale.c
View File

@ -24,6 +24,7 @@
#include "errno.h"
#include "limits.h"
#include "math.h"
#include "mbctype.h"
#include "stdio.h"
#include "wchar.h"
#include "wctype.h"
@ -684,6 +685,7 @@ _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret)
}
/* _Getcvt */
#if _MSVCP_VER < 110
ULONGLONG __cdecl _Getcvt(void)
{
union {
@ -697,14 +699,38 @@ ULONGLONG __cdecl _Getcvt(void)
ret.cvtvec.handle = ___lc_handle_func()[LC_CTYPE];
return ret.ull;
}
#else
_Cvtvec* __cdecl _Getcvt(_Cvtvec *ret)
{
int i;
TRACE("\n");
memset(ret, 0, sizeof(*ret));
ret->page = ___lc_codepage_func();
ret->mb_max = ___mb_cur_max_func();
if(ret->mb_max > 1) {
for(i=0; i<256; i++)
if(_ismbblead(i)) ret->isleadbyte[i/8] |= 1 << (i&7);
}
return ret;
}
#endif
/* ?_Getcvt@_Locinfo@std@@QBE?AU_Cvtvec@@XZ */
/* ?_Getcvt@_Locinfo@std@@QEBA?AU_Cvtvec@@XZ */
DEFINE_THISCALL_WRAPPER(_Locinfo__Getcvt, 8)
_Cvtvec* __thiscall _Locinfo__Getcvt(const _Locinfo *this, _Cvtvec *ret)
{
#if _MSVCP_VER < 110
ULONGLONG ull = _Getcvt();
memcpy(ret, &ull, sizeof(ull));
#else
_Cvtvec cvtvec;
_Getcvt(&cvtvec);
memcpy(ret, &cvtvec, sizeof(cvtvec));
#endif
return ret;
}

7
dlls/msvcp90/msvcp90.h
View File

@ -192,8 +192,15 @@ int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*,
int __thiscall codecvt_base_max_length(const codecvt_base*);
typedef struct {
#if _MSVCP_VER < 110
LCID handle;
#endif
unsigned page;
#if _MSVCP_VER >= 110
int mb_max;
int unk;
BYTE isleadbyte[32];
#endif
} _Cvtvec;
/* class codecvt<wchar> */

4
include/msvcrt/stdlib.h
View File

@ -119,8 +119,8 @@ extern unsigned int _fmode;
#endif /* __i386__ */
extern int* __cdecl ___mb_cur_max_func(void);
#define __mb_cur_max (*___mb_cur_max_func())
extern int __cdecl ___mb_cur_max_func(void);
#define __mb_cur_max ___mb_cur_max_func()
extern __msvcrt_ulong* __cdecl __doserrno(void);
#define _doserrno (*__doserrno())
extern int* __cdecl _errno(void);