Module: wine Branch: master Commit: d5fd01350f03f2c3b99404abeabf476e2bdef763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fd01350f03f2c3b99404abe...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Wed Apr 18 03:55:12 2018 +0000
kernel32: Implement GetCurrencyFormatEx.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
.../api-ms-win-core-localization-l2-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 13 +++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnls.h | 1 + 5 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/dlls/api-ms-win-core-localization-l2-1-0/api-ms-win-core-localization-l2-1-0.spec b/dlls/api-ms-win-core-localization-l2-1-0/api-ms-win-core-localization-l2-1-0.spec index d5c5ef0..ba319c9 100644 --- a/dlls/api-ms-win-core-localization-l2-1-0/api-ms-win-core-localization-l2-1-0.spec +++ b/dlls/api-ms-win-core-localization-l2-1-0/api-ms-win-core-localization-l2-1-0.spec @@ -7,6 +7,6 @@ @ stdcall EnumSystemCodePagesW(ptr long) kernel32.EnumSystemCodePagesW @ stdcall EnumTimeFormatsEx(ptr wstr long long) kernel32.EnumTimeFormatsEx @ stdcall EnumTimeFormatsW(ptr long long) kernel32.EnumTimeFormatsW -@ stub GetCurrencyFormatEx +@ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) kernel32.GetCurrencyFormatEx @ stdcall GetCurrencyFormatW(long long str ptr str long) kernel32.GetCurrencyFormatW @ stdcall GetNumberFormatEx(wstr long wstr ptr ptr long) kernel32.GetNumberFormatEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7470d2b..e78c1ca 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -621,7 +621,7 @@ @ stdcall GetConsoleTitleW(ptr long) @ stdcall GetConsoleWindow() @ stdcall GetCurrencyFormatA(long long str ptr str long) -# @ stub GetCurrencyFormatEx +@ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) @ stdcall GetCurrencyFormatW(long long str ptr str long) @ stdcall GetCurrentActCtx(ptr) @ stdcall GetCurrentConsoleFont(long long ptr) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index ecadd43..aeb48c6 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1756,6 +1756,19 @@ error: return 0; }
+/*********************************************************************** + * GetCurrencyFormatEx (KERNEL32.@) + */ +int WINAPI GetCurrencyFormatEx(LPCWSTR localename, DWORD flags, LPCWSTR value, + const CURRENCYFMTW *format, LPWSTR str, int len) +{ + TRACE("(%s,0x%08x,%s,%p,%p,%d)\n", debugstr_w(localename), flags, + debugstr_w(value), format, str, len); + + return GetCurrencyFormatW( LocaleNameToLCID(localename, 0), flags, value, format, str, len); +} + + /* FIXME: Everything below here needs to move somewhere else along with the * other EnumXXX functions, when a method for storing resources for * alternate calendars is determined. diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index be1e5b5..8cac67f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -448,7 +448,7 @@ @ stdcall GetConsoleScreenBufferInfo(long ptr) kernel32.GetConsoleScreenBufferInfo @ stdcall GetConsoleScreenBufferInfoEx(long ptr) kernel32.GetConsoleScreenBufferInfoEx @ stdcall GetConsoleTitleW(ptr long) kernel32.GetConsoleTitleW -@ stub GetCurrencyFormatEx +@ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) kernel32.GetCurrencyFormatEx @ stdcall GetCurrencyFormatW(long long str ptr str long) kernel32.GetCurrencyFormatW @ stdcall GetCurrentActCtx(ptr) kernel32.GetCurrentActCtx # @ stub GetCurrentApplicationUserModelId diff --git a/include/winnls.h b/include/winnls.h index 99a30e4..7475f97 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -896,6 +896,7 @@ WINBASEAPI INT WINAPI GetCalendarInfoA(LCID,DWORD,DWORD,LPSTR,INT,LPDWOR WINBASEAPI INT WINAPI GetCalendarInfoW(LCID,DWORD,DWORD,LPWSTR,INT,LPDWORD); #define GetCalendarInfo WINELIB_NAME_AW(GetCalendarInfo) WINBASEAPI INT WINAPI GetCurrencyFormatA(LCID,DWORD,LPCSTR,const CURRENCYFMTA*,LPSTR,INT); +WINBASEAPI INT WINAPI GetCurrencyFormatEx(LPCWSTR,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,int); WINBASEAPI INT WINAPI GetCurrencyFormatW(LCID,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,INT); #define GetCurrencyFormat WINELIB_NAME_AW(GetCurrencyFormat) WINBASEAPI INT WINAPI GetDateFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,INT);