Jacek Caban : mshtml: Wine Gecko 1.0.0 release.
Alexandre Julliard
julliard at winehq.org
Tue Aug 4 12:25:49 CDT 2009
Module: wine
Branch: master
Commit: d97cc15608c7511d83cda025d3dce7c9e3659252
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97cc15608c7511d83cda025d3dce7c9e3659252
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Aug 4 14:05:05 2009 +0200
mshtml: Wine Gecko 1.0.0 release.
---
dlls/mshtml/install.c | 4 ++--
dlls/mshtml/mutation.c | 6 ++++++
dlls/mshtml/nsiface.idl | 30 ++++++++++++++++--------------
dlls/mshtml/tests/dom.c | 1 -
4 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c
index c993b99..5eca3a6 100644
--- a/dlls/mshtml/install.c
+++ b/dlls/mshtml/install.c
@@ -47,7 +47,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
-#define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION ".cab"
+#define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION "-x86.cab"
static const WCHAR mshtml_keyW[] =
{'S','o','f','t','w','a','r','e',
@@ -430,7 +430,7 @@ static LPWSTR get_url(void)
static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0};
static const WCHAR httpW[] = {'h','t','t','p'};
- static const WCHAR v_formatW[] = {'?','v','=',0};
+ static const WCHAR v_formatW[] = {'?','a','r','c','h','=','x','8','6','&','v','=',0};
/* @@ Wine registry key: HKCU\Software\Wine\MSHTML */
res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey);
diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c
index ab9649c..6060a8d 100644
--- a/dlls/mshtml/mutation.c
+++ b/dlls/mshtml/mutation.c
@@ -412,6 +412,11 @@ static void NSAPI nsDocumentObserver_CharacterDataChanged(nsIDocumentObserver *i
{
}
+static void NSAPI nsDocumentObserver_AttributeWillChange(nsIDocumentObserver *iface, nsIDocument *aDocument,
+ nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType)
+{
+}
+
static void NSAPI nsDocumentObserver_AttributeChanged(nsIDocumentObserver *iface, nsIDocument *aDocument,
nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask)
{
@@ -563,6 +568,7 @@ static const nsIDocumentObserverVtbl nsDocumentObserverVtbl = {
nsDocumentObserver_Release,
nsDocumentObserver_CharacterDataWillChange,
nsDocumentObserver_CharacterDataChanged,
+ nsDocumentObserver_AttributeWillChange,
nsDocumentObserver_AttributeChanged,
nsDocumentObserver_ContentAppended,
nsDocumentObserver_ContentInserted,
diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index 894bb41..24c6214 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -23,7 +23,7 @@
* compatible with XPCOM, usable in C code.
*/
-cpp_quote("#define GECKO_VERSION \"0.9.1\"")
+cpp_quote("#define GECKO_VERSION \"1.0.0\"")
cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION")
import "wtypes.idl";
@@ -855,7 +855,7 @@ interface nsIDOMDocument : nsIDOMNode
[
object,
- uuid(533a8131-8d0c-4ebf-990b-7fad7cd51466),
+ uuid(09a439ad-4079-46d5-a050-4d7015d1a108),
local
/* NOT_FROZEN */
]
@@ -868,9 +868,9 @@ interface nsIDOMNSDocument : nsISupports
nsresult GetTitle(nsAString *aTitle);
nsresult SetTitle(const nsAString *aTitle);
nsresult GetContentType(nsAString *aContentType);
+ nsresult GetReadyState(nsAString *aReadyState);
nsresult GetLastModified(nsAString *aLastModified);
nsresult GetReferrer(nsAString *aReferrer);
- nsresult GetBoxObjectFor(nsIDOMElement *elt, nsIBoxObject **_retval);
nsresult HasFocus(PRBool *_retval);
nsresult GetActiveElement(nsIDOMElement **aActiveElement);
nsresult GetElementsByClassName(const nsAString *classes, nsIDOMNodeList **_retval);
@@ -1546,13 +1546,13 @@ interface nsIWebNavigation : nsISupports
[
object,
- uuid(5af07661-6477-4235-8814-4a45215855b8),
+ uuid(343700dd-078b-42b6-a809-b9c1d7e951d0),
local
/* NOT_FROZEN */
]
interface nsIPrintSettings : nsISupports
{
- typedef struct { char dummy; } nsMargin;
+ typedef struct { char dummy; } nsIntMargin;
nsresult SetPrintOptions(PRInt32 aType, PRBool aTurnOnOff);
nsresult GetPrintOptions(PRInt32 aType, PRBool *_retval);
@@ -1672,13 +1672,13 @@ interface nsIPrintSettings : nsISupports
nsresult SetIsInitializedFromPrinter(PRBool aIsInitializedFromPrinter);
nsresult GetIsInitializedFromPrefs(PRBool *aIsInitializedFromPrefs);
nsresult SetIsInitializedFromPrefs(PRBool aIsInitializedFromPrefs);
- nsresult SetMarginInTwips(nsMargin *aMargin);
- nsresult SetEdgeInTwips(nsMargin *aEdge);
- nsresult GetMarginInTwips(nsMargin *aMargin);
- nsresult GetEdgeInTwips(nsMargin *aEdge);
+ nsresult SetMarginInTwips(nsIntMargin *aMargin);
+ nsresult SetEdgeInTwips(nsIntMargin *aEdge);
+ nsresult GetMarginInTwips(nsIntMargin *aMargin);
+ nsresult GetEdgeInTwips(nsIntMargin *aEdge);
nsresult SetupSilentPrinting();
- nsresult SetUnwriteableMarginInTwips(nsMargin *aEdge);
- nsresult GetUnwriteableMarginInTwips(nsMargin *aEdge);
+ nsresult SetUnwriteableMarginInTwips(nsIntMargin *aEdge);
+ nsresult GetUnwriteableMarginInTwips(nsIntMargin *aEdge);
}
[
@@ -1872,7 +1872,7 @@ interface nsIIOService : nsISupports
[
object,
- uuid(57322c6f-f4ec-4e46-8253-b74be220de16),
+ uuid(a50d5516-5c0a-4f08-b427-703ca0c44ac3),
local,
/* NOT_FROZEN */
]
@@ -2485,7 +2485,7 @@ interface nsIHTMLEditor : nsISupports
[
object,
- uuid(32e68316-67d4-44a5-8d35-0d390fa9df11),
+ uuid(365d600b-868a-452a-8de8-f46fad8fee53),
local
/* NOT_FROZEN */
]
@@ -2495,6 +2495,8 @@ interface nsIMutationObserver : nsISupports
void /*CharacterDataChangeInfo*/ *aInfo);
void CharacterDataChanged(nsIDocument *aDocument, nsIContent *aContent,
void /*CharacterDataChangeInfo*/ *aInfo);
+ void AttributeWillChange(nsIDocument *aDocument, nsIContent * aContent, PRInt32 aNameSpaceID,
+ nsIAtom *aAttribute, PRInt32 aModType);
void AttributeChanged(nsIDocument *aDocument, nsIContent *aContent, PRInt32 aNameSpaceID,
nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask);
void ContentAppended(nsIDocument *aDocument, nsIContent *aContainer, PRInt32 aNewIndexInContainer);
@@ -2531,7 +2533,7 @@ interface nsIDocumentObserver : nsIMutationObserver
void StyleRuleAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule);
void StyleRuleRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule);
void BindToDocument(nsIDocument *aDocument, nsIContent *aContent);
- void DoneAddingContent(nsIContent *aContent, PRBool aHaveNotified);
+ void DoneAddingChildren(nsIContent *aContent, PRBool aHaveNotified);
}
/*
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 97102db..4846848 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -3014,7 +3014,6 @@ static void test_default_style(IHTMLStyle *style)
hres = IHTMLStyle_get_margin(style, &str);
ok(hres == S_OK, "get_margin failed: %08x\n", hres);
- todo_wine
ok(!strcmp_wa(str, "1px"), "margin = %s\n", dbgstr_w(str));
hres = IHTMLStyle_put_margin(style, NULL);
More information about the wine-cvs
mailing list