From c03e5ed3be146ef12dfeaf060000fc62c1323731 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Fri, 4 Nov 2016 19:05:05 +0300 Subject: [PATCH] msvcrt: Added _wfindnext32(). Signed-off-by: Nikolay Sivov Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- .../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 dd881aafd8c..26520b6cfe1 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 03fd698b927..15d53393359 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 f5371b9f79f..b4549f580ee 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 e402c5fe11e..683dc6a901e 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 a953c389cef..0510b1647be 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 c1edc24e9fb..4bcef508367 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 93da303ba89..5c34e77ceee 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 3c5d16f12ea..f4edc287e8a 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -598,6 +598,23 @@ int CDECL MSVCRT__findnext32(MSVCRT_intptr_t hand, struct MSVCRT__finddata32_t * return 0; } +/********************************************************************* + * _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.@) * diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 47608f95ecd..83143b6a50d 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