=?UTF-8?Q?Iv=C3=A1n=20Matellanes=20?=: msvcirt: Add filebuf static fields.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Aug 5 10:28:04 CDT 2015
Module: wine
Branch: master
Commit: 30e33a406c80ccc5f8ab69b2d9592e018ec1ec94
URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e33a406c80ccc5f8ab69b2d9592e018ec1ec94
Author: Iván Matellanes <matellanesivan at gmail.com>
Date: Mon Aug 3 16:48:43 2015 +0200
msvcirt: Add filebuf static fields.
---
dlls/msvcirt/msvcirt.c | 13 +++++++++++++
dlls/msvcirt/msvcirt.spec | 12 ++++++------
dlls/msvcrt20/msvcrt20.spec | 12 ++++++------
dlls/msvcrt40/msvcrt40.spec | 12 ++++++------
4 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c
index 9a39b1a..f860c95 100644
--- a/dlls/msvcirt/msvcirt.c
+++ b/dlls/msvcirt/msvcirt.c
@@ -32,6 +32,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt);
#define RESERVE_SIZE 512
#define STATEBUF_SIZE 8
+/* ?sh_none at filebuf@@2HB */
+const int filebuf_sh_none = 0x800;
+/* ?sh_read at filebuf@@2HB */
+const int filebuf_sh_read = 0xa00;
+/* ?sh_write at filebuf@@2HB */
+const int filebuf_sh_write = 0xc00;
+/* ?openprot at filebuf@@2HB */
+const int filebuf_openprot = 420;
+/* ?binary at filebuf@@2HB */
+const int filebuf_binary = 0x8000;
+/* ?text at filebuf@@2HB */
+const int filebuf_text = 0x4000;
+
/* ?adjustfield at ios@@2JB */
const LONG ios_adjustfield = FLAGS_left | FLAGS_right | FLAGS_internal;
/* ?basefield at ios@@2JB */
diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec
index 249ee91..ffb6f21 100644
--- a/dlls/msvcirt/msvcirt.spec
+++ b/dlls/msvcirt/msvcirt.spec
@@ -415,7 +415,7 @@
@ 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 ios_basefield
-# @ extern ?binary at filebuf@@2HB # static int const filebuf::binary
+@ extern ?binary at filebuf@@2HB filebuf_binary
@ cdecl ?bitalloc at ios@@SAJXZ() ios_bitalloc
@ thiscall -arch=win32 ?blen at streambuf@@IBEHXZ(ptr) streambuf_blen
@ cdecl -arch=win64 ?blen at streambuf@@IEBAHXZ(ptr) streambuf_blen
@@ -570,7 +570,7 @@
@ stub -arch=win64 ?open at ifstream@@QEAAXPEBDHH at Z
@ stub -arch=win32 ?open at ofstream@@QAEXPBDHH at Z # void __thiscall ofstream::open(char const *,int,int)
@ stub -arch=win64 ?open at ofstream@@QEAAXPEBDHH at Z
-# @ extern ?openprot at filebuf@@2HB # static int const filebuf::openprot
+@ extern ?openprot at filebuf@@2HB filebuf_openprot
@ stub -arch=win32 ?opfx at ostream@@QAEHXZ # int __thiscall ostream::opfx(void)
@ stub -arch=win64 ?opfx at ostream@@QEAAHXZ
@ stub -arch=win32 ?osfx at ostream@@QAEXXZ # void __thiscall ostream::osfx(void)
@@ -697,9 +697,9 @@
@ cdecl -arch=win64 ?sgetc at streambuf@@QEAAHXZ(ptr) streambuf_sgetc
@ thiscall -arch=win32 ?sgetn at streambuf@@QAEHPADH at Z(ptr ptr long) streambuf_sgetn
@ cdecl -arch=win64 ?sgetn at streambuf@@QEAAHPEADH at Z(ptr ptr long) streambuf_sgetn
-# @ extern ?sh_none at filebuf@@2HB # static int const filebuf::sh_none
-# @ extern ?sh_read at filebuf@@2HB # static int const filebuf::sh_read
-# @ extern ?sh_write at filebuf@@2HB # static int const filebuf::sh_write
+@ extern ?sh_none at filebuf@@2HB filebuf_sh_none
+@ extern ?sh_read at filebuf@@2HB filebuf_sh_read
+@ extern ?sh_write at filebuf@@2HB filebuf_sh_write
@ thiscall -arch=win32 ?snextc at streambuf@@QAEHXZ(ptr) streambuf_snextc
@ cdecl -arch=win64 ?snextc at streambuf@@QEAAHXZ(ptr) streambuf_snextc
@ thiscall -arch=win32 ?sputbackc at streambuf@@QAEHD at Z(ptr long) streambuf_sputbackc
@@ -736,7 +736,7 @@
@ stub -arch=win64 ?tellg at istream@@QEAAJXZ
@ stub -arch=win32 ?tellp at ostream@@QAEJXZ # long __thiscall ostream::tellp(void)
@ stub -arch=win64 ?tellp at ostream@@QEAAJXZ
-# @ extern ?text at filebuf@@2HB # static int const filebuf::text
+@ extern ?text at filebuf@@2HB filebuf_text
@ thiscall -arch=win32 ?tie at ios@@QAEPAVostream@@PAV2@@Z(ptr ptr) ios_tie_set
@ cdecl -arch=win64 ?tie at ios@@QEAAPEAVostream@@PEAV2@@Z(ptr ptr) ios_tie_set
@ thiscall -arch=win32 ?tie at ios@@QBEPAVostream@@XZ(ptr) ios_tie_get
diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec
index ab59dde..ade81ae 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -403,7 +403,7 @@
@ 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 msvcirt.?basefield at ios@@2JB
-# @ extern ?binary at filebuf@@2HB
+@ extern ?binary at filebuf@@2HB msvcirt.?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
@ cdecl -arch=win64 ?blen at streambuf@@IEBAHXZ(ptr) msvcirt.?blen at streambuf@@IEBAHXZ
@@ -556,7 +556,7 @@
@ stub -arch=win64 ?open at ifstream@@QEAAXPEBDHH at Z
@ stub -arch=win32 ?open at ofstream@@QAEXPBDHH at Z
@ stub -arch=win64 ?open at ofstream@@QEAAXPEBDHH at Z
-# @ extern ?openprot at filebuf@@2HB
+@ extern ?openprot at filebuf@@2HB msvcirt.?openprot at filebuf@@2HB
@ stub -arch=win32 ?opfx at ostream@@QAEHXZ
@ stub -arch=win64 ?opfx at ostream@@QEAAHXZ
@ stub -arch=win32 ?osfx at ostream@@QAEXXZ
@@ -685,9 +685,9 @@
@ cdecl -arch=win64 ?sgetc at streambuf@@QEAAHXZ(ptr) msvcirt.?sgetc at streambuf@@QEAAHXZ
@ thiscall -arch=win32 ?sgetn at streambuf@@QAEHPADH at Z(ptr ptr long) msvcirt.?sgetn at streambuf@@QAEHPADH at Z
@ cdecl -arch=win64 ?sgetn at streambuf@@QEAAHPEADH at Z(ptr ptr long) msvcirt.?sgetn at streambuf@@QEAAHPEADH at Z
-# @ extern ?sh_none at filebuf@@2HB
-# @ extern ?sh_read at filebuf@@2HB
-# @ extern ?sh_write at filebuf@@2HB
+@ extern ?sh_none at filebuf@@2HB msvcirt.?sh_none at filebuf@@2HB
+@ extern ?sh_read at filebuf@@2HB msvcirt.?sh_read at filebuf@@2HB
+@ extern ?sh_write at filebuf@@2HB msvcirt.?sh_write at filebuf@@2HB
@ thiscall -arch=win32 ?snextc at streambuf@@QAEHXZ(ptr) msvcirt.?snextc at streambuf@@QAEHXZ
@ cdecl -arch=win64 ?snextc at streambuf@@QEAAHXZ(ptr) msvcirt.?snextc at streambuf@@QEAAHXZ
@ thiscall -arch=win32 ?sputbackc at streambuf@@QAEHD at Z(ptr long) msvcirt.?sputbackc at streambuf@@QAEHD at Z
@@ -725,7 +725,7 @@
@ stub -arch=win32 ?tellp at ostream@@QAEJXZ
@ stub -arch=win64 ?tellp at ostream@@QEAAJXZ
@ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ
-# @ extern ?text at filebuf@@2HB
+@ extern ?text at filebuf@@2HB msvcirt.?text at filebuf@@2HB
@ thiscall -arch=win32 ?tie at ios@@QAEPAVostream@@PAV2@@Z(ptr ptr) msvcirt.?tie at ios@@QAEPAVostream@@PAV2@@Z
@ cdecl -arch=win64 ?tie at ios@@QEAAPEAVostream@@PEAV2@@Z(ptr ptr) msvcirt.?tie at ios@@QEAAPEAVostream@@PEAV2@@Z
@ thiscall -arch=win32 ?tie at ios@@QBEPAVostream@@XZ(ptr) msvcirt.?tie at ios@@QBEPAVostream@@XZ
diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec
index 0f5811a..33e4f16 100644
--- a/dlls/msvcrt40/msvcrt40.spec
+++ b/dlls/msvcrt40/msvcrt40.spec
@@ -468,7 +468,7 @@
@ 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
+@ extern ?binary at filebuf@@2HB msvcirt.?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
@ cdecl -arch=win64 ?blen at streambuf@@IEBAHXZ(ptr) msvcirt.?blen at streambuf@@IEBAHXZ
@@ -625,7 +625,7 @@
@ stub -arch=win64 ?open at ifstream@@QEAAXPEBDHH at Z
@ stub -arch=win32 ?open at ofstream@@QAEXPBDHH at Z
@ stub -arch=win64 ?open at ofstream@@QEAAXPEBDHH at Z
-# @ extern ?openprot at filebuf@@2HB
+@ extern ?openprot at filebuf@@2HB msvcirt.?openprot at filebuf@@2HB
@ stub -arch=win32 ?opfx at ostream@@QAEHXZ
@ stub -arch=win64 ?opfx at ostream@@QEAAHXZ
@ stub -arch=win32 ?osfx at ostream@@QAEXXZ
@@ -757,9 +757,9 @@
@ cdecl -arch=win64 ?sgetc at streambuf@@QEAAHXZ(ptr) msvcirt.?sgetc at streambuf@@QEAAHXZ
@ thiscall -arch=win32 ?sgetn at streambuf@@QAEHPADH at Z(ptr ptr long) msvcirt.?sgetn at streambuf@@QAEHPADH at Z
@ cdecl -arch=win64 ?sgetn at streambuf@@QEAAHPEADH at Z(ptr ptr long) msvcirt.?sgetn at streambuf@@QEAAHPEADH at Z
-# @ extern ?sh_none at filebuf@@2HB
-# @ extern ?sh_read at filebuf@@2HB
-# @ extern ?sh_write at filebuf@@2HB
+@ extern ?sh_none at filebuf@@2HB msvcirt.?sh_none at filebuf@@2HB
+@ extern ?sh_read at filebuf@@2HB msvcirt.?sh_read at filebuf@@2HB
+@ extern ?sh_write at filebuf@@2HB msvcirt.?sh_write at filebuf@@2HB
@ thiscall -arch=win32 ?snextc at streambuf@@QAEHXZ(ptr) msvcirt.?snextc at streambuf@@QAEHXZ
@ cdecl -arch=win64 ?snextc at streambuf@@QEAAHXZ(ptr) msvcirt.?snextc at streambuf@@QEAAHXZ
@ thiscall -arch=win32 ?sputbackc at streambuf@@QAEHD at Z(ptr long) msvcirt.?sputbackc at streambuf@@QAEHD at Z
@@ -797,7 +797,7 @@
@ stub -arch=win32 ?tellp at ostream@@QAEJXZ
@ stub -arch=win64 ?tellp at ostream@@QEAAJXZ
@ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ
-# @ extern ?text at filebuf@@2HB
+@ extern ?text at filebuf@@2HB msvcirt.?text at filebuf@@2HB
@ thiscall -arch=win32 ?tie at ios@@QAEPAVostream@@PAV2@@Z(ptr ptr) msvcirt.?tie at ios@@QAEPAVostream@@PAV2@@Z
@ cdecl -arch=win64 ?tie at ios@@QEAAPEAVostream@@PEAV2@@Z(ptr ptr) msvcirt.?tie at ios@@QEAAPEAVostream@@PEAV2@@Z
@ thiscall -arch=win32 ?tie at ios@@QBEPAVostream@@XZ(ptr) msvcirt.?tie at ios@@QBEPAVostream@@XZ
More information about the wine-cvs
mailing list