Fix the definition of structs NUMBERFMT* and CURRENCYFMT*.
Add, fix and move prototypes from winbase.h to winnls.h.
This commit is contained in:
Francois Gouget
Alexandre Julliard
parent
607c810ac2
commit
038af7925b
|
|
@ -12,6 +12,7 @@
|
|||
#include "wingdi.h"
|
||||
#include "winuser.h"
|
||||
#include "winerror.h"
|
||||
#include "winnls.h"
|
||||
#include "winreg.h"
|
||||
#include "immddk.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1349,7 +1349,6 @@ BOOL WINAPI FreeEnvironmentStringsW(LPWSTR);
|
|||
#define FreeEnvironmentStrings WINELIB_NAME_AW(FreeEnvironmentStrings)
|
||||
VOID WINAPI FreeLibraryAndExitThread(HINSTANCE,DWORD);
|
||||
PVOID WINAPI FreeSid(PSID);
|
||||
UINT WINAPI GetACP(void);
|
||||
BOOL WINAPI GetCommConfig(HANDLE,LPCOMMCONFIG,LPDWORD);
|
||||
BOOL WINAPI GetCommMask(HANDLE,LPDWORD);
|
||||
BOOL WINAPI GetCommModemStatus(HANDLE,LPDWORD);
|
||||
|
|
@ -1370,9 +1369,6 @@ DWORD WINAPI GetConsoleTitleW(LPWSTR,DWORD);
|
|||
#define GetConsoleTitle WINELIB_NAME_AW(GetConsoleTitle)
|
||||
HANDLE WINAPI GetCurrentProcess(void);
|
||||
HANDLE WINAPI GetCurrentThread(void);
|
||||
INT WINAPI GetDateFormatA(LCID,DWORD,LPSYSTEMTIME,LPCSTR,LPSTR,INT);
|
||||
INT WINAPI GetDateFormatW(LCID,DWORD,LPSYSTEMTIME,LPCWSTR,LPWSTR,INT);
|
||||
#define GetDateFormat WINELIB_NAME_AW(GetDateFormat)
|
||||
BOOL WINAPI GetDefaultCommConfigA(LPCSTR,LPCOMMCONFIG,LPDWORD);
|
||||
BOOL WINAPI GetDefaultCommConfigW(LPCWSTR,LPCOMMCONFIG,LPDWORD);
|
||||
#define GetDefaultCommConfig WINELIB_NAME_AW(GetDefaultCommConfig)
|
||||
|
|
@ -1405,7 +1401,6 @@ DWORD WINAPI GetLongPathNameW(LPCWSTR,LPWSTR,DWORD);
|
|||
BOOL WINAPI GetNumberOfConsoleInputEvents(HANDLE,LPDWORD);
|
||||
BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD);
|
||||
BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD);
|
||||
UINT WINAPI GetOEMCP(void);
|
||||
BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD);
|
||||
DWORD WINAPI GetPriorityClass(HANDLE);
|
||||
BOOL WINAPI GetProcessTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME);
|
||||
|
|
@ -1424,9 +1419,6 @@ DWORD WINAPI GetShortPathNameA(LPCSTR,LPSTR,DWORD);
|
|||
DWORD WINAPI GetShortPathNameW(LPCWSTR,LPWSTR,DWORD);
|
||||
#define GetShortPathName WINELIB_NAME_AW(GetShortPathName)
|
||||
HANDLE WINAPI GetStdHandle(DWORD);
|
||||
BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,INT,LPWORD);
|
||||
BOOL WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,INT,LPWORD);
|
||||
#define GetStringTypeEx WINELIB_NAME_AW(GetStringTypeEx)
|
||||
VOID WINAPI GetSystemInfo(LPSYSTEM_INFO);
|
||||
BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS);
|
||||
VOID WINAPI GetSystemTime(LPSYSTEMTIME);
|
||||
|
|
@ -1434,12 +1426,8 @@ VOID WINAPI GetSystemTimeAsFileTime(LPFILETIME);
|
|||
DWORD WINAPI GetTapeParameters(HANDLE,DWORD,LPDWORD,LPVOID);
|
||||
DWORD WINAPI GetTapePosition(HANDLE,DWORD,LPDWORD,LPDWORD,LPDWORD);
|
||||
DWORD WINAPI GetTapeStatus(HANDLE);
|
||||
INT WINAPI GetTimeFormatA(LCID,DWORD,LPSYSTEMTIME,LPCSTR,LPSTR,INT);
|
||||
INT WINAPI GetTimeFormatW(LCID,DWORD,LPSYSTEMTIME,LPCWSTR,LPWSTR,INT);
|
||||
#define GetTimeFormat WINELIB_NAME_AW(GetTimeFormat)
|
||||
DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION);
|
||||
BOOL WINAPI GetThreadContext(HANDLE,CONTEXT *);
|
||||
LCID WINAPI GetThreadLocale(void);
|
||||
INT WINAPI GetThreadPriority(HANDLE);
|
||||
BOOL WINAPI GetThreadPriorityBoost(HANDLE,PBOOL);
|
||||
BOOL WINAPI GetThreadSelectorEntry(HANDLE,DWORD,LPLDT_ENTRY);
|
||||
|
|
@ -1467,9 +1455,7 @@ BOOL WINAPI IsTextUnicode(CONST LPVOID lpBuffer, int cb, LPINT lpi);
|
|||
BOOL WINAPI IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR);
|
||||
BOOL WINAPI IsValidSid(PSID);
|
||||
BOOL WINAPI ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL);
|
||||
BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE);
|
||||
BOOL WINAPI IsProcessorFeaturePresent(DWORD);
|
||||
BOOL WINAPI IsValidLocale(DWORD,DWORD);
|
||||
BOOL WINAPI LookupAccountSidA(LPCSTR,PSID,LPSTR,LPDWORD,LPSTR,LPDWORD,PSID_NAME_USE);
|
||||
BOOL WINAPI LookupAccountSidW(LPCWSTR,PSID,LPWSTR,LPDWORD,LPWSTR,LPDWORD,PSID_NAME_USE);
|
||||
#define LookupAccountSid WINELIB_NAME_AW(LookupAccountSid)
|
||||
|
|
@ -1490,9 +1476,7 @@ BOOL WINAPI MoveFileW(LPCWSTR,LPCWSTR);
|
|||
BOOL WINAPI MoveFileExA(LPCSTR,LPCSTR,DWORD);
|
||||
BOOL WINAPI MoveFileExW(LPCWSTR,LPCWSTR,DWORD);
|
||||
#define MoveFileEx WINELIB_NAME_AW(MoveFileEx)
|
||||
INT WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT);
|
||||
BOOL WINAPI NotifyChangeEventLog(HANDLE,HANDLE);
|
||||
INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,BOOL*);
|
||||
HANDLE WINAPI OpenBackupEventLogA(LPCSTR,LPCSTR);
|
||||
HANDLE WINAPI OpenBackupEventLogW(LPCWSTR,LPCWSTR);
|
||||
#define OpenBackupEventLog WINELIB_NAME_AW(OpenBackupEventLog)
|
||||
|
|
@ -1590,7 +1574,6 @@ DWORD WINAPI SetTapePosition(HANDLE,DWORD,DWORD,DWORD,DWORD,BOOL);
|
|||
DWORD WINAPI SetThreadAffinityMask(HANDLE,DWORD);
|
||||
BOOL WINAPI SetThreadContext(HANDLE,const CONTEXT *);
|
||||
DWORD WINAPI SetThreadExecutionState(EXECUTION_STATE);
|
||||
BOOL WINAPI SetThreadLocale(LCID);
|
||||
BOOL WINAPI SetThreadPriority(HANDLE,INT);
|
||||
BOOL WINAPI SetThreadPriorityBoost(HANDLE,BOOL);
|
||||
BOOL WINAPI SetThreadToken(PHANDLE,HANDLE);
|
||||
|
|
@ -1629,16 +1612,9 @@ BOOL WINAPI WriteConsoleW(HANDLE,LPCVOID,DWORD,LPDWORD,LPVOID);
|
|||
BOOL WINAPI WriteFile(HANDLE,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED);
|
||||
BOOL WINAPI WriteFileEx(HANDLE,LPCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
|
||||
DWORD WINAPI WriteTapemark(HANDLE,DWORD,DWORD,BOOL);
|
||||
LANGID WINAPI GetSystemDefaultLangID(void);
|
||||
LCID WINAPI GetSystemDefaultLCID(void);
|
||||
LANGID WINAPI GetUserDefaultLangID(void);
|
||||
LCID WINAPI GetUserDefaultLCID(void);
|
||||
ATOM WINAPI AddAtomA(LPCSTR);
|
||||
ATOM WINAPI AddAtomW(LPCWSTR);
|
||||
#define AddAtom WINELIB_NAME_AW(AddAtom)
|
||||
UINT WINAPI CompareStringA(DWORD,DWORD,LPCSTR,DWORD,LPCSTR,DWORD);
|
||||
UINT WINAPI CompareStringW(DWORD,DWORD,LPCWSTR,DWORD,LPCWSTR,DWORD);
|
||||
#define CompareString WINELIB_NAME_AW(CompareString)
|
||||
BOOL WINAPI CreateDirectoryA(LPCSTR,LPSECURITY_ATTRIBUTES);
|
||||
BOOL WINAPI CreateDirectoryW(LPCWSTR,LPSECURITY_ATTRIBUTES);
|
||||
#define CreateDirectory WINELIB_NAME_AW(CreateDirectory)
|
||||
|
|
@ -1733,8 +1709,6 @@ INT WINAPI GetProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT);
|
|||
VOID WINAPI GetStartupInfoA(LPSTARTUPINFOA);
|
||||
VOID WINAPI GetStartupInfoW(LPSTARTUPINFOW);
|
||||
#define GetStartupInfo WINELIB_NAME_AW(GetStartupInfo)
|
||||
BOOL WINAPI GetStringTypeA(LCID,DWORD,LPCSTR,INT,LPWORD);
|
||||
BOOL WINAPI GetStringTypeW(DWORD,LPCWSTR,INT,LPWORD);
|
||||
UINT WINAPI GetSystemDirectoryA(LPSTR,UINT);
|
||||
UINT WINAPI GetSystemDirectoryW(LPWSTR,UINT);
|
||||
#define GetSystemDirectory WINELIB_NAME_AW(GetSystemDirectory)
|
||||
|
|
@ -1785,7 +1759,6 @@ BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT);
|
|||
BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT);
|
||||
#define IsBadStringPtr WINELIB_NAME_AW(IsBadStringPtr)
|
||||
BOOL WINAPI IsBadWritePtr(LPVOID,UINT);
|
||||
BOOL WINAPI IsDBCSLeadByte(BYTE);
|
||||
BOOL WINAPI IsDebuggerPresent(void);
|
||||
HMODULE WINAPI LoadLibraryA(LPCSTR);
|
||||
HMODULE WINAPI LoadLibraryW(LPCWSTR);
|
||||
|
|
|
|||
141
include/winnls.h
141
include/winnls.h
|
|
@ -2,45 +2,13 @@
|
|||
#define __WINE_WINNLS_H
|
||||
#ifndef NONLS
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
/* Define a bunch of callback types */
|
||||
|
||||
#if defined(STRICT) || defined(__WINE__)
|
||||
typedef BOOL CALLBACK (*CALINFO_ENUMPROCA)(LPSTR);
|
||||
typedef BOOL CALLBACK (*CALINFO_ENUMPROCW)(LPWSTR);
|
||||
typedef BOOL CALLBACK (*CODEPAGE_ENUMPROCA)(LPSTR);
|
||||
typedef BOOL CALLBACK (*CODEPAGE_ENUMPROCW)(LPWSTR);
|
||||
typedef BOOL CALLBACK (*DATEFMT_ENUMPROCA)(LPSTR);
|
||||
typedef BOOL CALLBACK (*DATEFMT_ENUMPROCW)(LPWSTR);
|
||||
typedef BOOL CALLBACK (*LOCALE_ENUMPROCA)(LPSTR);
|
||||
typedef BOOL CALLBACK (*LOCALE_ENUMPROCW)(LPWSTR);
|
||||
typedef BOOL CALLBACK (*TIMEFMT_ENUMPROCA)(LPSTR);
|
||||
typedef BOOL CALLBACK (*TIMEFMT_ENUMPROCW)(LPWSTR);
|
||||
#else
|
||||
typedef FARPROC CALINFO_ENUMPROCA;
|
||||
typedef FARPROC CALINFO_ENUMPROCW;
|
||||
typedef FARPROC CODEPAGE_ENUMPROCA;
|
||||
typedef FARPROC CODEPAGE_ENUMPROCW;
|
||||
typedef FARPROC DATEFMT_ENUMPROCA;
|
||||
typedef FARPROC DATEFMT_ENUMPROCW;
|
||||
typedef FARPROC LOCALE_ENUMPROCA;
|
||||
typedef FARPROC LOCALE_ENUMPROCW;
|
||||
typedef FARPROC TIMEFMT_ENUMPROCA;
|
||||
typedef FARPROC TIMEFMT_ENUMPROCW;
|
||||
#endif /* STRICT || __WINE__ */
|
||||
|
||||
DECL_WINELIB_TYPE_AW(CALINFO_ENUMPROC)
|
||||
DECL_WINELIB_TYPE_AW(CODEPAGE_ENUMPROC)
|
||||
DECL_WINELIB_TYPE_AW(DATEFMT_ENUMPROC)
|
||||
DECL_WINELIB_TYPE_AW(LOCALE_ENUMPROC)
|
||||
DECL_WINELIB_TYPE_AW(TIMEFMT_ENUMPROC)
|
||||
|
||||
|
||||
#define MB_PRECOMPOSED 0x00000001
|
||||
#define MB_COMPOSITE 0x00000002
|
||||
#define MB_USEGLYPHCHARS 0x00000004
|
||||
|
|
@ -380,8 +348,8 @@ typedef struct _numberfmtA {
|
|||
UINT NumDigits;
|
||||
UINT LeadingZero;
|
||||
UINT Grouping;
|
||||
LPCSTR lpDecimalSep;
|
||||
LPCSTR lpThousandSep;
|
||||
LPSTR lpDecimalSep;
|
||||
LPSTR lpThousandSep;
|
||||
UINT NegativeOrder;
|
||||
} NUMBERFMTA, *LPNUMBERFMTA;
|
||||
|
||||
|
|
@ -389,8 +357,8 @@ typedef struct _numberfmtW {
|
|||
UINT NumDigits;
|
||||
UINT LeadingZero;
|
||||
UINT Grouping;
|
||||
LPCWSTR lpDecimalSep;
|
||||
LPCWSTR lpThousandSep;
|
||||
LPWSTR lpDecimalSep;
|
||||
LPWSTR lpThousandSep;
|
||||
UINT NegativeOrder;
|
||||
} NUMBERFMTW, *LPNUMBERFMTW;
|
||||
|
||||
|
|
@ -402,11 +370,11 @@ typedef struct _currencyfmtA
|
|||
UINT NumDigits;
|
||||
UINT LeadingZero;
|
||||
UINT Grouping;
|
||||
LPCSTR lpDecimalSep;
|
||||
LPCSTR lpThousandSep;
|
||||
LPSTR lpDecimalSep;
|
||||
LPSTR lpThousandSep;
|
||||
UINT NegativeOrder;
|
||||
UINT PositiveOrder;
|
||||
LPCSTR lpCurrencySymbol;
|
||||
LPSTR lpCurrencySymbol;
|
||||
} CURRENCYFMTA, *LPCURRENCYFMTA;
|
||||
|
||||
typedef struct _currencyfmtW
|
||||
|
|
@ -414,27 +382,79 @@ typedef struct _currencyfmtW
|
|||
UINT NumDigits;
|
||||
UINT LeadingZero;
|
||||
UINT Grouping;
|
||||
LPCWSTR lpDecimalSep;
|
||||
LPCWSTR lpThousandSep;
|
||||
LPWSTR lpDecimalSep;
|
||||
LPWSTR lpThousandSep;
|
||||
UINT NegativeOrder;
|
||||
UINT PositiveOrder;
|
||||
LPCWSTR lpCurrencySymbol;
|
||||
LPWSTR lpCurrencySymbol;
|
||||
} CURRENCYFMTW, *LPCURRENCYFMTW;
|
||||
|
||||
DECL_WINELIB_TYPE_AW(CURRENCYFMT)
|
||||
DECL_WINELIB_TYPE_AW(LPCURRENCYFMT)
|
||||
|
||||
|
||||
/* Define a bunch of callback types */
|
||||
|
||||
#if defined(STRICT) || defined(__WINE__)
|
||||
typedef BOOL CALLBACK (*CALINFO_ENUMPROCA)(LPSTR);
|
||||
typedef BOOL CALLBACK (*CALINFO_ENUMPROCW)(LPWSTR);
|
||||
typedef BOOL CALLBACK (*CALINFO_ENUMPROCEXA)(LPSTR,CALID);
|
||||
typedef BOOL CALLBACK (*CALINFO_ENUMPROCEXW)(LPWSTR,CALID);
|
||||
typedef BOOL CALLBACK (*CODEPAGE_ENUMPROCA)(LPSTR);
|
||||
typedef BOOL CALLBACK (*CODEPAGE_ENUMPROCW)(LPWSTR);
|
||||
typedef BOOL CALLBACK (*DATEFMT_ENUMPROCA)(LPSTR);
|
||||
typedef BOOL CALLBACK (*DATEFMT_ENUMPROCW)(LPWSTR);
|
||||
typedef BOOL CALLBACK (*DATEFMT_ENUMPROCEXA)(LPSTR,CALID);
|
||||
typedef BOOL CALLBACK (*DATEFMT_ENUMPROCEXW)(LPWSTR,CALID);
|
||||
typedef BOOL CALLBACK (*LOCALE_ENUMPROCA)(LPSTR);
|
||||
typedef BOOL CALLBACK (*LOCALE_ENUMPROCW)(LPWSTR);
|
||||
typedef BOOL CALLBACK (*TIMEFMT_ENUMPROCA)(LPSTR);
|
||||
typedef BOOL CALLBACK (*TIMEFMT_ENUMPROCW)(LPWSTR);
|
||||
#else
|
||||
typedef FARPROC CALINFO_ENUMPROCA;
|
||||
typedef FARPROC CALINFO_ENUMPROCW;
|
||||
typedef FARPROC CALINFO_ENUMPROCEXA;
|
||||
typedef FARPROC CALINFO_ENUMPROCEXW;
|
||||
typedef FARPROC CODEPAGE_ENUMPROCA;
|
||||
typedef FARPROC CODEPAGE_ENUMPROCW;
|
||||
typedef FARPROC DATEFMT_ENUMPROCA;
|
||||
typedef FARPROC DATEFMT_ENUMPROCW;
|
||||
typedef FARPROC DATEFMT_ENUMPROCEXA;
|
||||
typedef FARPROC DATEFMT_ENUMPROCEXW;
|
||||
typedef FARPROC LOCALE_ENUMPROCA;
|
||||
typedef FARPROC LOCALE_ENUMPROCW;
|
||||
typedef FARPROC TIMEFMT_ENUMPROCA;
|
||||
typedef FARPROC TIMEFMT_ENUMPROCW;
|
||||
#endif /* STRICT || __WINE__ */
|
||||
|
||||
DECL_WINELIB_TYPE_AW(CALINFO_ENUMPROC)
|
||||
DECL_WINELIB_TYPE_AW(CALINFO_ENUMPROCEX)
|
||||
DECL_WINELIB_TYPE_AW(CODEPAGE_ENUMPROC)
|
||||
DECL_WINELIB_TYPE_AW(DATEFMT_ENUMPROC)
|
||||
DECL_WINELIB_TYPE_AW(DATEFMT_ENUMPROCEX)
|
||||
DECL_WINELIB_TYPE_AW(LOCALE_ENUMPROC)
|
||||
DECL_WINELIB_TYPE_AW(TIMEFMT_ENUMPROC)
|
||||
|
||||
|
||||
/* APIs
|
||||
*/
|
||||
|
||||
int WINAPI CompareStringA(LCID,DWORD,LPCSTR,int,LPCSTR,int);
|
||||
int WINAPI CompareStringW(LCID,DWORD,LPCWSTR,int,LPCWSTR,int);
|
||||
#define CompareString WINELIB_NAME_AW(CompareString)
|
||||
LCID WINAPI ConvertDefaultLocale(LCID);
|
||||
BOOL WINAPI EnumCalendarInfoA(CALINFO_ENUMPROCA,LCID,CALID,CALTYPE);
|
||||
BOOL WINAPI EnumCalendarInfoW(CALINFO_ENUMPROCW,LCID,CALID,CALTYPE);
|
||||
#define EnumCalendarInfo WINELIB_NAME_AW(EnumCalendarInfo)
|
||||
BOOL WINAPI EnumCalendarInfoExA(CALINFO_ENUMPROCEXA,LCID,CALID,CALTYPE);
|
||||
BOOL WINAPI EnumCalendarInfoExW(CALINFO_ENUMPROCEXW,LCID,CALID,CALTYPE);
|
||||
#define EnumCalendarInfoEx WINELIB_NAME_AW(EnumCalendarInfoEx)
|
||||
BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA,LCID,DWORD);
|
||||
BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW,LCID,DWORD);
|
||||
#define EnumDateFormats WINELIB_NAME_AW(EnumDateFormats)
|
||||
BOOL WINAPI EnumDateFormatsExA(DATEFMT_ENUMPROCEXA,LCID,DWORD);
|
||||
BOOL WINAPI EnumDateFormatsExW(DATEFMT_ENUMPROCEXW,LCID,DWORD);
|
||||
#define EnumDateFormatsEx WINELIB_NAME_AW(EnumDateFormatsEx)
|
||||
BOOL WINAPI EnumSystemCodePagesA(CODEPAGE_ENUMPROCA,DWORD);
|
||||
BOOL WINAPI EnumSystemCodePagesW(CODEPAGE_ENUMPROCW,DWORD);
|
||||
#define EnumSystemCodePages WINELIB_NAME_AW(EnumSystemCodePages)
|
||||
|
|
@ -444,20 +464,53 @@ BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD);
|
|||
BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA,LCID,DWORD);
|
||||
BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW,LCID,DWORD);
|
||||
#define EnumTimeFormats WINELIB_NAME_AW(EnumTimeFormats)
|
||||
int WINAPI FoldStringA(DWORD,LPCSTR,int,LPSTR,int);
|
||||
int WINAPI FoldStringW(DWORD,LPCWSTR,int,LPWSTR,int);
|
||||
#define FoldString WINELIB_NAME_AW(FoldString)
|
||||
UINT WINAPI GetACP(void);
|
||||
BOOL WINAPI GetCPInfo(UINT,LPCPINFO);
|
||||
BOOL WINAPI GetCPInfoExA(UINT,DWORD,LPCPINFOEXA);
|
||||
BOOL WINAPI GetCPInfoExW(UINT,DWORD,LPCPINFOEXW);
|
||||
#define GetCPInfoEx WINELIB_NAME_AW(GetCPInfoEx)
|
||||
INT WINAPI GetCurrencyFormatA(LCID,DWORD,LPCSTR,const CURRENCYFMTA*,LPSTR,int);
|
||||
INT WINAPI GetCurrencyFormatW(LCID,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,int);
|
||||
#define GetCurrencyFormat WINELIB_NAME_AW(GetCurrencyFormat)
|
||||
INT WINAPI GetDateFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,INT);
|
||||
INT WINAPI GetDateFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT);
|
||||
#define GetDateFormat WINELIB_NAME_AW(GetDateFormat)
|
||||
INT WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,INT);
|
||||
INT WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,INT);
|
||||
#define GetLocaleInfo WINELIB_NAME_AW(GetLocaleInfo)
|
||||
INT WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMTA*,LPSTR,int);
|
||||
INT WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,int);
|
||||
#define GetNumberFormat WINELIB_NAME_AW(GetNumberFormat)
|
||||
UINT WINAPI GetOEMCP(void);
|
||||
BOOL WINAPI GetStringTypeA(LCID,DWORD,LPCSTR,INT,LPWORD);
|
||||
BOOL WINAPI GetStringTypeW(DWORD,LPCWSTR,INT,LPWORD);
|
||||
BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,INT,LPWORD);
|
||||
BOOL WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,INT,LPWORD);
|
||||
#define GetStringTypeEx WINELIB_NAME_AW(GetStringTypeEx)
|
||||
LANGID WINAPI GetSystemDefaultLangID(void);
|
||||
LCID WINAPI GetSystemDefaultLCID(void);
|
||||
LCID WINAPI GetThreadLocale(void);
|
||||
INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,INT);
|
||||
INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT);
|
||||
#define GetTimeFormat WINELIB_NAME_AW(GetTimeFormat)
|
||||
LANGID WINAPI GetUserDefaultLangID(void);
|
||||
LCID WINAPI GetUserDefaultLCID(void);
|
||||
BOOL WINAPI IsDBCSLeadByte(BYTE);
|
||||
BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE);
|
||||
BOOL WINAPI IsValidCodePage(UINT);
|
||||
BOOL WINAPI IsValidLocale(LCID,DWORD);
|
||||
INT WINAPI LCMapStringA(LCID,DWORD,LPCSTR,INT,LPSTR,INT);
|
||||
INT WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,INT,LPWSTR,INT);
|
||||
#define LCMapString WINELIB_NAME_AW(LCMapString)
|
||||
INT WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT);
|
||||
BOOL WINAPI SetLocaleInfoA(LCID,LCTYPE,LPCSTR);
|
||||
BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR);
|
||||
#define SetLocaleInfo WINELIB_NAME_AW(SetLocaleInfo)
|
||||
BOOL WINAPI SetThreadLocale(LCID);
|
||||
INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
|||
|
|
@ -723,7 +723,7 @@ static char *GetLocaleSubkeyName( DWORD lctype )
|
|||
/******************************************************************************
|
||||
* SetLocaleInfoA [KERNEL32.@]
|
||||
*/
|
||||
BOOL WINAPI SetLocaleInfoA(DWORD lcid, DWORD lctype, LPCSTR data)
|
||||
BOOL WINAPI SetLocaleInfoA(LCID lcid, LCTYPE lctype, LPCSTR data)
|
||||
{
|
||||
HKEY hKey;
|
||||
char *pacKey;
|
||||
|
|
@ -2458,13 +2458,13 @@ static inline int OLE2NLS_EstimateMappingLength(LCID lcid, DWORD dwMapFlags,
|
|||
*
|
||||
* Quite inefficient.
|
||||
*/
|
||||
UINT WINAPI CompareStringA(
|
||||
DWORD lcid, /* [in] locale ID */
|
||||
int WINAPI CompareStringA(
|
||||
LCID lcid, /* [in] locale ID */
|
||||
DWORD fdwStyle, /* [in] comparison-style options */
|
||||
LPCSTR s1, /* [in] first string */
|
||||
DWORD l1, /* [in] length of first string */
|
||||
int l1, /* [in] length of first string */
|
||||
LPCSTR s2, /* [in] second string */
|
||||
DWORD l2) /* [in] length of second string */
|
||||
int l2) /* [in] length of second string */
|
||||
{
|
||||
int mapstring_flags;
|
||||
int len1,len2;
|
||||
|
|
@ -2524,8 +2524,8 @@ UINT WINAPI CompareStringA(
|
|||
* FIXME : Does only string sort. Should
|
||||
* be reimplemented the same way as CompareStringA.
|
||||
*/
|
||||
UINT WINAPI CompareStringW(DWORD lcid, DWORD fdwStyle,
|
||||
LPCWSTR s1, DWORD l1, LPCWSTR s2,DWORD l2)
|
||||
int WINAPI CompareStringW(LCID lcid, DWORD fdwStyle,
|
||||
LPCWSTR s1, int l1, LPCWSTR s2, int l2)
|
||||
{
|
||||
int len,ret;
|
||||
if(fdwStyle & NORM_IGNORENONSPACE)
|
||||
|
|
@ -2589,7 +2589,7 @@ UINT WINAPI CompareStringW(DWORD lcid, DWORD fdwStyle,
|
|||
static INT OLE_GetFormatA(LCID locale,
|
||||
DWORD flags,
|
||||
DWORD tflags,
|
||||
LPSYSTEMTIME xtime,
|
||||
const SYSTEMTIME* xtime,
|
||||
LPCSTR _format, /*in*/
|
||||
LPSTR date, /*out*/
|
||||
INT datelen)
|
||||
|
|
@ -2800,7 +2800,7 @@ static INT OLE_GetFormatA(LCID locale,
|
|||
* OLE_GetFormatW [INTERNAL]
|
||||
*/
|
||||
static INT OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
|
||||
LPSYSTEMTIME xtime,
|
||||
const SYSTEMTIME* xtime,
|
||||
LPCWSTR format,
|
||||
LPWSTR output, INT outlen)
|
||||
{
|
||||
|
|
@ -3045,7 +3045,7 @@ static INT OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
|
|||
*
|
||||
*/
|
||||
INT WINAPI GetDateFormatA(LCID locale,DWORD flags,
|
||||
LPSYSTEMTIME xtime,
|
||||
const SYSTEMTIME* xtime,
|
||||
LPCSTR format, LPSTR date,INT datelen)
|
||||
{
|
||||
|
||||
|
|
@ -3120,7 +3120,7 @@ INT WINAPI GetDateFormatA(LCID locale,DWORD flags,
|
|||
*
|
||||
*/
|
||||
INT WINAPI GetDateFormatW(LCID locale,DWORD flags,
|
||||
LPSYSTEMTIME xtime,
|
||||
const SYSTEMTIME* xtime,
|
||||
LPCWSTR format,
|
||||
LPWSTR date, INT datelen)
|
||||
{
|
||||
|
|
@ -4161,14 +4161,14 @@ static LCID OLE2NLS_CheckLocale (LCID locale)
|
|||
INT WINAPI
|
||||
GetTimeFormatA(LCID locale, /* [in] */
|
||||
DWORD flags, /* [in] */
|
||||
LPSYSTEMTIME xtime, /* [in] */
|
||||
const SYSTEMTIME* xtime, /* [in] */
|
||||
LPCSTR format, /* [in] */
|
||||
LPSTR timestr, /* [out] */
|
||||
INT timelen /* [in] */)
|
||||
{ char format_buf[40];
|
||||
LPCSTR thisformat;
|
||||
SYSTEMTIME t;
|
||||
LPSYSTEMTIME thistime;
|
||||
const SYSTEMTIME* thistime;
|
||||
LCID thislocale=0;
|
||||
DWORD thisflags=LOCALE_STIMEFORMAT; /* standard timeformat */
|
||||
INT ret;
|
||||
|
|
@ -4209,14 +4209,14 @@ GetTimeFormatA(LCID locale, /* [in] */
|
|||
INT WINAPI
|
||||
GetTimeFormatW(LCID locale, /* [in] */
|
||||
DWORD flags, /* [in] */
|
||||
LPSYSTEMTIME xtime, /* [in] */
|
||||
const SYSTEMTIME* xtime, /* [in] */
|
||||
LPCWSTR format, /* [in] */
|
||||
LPWSTR timestr, /* [out] */
|
||||
INT timelen /* [in] */)
|
||||
{ WCHAR format_buf[40];
|
||||
LPCWSTR thisformat;
|
||||
SYSTEMTIME t;
|
||||
LPSYSTEMTIME thistime;
|
||||
const SYSTEMTIME* thistime;
|
||||
LCID thislocale=0;
|
||||
DWORD thisflags=LOCALE_STIMEFORMAT; /* standard timeformat */
|
||||
INT ret;
|
||||
|
|
|
|||
Loading…
Reference in New Issue