ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Wine Gecko 1.0.0 release.

This commit is contained in:
Jacek Caban 2009-08-04 14:05:05 +02:00 committed by Alexandre Julliard
parent 870f508c98
commit d97cc15608
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/mshtml/install.c
View File

@ -47,7 +47,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml); 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[] = static const WCHAR mshtml_keyW[] =
{'S','o','f','t','w','a','r','e', {'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 wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0};
static const WCHAR httpW[] = {'h','t','t','p'}; 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 */ /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */
res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey);

6
dlls/mshtml/mutation.c
View File

@ -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, static void NSAPI nsDocumentObserver_AttributeChanged(nsIDocumentObserver *iface, nsIDocument *aDocument,
nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask) nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask)
{ {
@ -563,6 +568,7 @@ static const nsIDocumentObserverVtbl nsDocumentObserverVtbl = {
nsDocumentObserver_Release, nsDocumentObserver_Release,
nsDocumentObserver_CharacterDataWillChange, nsDocumentObserver_CharacterDataWillChange,
nsDocumentObserver_CharacterDataChanged, nsDocumentObserver_CharacterDataChanged,
nsDocumentObserver_AttributeWillChange,
nsDocumentObserver_AttributeChanged, nsDocumentObserver_AttributeChanged,
nsDocumentObserver_ContentAppended, nsDocumentObserver_ContentAppended,
nsDocumentObserver_ContentInserted, nsDocumentObserver_ContentInserted,

30
dlls/mshtml/nsiface.idl
View File

@ -23,7 +23,7 @@
* compatible with XPCOM, usable in C code. * 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") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION")
import "wtypes.idl"; import "wtypes.idl";
@ -855,7 +855,7 @@ interface nsIDOMDocument : nsIDOMNode
[ [
object, object,
uuid(533a8131-8d0c-4ebf-990b-7fad7cd51466), uuid(09a439ad-4079-46d5-a050-4d7015d1a108),
local local
/* NOT_FROZEN */ /* NOT_FROZEN */
] ]
@ -868,9 +868,9 @@ interface nsIDOMNSDocument : nsISupports
nsresult GetTitle(nsAString *aTitle); nsresult GetTitle(nsAString *aTitle);
nsresult SetTitle(const nsAString *aTitle); nsresult SetTitle(const nsAString *aTitle);
nsresult GetContentType(nsAString *aContentType); nsresult GetContentType(nsAString *aContentType);
nsresult GetReadyState(nsAString *aReadyState);
nsresult GetLastModified(nsAString *aLastModified); nsresult GetLastModified(nsAString *aLastModified);
nsresult GetReferrer(nsAString *aReferrer); nsresult GetReferrer(nsAString *aReferrer);
nsresult GetBoxObjectFor(nsIDOMElement *elt, nsIBoxObject **_retval);
nsresult HasFocus(PRBool *_retval); nsresult HasFocus(PRBool *_retval);
nsresult GetActiveElement(nsIDOMElement **aActiveElement); nsresult GetActiveElement(nsIDOMElement **aActiveElement);
nsresult GetElementsByClassName(const nsAString *classes, nsIDOMNodeList **_retval); nsresult GetElementsByClassName(const nsAString *classes, nsIDOMNodeList **_retval);
@ -1546,13 +1546,13 @@ interface nsIWebNavigation : nsISupports
[ [
object, object,
uuid(5af07661-6477-4235-8814-4a45215855b8), uuid(343700dd-078b-42b6-a809-b9c1d7e951d0),
local local
/* NOT_FROZEN */ /* NOT_FROZEN */
] ]
interface nsIPrintSettings : nsISupports interface nsIPrintSettings : nsISupports
{ {
typedef struct { char dummy; } nsMargin; typedef struct { char dummy; } nsIntMargin;
nsresult SetPrintOptions(PRInt32 aType, PRBool aTurnOnOff); nsresult SetPrintOptions(PRInt32 aType, PRBool aTurnOnOff);
nsresult GetPrintOptions(PRInt32 aType, PRBool *_retval); nsresult GetPrintOptions(PRInt32 aType, PRBool *_retval);
@ -1672,13 +1672,13 @@ interface nsIPrintSettings : nsISupports
nsresult SetIsInitializedFromPrinter(PRBool aIsInitializedFromPrinter); nsresult SetIsInitializedFromPrinter(PRBool aIsInitializedFromPrinter);
nsresult GetIsInitializedFromPrefs(PRBool *aIsInitializedFromPrefs); nsresult GetIsInitializedFromPrefs(PRBool *aIsInitializedFromPrefs);
nsresult SetIsInitializedFromPrefs(PRBool aIsInitializedFromPrefs); nsresult SetIsInitializedFromPrefs(PRBool aIsInitializedFromPrefs);
nsresult SetMarginInTwips(nsMargin *aMargin); nsresult SetMarginInTwips(nsIntMargin *aMargin);
nsresult SetEdgeInTwips(nsMargin *aEdge); nsresult SetEdgeInTwips(nsIntMargin *aEdge);
nsresult GetMarginInTwips(nsMargin *aMargin); nsresult GetMarginInTwips(nsIntMargin *aMargin);
nsresult GetEdgeInTwips(nsMargin *aEdge); nsresult GetEdgeInTwips(nsIntMargin *aEdge);
nsresult SetupSilentPrinting(); nsresult SetupSilentPrinting();
nsresult SetUnwriteableMarginInTwips(nsMargin *aEdge); nsresult SetUnwriteableMarginInTwips(nsIntMargin *aEdge);
nsresult GetUnwriteableMarginInTwips(nsMargin *aEdge); nsresult GetUnwriteableMarginInTwips(nsIntMargin *aEdge);
} }
[ [
@ -1872,7 +1872,7 @@ interface nsIIOService : nsISupports
[ [
object, object,
uuid(57322c6f-f4ec-4e46-8253-b74be220de16), uuid(a50d5516-5c0a-4f08-b427-703ca0c44ac3),
local, local,
/* NOT_FROZEN */ /* NOT_FROZEN */
] ]
@ -2485,7 +2485,7 @@ interface nsIHTMLEditor : nsISupports
[ [
object, object,
uuid(32e68316-67d4-44a5-8d35-0d390fa9df11), uuid(365d600b-868a-452a-8de8-f46fad8fee53),
local local
/* NOT_FROZEN */ /* NOT_FROZEN */
] ]
@ -2495,6 +2495,8 @@ interface nsIMutationObserver : nsISupports
void /*CharacterDataChangeInfo*/ *aInfo); void /*CharacterDataChangeInfo*/ *aInfo);
void CharacterDataChanged(nsIDocument *aDocument, nsIContent *aContent, void CharacterDataChanged(nsIDocument *aDocument, nsIContent *aContent,
void /*CharacterDataChangeInfo*/ *aInfo); void /*CharacterDataChangeInfo*/ *aInfo);
void AttributeWillChange(nsIDocument *aDocument, nsIContent * aContent, PRInt32 aNameSpaceID,
nsIAtom *aAttribute, PRInt32 aModType);
void AttributeChanged(nsIDocument *aDocument, nsIContent *aContent, PRInt32 aNameSpaceID, void AttributeChanged(nsIDocument *aDocument, nsIContent *aContent, PRInt32 aNameSpaceID,
nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask); nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask);
void ContentAppended(nsIDocument *aDocument, nsIContent *aContainer, PRInt32 aNewIndexInContainer); void ContentAppended(nsIDocument *aDocument, nsIContent *aContainer, PRInt32 aNewIndexInContainer);
@ -2531,7 +2533,7 @@ interface nsIDocumentObserver : nsIMutationObserver
void StyleRuleAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule); void StyleRuleAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule);
void StyleRuleRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule); void StyleRuleRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule);
void BindToDocument(nsIDocument *aDocument, nsIContent *aContent); void BindToDocument(nsIDocument *aDocument, nsIContent *aContent);
void DoneAddingContent(nsIContent *aContent, PRBool aHaveNotified); void DoneAddingChildren(nsIContent *aContent, PRBool aHaveNotified);
} }
/* /*

1
dlls/mshtml/tests/dom.c
View File

@ -3014,7 +3014,6 @@ static void test_default_style(IHTMLStyle *style)
hres = IHTMLStyle_get_margin(style, &str); hres = IHTMLStyle_get_margin(style, &str);
ok(hres == S_OK, "get_margin failed: %08x\n", hres); ok(hres == S_OK, "get_margin failed: %08x\n", hres);
todo_wine
ok(!strcmp_wa(str, "1px"), "margin = %s\n", dbgstr_w(str)); ok(!strcmp_wa(str, "1px"), "margin = %s\n", dbgstr_w(str));
hres = IHTMLStyle_put_margin(style, NULL); hres = IHTMLStyle_put_margin(style, NULL);