Changeset 3257 for trunk/src/shell32/shellpath.cpp

Timestamp:

Mar 28, 2000, 5:28:54 PM (25 years ago)

Author:

cbratschi

Message:

floppy name resource, release fix (don't use pdump)

File:

• trunk/src/shell32/shellpath.cpp (modified) (7 diffs)

trunk/src/shell32/shellpath.cpp

@@ -1 @@
-/* $Id: shellpath.cpp,v 1.7 2000-03-26 16:34:52 cbratschi Exp $ */
+/* $Id: shellpath.cpp,v 1.8 2000-03-28 15:28:52 cbratschi Exp $ */
 
 /*
@@ -555 +555 @@
   return 0;
 }
+
 static BOOL PathMatchSingleMaskW(LPCWSTR name, LPCWSTR mask)
 {
-  while (*name && *mask && *mask!=';') {
-    if (*mask=='*') {
-      do {
-   if (PathMatchSingleMaskW(name,mask+1)) return 1;  /* try substrings */
+  while (*name && *mask && (*mask != ';'))
+  {
+    if (*mask == '*')
+    {
+      do
+      {
+        if (PathMatchSingleMaskW(name,mask+1)) return 1;  /* try substrings */
       } while (*name++);
-      return 0;
+      return FALSE;
     }
-    if (towupper(*mask)!=towupper(*name) && *mask!='?') return 0;
+    if ((towupper(*mask) != towupper(*name)) && (*mask != '?')) return 0;
     name++;
     mask++;
   }
-  if (!*name) {
-    while (*mask=='*') mask++;
-    if (!*mask || *mask==';') return 1;
+  if (!*name)
+  {
+    while (*mask == '*') mask++;
+    if (!*mask || (*mask == ';')) return TRUE;
   }
-  return 0;
+
+  return FALSE;
 }
 /*************************************************************************
@@ -586 +592 @@
   TRACE("%s %s\n",name,mask);
 
-  if (!lstrcmpA( mask, "*.*" )) return 1;   /* we don't require a period */
-
-  while (*mask) {
-    if (PathMatchSingleMaskA(name,mask)) return 1;    /* helper function */
+  if (!lstrcmpA( mask, "*.*" )) return TRUE;   /* we don't require a period */
+
+  while (*mask)
+  {
+    if (PathMatchSingleMaskA(name,mask)) return TRUE;    /* helper function */
     while (*mask && *mask!=';') mask++;
-    if (*mask==';') {
+    if (*mask==';')
+    {
       mask++;
       while (*mask==' ') mask++;      /*  masks may be separated by "; " */
-     }
-   }
-  return 0;
-}
+    }
+  }
+
+  return FALSE;
+}
+
 ODINFUNCTION2(BOOL, PathMatchSpecW,
               LPCWSTR, name,
               LPCWSTR, mask)
-{  WCHAR stemp[4];
+{
   TRACE("%ls %ls\n",name,mask);
-   lstrcpyAtoW(stemp,"*.*");
-  if (!lstrcmpW( mask, stemp )) return 1;   /* we don't require a period */
-
-  while (*mask) {
-    if (PathMatchSingleMaskW(name,mask)) return 1;    /* helper function */
-    while (*mask && *mask!=';') mask++;
-    if (*mask==';') {
+
+  if (!lstrcmpW( mask, (WCHAR*)L"*.*" )) return TRUE;   /* we don't require a period */
+
+  while (*mask)
+  {
+    if (PathMatchSingleMaskW(name,mask)) return TRUE;    /* helper function */
+    while (*mask && (*mask != ';')) mask++;
+    if (*mask == ';')
+    {
       mask++;
       while (*mask==' ') mask++;       /* masks may be separated by "; " */
-     }
-   }
-  return 0;
+    }
+  }
+
+  return FALSE;
 }
 ODINFUNCTION2(BOOL, PathMatchSpecAW,
               LPVOID, name,
               LPVOID, mask)
-{  if (VERSION_OsIsUnicode())
+{
+   if (VERSION_OsIsUnicode())
      return PathMatchSpecW( (LPWSTR)name, (LPWSTR)mask );
    return PathMatchSpecA( (LPSTR)name, (LPSTR)mask );
@@ -1295 +1309 @@
     FIXME("(%p),stub!\n", pSubKey);
 
-        return ERROR_SUCCESS;  /* return success */
+        return ERROR_SUCCESS;  /* return success */
 }
 
@@ -1309 +1323 @@
     FIXME("(%p),stub!\n", pSubKey);
 
-        return ERROR_SUCCESS;  /* return success */
+        return ERROR_SUCCESS;  /* return success */
 }
 
@@ -1327 +1341 @@
     FIXME("(%p),stub!\n", pSubKey);
 
-        return ERROR_SUCCESS;  /* return success */
+        return ERROR_SUCCESS;  /* return success */
 }
 
@@ -1343 +1357 @@
     FIXME("(%p),stub!\n", pSubKey);
 
-        return ERROR_SUCCESS;  /* return success */
-}
-
+        return ERROR_SUCCESS;  /* return success */
+}
+