commit 072dfb57e3037db3a35d3290625b7ea51ad39902
author Alexandre Julliard <julliard@winehq.org> Mon Sep 25 23:30:56 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Sep 25 23:30:56 2000 +0000
tree b934ef01d53db5534b71974c5c3fda04d03a2c30
parent 770eb51ed574c4b17ad63395bbddcc1b3dc83dc6

Removed inclusion of wine/winestring.h from winbase.h and added it to
the C files that need it.

files/dos_fs.c

diff --git a/files/dos_fs.c b/files/dos_fs.c
index d7a6bcd..73d9954 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -25,6 +25,7 @@
 #include "ntddk.h"
 #include "wine/winbase16.h"
 #include "wine/unicode.h"
+#include "wine/winestring.h"
 #include "winerror.h"
 #include "drive.h"
 #include "file.h"
@@ -609,7 +610,7 @@
             }
             else
             {
-                if (!lstrncmpiA( long_name, name, len )) break;
+                if (!strncasecmp( long_name, name, len )) break;
             }
         }
         if (dos_name[0])
@@ -660,7 +661,7 @@
     for (i = 0; i < sizeof(DOSFS_Devices)/sizeof(DOSFS_Devices[0]); i++)
     {
         const char *dev = DOSFS_Devices[i].name;
-        if (!lstrncmpiA( dev, name, strlen(dev) ))
+        if (!strncasecmp( dev, name, strlen(dev) ))
         {
             p = name + strlen( dev );
             if (!*p || (*p == '.')) return &DOSFS_Devices[i];
@@ -711,7 +712,7 @@
     for (i = 0; i < sizeof(DOSFS_Devices)/sizeof(DOSFS_Devices[0]); i++)
     {
         const char *dev = DOSFS_Devices[i].name;
-        if (!lstrncmpiA( dev, name, strlen(dev) ))
+        if (!strncasecmp( dev, name, strlen(dev) ))
         {
             p = name + strlen( dev );
             if (!*p || (*p == '.')) {
@@ -1606,8 +1607,11 @@
           dataW->ftLastWriteTime  = dataA.ftLastWriteTime;
           dataW->nFileSizeHigh    = dataA.nFileSizeHigh;
           dataW->nFileSizeLow     = dataA.nFileSizeLow;
-          lstrcpyAtoW( dataW->cFileName, dataA.cFileName );
-          lstrcpyAtoW( dataW->cAlternateFileName, dataA.cAlternateFileName );
+          MultiByteToWideChar( CP_ACP, 0, dataA.cFileName, -1,
+                               dataW->cFileName, sizeof(dataW->cFileName)/sizeof(WCHAR) );
+          MultiByteToWideChar( CP_ACP, 0, dataA.cAlternateFileName, -1,
+                               dataW->cAlternateFileName,
+                               sizeof(dataW->cAlternateFileName)/sizeof(WCHAR) );
         }
         break;
       default:
@@ -1670,8 +1674,11 @@
     data->ftLastWriteTime  = dataA.ftLastWriteTime;
     data->nFileSizeHigh    = dataA.nFileSizeHigh;
     data->nFileSizeLow     = dataA.nFileSizeLow;
-    lstrcpyAtoW( data->cFileName, dataA.cFileName );
-    lstrcpyAtoW( data->cAlternateFileName, dataA.cAlternateFileName );
+    MultiByteToWideChar( CP_ACP, 0, dataA.cFileName, -1,
+                         data->cFileName, sizeof(data->cFileName)/sizeof(WCHAR) );
+    MultiByteToWideChar( CP_ACP, 0, dataA.cAlternateFileName, -1,
+                         data->cAlternateFileName,
+                         sizeof(data->cAlternateFileName)/sizeof(WCHAR) );
     return TRUE;
 }