Piotr Caban : msvcp90: Define basic_streambuf structure globally.
Alexandre Julliard
julliard at winehq.org
Thu Jun 21 15:03:40 CDT 2012
Module: wine
Branch: master
Commit: 237cc9506f72c9e9d174f25875a7492023ff12e2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=237cc9506f72c9e9d174f25875a7492023ff12e2
Author: Piotr Caban <piotr at codeweavers.com>
Date: Thu Jun 21 12:25:44 2012 +0200
msvcp90: Define basic_streambuf structure globally.
---
dlls/msvcp90/ios.c | 36 ------------------------------------
dlls/msvcp90/locale.c | 4 ++--
dlls/msvcp90/msvcp90.h | 38 ++++++++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index 9062760..5bfc4e6 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -50,42 +50,6 @@ typedef struct {
streamsize arg;
} manip_streamsize;
-typedef struct {
- const vtable_ptr *vtable;
- mutex lock;
- char *rbuf;
- char *wbuf;
- char **prbuf;
- char **pwbuf;
- char *rpos;
- char *wpos;
- char **prpos;
- char **pwpos;
- int rsize;
- int wsize;
- int *prsize;
- int *pwsize;
- locale *loc;
-} basic_streambuf_char;
-
-typedef struct {
- const vtable_ptr *vtable;
- mutex lock;
- wchar_t *rbuf;
- wchar_t *wbuf;
- wchar_t **prbuf;
- wchar_t **pwbuf;
- wchar_t *rpos;
- wchar_t *wpos;
- wchar_t **prpos;
- wchar_t **pwpos;
- int rsize;
- int wsize;
- int *prsize;
- int *pwsize;
- locale *loc;
-} basic_streambuf_wchar;
-
typedef enum {
INITFL_new = 0,
INITFL_open = 1,
diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index ca26378..94b3384 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -104,14 +104,14 @@ typedef struct {
typedef struct _istreambuf_iterator_char
{
- struct _basic_streambuf_char *strbuf;
+ basic_streambuf_char *strbuf;
MSVCP_bool got;
char val;
} istreambuf_iterator_char;
typedef struct _istreambuf_iterator_wchar
{
- struct _basic_streambuf_wchar *strbuf;
+ basic_streambuf_wchar *strbuf;
MSVCP_bool got;
wchar_t val;
} istreambuf_iterator_wchar;
diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h
index 2dde330..e6cffc7 100644
--- a/dlls/msvcp90/msvcp90.h
+++ b/dlls/msvcp90/msvcp90.h
@@ -484,5 +484,43 @@ typedef struct _ios_base {
locale *loc;
} ios_base;
+/* class basic_streambuf<char> */
+typedef struct {
+ const vtable_ptr *vtable;
+ mutex lock;
+ char *rbuf;
+ char *wbuf;
+ char **prbuf;
+ char **pwbuf;
+ char *rpos;
+ char *wpos;
+ char **prpos;
+ char **pwpos;
+ int rsize;
+ int wsize;
+ int *prsize;
+ int *pwsize;
+ locale *loc;
+} basic_streambuf_char;
+
+/* class basic_streambuf<wchar> */
+typedef struct {
+ const vtable_ptr *vtable;
+ mutex lock;
+ wchar_t *rbuf;
+ wchar_t *wbuf;
+ wchar_t **prbuf;
+ wchar_t **pwbuf;
+ wchar_t *rpos;
+ wchar_t *wpos;
+ wchar_t **prpos;
+ wchar_t **pwpos;
+ int rsize;
+ int wsize;
+ int *prsize;
+ int *pwsize;
+ locale *loc;
+} basic_streambuf_wchar;
+
void init_io(void);
void free_io(void);
More information about the wine-cvs
mailing list