Nikolay Sivov : shlwapi: Forward SHUnicodeToUnicode() to shcore.

Alexandre Julliard julliard at winehq.org
Wed Dec 5 15:49:00 CST 2018


Module: wine
Branch: master
Commit: f7c33804e3cca97aa62e11001151097aabd0e5ac
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f7c33804e3cca97aa62e11001151097aabd0e5ac

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Dec  5 08:58:16 2018 +0300

shlwapi: Forward SHUnicodeToUnicode() to shcore.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shlwapi/shlwapi.spec |  2 +-
 dlls/shlwapi/string.c     | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index 4c31724..c96fcf0 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -343,7 +343,7 @@
 343 stdcall -noname SHRegGetCLSIDKeyA(ptr str long long ptr)
 344 stdcall -noname SHRegGetCLSIDKeyW(ptr wstr long long ptr)
 345 stdcall -ordinal SHAnsiToAnsi(str ptr long)
-346 stdcall -ordinal SHUnicodeToUnicode(wstr ptr long)
+346 stdcall -ordinal SHUnicodeToUnicode(wstr ptr long) shcore.SHUnicodeToUnicode
 347 stdcall -noname RegDeleteValueWrapW(long wstr) advapi32.RegDeleteValueW
 348 stub -noname SHGetFileDescriptionW
 349 stub -noname SHGetFileDescriptionA
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index b190ffc..baa9c29 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -2774,21 +2774,6 @@ DWORD WINAPI SHAnsiToAnsi(LPCSTR lpszSrc, LPSTR lpszDst, int iLen)
 }
 
 /*************************************************************************
- *      @	[SHLWAPI.346]
- *
- * Unicode version of SSHAnsiToAnsi.
- */
-DWORD WINAPI SHUnicodeToUnicode(LPCWSTR lpszSrc, LPWSTR lpszDst, int iLen)
-{
-    LPWSTR lpszRet;
-
-    TRACE("(%s,%p,0x%08x)\n", debugstr_w(lpszSrc), lpszDst, iLen);
-
-    lpszRet = StrCpyNXW(lpszDst, lpszSrc, iLen);
-    return lpszRet - lpszDst + 1;
-}
-
-/*************************************************************************
  *      @	[SHLWAPI.364]
  *
  * Determine if an Ascii string converts to Unicode and back identically.




More information about the wine-cvs mailing list