YongHao Hu : msvcp110: Add tr2_sys__Close_dir implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f142ca1f923519f9ae2ce493d6c538cac889eeab
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f142ca1f923519f9ae2ce493d6...

Author: YongHao Hu <christopherwuy(a)gmail.com>
Date:   Mon Dec 21 12:15:47 2015 +0800

msvcp110: Add tr2_sys__Close_dir implementation.

Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/msvcp110/msvcp110.spec         | 4 ++--
 dlls/msvcp120/msvcp120.spec         | 4 ++--
 dlls/msvcp120_app/msvcp120_app.spec | 4 ++--
 dlls/msvcp90/ios.c                  | 9 +++++++++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec
index 9751854..6c8aee4 100644
--- a/dlls/msvcp110/msvcp110.spec
+++ b/dlls/msvcp110/msvcp110.spec
@@ -1161,8 +1161,8 @@
 @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns
 @ extern -arch=win32 ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A locale__Locimp__Clocptr
 @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr
-@ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z
-@ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z
+@ cdecl -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z(ptr) tr2_sys__Close_dir
+@ cdecl -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z(ptr) tr2_sys__Close_dir
 @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) tr2_sys__Copy_file
 @ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) tr2_sys__Copy_file
 @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) tr2_sys__Copy_file_wchar
diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec
index 4a136a2..e3200a2 100644
--- a/dlls/msvcp120/msvcp120.spec
+++ b/dlls/msvcp120/msvcp120.spec
@@ -1126,8 +1126,8 @@
 @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns
 @ extern -arch=win32 ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A locale__Locimp__Clocptr
 @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr
-@ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z
-@ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z
+@ cdecl -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z(ptr) tr2_sys__Close_dir
+@ cdecl -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z(ptr) tr2_sys__Close_dir
 @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) tr2_sys__Copy_file
 @ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) tr2_sys__Copy_file
 @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) tr2_sys__Copy_file_wchar
diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec
index 53f8b0b..655e0e6 100644
--- a/dlls/msvcp120_app/msvcp120_app.spec
+++ b/dlls/msvcp120_app/msvcp120_app.spec
@@ -1126,8 +1126,8 @@
 @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) msvcp120.?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z
 @ extern -arch=win32 ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A msvcp120.?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A
 @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA msvcp120.?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA
-@ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z
-@ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z
+@ cdecl -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z(ptr) msvcp120.?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z
+@ cdecl -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z(ptr) msvcp120.?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z
 @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z
 @ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z
 @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index f01cf6d..7440aff 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -14504,6 +14504,15 @@ char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type
     return target;
 }
 
+/* ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z */
+/* ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z */
+void __cdecl tr2_sys__Close_dir(void* handle)
+{
+    TRACE("(%p)\n", handle);
+
+    FindClose(handle);
+}
+
 /* ??0strstream(a)std@@QAE(a)PADHH@Z */
 /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */
 #if STREAMSIZE_BITS == 64