Module: wine Branch: master Commit: e165464eea243012af3a6945eeb017fc01078d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e165464eea243012af3a6945ee...
Author: André Hentschel nerv@dawncrow.de Date: Sat Feb 26 19:49:51 2011 +0100
msvcrt: Implement _wfindnext64.
---
dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 19 +++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 54a8024..608bfc6 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1344,7 +1344,7 @@ @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 -@ stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64 @ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index e378340..b83ce7f 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -625,7 +625,7 @@ @ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirsti64(wstr ptr) msvcrt._wfindfirsti64 @ cdecl _wfindnext(long ptr) msvcrt._wfindnext -@ stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64 @ cdecl _wfindnexti64(long ptr) msvcrt._wfindnexti64 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index ec8cddd..648802a 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -621,7 +621,7 @@ @ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirsti64(wstr ptr) msvcrt._wfindfirsti64 @ cdecl _wfindnext(long ptr) msvcrt._wfindnext -@ stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64 @ cdecl _wfindnexti64(long ptr) msvcrt._wfindnexti64 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e2b1bec..58b855c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1197,7 +1197,7 @@ @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 -@ stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64 @ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 576149d..d76acc8 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1184,7 +1184,7 @@ @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 -@ stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64 @ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 8fcff3d..a5c4974 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -560,6 +560,25 @@ int CDECL MSVCRT__findnext64(long hand, struct MSVCRT__finddata64_t * ft) }
/********************************************************************* + * _wfindnext64 (MSVCRT.@) + * + * Unicode version of _wfindnext64. + */ +int CDECL MSVCRT__wfindnext64(MSVCRT_intptr_t hand, struct MSVCRT__wfinddata64_t * ft) +{ + WIN32_FIND_DATAW find_data; + + if (!FindNextFileW((HANDLE)hand, &find_data)) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + + msvcrt_wfttofd64(&find_data,ft); + return 0; +} + +/********************************************************************* * _findnext64i32 (MSVCRT.@) * * 64-bit/32-bit version of _findnext. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index cc40817..c7f2120 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1116,7 +1116,7 @@ @ cdecl _wfindfirsti64(wstr ptr) MSVCRT__wfindfirsti64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 @ cdecl _wfindnext(long ptr) MSVCRT__wfindnext -# stub _wfindnext64 +@ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 @ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 @ cdecl _wfindnexti64(long ptr) MSVCRT__wfindnexti64 @ cdecl _wfopen(wstr wstr) MSVCRT__wfopen