[09/13] msvcirt: Add ios format flag masks

Iván Matellanes matellanesivan at gmail.com
Fri Jul 17 09:37:05 CDT 2015


---
 dlls/msvcirt/msvcirt.c      | 6 ++++++
 dlls/msvcirt/msvcirt.spec   | 6 +++---
 dlls/msvcrt20/msvcrt20.spec | 6 +++---
 dlls/msvcrt40/msvcrt40.spec | 6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c
index 6959db3..6dd650b 100644
--- a/dlls/msvcirt/msvcirt.c
+++ b/dlls/msvcirt/msvcirt.c
@@ -31,6 +31,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt);
 
 #define RESERVE_SIZE 512
 
+/* ?adjustfield at ios@@2JB */
+const LONG ios_adjustfield = FLAGS_left | FLAGS_right | FLAGS_internal;
+/* ?basefield at ios@@2JB */
+const LONG ios_basefield = FLAGS_dec | FLAGS_oct | FLAGS_hex;
+/* ?floatfield at ios@@2JB */
+const LONG ios_floatfield = FLAGS_scientific | FLAGS_fixed;
 /* ?x_lockc at ios@@0U_CRT_CRITICAL_SECTION@@A */
 extern CRITICAL_SECTION ios_static_lock;
 CRITICAL_SECTION_DEBUG ios_static_lock_debug =
diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec
index 8d26652..b64b41a 100644
--- a/dlls/msvcirt/msvcirt.spec
+++ b/dlls/msvcirt/msvcirt.spec
@@ -399,7 +399,7 @@
 @ thiscall -arch=win32 ??_Gstreambuf@@UAEPAXI at Z(ptr long) streambuf_scalar_dtor
 @ stub -arch=win32 ??_Gstrstream@@UAEPAXI at Z  # virtual void * __thiscall strstream::`scalar deleting destructor'(unsigned int)
 @ stub -arch=win32 ??_Gstrstreambuf@@UAEPAXI at Z  # virtual void * __thiscall strstreambuf::`scalar deleting destructor'(unsigned int)
-# @ extern ?adjustfield at ios@@2JB  # static long const ios::adjustfield
+@ extern ?adjustfield at ios@@2JB ios_adjustfield
 @ thiscall -arch=win32 ?allocate at streambuf@@IAEHXZ(ptr) streambuf_allocate
 @ cdecl -arch=win64 ?allocate at streambuf@@IEAAHXZ(ptr) streambuf_allocate
 @ stub -arch=win32 ?attach at filebuf@@QAEPAV1 at H@Z  # class filebuf * __thiscall filebuf::attach(int)
@@ -414,7 +414,7 @@
 @ cdecl -arch=win64 ?bad at ios@@QEBAHXZ(ptr) ios_bad
 @ thiscall -arch=win32 ?base at streambuf@@IBEPADXZ(ptr) streambuf_base
 @ cdecl -arch=win64 ?base at streambuf@@IEBAPEADXZ(ptr) streambuf_base
-# @ extern ?basefield at ios@@2JB  # static long const ios::basefield
+@ extern ?basefield at ios@@2JB ios_basefield
 # @ extern ?binary at filebuf@@2HB  # static int const filebuf::binary
 @ cdecl ?bitalloc at ios@@SAJXZ() ios_bitalloc
 @ thiscall -arch=win32 ?blen at streambuf@@IBEHXZ(ptr) streambuf_blen
@@ -484,7 +484,7 @@
 @ cdecl -arch=win64 ?flags at ios@@QEAAJJ at Z(ptr long) ios_flags_set
 @ thiscall -arch=win32 ?flags at ios@@QBEJXZ(ptr) ios_flags_get
 @ cdecl -arch=win64 ?flags at ios@@QEBAJXZ(ptr) ios_flags_get
-# @ extern ?floatfield at ios@@2JB  # static long const ios::floatfield
+@ extern ?floatfield at ios@@2JB ios_floatfield
 @ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z  # class ostream & __cdecl flush(class ostream &)
 @ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z
 @ stub -arch=win32 ?flush at ostream@@QAEAAV1 at XZ  # class ostream & __thiscall ostream::flush(void)
diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec
index b76b1d0..aa6f5bc 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -387,7 +387,7 @@
 @ cdecl ?_set_new_mode@@YAHH at Z(long) msvcrt.?_set_new_mode@@YAHH at Z
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0 at Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0 at Z@Z
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0 at Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0 at Z@Z
-# @ extern ?adjustfield at ios@@2JB
+@ extern ?adjustfield at ios@@2JB msvcirt.?adjustfield at ios@@2JB
 @ thiscall -arch=win32 ?allocate at streambuf@@IAEHXZ(ptr) msvcirt.?allocate at streambuf@@IAEHXZ
 @ cdecl -arch=win64 ?allocate at streambuf@@IEAAHXZ(ptr) msvcirt.?allocate at streambuf@@IEAAHXZ
 @ stub -arch=win32 ?attach at filebuf@@QAEPAV1 at H@Z
