Changeset 5618 for trunk/src/shlwapi/path.c

Timestamp:

Apr 28, 2001, 3:33:49 PM (24 years ago)

Author:

sandervl

Message:

resync with latest wine

File:

• trunk/src/shlwapi/path.c (modified) (5 diffs)

trunk/src/shlwapi/path.c

@@ -1 +1 @@
 /*
  * Path Functions
- *
- * Note: Odin changes marked by #ifdef __WIN32OS2__
- */
-
+ */
 #ifdef __WIN32OS2__
 #include <odin.h>
@@ -17 +14 @@
 
 #include <heapstring.h>
+#include <wine\undocshell.h>
 #endif
 
@@ -24 +22 @@
 #include "winerror.h"
 #include "wine/unicode.h"
-#include "wine/undocshell.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
 #include "shlwapi.h"
 #include "debugtools.h"
+
 
 DEFAULT_DEBUG_CHANNEL(shell);
@@ -211 +212 @@
 LPWSTR WINAPI PathBuildRootW(LPWSTR lpszPath, int drive) 
 {
+        lpszPath[0] = 'A' + drive;
+        lpszPath[1] = ':';
+        lpszPath[2] = '\\';
+        lpszPath[3] = 0;
         TRACE("%p %i\n",debugstr_w(lpszPath), drive);
-
-        lstrcpyAtoW(lpszPath,"A:\\");
-        lpszPath[0]+=drive;
         return lpszPath;
 }
@@ -1070 +1072 @@
 BOOL WINAPI PathMatchSpecW(LPCWSTR name, LPCWSTR mask) 
 {
-        WCHAR stemp[4];
+    static const WCHAR stemp[] = { '*','.','*',0 };
         TRACE("%s %s\n",debugstr_w(name),debugstr_w(mask));
 
-        lstrcpyAtoW(stemp,"*.*");       
         if (!lstrcmpW( mask, stemp )) return 1;   /* we don't require a period */