Changeset 3009 for trunk/src/lib/nt/ntunlink.c

Timestamp:

Nov 7, 2016, 3:21:59 AM (9 years ago)

Author:

bird

Message:

ntunlink: W apis.

File:

• trunk/src/lib/nt/ntunlink.c (modified) (8 diffs)

trunk/src/lib/nt/ntunlink.c

@@ -83 +83 @@
 
 
-static int birdUnlinkInternal(HANDLE hRoot, const char *pszFile, int fReadOnlyToo, int fFast)
+static int birdUnlinkInternal(HANDLE hRoot, const char *pszFile, const wchar_t *pwszFile, int fReadOnlyToo, int fFast)
 {
     MY_UNICODE_STRING   NtPath;
@@ -91 +91 @@
         hRoot = NULL;
     if (hRoot == NULL)
-        rc = birdDosToNtPath(pszFile, &NtPath);
+    {
+        if (pwszFile)
+            rc = birdDosToNtPathW(pwszFile, &NtPath);
+        else
+            rc = birdDosToNtPath(pszFile, &NtPath);
+    }
     else
-        rc = birdDosToRelativeNtPath(pszFile, &NtPath);
+    {
+        if (pwszFile)
+            rc = birdDosToRelativeNtPathW(pwszFile, &NtPath);
+        else
+            rc = birdDosToRelativeNtPath(pszFile, &NtPath);
+    }
     if (rc == 0)
     {
@@ -162 +172 @@
 int birdUnlink(const char *pszFile)
 {
-    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
+    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, NULL /*pwszFile*/, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
+}
+
+
+int birdUnlinkW(const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal(NULL /*hRoot*/, NULL /*pwszFile*/, pwszFile, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
 }
 
@@ -168 +184 @@
 int birdUnlinkEx(void *hRoot, const char *pszFile)
 {
-    return birdUnlinkInternal((HANDLE)hRoot, pszFile, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
+    return birdUnlinkInternal((HANDLE)hRoot, pszFile, NULL /*pwszFile*/, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
+}
+
+
+int birdUnlinkExW(void *hRoot, const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal((HANDLE)hRoot, NULL /*pszFile*/, pwszFile, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
 }
 
@@ -174 +196 @@
 int birdUnlinkForced(const char *pszFile)
 {
-    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
+    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, NULL /*pwszFile*/, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
+}
+
+
+int birdUnlinkForcedW(const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal(NULL /*hRoot*/, NULL /*pszFile*/, pwszFile, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
 }
 
@@ -180 +208 @@
 int birdUnlinkForcedEx(void *hRoot, const char *pszFile)
 {
-    return birdUnlinkInternal((HANDLE)hRoot, pszFile, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
+    return birdUnlinkInternal((HANDLE)hRoot, pszFile, NULL /*pwszFile*/, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
+}
+
+
+int birdUnlinkForcedExW(void *hRoot, const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal((HANDLE)hRoot, NULL /*pszFile*/, pwszFile, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
 }
 
@@ -186 +220 @@
 int birdUnlinkForcedFast(const char *pszFile)
 {
-    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
+    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, NULL /*pwszFile*/, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
+}
+
+
+int birdUnlinkForcedFastW(const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal(NULL /*hRoot*/, NULL /*pszFile*/, pwszFile, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
 }
 
@@ -192 +232 @@
 int birdUnlinkForcedFastEx(void *hRoot, const char *pszFile)
 {
-    return birdUnlinkInternal((HANDLE)hRoot, pszFile, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
-}
-
+    return birdUnlinkInternal((HANDLE)hRoot, pszFile, NULL /*pwszFile*/, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
+}
+
+
+int birdUnlinkForcedFastExW(void *hRoot, const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal((HANDLE)hRoot, NULL /*pszFile*/, pwszFile, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
+}
+