Jacek Caban : mshtml: Move BSCallback declaration to navigate.c.
Alexandre Julliard
julliard at winehq.org
Mon Mar 24 07:54:48 CDT 2008
Module: wine
Branch: master
Commit: a7caae954015c45debc762934161e9211c765c71
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7caae954015c45debc762934161e9211c765c71
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sun Mar 23 02:16:18 2008 +0100
mshtml: Move BSCallback declaration to navigate.c.
---
dlls/mshtml/mshtml_private.h | 36 ------------------------------------
dlls/mshtml/navigate.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index a21eee3..17a1219 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -235,42 +235,6 @@ typedef struct {
} nsChannel;
typedef struct {
- const nsIInputStreamVtbl *lpInputStreamVtbl;
-
- LONG ref;
-
- char buf[1024];
- DWORD buf_size;
-} nsProtocolStream;
-
-struct BSCallback {
- const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl;
- const IServiceProviderVtbl *lpServiceProviderVtbl;
- const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl;
- const IInternetBindInfoVtbl *lpInternetBindInfoVtbl;
-
- LONG ref;
-
- LPWSTR headers;
- HGLOBAL post_data;
- ULONG post_data_len;
- ULONG readed;
-
- nsChannel *nschannel;
- nsIStreamListener *nslistener;
- nsISupports *nscontext;
-
- IMoniker *mon;
- IBinding *binding;
-
- HTMLDocument *doc;
-
- nsProtocolStream *nsstream;
-
- struct list entry;
-};
-
-typedef struct {
HRESULT (*qi)(HTMLDOMNode*,REFIID,void**);
void (*destructor)(HTMLDOMNode*);
} NodeImplVtbl;
diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index ebeca3d..2349178 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -41,8 +41,44 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
#define CONTENT_LENGTH "Content-Length"
#define UTF16_STR "utf-16"
+typedef struct {
+ const nsIInputStreamVtbl *lpInputStreamVtbl;
+
+ LONG ref;
+
+ char buf[1024];
+ DWORD buf_size;
+} nsProtocolStream;
+
#define NSINSTREAM(x) ((nsIInputStream*) &(x)->lpInputStreamVtbl)
+struct BSCallback {
+ const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl;
+ const IServiceProviderVtbl *lpServiceProviderVtbl;
+ const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl;
+ const IInternetBindInfoVtbl *lpInternetBindInfoVtbl;
+
+ LONG ref;
+
+ LPWSTR headers;
+ HGLOBAL post_data;
+ ULONG post_data_len;
+ ULONG readed;
+
+ nsChannel *nschannel;
+ nsIStreamListener *nslistener;
+ nsISupports *nscontext;
+
+ IMoniker *mon;
+ IBinding *binding;
+
+ HTMLDocument *doc;
+
+ nsProtocolStream *nsstream;
+
+ struct list entry;
+};
+
#define NSINSTREAM_THIS(iface) DEFINE_THIS(nsProtocolStream, InputStream, iface)
static nsresult NSAPI nsInputStream_QueryInterface(nsIInputStream *iface, nsIIDRef riid,
More information about the wine-cvs
mailing list