From 80e8c138f17663fe5d09cb26d90eb273443fde3a Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 2 Mar 2020 18:35:03 +0100
Subject: [PATCH] kernel32: Move Idn functions to kernelbase.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/kernel32/kernel32.spec     |  6 +++---
 dlls/kernel32/locale.c          | 31 ----------------------------
 dlls/kernelbase/kernelbase.spec |  6 +++---
 dlls/kernelbase/locale.c        | 36 +++++++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 99297ea8248..b8eaa6cdde2 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -938,9 +938,9 @@
 @ stub HeapUsage
 @ stdcall -import HeapValidate(long long ptr)
 @ stdcall -import HeapWalk(long ptr)
-@ stdcall IdnToAscii(long wstr long ptr long)
-@ stdcall IdnToNameprepUnicode(long wstr long ptr long)
-@ stdcall IdnToUnicode(long wstr long ptr long)
+@ stdcall -import IdnToAscii(long wstr long ptr long)
+@ stdcall -import IdnToNameprepUnicode(long wstr long ptr long)
+@ stdcall -import IdnToUnicode(long wstr long ptr long)
 @ stdcall InitAtomTable(long)
 @ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernelbase.InitOnceBeginInitialize
 @ stdcall InitOnceComplete(ptr long ptr) kernelbase.InitOnceComplete
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index cb77ec8c7dd..ac04e859460 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -541,37 +541,6 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L
 }
 
 
-/******************************************************************************
- *           IdnToAscii (KERNEL32.@)
- */
-INT WINAPI IdnToAscii( DWORD flags, const WCHAR *src, INT srclen, WCHAR *dst, INT dstlen )
-{
-    NTSTATUS status = RtlIdnToAscii( flags, src, srclen, dst, &dstlen );
-    if (!set_ntstatus( status )) return 0;
-    return dstlen;
-}
-
-/******************************************************************************
- *           IdnToNameprepUnicode (KERNEL32.@)
- */
-INT WINAPI IdnToNameprepUnicode( DWORD flags, const WCHAR *src, INT srclen, WCHAR *dst, INT dstlen )
-{
-    NTSTATUS status = RtlIdnToNameprepUnicode( flags, src, srclen, dst, &dstlen );
-    if (!set_ntstatus( status )) return 0;
-    return dstlen;
-}
-
-/******************************************************************************
- *           IdnToUnicode (KERNEL32.@)
- */
-INT WINAPI IdnToUnicode( DWORD flags, const WCHAR *src, INT srclen, WCHAR *dst, INT dstlen )
-{
-    NTSTATUS status = RtlIdnToUnicode( flags, src, srclen, dst, &dstlen );
-    if (!set_ntstatus( status )) return 0;
-    return dstlen;
-}
-
-
 /******************************************************************************
  *           GetFileMUIPath (KERNEL32.@)
  */
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index 63719b514d7..4f39f15f0b0 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -785,9 +785,9 @@
 @ stdcall HeapUnlock(long)
 @ stdcall HeapValidate(long long ptr)
 @ stdcall HeapWalk(long ptr)
-@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii
-@ stdcall IdnToNameprepUnicode(long wstr long ptr long) kernel32.IdnToNameprepUnicode
-@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode
+@ stdcall IdnToAscii(long wstr long ptr long)
+@ stdcall IdnToNameprepUnicode(long wstr long ptr long)
+@ stdcall IdnToUnicode(long wstr long ptr long)
 @ stdcall ImpersonateAnonymousToken(long)
 @ stdcall ImpersonateLoggedOnUser(long)
 @ stdcall ImpersonateNamedPipeClient(long)
diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index aad2422db29..169da016086 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -4459,6 +4459,42 @@ GEOID WINAPI DECLSPEC_HOTPATCH GetUserGeoID( GEOCLASS geoclass )
 }
 
 
+/******************************************************************************
+ *	IdnToAscii   (kernelbase.@)
+ */
+INT WINAPI DECLSPEC_HOTPATCH IdnToAscii( DWORD flags, const WCHAR *src, INT srclen,
+                                         WCHAR *dst, INT dstlen )
+{
+    NTSTATUS status = RtlIdnToAscii( flags, src, srclen, dst, &dstlen );
+    if (!set_ntstatus( status )) return 0;
+    return dstlen;
+}
+
+
+/******************************************************************************
+ *	IdnToNameprepUnicode   (kernelbase.@)
+ */
+INT WINAPI DECLSPEC_HOTPATCH IdnToNameprepUnicode( DWORD flags, const WCHAR *src, INT srclen,
+                                                   WCHAR *dst, INT dstlen )
+{
+    NTSTATUS status = RtlIdnToNameprepUnicode( flags, src, srclen, dst, &dstlen );
+    if (!set_ntstatus( status )) return 0;
+    return dstlen;
+}
+
+
+/******************************************************************************
+ *	IdnToUnicode   (kernelbase.@)
+ */
+INT WINAPI DECLSPEC_HOTPATCH IdnToUnicode( DWORD flags, const WCHAR *src, INT srclen,
+                                           WCHAR *dst, INT dstlen )
+{
+    NTSTATUS status = RtlIdnToUnicode( flags, src, srclen, dst, &dstlen );
+    if (!set_ntstatus( status )) return 0;
+    return dstlen;
+}
+
+
 /******************************************************************************
  *	IsCharAlphaA   (kernelbase.@)
  */