ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Mark __lc_time_data strings const. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2019-12-04 15:30:45 +01:00 committed by Alexandre Julliard
parent 1b6eee3069
commit c4b41fd4f1
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcrt/locale.c
View File

@ -1016,7 +1016,7 @@ static MSVCRT___lc_time_data* create_time_data(LCID lcid)
} }
#if _MSVCR_VER >= 110 #if _MSVCR_VER >= 110
cur->locname = (MSVCRT_wchar_t*)&cur->data[ret]; cur->locname = (MSVCRT_wchar_t*)&cur->data[ret];
LCIDToLocaleName(lcid, cur->locname, (size-ret)/sizeof(MSVCRT_wchar_t), 0); LCIDToLocaleName(lcid, (MSVCRT_wchar_t*)&cur->data[ret], (size-ret)/sizeof(MSVCRT_wchar_t), 0);
#else #else
cur->lcid = lcid; cur->lcid = lcid;
#endif #endif

42
dlls/msvcrt/msvcrt.h
View File

@ -125,17 +125,17 @@ typedef struct MSVCRT_tagLC_ID {
typedef struct { typedef struct {
union { union {
char *str[43]; const char *str[43];
struct { struct {
char *short_wday[7]; const char *short_wday[7];
char *wday[7]; const char *wday[7];
char *short_mon[12]; const char *short_mon[12];
char *mon[12]; const char *mon[12];
char *am; const char *am;
char *pm; const char *pm;
char *short_date; const char *short_date;
char *date; const char *date;
char *time; const char *time;
} names; } names;
} str; } str;
#if _MSVCR_VER < 110 #if _MSVCR_VER < 110
@ -143,21 +143,21 @@ typedef struct {
#endif #endif
int unk[2]; int unk[2];
union { union {
MSVCRT_wchar_t *wstr[43]; const MSVCRT_wchar_t *wstr[43];
struct { struct {
MSVCRT_wchar_t *short_wday[7]; const MSVCRT_wchar_t *short_wday[7];
MSVCRT_wchar_t *wday[7]; const MSVCRT_wchar_t *wday[7];
MSVCRT_wchar_t *short_mon[12]; const MSVCRT_wchar_t *short_mon[12];
MSVCRT_wchar_t *mon[12]; const MSVCRT_wchar_t *mon[12];
MSVCRT_wchar_t *am; const MSVCRT_wchar_t *am;
MSVCRT_wchar_t *pm; const MSVCRT_wchar_t *pm;
MSVCRT_wchar_t *short_date; const MSVCRT_wchar_t *short_date;
MSVCRT_wchar_t *date; const MSVCRT_wchar_t *date;
MSVCRT_wchar_t *time; const MSVCRT_wchar_t *time;
} names; } names;
} wstr; } wstr;
#if _MSVCR_VER >= 110 #if _MSVCR_VER >= 110
MSVCRT_wchar_t *locname; const MSVCRT_wchar_t *locname;
#endif #endif
char data[1]; char data[1];
} MSVCRT___lc_time_data; } MSVCRT___lc_time_data;