[PATCH v3 01/11] msvcrt: Call _wfindfirst64i32 in _findfirst64i32 function.

[Piotr Caban]

From: Piotr Caban

---
 dlls/msvcrt/dir.c          | 47 ++++++++++++++++++++++----------------
 dlls/ucrtbase/tests/file.c | 11 +++++++++
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c
index b72682db806..8e4549ab306 100644
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -486,45 +486,52 @@ intptr_t CDECL _findfirst64(const char *fspec, struct _finddata64_t *ft)
 }

/*********************************************************************
- *		_findfirst64i32 (MSVCRT.@)
+ *		_wfindfirst64i32 (MSVCRT.@)
  *
- * 64-bit/32-bit version of _findfirst.
+ * Unicode version of _findfirst64i32.
  */
-intptr_t CDECL _findfirst64i32(const char * fspec, struct _finddata64i32_t* ft)
+intptr_t CDECL _wfindfirst64i32(const wchar_t * fspec, struct _wfinddata64i32_t* ft)
 {
-  WIN32_FIND_DATAA find_data;
+  WIN32_FIND_DATAW find_data;
   HANDLE hfind;

-  hfind  = FindFirstFileA(fspec, &find_data);
+  hfind  = FindFirstFileW(fspec, &find_data);
   if (hfind == INVALID_HANDLE_VALUE)
   {
     msvcrt_set_errno(GetLastError());
     return -1;
   }
-  msvcrt_fttofd64i32(&find_data,ft);
+  msvcrt_wfttofd64i32(&find_data,ft);
   TRACE(":got handle %p\n",hfind);
   return (intptr_t)hfind;
 }

+static int finddata64i32_wtoa(const struct _wfinddata64i32_t *wfd, struct _finddata64i32_t *fd)
+{
+    fd->attrib = wfd->attrib;
+    fd->time_create = wfd->time_create;
+    fd->time_access = wfd->time_access;
+    fd->time_write = wfd->time_write;
+    fd->size = wfd->size;
+    return convert_wcs_to_acp_utf8(wfd->name, fd->name, ARRAY_SIZE(fd->name));
+}
+
 /*********************************************************************
- *		_wfindfirst64i32 (MSVCRT.@)
+ *		_findfirst64i32 (MSVCRT.@)
  *
- * Unicode version of _findfirst64i32.
+ * 64-bit/32-bit version of _findfirst.
  */
-intptr_t CDECL _wfindfirst64i32(const wchar_t * fspec, struct _wfinddata64i32_t* ft)
+intptr_t CDECL _findfirst64i32(const char *fspec, struct _finddata64i32_t *ft)
 {
-  WIN32_FIND_DATAW find_data;
-  HANDLE hfind;
+    struct _wfinddata64i32_t wft;
+    wchar_t *fspecW = NULL;
+    intptr_t ret;

-  hfind  = FindFirstFileW(fspec, &find_data);
-  if (hfind == INVALID_HANDLE_VALUE)
-  {
-    msvcrt_set_errno(GetLastError());
-    return -1;
-  }
-  msvcrt_wfttofd64i32(&find_data,ft);
-  TRACE(":got handle %p\n",hfind);
-  return (intptr_t)hfind;
+    if (fspec && !(fspecW = wstrdupa_utf8(fspec))) return -1;
+    ret = _wfindfirst64i32(fspecW, &wft);
+    free(fspecW);
+    if (!finddata64i32_wtoa(&wft, ft)) return -1;
+    return ret;
 }

/*********************************************************************
diff --git a/dlls/ucrtbase/tests/file.c b/dlls/ucrtbase/tests/file.c
index ef732479165..7b7604480bf 100644
--- a/dlls/ucrtbase/tests/file.c
+++ b/dlls/ucrtbase/tests/file.c
@@ -239,6 +239,7 @@ static void test_utf8(void)
     const WCHAR dirW[] = L"dir\x0119\x015b\x0107";

char file2[32], buf[256], *p, *q;
+    struct _finddata64i32_t fdata64i32;
     struct _finddata32_t fdata32;
     struct _finddata64_t fdata64;
     struct _stat64 stat;
@@ -353,6 +354,16 @@ static void test_utf8(void)
     ret = _findclose(hfind);
     ok(!ret, "_findclose returned %d, errno %d\n", ret, errno);

+    strcpy(buf, file);
+    strcat(buf, "*");
+    fdata64i32.name[0] = 'x';
+    hfind = _findfirst64i32(buf, &fdata64i32);
+    ok(hfind != -1, "_findfirst64i32 returned %Id, errno %d\n", hfind, errno);
+    todo_wine_if(!is_lossless_convertion(dir))
+        ok(!memcmp(file, fdata64i32.name, sizeof(file) - 1), "fdata64i32.name = %s\n", debugstr_a(fdata64i32.name));
+    ret = _findclose(hfind);
+    ok(!ret, "_findclose returned %d, errno %d\n", ret, errno);
+
     ret = remove(file2);
     ok(!ret, "remove returned %d, errno %d\n", ret, errno);