[NETAPI32] Add the NetpAllocStrFromWStr helper function

diff --git a/dll/win32/netapi32/misc.c b/dll/win32/netapi32/misc.c
index 129dda8..8fa84a0 100644 (file)
--- a/dll/win32/netapi32/misc.c
+++ b/dll/win32/netapi32/misc.c
@@ -167,6 +167,38 @@ NetpAllocAnsiStrFromWStr(
 }
 
 
 }
 
 

+PSTR
+WINAPI
+NetpAllocStrFromWStr(
+    _In_ PWSTR InString)
+{
+    UNICODE_STRING UnicodeString;
+    OEM_STRING OemString;
+    ULONG Size;
+    NET_API_STATUS NetStatus;
+    NTSTATUS Status;
+
+    RtlInitUnicodeString(&UnicodeString, InString);
+
+    Size = RtlUnicodeStringToOemSize(&UnicodeString);
+    NetStatus = NetApiBufferAllocate(Size,
+                                     (PVOID*)&OemString.Buffer);
+    if (NetStatus != NERR_Success)
+        return NULL;
+
+    Status = RtlUnicodeStringToOemString(&OemString,
+                                         &UnicodeString,
+                                         FALSE);
+    if (!NT_SUCCESS(Status))
+    {
+        NetApiBufferFree(OemString.Buffer);
+        return NULL;
+    }
+
+    return OemString.Buffer;
+}
+
+

 PWSTR
 WINAPI
 NetpAllocWStrFromAnsiStr(
 PWSTR
 WINAPI
 NetpAllocWStrFromAnsiStr(

diff --git a/dll/win32/netapi32/netapi32.h b/dll/win32/netapi32/netapi32.h
index 35004bb..4f4bcb6 100644 (file)
--- a/dll/win32/netapi32/netapi32.h
+++ b/dll/win32/netapi32/netapi32.h
@@ -69,6 +69,11 @@ WINAPI
 NetpAllocAnsiStrFromWStr(
     _In_ PWSTR InString);
 
 NetpAllocAnsiStrFromWStr(
     _In_ PWSTR InString);
 

+PSTR
+WINAPI
+NetpAllocStrFromWStr(
+    _In_ PWSTR InString);
+

 PWSTR
 WINAPI
 NetpAllocWStrFromAnsiStr(
 PWSTR
 WINAPI
 NetpAllocWStrFromAnsiStr(

diff --git a/dll/win32/netapi32/netapi32.spec b/dll/win32/netapi32/netapi32.spec
index f4e8824..75845a4 100644 (file)
--- a/dll/win32/netapi32/netapi32.spec
+++ b/dll/win32/netapi32/netapi32.spec
@@ -268,7 +268,7 @@
 @ stub NetpAddTlnFtinfoEntry
 @ stub NetpAllocConfigName
 @ stub NetpAllocFtinfoEntry
 @ stub NetpAddTlnFtinfoEntry
 @ stub NetpAllocConfigName
 @ stub NetpAllocFtinfoEntry

-@ stub NetpAllocStrFromWStr
+@ stdcall NetpAllocStrFromWStr(wstr)

 @ stdcall NetpAllocWStrFromStr(str)
 @ stdcall NetpAllocWStrFromWStr(wstr)
 @ stub NetpApiStatusToNtStatus
 @ stdcall NetpAllocWStrFromStr(str)
 @ stdcall NetpAllocWStrFromWStr(wstr)
 @ stub NetpApiStatusToNtStatus