From dc0cfe772980c51b5ddcb78ec643033bc89d7dae Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Fri, 29 Sep 2006 12:42:10 +0200
Subject: [PATCH] urlmon: Fix the case of the BINDINFO.cbstgmedData field.
 Fixes the htmldoc test compilation on Windows.

---
 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 efa5ff7f9b5..1f7c560899e 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -364,7 +364,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface,
     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 9d823018191..d9eb099160e 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -118,7 +118,7 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx)
     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 bc8df9168ce..c6fb288469c 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -447,7 +447,7 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon
     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 5d4ad0fea13..3ff6ae94366 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_GetBindInfo(IBindStatusCallback *iface,
     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, IMoniker *mon, IBindCtx *bindctx,
     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 4277cb2df3a..e5c2c000b6a 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 85df342fa8d..da068684cb8 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;
-- 
2.11.4.GIT