Jactry Zeng : kernel32: Add stub for ResolveLocaleName.
Alexandre Julliard
julliard at winehq.org
Wed Jul 19 16:05:33 CDT 2017
Module: wine
Branch: master
Commit: b9a9fe4a042f98521efea3275ded4af4b7cba4c9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a9fe4a042f98521efea3275ded4af4b7cba4c9
Author: Jactry Zeng <jzeng at codeweavers.com>
Date: Wed Jun 28 15:05:21 2017 +0800
kernel32: Add stub for ResolveLocaleName.
Signed-off-by: Jactry Zeng <jzeng at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
.../api-ms-win-core-localization-l1-1-0.spec | 2 +-
.../api-ms-win-core-localization-l1-2-0.spec | 2 +-
.../api-ms-win-core-localization-l1-2-1.spec | 2 +-
dlls/kernel32/kernel32.spec | 2 +-
dlls/kernel32/locale.c | 12 ++++++++++++
dlls/kernelbase/kernelbase.spec | 2 +-
include/winnls.h | 1 +
7 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec
index 31abadc..1e9ea4a 100644
--- a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec
+++ b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec
@@ -39,7 +39,7 @@
@ stub NlsUpdateLocale
@ stub NlsUpdateSystemLocale
@ stub NlsWriteEtwEvent
-@ stub ResolveLocaleName
+@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName
@ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW
@ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW
@ stdcall SetThreadLocale(long) kernel32.SetThreadLocale
diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec
index bdbcbb8..49c6d2e 100644
--- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec
+++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec
@@ -47,7 +47,7 @@
@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx
@ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW
@ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID
-@ stub ResolveLocaleName
+@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName
@ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW
@ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW
@ stub SetProcessPreferredUILanguages
diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec
index 98ec923..6272d01 100644
--- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec
+++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec
@@ -48,7 +48,7 @@
@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx
@ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW
@ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID
-@ stub ResolveLocaleName
+@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName
@ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW
@ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW
@ stub SetProcessPreferredUILanguages
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 1a11af5..7ba1978 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -1281,7 +1281,7 @@
@ stdcall ResetEvent(long)
@ stdcall ResetWriteWatch(ptr long)
@ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) ntdll.LdrResolveDelayLoadedAPI
-# @ stub ResolveLocaleName
+@ stdcall ResolveLocaleName(wstr ptr long)
@ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error
@ stdcall ResumeThread(long)
@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index a72a8aa..64966e5 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -5893,3 +5893,15 @@ BOOL WINAPI GetFileMUIInfo(DWORD flags, PCWSTR path, FILEMUIINFO *info, DWORD *s
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
+
+/******************************************************************************
+ * ResolveLocaleName (KERNEL32.@)
+ */
+
+INT WINAPI ResolveLocaleName(LPCWSTR name, LPWSTR localename, INT len)
+{
+ FIXME("stub: %s, %p, %d\n", wine_dbgstr_w(name), localename, len);
+
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index bb80f21..5dc6fa6 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1345,7 +1345,7 @@
@ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch
@ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) kernel32.ResolveDelayLoadedAPI
# @ stub ResolveDelayLoadsFromDll
-@ stub ResolveLocaleName
+@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName
@ stdcall RestoreLastError(long) kernel32.RestoreLastError
@ stdcall ResumeThread(long) kernel32.ResumeThread
@ stdcall RevertToSelf() advapi32.RevertToSelf
diff --git a/include/winnls.h b/include/winnls.h
index 470acf84..8cb8af6 100644
--- a/include/winnls.h
+++ b/include/winnls.h
@@ -950,6 +950,7 @@ WINBASEAPI INT WINAPI LCMapStringEx(LPCWSTR,DWORD,LPCWSTR,INT,LPWSTR,INT
WINBASEAPI LCID WINAPI LocaleNameToLCID(LPCWSTR,DWORD);
WINBASEAPI INT WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT);
WINNORMALIZEAPI INT WINAPI NormalizeString(NORM_FORM,LPCWSTR,INT,LPWSTR,INT);
+WINBASEAPI INT WINAPI ResolveLocaleName(LPCWSTR,LPWSTR,INT);
WINBASEAPI INT WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR);
WINBASEAPI INT WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR);
#define SetCalendarInfo WINELIB_NAME_AW(SetCalendarInfo)
More information about the wine-cvs
mailing list