@@ -402,7 +402,7 @@
 @ cdecl -arch=win64 ?bad at ios@@QEBAHXZ(ptr) msvcirt.?bad at ios@@QEBAHXZ
 @ thiscall -arch=win32 ?base at streambuf@@IBEPADXZ(ptr) msvcirt.?base at streambuf@@IBEPADXZ
 @ cdecl -arch=win64 ?base at streambuf@@IEBAPEADXZ(ptr) msvcirt.?base at streambuf@@IEBAPEADXZ
-# @ extern ?basefield at ios@@2JB
+@ extern ?basefield at ios@@2JB msvcirt.?basefield at ios@@2JB
 # @ extern ?binary at filebuf@@2HB
 @ cdecl ?bitalloc at ios@@SAJXZ() msvcirt.?bitalloc at ios@@SAJXZ
 @ thiscall -arch=win32 ?blen at streambuf@@IBEHXZ(ptr) msvcirt.?blen at streambuf@@IBEHXZ
@@ -472,7 +472,7 @@
 @ cdecl -arch=win64 ?flags at ios@@QEAAJJ at Z(ptr long) msvcirt.?flags at ios@@QEAAJJ at Z
 @ thiscall -arch=win32 ?flags at ios@@QBEJXZ(ptr) msvcirt.?flags at ios@@QBEJXZ
 @ cdecl -arch=win64 ?flags at ios@@QEBAJXZ(ptr) msvcirt.?flags at ios@@QEBAJXZ
-# @ extern ?floatfield at ios@@2JB
+@ extern ?floatfield at ios@@2JB msvcirt.?floatfield at ios@@2JB
 @ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z
 @ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z
 @ stub -arch=win32 ?flush at ostream@@QAEAAV1 at XZ
diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec
index cfe2fea..a80fd20 100644
--- a/dlls/msvcrt40/msvcrt40.spec
+++ b/dlls/msvcrt40/msvcrt40.spec
@@ -450,7 +450,7 @@
 @ cdecl ?_set_new_mode@@YAHH at Z(long) msvcrt.?_set_new_mode@@YAHH at Z
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0 at Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0 at Z@Z
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0 at Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0 at Z@Z
-# @ extern ?adjustfield at ios@@2JB
+@ extern ?adjustfield at ios@@2JB msvcirt.?adjustfield at ios@@2JB
 @ thiscall -arch=win32 ?allocate at streambuf@@IAEHXZ(ptr) msvcirt.?allocate at streambuf@@IAEHXZ
 @ cdecl -arch=win64 ?allocate at streambuf@@IEAAHXZ(ptr) msvcirt.?allocate at streambuf@@IEAAHXZ
 @ stub -arch=win32 ?attach at filebuf@@QAEPAV1 at H@Z
@@ -465,7 +465,7 @@
 @ cdecl -arch=win64 ?bad at ios@@QEBAHXZ(ptr) msvcirt.?bad at ios@@QEBAHXZ
 @ thiscall -arch=win32 ?base at streambuf@@IBEPADXZ(ptr) msvcirt.?base at streambuf@@IBEPADXZ
 @ cdecl -arch=win64 ?base at streambuf@@IEBAPEADXZ(ptr) msvcirt.?base at streambuf@@IEBAPEADXZ
-# @ extern ?basefield at ios@@2JB
+@ extern ?basefield at ios@@2JB msvcirt.?basefield at ios@@2JB
 @ thiscall -arch=i386 ?before at type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before at type_info@@QBEHABV1@@Z
 @ cdecl -arch=win64 ?before at type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before at type_info@@QEBAHAEBV1@@Z
 # @ extern ?binary at filebuf@@2HB
@@ -537,7 +537,7 @@
 @ cdecl -arch=win64 ?flags at ios@@QEAAJJ at Z(ptr long) msvcirt.?flags at ios@@QEAAJJ at Z
 @ thiscall -arch=win32 ?flags at ios@@QBEJXZ(ptr) msvcirt.?flags at ios@@QBEJXZ
 @ cdecl -arch=win64 ?flags at ios@@QEBAJXZ(ptr) msvcirt.?flags at ios@@QEBAJXZ
-# @ extern ?floatfield at ios@@2JB
+@ extern ?floatfield at ios@@2JB msvcirt.?floatfield at ios@@2JB
 @ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z
 @ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z
 @ stub -arch=win32 ?flush at ostream@@QAEAAV1 at XZ
-- 
2.1.4




More information about the wine-patches mailing list