Nikolay Sivov : msvcrt: Added _wfindnext32().
Alexandre Julliard
julliard at winehq.org
Fri Nov 4 15:15:54 CDT 2016
Module: wine
Branch: master
Commit: c03e5ed3be146ef12dfeaf060000fc62c1323731
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03e5ed3be146ef12dfeaf060000fc62c1323731
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Nov 4 19:05:05 2016 +0300
msvcrt: Added _wfindnext32().
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
.../api-ms-win-crt-filesystem-l1-1-0.spec | 2 +-
dlls/msvcr100/msvcr100.spec | 2 +-
dlls/msvcr110/msvcr110.spec | 2 +-
dlls/msvcr120/msvcr120.spec | 2 +-
dlls/msvcr120_app/msvcr120_app.spec | 2 +-
dlls/msvcr80/msvcr80.spec | 2 +-
dlls/msvcr90/msvcr90.spec | 2 +-
dlls/msvcrt/dir.c | 17 +++++++++++++++++
dlls/ucrtbase/ucrtbase.spec | 2 +-
9 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec b/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec
index dd881aa..26520b6 100644
--- a/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec
@@ -43,7 +43,7 @@
@ stub _wfindfirst32i64
@ cdecl _wfindfirst64(wstr ptr) ucrtbase._wfindfirst64
@ cdecl _wfindfirst64i32(wstr ptr) ucrtbase._wfindfirst64i32
-@ stub _wfindnext32
+@ cdecl _wfindnext32(long ptr) ucrtbase._wfindnext32
@ stub _wfindnext32i64
@ cdecl _wfindnext64(long ptr) ucrtbase._wfindnext64
@ cdecl _wfindnext64i32(long ptr) ucrtbase._wfindnext64i32
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 03fd698..15d5339 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1547,7 +1547,7 @@
@ stub _wfindfirst32i64
@ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64
@ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32
-@ stub _wfindnext32
+@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32
@ stub _wfindnext32i64
@ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64
@ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index f5371b9..b4549f5 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1905,7 +1905,7 @@
@ stub _wfindfirst32i64
@ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64
@ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32
-@ stub _wfindnext32
+@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32
@ stub _wfindnext32i64
@ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64
@ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index e402c5f..683dc6a 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -1929,7 +1929,7 @@
@ stub _wfindfirst32i64
@ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64
@ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32
-@ stub _wfindnext32
+@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32
@ stub _wfindnext32i64
@ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64
@ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index a953c38..0510b16 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1613,7 +1613,7 @@
@ stub _wfindfirst32i64
@ cdecl _wfindfirst64(wstr ptr) msvcr120._wfindfirst64
@ cdecl _wfindfirst64i32(wstr ptr) msvcr120._wfindfirst64i32
-@ stub _wfindnext32
+@ cdecl _wfindnext32(long ptr) msvcr120._wfindnext32
@ stub _wfindnext32i64
@ cdecl _wfindnext64(long ptr) msvcr120._wfindnext64
@ cdecl _wfindnext64i32(long ptr) msvcr120._wfindnext64i32
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index c1edc24..4bcef50 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -1226,7 +1226,7 @@
@ stub _wfindfirst32i64
@ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64
@ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32
-@ stub _wfindnext32
+@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32
@ stub _wfindnext32i64
@ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64
@ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 93da303..5c34e77 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -1202,7 +1202,7 @@
@ stub _wfindfirst32i64
@ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64
@ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32
-@ stub _wfindnext32
+@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32
@ stub _wfindnext32i64
@ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64
@ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32
diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c
index 3c5d16f..f4edc28 100644
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -599,6 +599,23 @@ int CDECL MSVCRT__findnext32(MSVCRT_intptr_t hand, struct MSVCRT__finddata32_t *
}
/*********************************************************************
+ * _wfindnext32 (MSVCRT.@)
+ */
+int CDECL MSVCRT__wfindnext32(MSVCRT_intptr_t hand, struct MSVCRT__wfinddata32_t * ft)
+{
+ WIN32_FIND_DATAW find_data;
+
+ if (!FindNextFileW((HANDLE)hand, &find_data))
+ {
+ *MSVCRT__errno() = MSVCRT_ENOENT;
+ return -1;
+ }
+
+ msvcrt_wfttofd32(&find_data, ft);
+ return 0;
+}
+
+/*********************************************************************
* _wfindnext (MSVCRT.@)
*
* Unicode version of _findnext.
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 47608f9..83143b6 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -2077,7 +2077,7 @@
@ stub _wfindfirst32i64
@ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64
@ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32
-@ stub _wfindnext32
+@ cdecl _wfindnext32(long ptr) MSVCRT__wfindnext32
@ stub _wfindnext32i64
@ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64
@ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32
More information about the wine-cvs
mailing list