Piotr Caban : msvcp60: Added basic_ifstream::open implementation.

[Alexandre Julliard]

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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Fri Oct  5 14:54:46 2012 +0200

msvcp60: Added basic_ifstream::open implementation.

---

 dlls/msvcp60/ios.c        |   46 +++++++++++++++++++++++++++++++++++++++++++++
 dlls/msvcp60/msvcp60.spec |   16 +++++++-------
 2 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c
index 8d7381a..a169851 100644
--- a/dlls/msvcp60/ios.c
+++ b/dlls/msvcp60/ios.c
@@ -9693,6 +9693,29 @@ MSVCP_bool __thiscall basic_ifstream_char_is_open(const basic_ifstream_char *thi
     return basic_filebuf_char_is_open(&this->filebuf);
 }
 
+/* ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QAEXPBDH at Z */
+/* ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QEAAXPEBDH at Z */
+DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open, 12)
+void __thiscall basic_ifstream_char_open(basic_ifstream_char *this,
+        const char *name, int mode)
+{
+    TRACE("(%p %s %d)\n", this, name, mode);
+
+    if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) {
+        basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base);
+        basic_ios_char_setstate(basic_ios, IOSTATE_failbit);
+    }
+}
+
+/* ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QAEXPBDF at Z */
+/* ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QEAAXPEBDF at Z */
+DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open_old, 12)
+void __thiscall basic_ifstream_char_open_old(basic_ifstream_char *this,
+        const char *name, short mode)
+{
+    basic_ifstream_char_open(this, name, mode);
+}
+
 /* ?rdbuf@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QBEPAV?$basic_filebuf at DU?$char_traits at D@std@@@2 at XZ */
 /* ?rdbuf@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QEBAPEAV?$basic_filebuf at DU?$char_traits at D@std@@@2 at XZ */
 DEFINE_THISCALL_WRAPPER(basic_ifstream_char_rdbuf, 4)
@@ -9821,6 +9844,29 @@ MSVCP_bool __thiscall basic_ifstream_wchar_is_open(const basic_ifstream_wchar *t
     return basic_filebuf_wchar_is_open(&this->filebuf);
 }
 
+/* ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QAEXPBDH at Z */
+/* ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QEAAXPEBDH at Z */
+DEFINE_THISCALL_WRAPPER(basic_ifstream_wchar_open, 12)
+void __thiscall basic_ifstream_wchar_open(basic_ifstream_wchar *this,
+        const char *name, int mode)
+{
+    TRACE("(%p %s %d)\n", this, name, mode);
+
+    if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) {
+        basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base);
+        basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit);
+    }
+}
+
+/* ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QAEXPBDF at Z */
+/* ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QEAAXPEBDF at Z */
+DEFINE_THISCALL_WRAPPER(basic_ifstream_wchar_open_old, 12)
+void __thiscall basic_ifstream_wchar_open_old(basic_ifstream_wchar *this,
+        const char *name, short mode)
+{
+    basic_ifstream_wchar_open(this, name, mode);
+}
+
 /* ?rdbuf@?$basic_ifstream at _WU?$char_traits at _W@std@@@std@@QBEPAV?$basic_filebuf at _WU?$char_traits at _W@std@@@2 at XZ */
 /* ?rdbuf@?$basic_ifstream at _WU?$char_traits at _W@std@@@std@@QEBAPEAV?$basic_filebuf at _WU?$char_traits at _W@std@@@2 at XZ */
 /* ?rdbuf@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QBEPAV?$basic_filebuf at GU?$char_traits at G@std@@@2 at XZ */
diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec
index 9301a6f..97e9458 100644
--- a/dlls/msvcp60/msvcp60.spec
+++ b/dlls/msvcp60/msvcp60.spec
@@ -3514,14 +3514,14 @@
 @ stub -arch=win64 ?open@?$basic_fstream at GU?$char_traits at G@std@@@std@@QEAAXPEBDF at Z
 @ stub -arch=win32 ?open@?$basic_fstream at GU?$char_traits at G@std@@@std@@QAEXPBDH at Z
 @ stub -arch=win64 ?open@?$basic_fstream at GU?$char_traits at G@std@@@std@@QEAAXPEBDH at Z
-@ stub -arch=win32 ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QAEXPBDF at Z
-@ stub -arch=win64 ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QEAAXPEBDF at Z
-@ stub -arch=win32 ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QAEXPBDH at Z
-@ stub -arch=win64 ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QEAAXPEBDH at Z
-@ stub -arch=win32 ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QAEXPBDF at Z
-@ stub -arch=win64 ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QEAAXPEBDF at Z
-@ stub -arch=win32 ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QAEXPBDH at Z
-@ stub -arch=win64 ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QEAAXPEBDH at Z
+@ thiscall -arch=win32 ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QAEXPBDF at Z(ptr str long) basic_ifstream_char_open_old
+@ cdecl -arch=win64 ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QEAAXPEBDF at Z(ptr str long) basic_ifstream_char_open_old
+@ thiscall -arch=win32 ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QAEXPBDH at Z(ptr str long) basic_ifstream_char_open
+@ cdecl -arch=win64 ?open@?$basic_ifstream at DU?$char_traits at D@std@@@std@@QEAAXPEBDH at Z(ptr str long) basic_ifstream_char_open
+@ thiscall -arch=win32 ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QAEXPBDF at Z(ptr str long) basic_ifstream_wchar_open_old
+@ cdecl -arch=win64 ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QEAAXPEBDF at Z(ptr str long) basic_ifstream_wchar_open_old
+@ thiscall -arch=win32 ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QAEXPBDH at Z(ptr str long) basic_ifstream_wchar_open
+@ cdecl -arch=win64 ?open@?$basic_ifstream at GU?$char_traits at G@std@@@std@@QEAAXPEBDH at Z(ptr str long) basic_ifstream_wchar_open
 @ stub -arch=win32 ?open@?$basic_ofstream at DU?$char_traits at D@std@@@std@@QAEXPBDF at Z
 @ stub -arch=win64 ?open@?$basic_ofstream at DU?$char_traits at D@std@@@std@@QEAAXPEBDF at Z
 @ stub -arch=win32 ?open@?$basic_ofstream at DU?$char_traits at D@std@@@std@@QAEXPBDH at Z