commit 24a62ab9b0166dcf37e3f4cbfb127127d581fdc2
author Alexandre Julliard <julliard@winehq.org> Tue Nov 28 22:40:56 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Nov 28 22:40:56 2000 +0000
tree d77a7467f8a94733ac86f0e96ffb6e36bd502976
parent ff96f919c6cac86549b5b0451383fe524fe5c976

Got rid of the Wine internal lstrcpy* functions and of winestring.h.

files/profile.c

diff --git a/files/profile.c b/files/profile.c
index 1472038..c938332 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -14,12 +14,11 @@
 #include <pwd.h>
 #include <unistd.h>
 
+#include "windef.h"
 #include "winbase.h"
+#include "winnls.h"
 #include "winerror.h"
 #include "wine/winbase16.h"
-#include "wine/winestring.h"
-#include "windef.h"
-#include "winnls.h"
 #include "winreg.h"
 #include "file.h"
 #include "heap.h"
@@ -1226,7 +1225,8 @@
     LPSTR bufferA   = HeapAlloc( GetProcessHeap(), 0, len );
     INT ret = GetPrivateProfileStringA( sectionA, entryA, def_valA,
                                             bufferA, len, filenameA );
-    lstrcpynAtoW( buffer, bufferA, len );
+    if (len > 0 && !MultiByteToWideChar( CP_ACP, 0, bufferA, -1, buffer, len ))
+        buffer[len-1] = 0;
     HeapFree( GetProcessHeap(), 0, sectionA );
     HeapFree( GetProcessHeap(), 0, entryA );
     HeapFree( GetProcessHeap(), 0, filenameA );
@@ -1603,7 +1603,8 @@
    LPSTR bufferA   = HeapAlloc( GetProcessHeap(), 0, size);
 
    INT ret = GetPrivateProfileSectionNames16 (bufferA, size, filenameA);
-   lstrcpynAtoW( buffer, bufferA, size);   
+   if (size > 0 && !MultiByteToWideChar( CP_ACP, 0, bufferA, -1, buffer, size ))
+        buffer[size-1] = 0;
    HeapFree( GetProcessHeap(), 0, bufferA);
    HeapFree( GetProcessHeap(), 0, filenameA );
 
@@ -1707,7 +1708,8 @@
 
     INT ret = GetPrivateProfileStructA( sectionA, keyA, bufferA,
 					len, filenameA );
-    lstrcpynAtoW( buffer, bufferA, len );
+    if (len > 0 && !MultiByteToWideChar( CP_ACP, 0, bufferA, -1, buffer, len ))
+        ((LPWSTR)buffer)[len-1] = 0;
     HeapFree( GetProcessHeap(), 0, bufferA);
     HeapFree( GetProcessHeap(), 0, sectionA );
     HeapFree( GetProcessHeap(), 0, keyA );