Commit 433430ae authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

Add msvcrt/locale.h.

Add missing include directives in msvcrt/wchar.h. Fix prototype of _wstati64 in msvcrt/sys/stat.h.
parent 9f88a542
......@@ -4,7 +4,9 @@
* Copyright 2000 Jon Griffiths
*/
#include "winnt.h"
#include "msvcrt.h"
#include "msvcrt/locale.h"
DEFAULT_DEBUG_CHANNEL(msvcrt);
......@@ -33,16 +35,6 @@ extern unsigned char MSVCRT_mbctype[257];
#define MSVCRT_LEADBYTE 0x8000
/* Locales */
#define MSVCRT_LC_ALL 0
#define MSVCRT_LC_COLLATE 1
#define MSVCRT_LC_CTYPE 2
#define MSVCRT_LC_MONETARY 3
#define MSVCRT_LC_NUMERIC 4
#define MSVCRT_LC_TIME 5
#define MSVCRT_LC_MIN MSVCRT_LC_ALL
#define MSVCRT_LC_MAX MSVCRT_LC_TIME
/* Friendly country strings & iso codes for synonym support.
* Based on MS documentation for setlocale().
*/
......
......@@ -5,6 +5,7 @@
*/
#include "msvcrt.h"
#include "msvcrt/locale.h"
#include "msvcrt/stdio.h"
......@@ -32,7 +33,6 @@ void msvcrt_free_console(void);
void msvcrt_init_args(void);
void msvcrt_free_args(void);
void msvcrt_init_vtables(void);
char* MSVCRT_setlocale(int category, const char* locale);
/*********************************************************************
......
......@@ -59,6 +59,7 @@ INSTALLED_INCLUDES = \
msvcrt/eh.h \
msvcrt/fcntl.h \
msvcrt/io.h \
msvcrt/locale.h \
msvcrt/malloc.h \
msvcrt/process.h \
msvcrt/search.h \
......
/*
* Locale definitions
*
* Copyright 2000 Francois Gouget.
*/
#ifndef __WINE_LOCALE_H
#define __WINE_LOCALE_H
#include "winnt.h"
#ifdef USE_MSVCRT_PREFIX
#define MSVCRT(x) MSVCRT_##x
#else
#define MSVCRT(x) x
#endif
#ifdef USE_MSVCRT_PREFIX
#define MSVCRT_LC_ALL 0
#define MSVCRT_LC_COLLATE 1
#define MSVCRT_LC_CTYPE 2
#define MSVCRT_LC_MONETARY 3
#define MSVCRT_LC_NUMERIC 4
#define MSVCRT_LC_TIME 5
#define MSVCRT_LC_MIN MSVCRT_LC_ALL
#define MSVCRT_LC_MAX MSVCRT_LC_TIME
#else
#define LC_ALL 0
#define LC_COLLATE 1
#define LC_CTYPE 2
#define LC_MONETARY 3
#define LC_NUMERIC 4
#define LC_TIME 5
#define LC_MIN LC_ALL
#define LC_MAX LC_TIME
#endif /* USE_MSVCRT_PREFIX */
struct MSVCRT(lconv)
{
char* decimal_point;
char* thousands_sep;
char* grouping;
char* int_curr_symbol;
char* currency_symbol;
char* mon_decimal_point;
char* mon_thousands_sep;
char* mon_grouping;
char* positive_sign;
char* negative_sign;
char int_frac_digits;
char frac_digits;
char p_cs_precedes;
char p_sep_by_space;
char n_cs_precedes;
char n_sep_by_space;
char p_sign_posn;
char n_sign_posn;
};
#ifdef __cplusplus
extern "C" {
#endif
char* MSVCRT(setlocale)(int,const char*);
struct MSVCRT(lconv)* MSVCRT(localeconv)(void);
WCHAR* _wsetlocale(int,const WCHAR*);
#ifdef __cplusplus
}
#endif
#endif /* __WINE_LOCALE_H */
......@@ -60,7 +60,7 @@ int _stat(const char*,struct _stat*);
int _stati64(const char*,struct _stati64*);
int _wstat(const WCHAR*,struct _stat*);
int _wstati64(const wchar_t*,struct _stati64*);
int _wstati64(const WCHAR*,struct _stati64*);
#ifdef __cplusplus
}
......
......@@ -9,13 +9,13 @@
#define __WINE_WCHAR_H
#include "msvcrt/io.h"
/* FIXME: does not exist yet #include "msvcrt/locale.h" */
/* FIXME: does not exist yet #include "msvcrt/process.h" */
#include "msvcrt/locale.h"
#include "msvcrt/process.h"
#include "msvcrt/stdio.h"
#include "msvcrt/stdlib.h"
#include "msvcrt/string.h"
#include "msvcrt/sys/stat.h"
/* FIXME: does not exist yet #include "msvcrt/sys/types.h" */
#include "msvcrt/sys/types.h"
#include "msvcrt/time.h"
#include "msvcrt/wctype.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment