Module: wine Branch: master Commit: bc90e1c8bc5ffaba64820724b0b4c53ba8fa8734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc90e1c8bc5ffaba64820724b0...
Author: Iván Matellanes matellanesivan@gmail.com Date: Fri Jul 17 16:37:05 2015 +0200
msvcirt: Add ios format flag masks.
---
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@ios@@2JB */ +const LONG ios_adjustfield = FLAGS_left | FLAGS_right | FLAGS_internal; +/* ?basefield@ios@@2JB */ +const LONG ios_basefield = FLAGS_dec | FLAGS_oct | FLAGS_hex; +/* ?floatfield@ios@@2JB */ +const LONG ios_floatfield = FLAGS_scientific | FLAGS_fixed; /* ?x_lockc@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@Z(ptr long) streambuf_scalar_dtor @ stub -arch=win32 ??_Gstrstream@@UAEPAXI@Z # virtual void * __thiscall strstream::`scalar deleting destructor'(unsigned int) @ stub -arch=win32 ??_Gstrstreambuf@@UAEPAXI@Z # virtual void * __thiscall strstreambuf::`scalar deleting destructor'(unsigned int) -# @ extern ?adjustfield@ios@@2JB # static long const ios::adjustfield +@ extern ?adjustfield@ios@@2JB ios_adjustfield @ thiscall -arch=win32 ?allocate@streambuf@@IAEHXZ(ptr) streambuf_allocate @ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) streambuf_allocate @ stub -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z # class filebuf * __thiscall filebuf::attach(int) @@ -414,7 +414,7 @@ @ cdecl -arch=win64 ?bad@ios@@QEBAHXZ(ptr) ios_bad @ thiscall -arch=win32 ?base@streambuf@@IBEPADXZ(ptr) streambuf_base @ cdecl -arch=win64 ?base@streambuf@@IEBAPEADXZ(ptr) streambuf_base -# @ extern ?basefield@ios@@2JB # static long const ios::basefield +@ extern ?basefield@ios@@2JB ios_basefield # @ extern ?binary@filebuf@@2HB # static int const filebuf::binary @ cdecl ?bitalloc@ios@@SAJXZ() ios_bitalloc @ thiscall -arch=win32 ?blen@streambuf@@IBEHXZ(ptr) streambuf_blen @@ -484,7 +484,7 @@ @ cdecl -arch=win64 ?flags@ios@@QEAAJJ@Z(ptr long) ios_flags_set @ thiscall -arch=win32 ?flags@ios@@QBEJXZ(ptr) ios_flags_get @ cdecl -arch=win64 ?flags@ios@@QEBAJXZ(ptr) ios_flags_get -# @ extern ?floatfield@ios@@2JB # static long const ios::floatfield +@ extern ?floatfield@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@ostream@@QAEAAV1@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@Z(long) msvcrt.?_set_new_mode@@YAHH@Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z -# @ extern ?adjustfield@ios@@2JB +@ extern ?adjustfield@ios@@2JB msvcirt.?adjustfield@ios@@2JB @ thiscall -arch=win32 ?allocate@streambuf@@IAEHXZ(ptr) msvcirt.?allocate@streambuf@@IAEHXZ @ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) msvcirt.?allocate@streambuf@@IEAAHXZ @ stub -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z @@ -402,7 +402,7 @@ @ cdecl -arch=win64 ?bad@ios@@QEBAHXZ(ptr) msvcirt.?bad@ios@@QEBAHXZ @ thiscall -arch=win32 ?base@streambuf@@IBEPADXZ(ptr) msvcirt.?base@streambuf@@IBEPADXZ @ cdecl -arch=win64 ?base@streambuf@@IEBAPEADXZ(ptr) msvcirt.?base@streambuf@@IEBAPEADXZ -# @ extern ?basefield@ios@@2JB +@ extern ?basefield@ios@@2JB msvcirt.?basefield@ios@@2JB # @ extern ?binary@filebuf@@2HB @ cdecl ?bitalloc@ios@@SAJXZ() msvcirt.?bitalloc@ios@@SAJXZ @ thiscall -arch=win32 ?blen@streambuf@@IBEHXZ(ptr) msvcirt.?blen@streambuf@@IBEHXZ @@ -472,7 +472,7 @@ @ cdecl -arch=win64 ?flags@ios@@QEAAJJ@Z(ptr long) msvcirt.?flags@ios@@QEAAJJ@Z @ thiscall -arch=win32 ?flags@ios@@QBEJXZ(ptr) msvcirt.?flags@ios@@QBEJXZ @ cdecl -arch=win64 ?flags@ios@@QEBAJXZ(ptr) msvcirt.?flags@ios@@QEBAJXZ -# @ extern ?floatfield@ios@@2JB +@ extern ?floatfield@ios@@2JB msvcirt.?floatfield@ios@@2JB @ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z @ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z @ stub -arch=win32 ?flush@ostream@@QAEAAV1@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@Z(long) msvcrt.?_set_new_mode@@YAHH@Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z -# @ extern ?adjustfield@ios@@2JB +@ extern ?adjustfield@ios@@2JB msvcirt.?adjustfield@ios@@2JB @ thiscall -arch=win32 ?allocate@streambuf@@IAEHXZ(ptr) msvcirt.?allocate@streambuf@@IAEHXZ @ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) msvcirt.?allocate@streambuf@@IEAAHXZ @ stub -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z @@ -465,7 +465,7 @@ @ cdecl -arch=win64 ?bad@ios@@QEBAHXZ(ptr) msvcirt.?bad@ios@@QEBAHXZ @ thiscall -arch=win32 ?base@streambuf@@IBEPADXZ(ptr) msvcirt.?base@streambuf@@IBEPADXZ @ cdecl -arch=win64 ?base@streambuf@@IEBAPEADXZ(ptr) msvcirt.?base@streambuf@@IEBAPEADXZ -# @ extern ?basefield@ios@@2JB +@ extern ?basefield@ios@@2JB msvcirt.?basefield@ios@@2JB @ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z # @ extern ?binary@filebuf@@2HB @@ -537,7 +537,7 @@ @ cdecl -arch=win64 ?flags@ios@@QEAAJJ@Z(ptr long) msvcirt.?flags@ios@@QEAAJJ@Z @ thiscall -arch=win32 ?flags@ios@@QBEJXZ(ptr) msvcirt.?flags@ios@@QBEJXZ @ cdecl -arch=win64 ?flags@ios@@QEBAJXZ(ptr) msvcirt.?flags@ios@@QEBAJXZ -# @ extern ?floatfield@ios@@2JB +@ extern ?floatfield@ios@@2JB msvcirt.?floatfield@ios@@2JB @ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z @ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z @ stub -arch=win32 ?flush@ostream@@QAEAAV1@XZ