mshtml: Wine Gecko 1.9 release.

dlls/appwiz.cpl/addons.c

@@ -53,14 +53,14 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl);
 
-#define GECKO_VERSION "1.8"
+#define GECKO_VERSION "1.9"
 
 #ifdef __i386__
 #define ARCH_STRING "x86"
-#define GECKO_SHA "a8622ff749cc2a2cb311f902b7e99664ecc2f8d6"
+#define GECKO_SHA "d2553224848a926eacfa8685662ff1d7e8be2428"
 #elif defined(__x86_64__)
 #define ARCH_STRING "x86_64"
-#define GECKO_SHA "ea8bb450c6b41f71cc0ef23c490dfebdaccf789d"
+#define GECKO_SHA "c7cd0994f89dd15b36ce8dacaa33d0ec47c407d1"
 #else
 #define ARCH_STRING ""
 #define GECKO_SHA "???"

dlls/mshtml/htmlnode.c

@@ -1143,7 +1143,7 @@ static nsresult NSAPI HTMLDOMNode_traverse(void *ccp, void *p, nsCycleCollection
 
     TRACE("%p\n", This);
 
-    describe_cc_node(&This->ccref, sizeof(*This), "HTMLDOMNode", cb);
+    describe_cc_node(&This->ccref, "HTMLDOMNode", cb);
 
     if(This->nsnode)
         note_cc_edge((nsISupports*)This->nsnode, "This->nsnode", cb);

dlls/mshtml/mshtml_private.h

@@ -254,7 +254,7 @@ nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*);
 void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt);
 void (__cdecl *ccref_unmark_if_purple)(nsCycleCollectingAutoRefCnt*);
 void (__cdecl *ccp_init)(nsXPCOMCycleCollectionParticipant*,const CCObjCallback*);
-void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,size_t,const char*,nsCycleCollectionTraversalCallback*);
+void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*);
 void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*);
 
 void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN;

dlls/mshtml/mutation.c

@@ -533,6 +533,11 @@ static void NSAPI nsDocumentObserver_AttributeChanged(nsIDocumentObserver *iface
 {
 }
 
+static void NSAPI nsDocumentObserver_AttributeSetToCurrentValue(nsIDocumentObserver *iface, nsIDocument *aDocument,
+        void *aElement, PRInt32 aNameSpaceID, nsIAtom *aAttribute)
+{
+}
+
 static void NSAPI nsDocumentObserver_ContentAppended(nsIDocumentObserver *iface, nsIDocument *aDocument,
         nsIContent *aContainer, nsIContent *aFirstNewContent, PRInt32 aNewIndexInContainer)
 {
@@ -715,6 +720,7 @@ static const nsIDocumentObserverVtbl nsDocumentObserverVtbl = {
     nsDocumentObserver_CharacterDataChanged,
     nsDocumentObserver_AttributeWillChange,
     nsDocumentObserver_AttributeChanged,
+    nsDocumentObserver_AttributeSetToCurrentValue,
     nsDocumentObserver_ContentAppended,
     nsDocumentObserver_ContentInserted,
     nsDocumentObserver_ContentRemoved,

dlls/mshtml/navigate.c

@@ -138,7 +138,7 @@ static nsresult NSAPI nsInputStream_Close(nsIInputStream *iface)
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-static nsresult NSAPI nsInputStream_Available(nsIInputStream *iface, PRUint32 *_retval)
+static nsresult NSAPI nsInputStream_Available(nsIInputStream *iface, PRUint64 *_retval)
 {
     nsProtocolStream *This = impl_from_nsIInputStream(iface);
     FIXME("(%p)->(%p)\n", This, _retval);
@@ -1001,7 +1001,8 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret)
 
 static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel)
 {
-    PRUint32 data_len = 0, available = 0;
+    PRUint64 available = 0;
+    PRUint32 data_len = 0;
     char *data, *post_data;
     nsresult nsres;
     HRESULT hres = S_OK;

dlls/mshtml/nsio.c

@@ -1134,6 +1134,13 @@ static nsresult NSAPI nsChannel_GetContentDisposition(nsIHttpChannel *iface, PRU
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+static nsresult NSAPI nsChannel_SetContentDisposition(nsIHttpChannel *iface, PRUint32 aContentDisposition)
+{
+    nsChannel *This = impl_from_nsIHttpChannel(iface);
+    FIXME("(%p)->(%u)\n", This, aContentDisposition);
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 static nsresult NSAPI nsChannel_GetContentDispositionFilename(nsIHttpChannel *iface, nsAString *aContentDispositionFilename)
 {
     nsChannel *This = impl_from_nsIHttpChannel(iface);
@@ -1141,6 +1148,13 @@ static nsresult NSAPI nsChannel_GetContentDispositionFilename(nsIHttpChannel *if
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+static nsresult NSAPI nsChannel_SetContentDispositionFilename(nsIHttpChannel *iface, const nsAString *aContentDispositionFilename)
+{
+    nsChannel *This = impl_from_nsIHttpChannel(iface);
+    FIXME("(%p)->(%p)\n", This, aContentDispositionFilename);
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 static nsresult NSAPI nsChannel_GetContentDispositionHeader(nsIHttpChannel *iface, nsACString *aContentDispositionHeader)
 {
     nsChannel *This = impl_from_nsIHttpChannel(iface);
@@ -1399,7 +1413,9 @@ static const nsIHttpChannelVtbl nsChannelVtbl = {
     nsChannel_Open,
     nsChannel_AsyncOpen,
     nsChannel_GetContentDisposition,
+    nsChannel_SetContentDisposition,
     nsChannel_GetContentDispositionFilename,
+    nsChannel_SetContentDispositionFilename,
     nsChannel_GetContentDispositionHeader,
     nsChannel_GetRequestMethod,
     nsChannel_SetRequestMethod,
@@ -1447,7 +1463,7 @@ static nsrefcnt NSAPI nsUploadChannel_Release(nsIUploadChannel *iface)
 }
 
 static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface,
-        nsIInputStream *aStream, const nsACString *aContentType, PRInt32 aContentLength)
+        nsIInputStream *aStream, const nsACString *aContentType, PRInt64 aContentLength)
 {
     nsChannel *This = impl_from_nsIUploadChannel(iface);
     const char *content_type;
@@ -1455,7 +1471,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface,
     static const WCHAR content_typeW[] =
         {'C','o','n','t','e','n','t','-','T','y','p','e',0};
 
-    TRACE("(%p)->(%p %s %d)\n", This, aStream, debugstr_nsacstr(aContentType), aContentLength);
+    TRACE("(%p)->(%p %s %s)\n", This, aStream, debugstr_nsacstr(aContentType), wine_dbgstr_longlong(aContentLength));
 
     This->post_data_contains_headers = TRUE;
 
@@ -1479,7 +1495,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface,
         nsIInputStream_Release(This->post_data_stream);
 
     if(aContentLength != -1)
-        FIXME("Unsupported acontentLength = %d\n", aContentLength);
+        FIXME("Unsupported acontentLength = %s\n", wine_dbgstr_longlong(aContentLength));
 
     if(This->post_data_stream)
         nsIInputStream_Release(This->post_data_stream);