urlmon: Fix the case of the BINDINFO.cbstgmedData field. Fixes the
htmldoc test compilation on Windows.
Francois Gouget
fgouget at free.fr
Fri Sep 29 05:42:10 CDT 2006
---
dlls/mshtml/navigate.c | 2 +-
dlls/mshtml/persist.c | 2 +-
dlls/mshtml/tests/htmldoc.c | 2 +-
dlls/shdocvw/navigate.c | 6 +++---
dlls/urlmon/binding.c | 2 +-
include/urlmon.idl | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index efa5ff7..1f7c560 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -364,7 +364,7 @@ static HRESULT WINAPI BindStatusCallback
memset(pbindinfo, 0, size);
pbindinfo->cbSize = size;
- pbindinfo->cbStgmedData = This->post_data_len;
+ pbindinfo->cbstgmedData = This->post_data_len;
pbindinfo->dwCodePage = CP_UTF8;
pbindinfo->dwOptions = 0x80000;
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 5b5f01c..db3f9da 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -118,7 +118,7 @@ static nsIInputStream *get_post_data_str
hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo);
if(SUCCEEDED(hres) && bindinfo.dwBindVerb == BINDVERB_POST)
- post_len = bindinfo.cbStgmedData;
+ post_len = bindinfo.cbstgmedData;
if(headers_len || post_len) {
int len = headers_len ? headers_len-1 : 0;
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index efa4679..96afe73 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -436,7 +436,7 @@ static HRESULT WINAPI Moniker_BindToStor
ok(bindinfo.grfBindInfoF == 0, "bindinfo.grfBinfInfoF=%08lx\n", bindinfo.grfBindInfoF);
ok(bindinfo.dwBindVerb == 0, "bindinfo.dwBindVerb=%ld\n", bindinfo.dwBindVerb);
ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb);
- ok(bindinfo.cbStgmedData == 0, "bindinfo.cbStgmedData=%ld\n", bindinfo.cbStgmedData);
+ ok(bindinfo.cbstgmedData == 0, "bindinfo.cbstgmedData=%ld\n", bindinfo.cbstgmedData);
ok(bindinfo.dwOptions == 0x80000, "bindinfo.dwOptions=%lx\n", bindinfo.dwOptions);
ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%ld\n", bindinfo.dwOptionsFlags);
/* TODO: test dwCodePage */
diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c
index 5d4ad0f..3ff6ae9 100644
--- a/dlls/shdocvw/navigate.c
+++ b/dlls/shdocvw/navigate.c
@@ -79,7 +79,7 @@ static void dump_BINDINFO(BINDINFO *bi)
bi->dwBindVerb > BINDVERB_CUSTOM
? "unknown" : BINDVERB_str[bi->dwBindVerb],
debugstr_w(bi->szCustomVerb),
- bi->cbStgmedData, bi->dwOptions, bi->dwOptionsFlags, bi->dwCodePage,
+ bi->cbstgmedData, bi->dwOptions, bi->dwOptionsFlags, bi->dwCodePage,
bi->securityAttributes.nLength,
bi->securityAttributes.lpSecurityDescriptor,
bi->securityAttributes.bInheritHandle,
@@ -195,7 +195,7 @@ static HRESULT WINAPI BindStatusCallback
memset(pbindinfo, 0, sizeof(BINDINFO));
pbindinfo->cbSize = sizeof(BINDINFO);
- pbindinfo->cbStgmedData = This->post_data_len;
+ pbindinfo->cbstgmedData = This->post_data_len;
if(This->post_data) {
pbindinfo->dwBindVerb = BINDVERB_POST;
@@ -539,7 +539,7 @@ HRESULT navigate_hlink(DocHost *This, IM
hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo);
dump_BINDINFO(&bindinfo);
if(bindinfo.dwBindVerb == BINDVERB_POST) {
- post_data_len = bindinfo.cbStgmedData;
+ post_data_len = bindinfo.cbstgmedData;
if(post_data_len)
post_data = bindinfo.stgmedData.u.hGlobal;
}
diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c
index 4277cb2..e5c2c00 100644
--- a/dlls/urlmon/binding.c
+++ b/dlls/urlmon/binding.c
@@ -339,7 +339,7 @@ static void dump_BINDINFO(BINDINFO *bi)
bi->dwBindVerb > BINDVERB_CUSTOM
? "unknown" : BINDVERB_str[bi->dwBindVerb],
debugstr_w(bi->szCustomVerb),
- bi->cbStgmedData, bi->dwOptions, bi->dwOptionsFlags, bi->dwCodePage,
+ bi->cbstgmedData, bi->dwOptions, bi->dwOptionsFlags, bi->dwCodePage,
bi->securityAttributes.nLength,
bi->securityAttributes.lpSecurityDescriptor,
bi->securityAttributes.bInheritHandle,
diff --git a/include/urlmon.idl b/include/urlmon.idl
index 85df342..da06868 100644
--- a/include/urlmon.idl
+++ b/include/urlmon.idl
@@ -131,7 +131,7 @@ interface IBindStatusCallback : IUnknown
DWORD grfBindInfoF;
DWORD dwBindVerb;
LPWSTR szCustomVerb;
- DWORD cbStgmedData;
+ DWORD cbstgmedData;
DWORD dwOptions;
DWORD dwOptionsFlags;
DWORD dwCodePage;
--
1.4.1.1
More information about the wine-patches
mailing list