[PATCH 3/3] Added _findnext32() implementation

Nikolay Sivov nsivov at codeweavers.com
Mon Mar 14 19:06:17 CDT 2011


---
 dlls/msvcr100/msvcr100.spec |    2 +-
 dlls/msvcr80/msvcr80.spec   |    2 +-
 dlls/msvcr90/msvcr90.spec   |    2 +-
 dlls/msvcrt/dir.c           |   17 +++++++++++++++++
 dlls/msvcrt/msvcrt.spec     |    1 +
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index c3dfa7d..7f6ac97 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -621,7 +621,7 @@
 @ stub _findfirst32i64
 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64
 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32
-@ stub _findnext32
+@ cdecl _findnext32(long ptr) msvcrt._findnext32
 @ stub _findnext32i64
 @ cdecl _findnext64(long ptr) msvcrt._findnext64
 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index a615c0d..e4cf5cd 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -462,7 +462,7 @@
 @ stub _findfirst32i64
 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64
 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32
-@ stub _findnext32
+@ cdecl _findnext32(long ptr) msvcrt._findnext32
 @ stub _findnext32i64
 @ cdecl _findnext64(long ptr) msvcrt._findnext64
 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 6b3e766..515a6bd 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -454,7 +454,7 @@
 @ stub _findfirst32i64
 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64
 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32
-@ stub _findnext32
+@ cdecl _findnext32(long ptr) msvcrt._findnext32
 @ stub _findnext32i64
 @ cdecl _findnext64(long ptr) msvcrt._findnext64
 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32
diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c
index 712ffa9..fc7241f 100644
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -542,6 +542,23 @@ int CDECL MSVCRT__findnext(MSVCRT_intptr_t hand, struct MSVCRT__finddata_t * ft)
 }
 
 /*********************************************************************
+ *               _findnext32 (MSVCRT.@)
+ */
+int CDECL MSVCRT__findnext32(MSVCRT_intptr_t hand, struct MSVCRT__finddata32_t * ft)
+{
+  WIN32_FIND_DATAA find_data;
+
+  if (!FindNextFileA((HANDLE)hand, &find_data))
+  {
+    *MSVCRT__errno() = MSVCRT_ENOENT;
+    return -1;
+  }
+
+  msvcrt_fttofd32(&find_data, ft);
+  return 0;
+}
+
+/*********************************************************************
  *		_wfindnext (MSVCRT.@)
  *
  * Unicode version of _findnext.
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index a4656a7..68eab2e 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -416,6 +416,7 @@
 @ cdecl _findfirst64i32(str ptr) MSVCRT__findfirst64i32
 @ cdecl _findfirsti64(str ptr) MSVCRT__findfirsti64
 @ cdecl _findnext(long ptr) MSVCRT__findnext
+@ cdecl _findnext32(long ptr) MSVCRT__findnext32
 @ cdecl _findnext64(long ptr) MSVCRT__findnext64
 @ cdecl _findnext64i32(long ptr) MSVCRT__findnext64i32
 @ cdecl _findnexti64(long ptr) MSVCRT__findnexti64
-- 
1.5.6.5



--------------040104030607010102080504--



More information about the wine-patches mailing list