From 9c2b80b5c4f7b5339906009d7f6f507a446bf0f7 Mon Sep 17 00:00:00 2001 From: loesje_ Date: Mon, 19 Mar 2012 14:43:54 +0000 Subject: [PATCH] * Re-generated .inc files with new version from the idlparser. * Some string-types are now not returned as function result but as parameter. Solves several string issues. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2357 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../version2/Components/GeckoBrowser.pas | 13 +++--- .../Components/GeckoPromptService.pas | 8 ++-- components/geckoport/version2/domstubs.inc | 2 +- .../geckoport/version2/gecko10/idltypemap.cfg | 12 +++++ .../geckoport/version2/gecko10/nsiatom.inc | 2 +- .../version2/gecko10/nsiauthinformation.inc | 3 +- .../version2/gecko10/nsibinaryinputstream.inc | 2 +- .../geckoport/version2/gecko10/nsichannel.inc | 9 ++-- .../version2/gecko10/nsicollection.inc | 2 +- .../version2/gecko10/nsicomponentmanager.inc | 8 ++-- .../gecko10/nsicomponentregistrar.inc | 12 ++--- .../geckoport/version2/gecko10/nsidomattr.inc | 6 +-- .../version2/gecko10/nsidomcharacterdata.inc | 5 +-- .../version2/gecko10/nsidomcrypto.inc | 11 +++-- .../version2/gecko10/nsidomdocument.inc | 39 ++++++---------- .../version2/gecko10/nsidomdocumenttype.inc | 12 ++--- .../version2/gecko10/nsidomdomstringlist.inc | 2 +- .../version2/gecko10/nsidomelement.inc | 7 ++- .../version2/gecko10/nsidomevent.inc | 3 +- .../geckoport/version2/gecko10/nsidomfile.inc | 14 +++--- .../version2/gecko10/nsidomhistory.inc | 11 ++--- .../version2/gecko10/nsidomlocation.inc | 26 ++++------- .../version2/gecko10/nsidommedialist.inc | 5 +-- .../version2/gecko10/nsidommediaquerylist.inc | 3 +- .../version2/gecko10/nsidommimetype.inc | 9 ++-- .../version2/gecko10/nsidomnavigator.inc | 39 ++++++---------- .../geckoport/version2/gecko10/nsidomnode.inc | 25 ++++------- .../gecko10/nsidomofflineresourcelist.inc | 2 +- .../gecko10/nsidomperformancenavigation.inc | 2 +- .../version2/gecko10/nsidomplugin.inc | 12 ++--- .../gecko10/nsidomprocessinginstruction.inc | 3 +- .../version2/gecko10/nsidomstorage.inc | 4 +- .../version2/gecko10/nsidomstorageitem.inc | 3 +- .../gecko10/nsidomstorageobsolete.inc | 2 +- .../version2/gecko10/nsidomstylesheet.inc | 9 ++-- .../geckoport/version2/gecko10/nsidomtext.inc | 3 +- .../version2/gecko10/nsidomwindow.inc | 17 +++---- .../version2/gecko10/nsieventsource.inc | 3 +- .../geckoport/version2/gecko10/nsifactory.inc | 2 +- .../geckoport/version2/gecko10/nsifile.inc | 9 ++-- .../version2/gecko10/nsihttpchannel.inc | 10 ++--- .../gecko10/nsiinterfacerequestor.inc | 2 - .../version2/gecko10/nsiioservice.inc | 2 +- .../version2/gecko10/nsilocalfile.inc | 5 +-- .../geckoport/version2/gecko10/nsimodule.inc | 2 +- .../gecko10/nsiobjectoutputstream.inc | 2 +- .../version2/gecko10/nsiprincipal.inc | 9 ++-- .../version2/gecko10/nsiproperties.inc | 2 - .../version2/gecko10/nsiprotocolhandler.inc | 3 +- .../geckoport/version2/gecko10/nsirequest.inc | 3 +- .../version2/gecko10/nsiservicemanager.inc | 8 ++-- .../geckoport/version2/gecko10/nsishentry.inc | 3 +- .../geckoport/version2/gecko10/nsiuri.inc | 44 +++++++------------ .../geckoport/version2/gecko10/nsivariant.inc | 8 ++-- .../version2/gecko10/nsiweakreference.inc | 2 - .../version2/gecko10/nsiwebbrowser.inc | 4 +- .../geckoport/version2/genincludefiles.sh | 4 +- components/geckoport/version2/nsNetUtil.pas | 12 ++--- components/geckoport/version2/nsXPCOM.pas | 1 - components/geckoport/version2/nsXPCOMGlue.pas | 6 +-- 60 files changed, 193 insertions(+), 300 deletions(-) diff --git a/components/geckoport/version2/Components/GeckoBrowser.pas b/components/geckoport/version2/Components/GeckoBrowser.pas index 7bc2ef1d2..685204ccf 100755 --- a/components/geckoport/version2/Components/GeckoBrowser.pas +++ b/components/geckoport/version2/Components/GeckoBrowser.pas @@ -1016,7 +1016,7 @@ begin {$ELSE} {$PUSH} {$R-} - browser.RemoveWebBrowserListener(weak, table.Entries[i].IID); + browser.RemoveWebBrowserListener(weak, table.Entries[i].IID^); {$POP} {$ENDIF} end; @@ -1040,7 +1040,7 @@ begin if Assigned(FDOMEvents) then begin str := NewString; - str.assign(aEvent.GetType()); + aEvent.GetType(str.AString); eventType := str.ToString; I := 0; while FDOMEvents[I].eventType <>etNone do @@ -1755,8 +1755,7 @@ begin UseParameter(aWebProgress); UseParameter(aRequest); str := NewCString; - // This leads to crashes. Seems to be a problem in the calling-convention. - //str.assign(location.GetSpec()); + location.GetSpec(str.ACString); {$IFDEF DEBUG} { OutputDebugStringA(PAnsiChar( @@ -2145,7 +2144,7 @@ begin str :=NewUTF8String; //URI if Self.WebNavigation <> nil then - str.assign(Self.WebNavigation.CurrentURI.GetSpec); + Self.WebNavigation.CurrentURI.GetSpec(str.AUtf8String); Result := str.ToString; end; @@ -2296,7 +2295,7 @@ begin try str := NewUTF8String; uri := FInfo.GetImageSrc(); - str.assign(uri.GetSpec); + uri.GetSpec(str.Autf8String); Result := str.ToString; except end; @@ -2310,7 +2309,7 @@ begin try str := NewUTF8String; uri := FInfo.GetBackgroundImageSrc(); - str.assign(uri.GetSpec); + uri.GetSpec(str.AUtf8String); Result := str.ToString; except end; diff --git a/components/geckoport/version2/Components/GeckoPromptService.pas b/components/geckoport/version2/Components/GeckoPromptService.pas index 2d652daec..516e3974e 100644 --- a/components/geckoport/version2/Components/GeckoPromptService.pas +++ b/components/geckoport/version2/Components/GeckoPromptService.pas @@ -49,7 +49,7 @@ type { IPromptServiceFactory } IPromptServiceFactory = class(TInterfacedObject,nsIFactory) - procedure CreateInstance(aOuter: nsISupports; iid: nsIIDRef; out result); safecall; + procedure CreateInstance(aOuter: nsISupports; constref iid: Tguid; out result); safecall; procedure LockFactory(lock: longbool); safecall; end; @@ -184,7 +184,7 @@ begin if not Assigned(GeckoPromptServiceFactory) then begin NS_GetComponentRegistrar(ComponentRegistrar); GeckoPromptServiceFactory:=IPromptServiceFactory.Create; - ComponentRegistrar.RegisterFactory(@NS_PROMPT_SERVICE_CID,'Prompt Service',nil,GeckoPromptServiceFactory); + ComponentRegistrar.RegisterFactory(NS_PROMPT_SERVICE_CID,'Prompt Service',nil,GeckoPromptServiceFactory); end; end; @@ -341,11 +341,11 @@ end; { IPromptServiceFactory } -procedure IPromptServiceFactory.CreateInstance(aOuter: nsISupports; iid: nsIIDRef; out result); safecall; +procedure IPromptServiceFactory.CreateInstance(aOuter: nsISupports; constref iid: Tguid; out result); safecall; begin if not Assigned(ThisGeckoPromptService) then ThisGeckoPromptService:=IPromptService.Create; - ThisGeckoPromptService.QueryInterface(IID^,result); + ThisGeckoPromptService.QueryInterface(IID,result); end; procedure IPromptServiceFactory.LockFactory(lock: longbool); safecall; diff --git a/components/geckoport/version2/domstubs.inc b/components/geckoport/version2/domstubs.inc index 2e14c8f21..4d5dad3b6 100644 --- a/components/geckoport/version2/domstubs.inc +++ b/components/geckoport/version2/domstubs.inc @@ -1,5 +1,5 @@ type - DOMTimeMilliSec = culonglong; + DOMTimeMilliSec = qword; type // nsIDOMAttr = interface; diff --git a/components/geckoport/version2/gecko10/idltypemap.cfg b/components/geckoport/version2/gecko10/idltypemap.cfg index f89076936..14a25f957 100644 --- a/components/geckoport/version2/gecko10/idltypemap.cfg +++ b/components/geckoport/version2/gecko10/idltypemap.cfg @@ -2,3 +2,15 @@ wstring=PWideChar string=PAnsiChar boolean=longbool FILE=PFILE +nsQIResult,out= +nsCIDRef,in=TGuid,constref +nsIIDRef,in=TGuid,constref +long=idllong +short=idlshort +float=idlfloat +long,unsigned=idlulong +short,unsigned=idlushort +float,unsigned=idlufloat +AUTF8String,f=AUTF8String, +ACString,f=ACString, +DOMString,f=DOMString, diff --git a/components/geckoport/version2/gecko10/nsiatom.inc b/components/geckoport/version2/gecko10/nsiatom.inc index 0dcea51ad..6ede209ea 100644 --- a/components/geckoport/version2/gecko10/nsiatom.inc +++ b/components/geckoport/version2/gecko10/nsiatom.inc @@ -3,7 +3,7 @@ type nsIAtom = interface(nsISupports) ['{1f341018-521a-49de-b806-1bef5c9a00b0}'] function toString() : AString; safecall; - function toUTF8String() : AUTF8String; safecall; + procedure toUTF8String( result_: AUTF8String); safecall; function equals(aString: AString) : longbool; safecall; function equalsUTF8(aString: AUTF8String) : longbool; safecall; function isStaticAtom() : longbool; safecall; diff --git a/components/geckoport/version2/gecko10/nsiauthinformation.inc b/components/geckoport/version2/gecko10/nsiauthinformation.inc index 849009c09..2f14e3e77 100644 --- a/components/geckoport/version2/gecko10/nsiauthinformation.inc +++ b/components/geckoport/version2/gecko10/nsiauthinformation.inc @@ -6,8 +6,7 @@ type property flags : idlulong read Getflags; function Getrealm(): AString; safecall; property realm : AString read Getrealm; - function GetauthenticationScheme(): AUTF8String; safecall; - property authenticationScheme : AUTF8String read GetauthenticationScheme; + procedure GetauthenticationScheme( result_: AUTF8String); safecall; function Getusername(): AString; safecall; procedure Setusername(ausername: AString); safecall; property username : AString read Getusername write Setusername; diff --git a/components/geckoport/version2/gecko10/nsibinaryinputstream.inc b/components/geckoport/version2/gecko10/nsibinaryinputstream.inc index fc14b9508..42116874b 100644 --- a/components/geckoport/version2/gecko10/nsibinaryinputstream.inc +++ b/components/geckoport/version2/gecko10/nsibinaryinputstream.inc @@ -10,7 +10,7 @@ type function read64() : PRUint64; safecall; function readFloat() : idlfloat; safecall; function readDouble() : double; safecall; - function readCString() : ACString; safecall; + procedure readCString( result_: ACString); safecall; function readString() : AString; safecall; procedure readBytes(aLength: PRUint32; out aString: PAnsiChar); safecall; procedure readByteArray(aLength: PRUint32; out aBytes: PRUint8); safecall; diff --git a/components/geckoport/version2/gecko10/nsichannel.inc b/components/geckoport/version2/gecko10/nsichannel.inc index 440af1676..02cd9afbb 100644 --- a/components/geckoport/version2/gecko10/nsichannel.inc +++ b/components/geckoport/version2/gecko10/nsichannel.inc @@ -15,12 +15,10 @@ type property notificationCallbacks : nsIInterfaceRequestor read GetnotificationCallbacks write SetnotificationCallbacks; function GetsecurityInfo(): nsISupports; safecall; property securityInfo : nsISupports read GetsecurityInfo; - function GetcontentType(): ACString; safecall; + procedure GetcontentType( result_: ACString); safecall; procedure SetcontentType(acontentType: ACString); safecall; - property contentType : ACString read GetcontentType write SetcontentType; - function GetcontentCharset(): ACString; safecall; + procedure GetcontentCharset( result_: ACString); safecall; procedure SetcontentCharset(acontentCharset: ACString); safecall; - property contentCharset : ACString read GetcontentCharset write SetcontentCharset; function GetcontentLength(): idllong; safecall; procedure SetcontentLength(acontentLength: idllong); safecall; property contentLength : idllong read GetcontentLength write SetcontentLength; @@ -30,8 +28,7 @@ type property contentDisposition : idlulong read GetcontentDisposition; function GetcontentDispositionFilename(): AString; safecall; property contentDispositionFilename : AString read GetcontentDispositionFilename; - function GetcontentDispositionHeader(): ACString; safecall; - property contentDispositionHeader : ACString read GetcontentDispositionHeader; + procedure GetcontentDispositionHeader( result_: ACString); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsicollection.inc b/components/geckoport/version2/gecko10/nsicollection.inc index c942bb491..63fa30718 100644 --- a/components/geckoport/version2/gecko10/nsicollection.inc +++ b/components/geckoport/version2/gecko10/nsicollection.inc @@ -4,7 +4,7 @@ type ['{83b6019c-cbc4-11d2-8cca-0060b0fc14a3}'] function Count() : PRUint32; safecall; function GetElementAt(index: PRUint32) : nsISupports; safecall; - procedure QueryElementAt(index: PRUint32; uuid: nsIIDRef; out result: nsQIResult); safecall; + procedure QueryElementAt(index: PRUint32; constref uuid: TGuid; out result); safecall; procedure SetElementAt(index: PRUint32; item: nsISupports); safecall; procedure AppendElement(item: nsISupports); safecall; procedure RemoveElement(item: nsISupports); safecall; diff --git a/components/geckoport/version2/gecko10/nsicomponentmanager.inc b/components/geckoport/version2/gecko10/nsicomponentmanager.inc index e0d41e967..da8f6c6a5 100644 --- a/components/geckoport/version2/gecko10/nsicomponentmanager.inc +++ b/components/geckoport/version2/gecko10/nsicomponentmanager.inc @@ -2,10 +2,10 @@ type nsIComponentManager = interface(nsISupports) ['{1d940426-5fe5-42c3-84ae-a300f2d9ebd5}'] - procedure getClassObject(aClass: nsCIDRef; aIID: nsIIDRef; out result); safecall; - procedure getClassObjectByContractID(aContractID: PAnsiChar; aIID: nsIIDRef; out result); safecall; - procedure createInstance(aClass: nsCIDRef; aDelegate: nsISupports; aIID: nsIIDRef; out result); safecall; - procedure createInstanceByContractID(aContractID: PAnsiChar; aDelegate: nsISupports; aIID: nsIIDRef; out result); safecall; + procedure getClassObject(constref aClass: TGuid; constref aIID: TGuid; out result); safecall; + procedure getClassObjectByContractID(aContractID: PAnsiChar; constref aIID: TGuid; out result); safecall; + procedure createInstance(constref aClass: TGuid; aDelegate: nsISupports; constref aIID: TGuid; out result); safecall; + procedure createInstanceByContractID(aContractID: PAnsiChar; aDelegate: nsISupports; constref aIID: TGuid; out result); safecall; procedure addBootstrappedManifestLocation(aLocation: nsILocalFile); safecall; procedure removeBootstrappedManifestLocation(aLocation: nsILocalFile); safecall; diff --git a/components/geckoport/version2/gecko10/nsicomponentregistrar.inc b/components/geckoport/version2/gecko10/nsicomponentregistrar.inc index cd3f6213f..7696e2799 100644 --- a/components/geckoport/version2/gecko10/nsicomponentregistrar.inc +++ b/components/geckoport/version2/gecko10/nsicomponentregistrar.inc @@ -4,15 +4,15 @@ type ['{2417cbfe-65ad-48a6-b4b6-eb84db174392}'] procedure autoRegister(aSpec: nsIFile); safecall; procedure autoUnregister(aSpec: nsIFile); safecall; - procedure registerFactory(aClass: nsCIDRef; aClassName: PAnsiChar; aContractID: PAnsiChar; aFactory: nsIFactory); safecall; - procedure unregisterFactory(aClass: nsCIDRef; aFactory: nsIFactory); safecall; - procedure registerFactoryLocation(aClass: nsCIDRef; aClassName: PAnsiChar; aContractID: PAnsiChar; aFile: nsIFile; aLoaderStr: PAnsiChar; aType: PAnsiChar); safecall; - procedure unregisterFactoryLocation(aClass: nsCIDRef; aFile: nsIFile); safecall; - function isCIDRegistered(aClass: nsCIDRef) : longbool; safecall; + procedure registerFactory(constref aClass: TGuid; aClassName: PAnsiChar; aContractID: PAnsiChar; aFactory: nsIFactory); safecall; + procedure unregisterFactory(constref aClass: TGuid; aFactory: nsIFactory); safecall; + procedure registerFactoryLocation(constref aClass: TGuid; aClassName: PAnsiChar; aContractID: PAnsiChar; aFile: nsIFile; aLoaderStr: PAnsiChar; aType: PAnsiChar); safecall; + procedure unregisterFactoryLocation(constref aClass: TGuid; aFile: nsIFile); safecall; + function isCIDRegistered(constref aClass: TGuid) : longbool; safecall; function isContractIDRegistered(aContractID: PAnsiChar) : longbool; safecall; function enumerateCIDs() : nsISimpleEnumerator; safecall; function enumerateContractIDs() : nsISimpleEnumerator; safecall; - function CIDToContractID(aClass: nsCIDRef) : PAnsiChar; safecall; + function CIDToContractID(constref aClass: TGuid) : PAnsiChar; safecall; function contractIDToCID(aContractID: PAnsiChar) : nsCIDPtr; safecall; end; diff --git a/components/geckoport/version2/gecko10/nsidomattr.inc b/components/geckoport/version2/gecko10/nsidomattr.inc index 63441071a..b5d4f8a1b 100644 --- a/components/geckoport/version2/gecko10/nsidomattr.inc +++ b/components/geckoport/version2/gecko10/nsidomattr.inc @@ -2,13 +2,11 @@ type nsIDOMAttr = interface(nsIDOMNode) ['{03da4bc9-1b9a-41dc-a1a4-32414d48d704}'] - function Getname(): DOMString; safecall; - property name : DOMString read Getname; + procedure Getname( result_: DOMString); safecall; function Getspecified(): longbool; safecall; property specified : longbool read Getspecified; - function Getvalue(): DOMString; safecall; + procedure Getvalue( result_: DOMString); safecall; procedure Setvalue(avalue: DOMString); safecall; - property value : DOMString read Getvalue write Setvalue; function GetownerElement(): nsIDOMElement; safecall; property ownerElement : nsIDOMElement read GetownerElement; function GetisId(): longbool; safecall; diff --git a/components/geckoport/version2/gecko10/nsidomcharacterdata.inc b/components/geckoport/version2/gecko10/nsidomcharacterdata.inc index 5267324e5..4cc3dec98 100644 --- a/components/geckoport/version2/gecko10/nsidomcharacterdata.inc +++ b/components/geckoport/version2/gecko10/nsidomcharacterdata.inc @@ -2,12 +2,11 @@ type nsIDOMCharacterData = interface(nsIDOMNode) ['{cb75c251-afc7-444f-b2d6-b9635555f3ed}'] - function Getdata(): DOMString; safecall; + procedure Getdata( result_: DOMString); safecall; procedure Setdata(adata: DOMString); safecall; - property data : DOMString read Getdata write Setdata; function Getlength(): idlulong; safecall; property length : idlulong read Getlength; - function substringData(offset: idlulong; count: idlulong) : DOMString; safecall; + procedure substringData(offset: idlulong; count: idlulong; result_: DOMString); safecall; procedure appendData(arg: DOMString); safecall; procedure insertData(offset: idlulong; arg: DOMString); safecall; procedure deleteData(offset: idlulong; count: idlulong); safecall; diff --git a/components/geckoport/version2/gecko10/nsidomcrypto.inc b/components/geckoport/version2/gecko10/nsidomcrypto.inc index 184ecd278..0becdcda8 100644 --- a/components/geckoport/version2/gecko10/nsidomcrypto.inc +++ b/components/geckoport/version2/gecko10/nsidomcrypto.inc @@ -2,16 +2,15 @@ type nsIDOMCrypto = interface(nsISupports) ['{12b6d899-2aed-4ea9-8c02-2223ab7ab592}'] - function Getversion(): DOMString; safecall; - property version : DOMString read Getversion; + procedure Getversion( result_: DOMString); safecall; function GetenableSmartCardEvents(): longbool; safecall; procedure SetenableSmartCardEvents(aenableSmartCardEvents: longbool); safecall; property enableSmartCardEvents : longbool read GetenableSmartCardEvents write SetenableSmartCardEvents; function generateCRMFRequest() : nsIDOMCRMFObject; safecall; - function importUserCertificates(nickname: DOMString; cmmfResponse: DOMString; doForcedBackup: longbool) : DOMString; safecall; - function popChallengeResponse(challenge: DOMString) : DOMString; safecall; - function random(numBytes: idllong) : DOMString; safecall; - function signText(stringToSign: DOMString; caOption: DOMString) : DOMString; safecall; + procedure importUserCertificates(nickname: DOMString; cmmfResponse: DOMString; doForcedBackup: longbool; result_: DOMString); safecall; + procedure popChallengeResponse(challenge: DOMString; result_: DOMString); safecall; + procedure random(numBytes: idllong; result_: DOMString); safecall; + procedure signText(stringToSign: DOMString; caOption: DOMString; result_: DOMString); safecall; procedure logout(); safecall; procedure disableRightClick(); safecall; diff --git a/components/geckoport/version2/gecko10/nsidomdocument.inc b/components/geckoport/version2/gecko10/nsidomdocument.inc index c2ad3e079..07f787cd0 100644 --- a/components/geckoport/version2/gecko10/nsidomdocument.inc +++ b/components/geckoport/version2/gecko10/nsidomdocument.inc @@ -21,10 +21,8 @@ type function createAttributeNS(anamespaceURI: DOMString; aqualifiedName: DOMString) : nsIDOMAttr; safecall; function getElementsByTagNameNS(anamespaceURI: DOMString; alocalName: DOMString) : nsIDOMNodeList; safecall; function getElementById(anelementId: DOMString) : nsIDOMElement; safecall; - function GetinputEncoding(): DOMString; safecall; - property inputEncoding : DOMString read GetinputEncoding; - function GetdocumentURI(): DOMString; safecall; - property documentURI : DOMString read GetdocumentURI; + procedure GetinputEncoding( result_: DOMString); safecall; + procedure GetdocumentURI( result_: DOMString); safecall; function adoptNode(asource: nsIDOMNode) : nsIDOMNode; safecall; function createRange() : nsIDOMRange; safecall; function createNodeIterator(aroot: nsIDOMNode; awhatToShow: idlulong; afilter: nsIDOMNodeFilter; anentityReferenceExpansion: longbool) : nsIDOMNodeIterator; safecall; @@ -32,41 +30,31 @@ type function createEvent(aneventType: DOMString) : nsIDOMEvent; safecall; function GetdefaultView(): nsIDOMWindow; safecall; property defaultView : nsIDOMWindow read GetdefaultView; - function GetcharacterSet(): DOMString; safecall; - property characterSet : DOMString read GetcharacterSet; - function Getdir(): DOMString; safecall; + procedure GetcharacterSet( result_: DOMString); safecall; + procedure Getdir( result_: DOMString); safecall; procedure Setdir(adir: DOMString); safecall; - property dir : DOMString read Getdir write Setdir; function Getlocation(): nsIDOMLocation; safecall; property location : nsIDOMLocation read Getlocation; - function Gettitle(): DOMString; safecall; + procedure Gettitle( result_: DOMString); safecall; procedure Settitle(atitle: DOMString); safecall; - property title : DOMString read Gettitle write Settitle; - function GetreadyState(): DOMString; safecall; - property readyState : DOMString read GetreadyState; - function GetlastModified(): DOMString; safecall; - property lastModified : DOMString read GetlastModified; - function Getreferrer(): DOMString; safecall; - property referrer : DOMString read Getreferrer; + procedure GetreadyState( result_: DOMString); safecall; + procedure GetlastModified( result_: DOMString); safecall; + procedure Getreferrer( result_: DOMString); safecall; function hasFocus() : longbool; safecall; function GetactiveElement(): nsIDOMElement; safecall; property activeElement : nsIDOMElement read GetactiveElement; function getElementsByClassName(aclasses: DOMString) : nsIDOMNodeList; safecall; function GetstyleSheets(): nsIDOMStyleSheetList; safecall; property styleSheets : nsIDOMStyleSheetList read GetstyleSheets; - function GetpreferredStyleSheetSet(): DOMString; safecall; - property preferredStyleSheetSet : DOMString read GetpreferredStyleSheetSet; - function GetselectedStyleSheetSet(): DOMString; safecall; + procedure GetpreferredStyleSheetSet( result_: DOMString); safecall; + procedure GetselectedStyleSheetSet( result_: DOMString); safecall; procedure SetselectedStyleSheetSet(aselectedStyleSheetSet: DOMString); safecall; - property selectedStyleSheetSet : DOMString read GetselectedStyleSheetSet write SetselectedStyleSheetSet; - function GetlastStyleSheetSet(): DOMString; safecall; - property lastStyleSheetSet : DOMString read GetlastStyleSheetSet; + procedure GetlastStyleSheetSet( result_: DOMString); safecall; function GetstyleSheetSets(): nsIDOMDOMStringList; safecall; property styleSheetSets : nsIDOMDOMStringList read GetstyleSheetSets; procedure enableStyleSheetsForSet(aname: DOMString); safecall; function elementFromPoint(ax: idlfloat; ay: idlfloat) : nsIDOMElement; safecall; - function GetcontentType(): DOMString; safecall; - property contentType : DOMString read GetcontentType; + procedure GetcontentType( result_: DOMString); safecall; function GetmozSyntheticDocument(): longbool; safecall; property mozSyntheticDocument : longbool read GetmozSyntheticDocument; function GetcurrentScript(): nsIDOMElement; safecall; @@ -91,8 +79,7 @@ type property onmouseleave : jsval read Getonmouseleave write Setonmouseleave; function GetmozHidden(): longbool; safecall; property mozHidden : longbool read GetmozHidden; - function GetmozVisibilityState(): DOMString; safecall; - property mozVisibilityState : DOMString read GetmozVisibilityState; + procedure GetmozVisibilityState( result_: DOMString); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsidomdocumenttype.inc b/components/geckoport/version2/gecko10/nsidomdocumenttype.inc index 8cd161bfe..d48a81505 100644 --- a/components/geckoport/version2/gecko10/nsidomdocumenttype.inc +++ b/components/geckoport/version2/gecko10/nsidomdocumenttype.inc @@ -2,14 +2,10 @@ type nsIDOMDocumentType = interface(nsIDOMNode) ['{ac5fd4c5-6c5d-4dfc-878c-7d661aa676de}'] - function Getname(): DOMString; safecall; - property name : DOMString read Getname; - function GetpublicId(): DOMString; safecall; - property publicId : DOMString read GetpublicId; - function GetsystemId(): DOMString; safecall; - property systemId : DOMString read GetsystemId; - function GetinternalSubset(): DOMString; safecall; - property internalSubset : DOMString read GetinternalSubset; + procedure Getname( result_: DOMString); safecall; + procedure GetpublicId( result_: DOMString); safecall; + procedure GetsystemId( result_: DOMString); safecall; + procedure GetinternalSubset( result_: DOMString); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsidomdomstringlist.inc b/components/geckoport/version2/gecko10/nsidomdomstringlist.inc index 54c8449dc..0544d5d40 100644 --- a/components/geckoport/version2/gecko10/nsidomdomstringlist.inc +++ b/components/geckoport/version2/gecko10/nsidomdomstringlist.inc @@ -2,7 +2,7 @@ type nsIDOMDOMStringList = interface(nsISupports) ['{0bbae65c-1dde-11d9-8c46-000a95dc234c}'] - function item(index: idlulong) : DOMString; safecall; + procedure item(index: idlulong; result_: DOMString); safecall; function Getlength(): idlulong; safecall; property length : idlulong read Getlength; function contains(str: DOMString) : longbool; safecall; diff --git a/components/geckoport/version2/gecko10/nsidomelement.inc b/components/geckoport/version2/gecko10/nsidomelement.inc index 225939a9a..13f1238b9 100644 --- a/components/geckoport/version2/gecko10/nsidomelement.inc +++ b/components/geckoport/version2/gecko10/nsidomelement.inc @@ -2,16 +2,15 @@ type nsIDOMElement = interface(nsIDOMNode) ['{1f249e8b-7b41-44c0-a8d5-15298c1198cd}'] - function GettagName(): DOMString; safecall; - property tagName : DOMString read GettagName; - function getAttribute(aname: DOMString) : DOMString; safecall; + procedure GettagName( result_: DOMString); safecall; + procedure getAttribute(aname: DOMString; result_: DOMString); safecall; procedure setAttribute(aname: DOMString; avalue: DOMString); safecall; procedure removeAttribute(aname: DOMString); safecall; function getAttributeNode(aname: DOMString) : nsIDOMAttr; safecall; function setAttributeNode(anewAttr: nsIDOMAttr) : nsIDOMAttr; safecall; function removeAttributeNode(anoldAttr: nsIDOMAttr) : nsIDOMAttr; safecall; function getElementsByTagName(aname: DOMString) : nsIDOMNodeList; safecall; - function getAttributeNS(anamespaceURI: DOMString; alocalName: DOMString) : DOMString; safecall; + procedure getAttributeNS(anamespaceURI: DOMString; alocalName: DOMString; result_: DOMString); safecall; procedure setAttributeNS(anamespaceURI: DOMString; aqualifiedName: DOMString; avalue: DOMString); safecall; procedure removeAttributeNS(anamespaceURI: DOMString; alocalName: DOMString); safecall; function getAttributeNodeNS(anamespaceURI: DOMString; alocalName: DOMString) : nsIDOMAttr; safecall; diff --git a/components/geckoport/version2/gecko10/nsidomevent.inc b/components/geckoport/version2/gecko10/nsidomevent.inc index cca2ac5f6..3e281996d 100644 --- a/components/geckoport/version2/gecko10/nsidomevent.inc +++ b/components/geckoport/version2/gecko10/nsidomevent.inc @@ -2,8 +2,7 @@ type nsIDOMEvent = interface(nsISupports) ['{e85cff74-951f-45c1-be0c-89442ea2f500}'] - function Gettype(): DOMString; safecall; - property atype : DOMString read Gettype; + procedure Gettype( result_: DOMString); safecall; function Gettarget(): nsIDOMEventTarget; safecall; property target : nsIDOMEventTarget read Gettarget; function GetcurrentTarget(): nsIDOMEventTarget; safecall; diff --git a/components/geckoport/version2/gecko10/nsidomfile.inc b/components/geckoport/version2/gecko10/nsidomfile.inc index 18918e507..b632c548d 100644 --- a/components/geckoport/version2/gecko10/nsidomfile.inc +++ b/components/geckoport/version2/gecko10/nsidomfile.inc @@ -4,11 +4,10 @@ type ['{d5237f31-443a-460b-9e42-449a135346f0}'] function Getsize(): idlulong; safecall; property size : idlulong read Getsize; - function Gettype(): DOMString; safecall; - property atype : DOMString read Gettype; + procedure Gettype( result_: DOMString); safecall; function GetinternalStream(): nsIInputStream; safecall; property internalStream : nsIInputStream read GetinternalStream; - function getInternalUrl(principal: nsIPrincipal) : DOMString; safecall; + procedure getInternalUrl(principal: nsIPrincipal; result_: DOMString); safecall; function mozSlice(start: idllong; anend: idllong; contentType: DOMString) : nsIDOMBlob; safecall; end; @@ -16,12 +15,9 @@ type nsIDOMFile = interface(nsIDOMBlob) ['{b096ef67-7b77-47f8-8e70-5d8ee36416bf}'] - function Getname(): DOMString; safecall; - property name : DOMString read Getname; - function GetmozFullPath(): DOMString; safecall; - property mozFullPath : DOMString read GetmozFullPath; - function GetmozFullPathInternal(): DOMString; safecall; - property mozFullPathInternal : DOMString read GetmozFullPathInternal; + procedure Getname( result_: DOMString); safecall; + procedure GetmozFullPath( result_: DOMString); safecall; + procedure GetmozFullPathInternal( result_: DOMString); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsidomhistory.inc b/components/geckoport/version2/gecko10/nsidomhistory.inc index 209be7f11..79e26390c 100644 --- a/components/geckoport/version2/gecko10/nsidomhistory.inc +++ b/components/geckoport/version2/gecko10/nsidomhistory.inc @@ -4,16 +4,13 @@ type ['{d5a3006b-dd6b-4ba3-81be-6559f8889e60}'] function Getlength(): idllong; safecall; property length : idllong read Getlength; - function Getcurrent(): DOMString; safecall; - property current : DOMString read Getcurrent; - function Getprevious(): DOMString; safecall; - property previous : DOMString read Getprevious; - function Getnext(): DOMString; safecall; - property next : DOMString read Getnext; + procedure Getcurrent( result_: DOMString); safecall; + procedure Getprevious( result_: DOMString); safecall; + procedure Getnext( result_: DOMString); safecall; procedure back(); safecall; procedure forward(); safecall; procedure go(aDelta: idllong); safecall; - function item(index: idlulong) : DOMString; safecall; + procedure item(index: idlulong; result_: DOMString); safecall; procedure pushState(aData: nsIVariant; aTitle: DOMString; aURL: DOMString); safecall; procedure replaceState(aData: nsIVariant; aTitle: DOMString; aURL: DOMString); safecall; function Getstate(): nsIVariant; safecall; diff --git a/components/geckoport/version2/gecko10/nsidomlocation.inc b/components/geckoport/version2/gecko10/nsidomlocation.inc index a04eb594d..9fc68e2a2 100644 --- a/components/geckoport/version2/gecko10/nsidomlocation.inc +++ b/components/geckoport/version2/gecko10/nsidomlocation.inc @@ -2,34 +2,26 @@ type nsIDOMLocation = interface(nsISupports) ['{a6cf906d-15b3-11d2-932e-00805f8add32}'] - function Gethash(): DOMString; safecall; + procedure Gethash( result_: DOMString); safecall; procedure Sethash(ahash: DOMString); safecall; - property hash : DOMString read Gethash write Sethash; - function Gethost(): DOMString; safecall; + procedure Gethost( result_: DOMString); safecall; procedure Sethost(ahost: DOMString); safecall; - property host : DOMString read Gethost write Sethost; - function Gethostname(): DOMString; safecall; + procedure Gethostname( result_: DOMString); safecall; procedure Sethostname(ahostname: DOMString); safecall; - property hostname : DOMString read Gethostname write Sethostname; - function Gethref(): DOMString; safecall; + procedure Gethref( result_: DOMString); safecall; procedure Sethref(ahref: DOMString); safecall; - property href : DOMString read Gethref write Sethref; - function Getpathname(): DOMString; safecall; + procedure Getpathname( result_: DOMString); safecall; procedure Setpathname(apathname: DOMString); safecall; - property pathname : DOMString read Getpathname write Setpathname; - function Getport(): DOMString; safecall; + procedure Getport( result_: DOMString); safecall; procedure Setport(aport: DOMString); safecall; - property port : DOMString read Getport write Setport; - function Getprotocol(): DOMString; safecall; + procedure Getprotocol( result_: DOMString); safecall; procedure Setprotocol(aprotocol: DOMString); safecall; - property protocol : DOMString read Getprotocol write Setprotocol; - function Getsearch(): DOMString; safecall; + procedure Getsearch( result_: DOMString); safecall; procedure Setsearch(asearch: DOMString); safecall; - property search : DOMString read Getsearch write Setsearch; procedure reload(forceget: longbool); safecall; procedure replace(url: DOMString); safecall; procedure assign(url: DOMString); safecall; - function toString() : DOMString; safecall; + procedure toString( result_: DOMString); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsidommedialist.inc b/components/geckoport/version2/gecko10/nsidommedialist.inc index c40762723..def00b04f 100644 --- a/components/geckoport/version2/gecko10/nsidommedialist.inc +++ b/components/geckoport/version2/gecko10/nsidommedialist.inc @@ -2,12 +2,11 @@ type nsIDOMMediaList = interface(nsISupports) ['{9b0c2ed7-111c-4824-adf9-ef0da6dad371}'] - function GetmediaText(): DOMString; safecall; + procedure GetmediaText( result_: DOMString); safecall; procedure SetmediaText(amediaText: DOMString); safecall; - property mediaText : DOMString read GetmediaText write SetmediaText; function Getlength(): idlulong; safecall; property length : idlulong read Getlength; - function item(index: idlulong) : DOMString; safecall; + procedure item(index: idlulong; result_: DOMString); safecall; procedure deleteMedium(oldMedium: DOMString); safecall; procedure appendMedium(newMedium: DOMString); safecall; diff --git a/components/geckoport/version2/gecko10/nsidommediaquerylist.inc b/components/geckoport/version2/gecko10/nsidommediaquerylist.inc index d20827412..d186b1fe7 100644 --- a/components/geckoport/version2/gecko10/nsidommediaquerylist.inc +++ b/components/geckoport/version2/gecko10/nsidommediaquerylist.inc @@ -2,8 +2,7 @@ type nsIDOMMediaQueryList = interface(nsISupports) ['{e0e49c52-915b-40f9-9cba-6026305cdf3e}'] - function Getmedia(): DOMString; safecall; - property media : DOMString read Getmedia; + procedure Getmedia( result_: DOMString); safecall; function Getmatches(): longbool; safecall; property matches : longbool read Getmatches; procedure addListener(listener: nsIDOMMediaQueryListListener); safecall; diff --git a/components/geckoport/version2/gecko10/nsidommimetype.inc b/components/geckoport/version2/gecko10/nsidommimetype.inc index 31cefaa8a..4e9c23460 100644 --- a/components/geckoport/version2/gecko10/nsidommimetype.inc +++ b/components/geckoport/version2/gecko10/nsidommimetype.inc @@ -2,14 +2,11 @@ type nsIDOMMimeType = interface(nsISupports) ['{f6134682-f28b-11d2-8360-c90899049c3c}'] - function Getdescription(): DOMString; safecall; - property description : DOMString read Getdescription; + procedure Getdescription( result_: DOMString); safecall; function GetenabledPlugin(): nsIDOMPlugin; safecall; property enabledPlugin : nsIDOMPlugin read GetenabledPlugin; - function Getsuffixes(): DOMString; safecall; - property suffixes : DOMString read Getsuffixes; - function Gettype(): DOMString; safecall; - property atype : DOMString read Gettype; + procedure Getsuffixes( result_: DOMString); safecall; + procedure Gettype( result_: DOMString); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsidomnavigator.inc b/components/geckoport/version2/gecko10/nsidomnavigator.inc index cd3480b05..f93b8f93d 100644 --- a/components/geckoport/version2/gecko10/nsidomnavigator.inc +++ b/components/geckoport/version2/gecko10/nsidomnavigator.inc @@ -2,40 +2,27 @@ type nsIDOMNavigator = interface(nsISupports) ['{c5acd187-bf76-4b26-9329-41c798e47fb6}'] - function GetappCodeName(): DOMString; safecall; - property appCodeName : DOMString read GetappCodeName; - function GetappName(): DOMString; safecall; - property appName : DOMString read GetappName; - function GetappVersion(): DOMString; safecall; - property appVersion : DOMString read GetappVersion; - function Getlanguage(): DOMString; safecall; - property language : DOMString read Getlanguage; + procedure GetappCodeName( result_: DOMString); safecall; + procedure GetappName( result_: DOMString); safecall; + procedure GetappVersion( result_: DOMString); safecall; + procedure Getlanguage( result_: DOMString); safecall; function GetmimeTypes(): nsIDOMMimeTypeArray; safecall; property mimeTypes : nsIDOMMimeTypeArray read GetmimeTypes; - function Getplatform(): DOMString; safecall; - property platform : DOMString read Getplatform; - function Getoscpu(): DOMString; safecall; - property oscpu : DOMString read Getoscpu; - function Getvendor(): DOMString; safecall; - property vendor : DOMString read Getvendor; - function GetvendorSub(): DOMString; safecall; - property vendorSub : DOMString read GetvendorSub; - function Getproduct(): DOMString; safecall; - property product : DOMString read Getproduct; - function GetproductSub(): DOMString; safecall; - property productSub : DOMString read GetproductSub; + procedure Getplatform( result_: DOMString); safecall; + procedure Getoscpu( result_: DOMString); safecall; + procedure Getvendor( result_: DOMString); safecall; + procedure GetvendorSub( result_: DOMString); safecall; + procedure Getproduct( result_: DOMString); safecall; + procedure GetproductSub( result_: DOMString); safecall; function Getplugins(): nsIDOMPluginArray; safecall; property plugins : nsIDOMPluginArray read Getplugins; - function GetuserAgent(): DOMString; safecall; - property userAgent : DOMString read GetuserAgent; + procedure GetuserAgent( result_: DOMString); safecall; function GetcookieEnabled(): longbool; safecall; property cookieEnabled : longbool read GetcookieEnabled; function GetonLine(): longbool; safecall; property onLine : longbool read GetonLine; - function GetbuildID(): DOMString; safecall; - property buildID : DOMString read GetbuildID; - function GetdoNotTrack(): DOMString; safecall; - property doNotTrack : DOMString read GetdoNotTrack; + procedure GetbuildID( result_: DOMString); safecall; + procedure GetdoNotTrack( result_: DOMString); safecall; function javaEnabled() : longbool; safecall; function taintEnabled() : longbool; safecall; diff --git a/components/geckoport/version2/gecko10/nsidomnode.inc b/components/geckoport/version2/gecko10/nsidomnode.inc index 8f86d488f..3b2984434 100644 --- a/components/geckoport/version2/gecko10/nsidomnode.inc +++ b/components/geckoport/version2/gecko10/nsidomnode.inc @@ -2,11 +2,9 @@ type nsIDOMNode = interface(nsISupports) ['{ce82fb71-60f2-4c38-be31-de5f2f90dada}'] - function GetnodeName(): DOMString; safecall; - property nodeName : DOMString read GetnodeName; - function GetnodeValue(): DOMString; safecall; + procedure GetnodeName( result_: DOMString); safecall; + procedure GetnodeValue( result_: DOMString); safecall; procedure SetnodeValue(anodeValue: DOMString); safecall; - property nodeValue : DOMString read GetnodeValue write SetnodeValue; function GetnodeType(): idlushort; safecall; property nodeType : idlushort read GetnodeType; function GetparentNode(): nsIDOMNode; safecall; @@ -35,22 +33,17 @@ type function cloneNode(deep: longbool) : nsIDOMNode; safecall; procedure normalize(); safecall; function isSupported(feature: DOMString; version: DOMString) : longbool; safecall; - function GetnamespaceURI(): DOMString; safecall; - property namespaceURI : DOMString read GetnamespaceURI; - function Getprefix(): DOMString; safecall; - property prefix : DOMString read Getprefix; - function GetlocalName(): DOMString; safecall; - property localName : DOMString read GetlocalName; + procedure GetnamespaceURI( result_: DOMString); safecall; + procedure Getprefix( result_: DOMString); safecall; + procedure GetlocalName( result_: DOMString); safecall; function hasAttributes() : longbool; safecall; - function GetbaseURI(): DOMString; safecall; - property baseURI : DOMString read GetbaseURI; + procedure GetbaseURI( result_: DOMString); safecall; function compareDocumentPosition(other: nsIDOMNode) : idlushort; safecall; - function GettextContent(): DOMString; safecall; + procedure GettextContent( result_: DOMString); safecall; procedure SettextContent(atextContent: DOMString); safecall; - property textContent : DOMString read GettextContent write SettextContent; - function lookupPrefix(anamespaceURI: DOMString) : DOMString; safecall; + procedure lookupPrefix(anamespaceURI: DOMString; result_: DOMString); safecall; function isDefaultNamespace(anamespaceURI: DOMString) : longbool; safecall; - function lookupNamespaceURI(aprefix: DOMString) : DOMString; safecall; + procedure lookupNamespaceURI(aprefix: DOMString; result_: DOMString); safecall; function isEqualNode(arg: nsIDOMNode) : longbool; safecall; function setUserData(key: DOMString; data: nsIVariant; handler: nsIDOMUserDataHandler) : nsIVariant; safecall; function getUserData(key: DOMString) : nsIVariant; safecall; diff --git a/components/geckoport/version2/gecko10/nsidomofflineresourcelist.inc b/components/geckoport/version2/gecko10/nsidomofflineresourcelist.inc index 85f3ebdb3..c692688dd 100644 --- a/components/geckoport/version2/gecko10/nsidomofflineresourcelist.inc +++ b/components/geckoport/version2/gecko10/nsidomofflineresourcelist.inc @@ -7,7 +7,7 @@ type function mozHasItem(uri: DOMString) : longbool; safecall; function GetmozLength(): idlulong; safecall; property mozLength : idlulong read GetmozLength; - function mozItem(index: idlulong) : DOMString; safecall; + procedure mozItem(index: idlulong; result_: DOMString); safecall; procedure mozAdd(uri: DOMString); safecall; procedure mozRemove(uri: DOMString); safecall; function Getstatus(): idlushort; safecall; diff --git a/components/geckoport/version2/gecko10/nsidomperformancenavigation.inc b/components/geckoport/version2/gecko10/nsidomperformancenavigation.inc index 12c51bcb4..1894a7ed8 100644 --- a/components/geckoport/version2/gecko10/nsidomperformancenavigation.inc +++ b/components/geckoport/version2/gecko10/nsidomperformancenavigation.inc @@ -1,5 +1,5 @@ type - nsDOMPerformanceNavigationType = cushort; + nsDOMPerformanceNavigationType = idlushort; type diff --git a/components/geckoport/version2/gecko10/nsidomplugin.inc b/components/geckoport/version2/gecko10/nsidomplugin.inc index da012d10d..5e95074f8 100644 --- a/components/geckoport/version2/gecko10/nsidomplugin.inc +++ b/components/geckoport/version2/gecko10/nsidomplugin.inc @@ -2,14 +2,10 @@ type nsIDOMPlugin = interface(nsISupports) ['{ff69a292-c74d-4ef5-9d0f-86112fff2d5b}'] - function Getdescription(): DOMString; safecall; - property description : DOMString read Getdescription; - function Getfilename(): DOMString; safecall; - property filename : DOMString read Getfilename; - function Getversion(): DOMString; safecall; - property version : DOMString read Getversion; - function Getname(): DOMString; safecall; - property name : DOMString read Getname; + procedure Getdescription( result_: DOMString); safecall; + procedure Getfilename( result_: DOMString); safecall; + procedure Getversion( result_: DOMString); safecall; + procedure Getname( result_: DOMString); safecall; function Getlength(): idlulong; safecall; property length : idlulong read Getlength; function item(index: idlulong) : nsIDOMMimeType; safecall; diff --git a/components/geckoport/version2/gecko10/nsidomprocessinginstruction.inc b/components/geckoport/version2/gecko10/nsidomprocessinginstruction.inc index 84797c1ed..e7d5de67a 100644 --- a/components/geckoport/version2/gecko10/nsidomprocessinginstruction.inc +++ b/components/geckoport/version2/gecko10/nsidomprocessinginstruction.inc @@ -2,8 +2,7 @@ type nsIDOMProcessingInstruction = interface(nsIDOMCharacterData) ['{d754433f-4637-4a5f-9034-0388173ea254}'] - function Gettarget(): DOMString; safecall; - property target : DOMString read Gettarget; + procedure Gettarget( result_: DOMString); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsidomstorage.inc b/components/geckoport/version2/gecko10/nsidomstorage.inc index ab52fce89..b6b405593 100644 --- a/components/geckoport/version2/gecko10/nsidomstorage.inc +++ b/components/geckoport/version2/gecko10/nsidomstorage.inc @@ -4,8 +4,8 @@ type ['{43E5EDAD-1E02-42c4-9D99-C3D9DEE22A20}'] function Getlength(): idlulong; safecall; property length : idlulong read Getlength; - function key(index: idlulong) : DOMString; safecall; - function getItem(akey: DOMString) : DOMString; safecall; + procedure key(index: idlulong; result_: DOMString); safecall; + procedure getItem(akey: DOMString; result_: DOMString); safecall; procedure setItem(akey: DOMString; data: DOMString); safecall; procedure removeItem(akey: DOMString); safecall; procedure clear(); safecall; diff --git a/components/geckoport/version2/gecko10/nsidomstorageitem.inc b/components/geckoport/version2/gecko10/nsidomstorageitem.inc index 178c7312f..e6f8aa058 100644 --- a/components/geckoport/version2/gecko10/nsidomstorageitem.inc +++ b/components/geckoport/version2/gecko10/nsidomstorageitem.inc @@ -5,9 +5,8 @@ type function Getsecure(): longbool; safecall; procedure Setsecure(asecure: longbool); safecall; property secure : longbool read Getsecure write Setsecure; - function Getvalue(): DOMString; safecall; + procedure Getvalue( result_: DOMString); safecall; procedure Setvalue(avalue: DOMString); safecall; - property value : DOMString read Getvalue write Setvalue; end; diff --git a/components/geckoport/version2/gecko10/nsidomstorageobsolete.inc b/components/geckoport/version2/gecko10/nsidomstorageobsolete.inc index 00f884b57..b7c8dc016 100644 --- a/components/geckoport/version2/gecko10/nsidomstorageobsolete.inc +++ b/components/geckoport/version2/gecko10/nsidomstorageobsolete.inc @@ -4,7 +4,7 @@ type ['{18013CF9-B104-49cf-9484-C2A7A845457E}'] function Getlength(): idlulong; safecall; property length : idlulong read Getlength; - function key(index: idlulong) : DOMString; safecall; + procedure key(index: idlulong; result_: DOMString); safecall; function getItem(akey: DOMString) : nsIDOMStorageItem; safecall; procedure setItem(akey: DOMString; data: DOMString); safecall; procedure removeItem(akey: DOMString); safecall; diff --git a/components/geckoport/version2/gecko10/nsidomstylesheet.inc b/components/geckoport/version2/gecko10/nsidomstylesheet.inc index 334c61697..3ad570a97 100644 --- a/components/geckoport/version2/gecko10/nsidomstylesheet.inc +++ b/components/geckoport/version2/gecko10/nsidomstylesheet.inc @@ -2,8 +2,7 @@ type nsIDOMStyleSheet = interface(nsISupports) ['{a6cf9080-15b3-11d2-932e-00805f8add32}'] - function Gettype(): DOMString; safecall; - property atype : DOMString read Gettype; + procedure Gettype( result_: DOMString); safecall; function Getdisabled(): longbool; safecall; procedure Setdisabled(adisabled: longbool); safecall; property disabled : longbool read Getdisabled write Setdisabled; @@ -11,10 +10,8 @@ type property ownerNode : nsIDOMNode read GetownerNode; function GetparentStyleSheet(): nsIDOMStyleSheet; safecall; property parentStyleSheet : nsIDOMStyleSheet read GetparentStyleSheet; - function Gethref(): DOMString; safecall; - property href : DOMString read Gethref; - function Gettitle(): DOMString; safecall; - property title : DOMString read Gettitle; + procedure Gethref( result_: DOMString); safecall; + procedure Gettitle( result_: DOMString); safecall; function Getmedia(): nsIDOMMediaList; safecall; property media : nsIDOMMediaList read Getmedia; diff --git a/components/geckoport/version2/gecko10/nsidomtext.inc b/components/geckoport/version2/gecko10/nsidomtext.inc index da01b401d..41da6ff3d 100644 --- a/components/geckoport/version2/gecko10/nsidomtext.inc +++ b/components/geckoport/version2/gecko10/nsidomtext.inc @@ -3,8 +3,7 @@ type nsIDOMText = interface(nsIDOMCharacterData) ['{437ed60c-febd-4bd0-892f-cf358adc3c96}'] function splitText(offset: idlulong) : nsIDOMText; safecall; - function GetwholeText(): DOMString; safecall; - property wholeText : DOMString read GetwholeText; + procedure GetwholeText( result_: DOMString); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsidomwindow.inc b/components/geckoport/version2/gecko10/nsidomwindow.inc index a830befbd..2102b9ab3 100644 --- a/components/geckoport/version2/gecko10/nsidomwindow.inc +++ b/components/geckoport/version2/gecko10/nsidomwindow.inc @@ -2,7 +2,7 @@ type nsIDOMMozURLProperty = interface(nsISupports) ['{8fc58f56-f769-4368-a098-edd08550cf1a}'] - function createObjectURL(blob: nsIDOMBlob) : DOMString; safecall; + procedure createObjectURL(blob: nsIDOMBlob; result_: DOMString); safecall; procedure revokeObjectURL(URL: DOMString); safecall; end; @@ -16,9 +16,8 @@ type property self : nsIDOMWindow read Getself; function Getdocument(): nsIDOMDocument; safecall; property document : nsIDOMDocument read Getdocument; - function Getname(): DOMString; safecall; + procedure Getname( result_: DOMString); safecall; procedure Setname(aname: DOMString); safecall; - property name : DOMString read Getname write Setname; function Getlocation(): nsIDOMLocation; safecall; property location : nsIDOMLocation read Getlocation; function Gethistory(): nsIDOMHistory; safecall; @@ -35,9 +34,8 @@ type property statusbar : nsIDOMBarProp read Getstatusbar; function Gettoolbar(): nsIDOMBarProp; safecall; property toolbar : nsIDOMBarProp read Gettoolbar; - function Getstatus(): DOMString; safecall; + procedure Getstatus( result_: DOMString); safecall; procedure Setstatus(astatus: DOMString); safecall; - property status : DOMString read Getstatus write Setstatus; procedure close(); safecall; procedure stop(); safecall; procedure focus(); safecall; @@ -59,12 +57,12 @@ type property applicationCache : nsIDOMOfflineResourceList read GetapplicationCache; procedure alert(text: DOMString); safecall; function confirm(text: DOMString) : longbool; safecall; - function prompt(aMessage: DOMString; aInitial: DOMString) : DOMString; safecall; + procedure prompt(aMessage: DOMString; aInitial: DOMString; result_: DOMString); safecall; procedure print(); safecall; function showModalDialog(aURI: DOMString; aArgs: nsIVariant; aOptions: DOMString) : nsIVariant; safecall; procedure postMessage(message: jsval; targetOrigin: DOMString); safecall; - function atob(aAsciiString: DOMString) : DOMString; safecall; - function btoa(aBase64Data: DOMString) : DOMString; safecall; + procedure atob(aAsciiString: DOMString; result_: DOMString); safecall; + procedure btoa(aBase64Data: DOMString; result_: DOMString); safecall; function GetsessionStorage(): nsIDOMStorage; safecall; property sessionStorage : nsIDOMStorage read GetsessionStorage; function GetlocalStorage(): nsIDOMStorage; safecall; @@ -125,9 +123,8 @@ type property pkcs11 : nsIDOMPkcs11 read Getpkcs11; function Getcontrollers(): nsIControllers; safecall; property controllers : nsIControllers read Getcontrollers; - function GetdefaultStatus(): DOMString; safecall; + procedure GetdefaultStatus( result_: DOMString); safecall; procedure SetdefaultStatus(adefaultStatus: DOMString); safecall; - property defaultStatus : DOMString read GetdefaultStatus write SetdefaultStatus; function GetmozInnerScreenX(): idlfloat; safecall; property mozInnerScreenX : idlfloat read GetmozInnerScreenX; function GetmozInnerScreenY(): idlfloat; safecall; diff --git a/components/geckoport/version2/gecko10/nsieventsource.inc b/components/geckoport/version2/gecko10/nsieventsource.inc index 60037c380..c3af771ee 100644 --- a/components/geckoport/version2/gecko10/nsieventsource.inc +++ b/components/geckoport/version2/gecko10/nsieventsource.inc @@ -2,8 +2,7 @@ type nsIEventSource = interface(nsISupports) ['{755e2d2d-a836-4539-83f4-16b51156341f}'] - function Geturl(): DOMString; safecall; - property url : DOMString read Geturl; + procedure Geturl( result_: DOMString); safecall; function GetreadyState(): idllong; safecall; property readyState : idllong read GetreadyState; function Getonopen(): nsIDOMEventListener; safecall; diff --git a/components/geckoport/version2/gecko10/nsifactory.inc b/components/geckoport/version2/gecko10/nsifactory.inc index 4112db3a3..cfafc184f 100644 --- a/components/geckoport/version2/gecko10/nsifactory.inc +++ b/components/geckoport/version2/gecko10/nsifactory.inc @@ -2,7 +2,7 @@ type nsIFactory = interface(nsISupports) ['{00000001-0000-0000-c000-000000000046}'] - procedure createInstance(aOuter: nsISupports; iid: nsIIDRef; out result); safecall; + procedure createInstance(aOuter: nsISupports; constref iid: TGuid; out result); safecall; procedure lockFactory(lock: longbool); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsifile.inc b/components/geckoport/version2/gecko10/nsifile.inc index aceca1a35..3fc68b0d4 100644 --- a/components/geckoport/version2/gecko10/nsifile.inc +++ b/components/geckoport/version2/gecko10/nsifile.inc @@ -9,9 +9,8 @@ type function GetleafName(): AString; safecall; procedure SetleafName(aleafName: AString); safecall; property leafName : AString read GetleafName write SetleafName; - function GetnativeLeafName(): ACString; safecall; + procedure GetnativeLeafName( result_: ACString); safecall; procedure SetnativeLeafName(anativeLeafName: ACString); safecall; - property nativeLeafName : ACString read GetnativeLeafName write SetnativeLeafName; procedure copyTo(newParentDir: nsIFile; newName: AString); safecall; procedure CopyToNative(newParentDir: nsIFile; newName: ACString); safecall; procedure copyToFollowingLinks(newParentDir: nsIFile; newName: AString); safecall; @@ -38,12 +37,10 @@ type property fileSizeOfLink : PRInt64 read GetfileSizeOfLink; function Gettarget(): AString; safecall; property target : AString read Gettarget; - function GetnativeTarget(): ACString; safecall; - property nativeTarget : ACString read GetnativeTarget; + procedure GetnativeTarget( result_: ACString); safecall; function Getpath(): AString; safecall; property path : AString read Getpath; - function GetnativePath(): ACString; safecall; - property nativePath : ACString read GetnativePath; + procedure GetnativePath( result_: ACString); safecall; function exists() : longbool; safecall; function isWritable() : longbool; safecall; function isReadable() : longbool; safecall; diff --git a/components/geckoport/version2/gecko10/nsihttpchannel.inc b/components/geckoport/version2/gecko10/nsihttpchannel.inc index 2d4fe5691..11f7ec4be 100644 --- a/components/geckoport/version2/gecko10/nsihttpchannel.inc +++ b/components/geckoport/version2/gecko10/nsihttpchannel.inc @@ -2,13 +2,12 @@ type nsIHttpChannel = interface(nsIChannel) ['{9277fe09-f0cc-4cd9-bbce-581dd94b0260}'] - function GetrequestMethod(): ACString; safecall; + procedure GetrequestMethod( result_: ACString); safecall; procedure SetrequestMethod(arequestMethod: ACString); safecall; - property requestMethod : ACString read GetrequestMethod write SetrequestMethod; function Getreferrer(): nsIURI; safecall; procedure Setreferrer(areferrer: nsIURI); safecall; property referrer : nsIURI read Getreferrer write Setreferrer; - function getRequestHeader(aHeader: ACString) : ACString; safecall; + procedure getRequestHeader(aHeader: ACString; result_: ACString); safecall; procedure setRequestHeader(aHeader: ACString; aValue: ACString; aMerge: longbool); safecall; procedure visitRequestHeaders(aVisitor: nsIHttpHeaderVisitor); safecall; function GetallowPipelining(): longbool; safecall; @@ -19,11 +18,10 @@ type property redirectionLimit : idlulong read GetredirectionLimit write SetredirectionLimit; function GetresponseStatus(): idlulong; safecall; property responseStatus : idlulong read GetresponseStatus; - function GetresponseStatusText(): ACString; safecall; - property responseStatusText : ACString read GetresponseStatusText; + procedure GetresponseStatusText( result_: ACString); safecall; function GetrequestSucceeded(): longbool; safecall; property requestSucceeded : longbool read GetrequestSucceeded; - function getResponseHeader(header: ACString) : ACString; safecall; + procedure getResponseHeader(header: ACString; result_: ACString); safecall; procedure setResponseHeader(header: ACString; value: ACString; merge: longbool); safecall; procedure visitResponseHeaders(aVisitor: nsIHttpHeaderVisitor); safecall; function isNoStoreResponse() : longbool; safecall; diff --git a/components/geckoport/version2/gecko10/nsiinterfacerequestor.inc b/components/geckoport/version2/gecko10/nsiinterfacerequestor.inc index acb363f20..897b95478 100644 --- a/components/geckoport/version2/gecko10/nsiinterfacerequestor.inc +++ b/components/geckoport/version2/gecko10/nsiinterfacerequestor.inc @@ -2,8 +2,6 @@ type nsIInterfaceRequestor = interface(nsISupports) ['{033A1470-8B2A-11d3-AF88-00A024FFC08C}'] - // uuid parameter is manually converted to constref/TGuid, so - // that it is possible to assign an interface to this parameter. procedure getInterface(constref uuid: TGuid; out result); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsiioservice.inc b/components/geckoport/version2/gecko10/nsiioservice.inc index a731fc89a..15f750de8 100644 --- a/components/geckoport/version2/gecko10/nsiioservice.inc +++ b/components/geckoport/version2/gecko10/nsiioservice.inc @@ -12,7 +12,7 @@ type procedure Setoffline(aoffline: longbool); safecall; property offline : longbool read Getoffline write Setoffline; function allowPort(aPort: idllong; aScheme: PAnsiChar) : longbool; safecall; - function extractScheme(urlString: AUTF8String) : ACString; safecall; + procedure extractScheme(urlString: AUTF8String; result_: ACString); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsilocalfile.inc b/components/geckoport/version2/gecko10/nsilocalfile.inc index 04d984627..47e986b4b 100644 --- a/components/geckoport/version2/gecko10/nsilocalfile.inc +++ b/components/geckoport/version2/gecko10/nsilocalfile.inc @@ -15,12 +15,11 @@ type property diskSpaceAvailable : PRInt64 read GetdiskSpaceAvailable; procedure appendRelativePath(relativeFilePath: AString); safecall; procedure appendRelativeNativePath(relativeFilePath: ACString); safecall; - function GetpersistentDescriptor(): ACString; safecall; + procedure GetpersistentDescriptor( result_: ACString); safecall; procedure SetpersistentDescriptor(apersistentDescriptor: ACString); safecall; - property persistentDescriptor : ACString read GetpersistentDescriptor write SetpersistentDescriptor; procedure reveal(); safecall; procedure launch(); safecall; - function getRelativeDescriptor(fromFile: nsILocalFile) : ACString; safecall; + procedure getRelativeDescriptor(fromFile: nsILocalFile; result_: ACString); safecall; procedure setRelativeDescriptor(fromFile: nsILocalFile; relativeDesc: ACString); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsimodule.inc b/components/geckoport/version2/gecko10/nsimodule.inc index 76161f8a1..872d9d1d7 100644 --- a/components/geckoport/version2/gecko10/nsimodule.inc +++ b/components/geckoport/version2/gecko10/nsimodule.inc @@ -2,7 +2,7 @@ type nsIModule = interface(nsISupports) ['{7392D032-5371-11d3-994E-00805FD26FEE}'] - procedure getClassObject(aCompMgr: nsIComponentManager; aClass: nsCIDRef; aIID: nsIIDRef; out aResult: nsQIResult); safecall; + procedure getClassObject(aCompMgr: nsIComponentManager; constref aClass: TGuid; constref aIID: TGuid; out aResult); safecall; procedure registerSelf(aCompMgr: nsIComponentManager; aLocation: nsIFile; aLoaderStr: PAnsiChar; aType: PAnsiChar); safecall; procedure unregisterSelf(aCompMgr: nsIComponentManager; aLocation: nsIFile; aLoaderStr: PAnsiChar); safecall; function canUnload(aCompMgr: nsIComponentManager) : longbool; safecall; diff --git a/components/geckoport/version2/gecko10/nsiobjectoutputstream.inc b/components/geckoport/version2/gecko10/nsiobjectoutputstream.inc index 2010163a7..55afdbb5c 100644 --- a/components/geckoport/version2/gecko10/nsiobjectoutputstream.inc +++ b/components/geckoport/version2/gecko10/nsiobjectoutputstream.inc @@ -4,7 +4,7 @@ type ['{92c898ac-5fde-4b99-87b3-5d486422094b}'] procedure writeObject(aObject: nsISupports; aIsStrongRef: longbool); safecall; procedure writeSingleRefObject(aObject: nsISupports); safecall; - procedure writeCompoundObject(aObject: nsISupports; aIID: nsIIDRef; aIsStrongRef: longbool); safecall; + procedure writeCompoundObject(aObject: nsISupports; constref aIID: TGuid; aIsStrongRef: longbool); safecall; procedure writeID(aID: nsIDRef); safecall; function getBuffer(aLength: PRUint32; aAlignMask: PRUint32) : charPtr; safecall; procedure putBuffer(aBuffer: charPtr; aLength: PRUint32); safecall; diff --git a/components/geckoport/version2/gecko10/nsiprincipal.inc b/components/geckoport/version2/gecko10/nsiprincipal.inc index 73e41aed5..14870b6cf 100644 --- a/components/geckoport/version2/gecko10/nsiprincipal.inc +++ b/components/geckoport/version2/gecko10/nsiprincipal.inc @@ -26,14 +26,11 @@ type property origin : PAnsiChar read Getorigin; function GethasCertificate(): longbool; safecall; property hasCertificate : longbool read GethasCertificate; - function Getfingerprint(): AUTF8String; safecall; - property fingerprint : AUTF8String read Getfingerprint; - function GetprettyName(): AUTF8String; safecall; - property prettyName : AUTF8String read GetprettyName; + procedure Getfingerprint( result_: AUTF8String); safecall; + procedure GetprettyName( result_: AUTF8String); safecall; function subsumes(other: nsIPrincipal) : longbool; safecall; procedure checkMayLoad(anuri: nsIURI; report: longbool); safecall; - function GetsubjectName(): AUTF8String; safecall; - property subjectName : AUTF8String read GetsubjectName; + procedure GetsubjectName( result_: AUTF8String); safecall; function Getcertificate(): nsISupports; safecall; property certificate : nsISupports read Getcertificate; function Getcsp(): nsIContentSecurityPolicy; safecall; diff --git a/components/geckoport/version2/gecko10/nsiproperties.inc b/components/geckoport/version2/gecko10/nsiproperties.inc index c0c7e6e28..e05994cc5 100644 --- a/components/geckoport/version2/gecko10/nsiproperties.inc +++ b/components/geckoport/version2/gecko10/nsiproperties.inc @@ -2,8 +2,6 @@ type nsIProperties = interface(nsISupports) ['{78650582-4e93-4b60-8e85-26ebd3eb14ca}'] - // iid parameter is manually converted to constref/TGuid, so - // that it is possible to assign an interface to this parameter. procedure get(prop: PAnsiChar; constref iid: TGuid; out result); safecall; procedure aset(prop: PAnsiChar; value: nsISupports); safecall; function has(prop: PAnsiChar) : longbool; safecall; diff --git a/components/geckoport/version2/gecko10/nsiprotocolhandler.inc b/components/geckoport/version2/gecko10/nsiprotocolhandler.inc index 5abac9c56..e1b53f911 100644 --- a/components/geckoport/version2/gecko10/nsiprotocolhandler.inc +++ b/components/geckoport/version2/gecko10/nsiprotocolhandler.inc @@ -2,8 +2,7 @@ type nsIProtocolHandler = interface(nsISupports) ['{15fd6940-8ea7-11d3-93ad-00104ba0fd40}'] - function Getscheme(): ACString; safecall; - property scheme : ACString read Getscheme; + procedure Getscheme( result_: ACString); safecall; function GetdefaultPort(): idllong; safecall; property defaultPort : idllong read GetdefaultPort; function GetprotocolFlags(): idlulong; safecall; diff --git a/components/geckoport/version2/gecko10/nsirequest.inc b/components/geckoport/version2/gecko10/nsirequest.inc index cba417406..429089c5f 100644 --- a/components/geckoport/version2/gecko10/nsirequest.inc +++ b/components/geckoport/version2/gecko10/nsirequest.inc @@ -2,8 +2,7 @@ type nsIRequest = interface(nsISupports) ['{ef6bfbd2-fd46-48d8-96b7-9f8f0fd387fe}'] - function Getname(): AUTF8String; safecall; - property name : AUTF8String read Getname; + procedure Getname( result_: AUTF8String); safecall; function isPending() : longbool; safecall; function Getstatus(): nsresult; safecall; property status : nsresult read Getstatus; diff --git a/components/geckoport/version2/gecko10/nsiservicemanager.inc b/components/geckoport/version2/gecko10/nsiservicemanager.inc index 36e255716..f8a9ec489 100644 --- a/components/geckoport/version2/gecko10/nsiservicemanager.inc +++ b/components/geckoport/version2/gecko10/nsiservicemanager.inc @@ -2,12 +2,10 @@ type nsIServiceManager = interface(nsISupports) ['{8bb35ed9-e332-462d-9155-4a002ab5c958}'] - // aIID and aClass parameters are manually converted to constref/TGuid, so - // that it is possible to assign an interface to this parameter. procedure getService(constref aClass: TGuid; constref aIID: TGuid; out result); safecall; - procedure getServiceByContractID(aContractID: PAnsiChar; aIID: nsIIDRef; out result); safecall; - function isServiceInstantiated(aClass: nsCIDRef; aIID: nsIIDRef) : longbool; safecall; - function isServiceInstantiatedByContractID(aContractID: PAnsiChar; aIID: nsIIDRef) : longbool; safecall; + procedure getServiceByContractID(aContractID: PAnsiChar; constref aIID: TGuid; out result); safecall; + function isServiceInstantiated(constref aClass: TGuid; constref aIID: TGuid) : longbool; safecall; + function isServiceInstantiatedByContractID(aContractID: PAnsiChar; constref aIID: TGuid) : longbool; safecall; end; diff --git a/components/geckoport/version2/gecko10/nsishentry.inc b/components/geckoport/version2/gecko10/nsishentry.inc index a462fb626..8f59c0f45 100644 --- a/components/geckoport/version2/gecko10/nsishentry.inc +++ b/components/geckoport/version2/gecko10/nsishentry.inc @@ -49,9 +49,8 @@ type function GetexpirationStatus(): longbool; safecall; procedure SetexpirationStatus(aexpirationStatus: longbool); safecall; property expirationStatus : longbool read GetexpirationStatus write SetexpirationStatus; - function GetcontentType(): ACString; safecall; + procedure GetcontentType( result_: ACString); safecall; procedure SetcontentType(acontentType: ACString); safecall; - property contentType : ACString read GetcontentType write SetcontentType; function GetURIWasModified(): longbool; safecall; procedure SetURIWasModified(aURIWasModified: longbool); safecall; property URIWasModified : longbool read GetURIWasModified write SetURIWasModified; diff --git a/components/geckoport/version2/gecko10/nsiuri.inc b/components/geckoport/version2/gecko10/nsiuri.inc index d675db688..86e277648 100644 --- a/components/geckoport/version2/gecko10/nsiuri.inc +++ b/components/geckoport/version2/gecko10/nsiuri.inc @@ -2,52 +2,38 @@ type nsIURI = interface(nsISupports) ['{395fe045-7d18-4adb-a3fd-af98c8a1af11}'] - function Getspec(): AUTF8String; safecall; + procedure Getspec( result_: AUTF8String); safecall; procedure Setspec(aspec: AUTF8String); safecall; - property spec : AUTF8String read Getspec write Setspec; - function GetprePath(): AUTF8String; safecall; - property prePath : AUTF8String read GetprePath; - function Getscheme(): ACString; safecall; + procedure GetprePath( result_: AUTF8String); safecall; + procedure Getscheme( result_: ACString); safecall; procedure Setscheme(ascheme: ACString); safecall; - property scheme : ACString read Getscheme write Setscheme; - function GetuserPass(): AUTF8String; safecall; + procedure GetuserPass( result_: AUTF8String); safecall; procedure SetuserPass(auserPass: AUTF8String); safecall; - property userPass : AUTF8String read GetuserPass write SetuserPass; - function Getusername(): AUTF8String; safecall; + procedure Getusername( result_: AUTF8String); safecall; procedure Setusername(ausername: AUTF8String); safecall; - property username : AUTF8String read Getusername write Setusername; - function Getpassword(): AUTF8String; safecall; + procedure Getpassword( result_: AUTF8String); safecall; procedure Setpassword(apassword: AUTF8String); safecall; - property password : AUTF8String read Getpassword write Setpassword; - function GethostPort(): AUTF8String; safecall; + procedure GethostPort( result_: AUTF8String); safecall; procedure SethostPort(ahostPort: AUTF8String); safecall; - property hostPort : AUTF8String read GethostPort write SethostPort; - function Gethost(): AUTF8String; safecall; + procedure Gethost( result_: AUTF8String); safecall; procedure Sethost(ahost: AUTF8String); safecall; - property host : AUTF8String read Gethost write Sethost; function Getport(): idllong; safecall; procedure Setport(aport: idllong); safecall; property port : idllong read Getport write Setport; - function Getpath(): AUTF8String; safecall; + procedure Getpath( result_: AUTF8String); safecall; procedure Setpath(apath: AUTF8String); safecall; - property path : AUTF8String read Getpath write Setpath; function equals(other: nsIURI) : longbool; safecall; function schemeIs(ascheme: PAnsiChar) : longbool; safecall; function clone() : nsIURI; safecall; - function resolve(relativePath: AUTF8String) : AUTF8String; safecall; - function GetasciiSpec(): ACString; safecall; - property asciiSpec : ACString read GetasciiSpec; - function GetasciiHost(): ACString; safecall; - property asciiHost : ACString read GetasciiHost; - function GetoriginCharset(): ACString; safecall; - property originCharset : ACString read GetoriginCharset; - function Getref(): AUTF8String; safecall; + procedure resolve(relativePath: AUTF8String; result_: AUTF8String); safecall; + procedure GetasciiSpec( result_: ACString); safecall; + procedure GetasciiHost( result_: ACString); safecall; + procedure GetoriginCharset( result_: ACString); safecall; + procedure Getref( result_: AUTF8String); safecall; procedure Setref(aref: AUTF8String); safecall; - property ref : AUTF8String read Getref write Setref; function equalsExceptRef(other: nsIURI) : longbool; safecall; function cloneIgnoringRef() : nsIURI; safecall; - function GetspecIgnoringRef(): AUTF8String; safecall; - property specIgnoringRef : AUTF8String read GetspecIgnoringRef; + procedure GetspecIgnoringRef( result_: AUTF8String); safecall; function GethasRef(): longbool; safecall; property hasRef : longbool read GethasRef; diff --git a/components/geckoport/version2/gecko10/nsivariant.inc b/components/geckoport/version2/gecko10/nsivariant.inc index ba1c0fd4f..2ce76e989 100644 --- a/components/geckoport/version2/gecko10/nsivariant.inc +++ b/components/geckoport/version2/gecko10/nsivariant.inc @@ -55,9 +55,9 @@ type function getAsWChar() : wchar; safecall; function getAsID(out retval: nsID) : nsresult; safecall; function getAsAString() : AString; safecall; - function getAsDOMString() : DOMString; safecall; - function getAsACString() : ACString; safecall; - function getAsAUTF8String() : AUTF8String; safecall; + procedure getAsDOMString( result_: DOMString); safecall; + procedure getAsACString( result_: ACString); safecall; + procedure getAsAUTF8String( result_: AUTF8String); safecall; function getAsString() : PAnsiChar; safecall; function getAsWString() : PWideChar; safecall; function getAsISupports() : nsISupports; safecall; @@ -96,7 +96,7 @@ type procedure setAsString(aValue: PAnsiChar); safecall; procedure setAsWString(aValue: PWideChar); safecall; procedure setAsISupports(aValue: nsISupports); safecall; - procedure setAsInterface(iid: nsIIDRef; iface: nsQIResult); safecall; + procedure setAsInterface(constref iid: TGuid; iface: nsQIResult); safecall; procedure setAsArray(atype: PRUint16; iid: nsIIDPtr; count: PRUint32; ptr: voidPtr); safecall; procedure setAsStringWithSize(size: PRUint32; str: PAnsiChar); safecall; procedure setAsWStringWithSize(size: PRUint32; str: PWideChar); safecall; diff --git a/components/geckoport/version2/gecko10/nsiweakreference.inc b/components/geckoport/version2/gecko10/nsiweakreference.inc index 69a6bbdc8..713a590e8 100644 --- a/components/geckoport/version2/gecko10/nsiweakreference.inc +++ b/components/geckoport/version2/gecko10/nsiweakreference.inc @@ -2,8 +2,6 @@ type nsIWeakReference = interface(nsISupports) ['{9188bc85-f92e-11d2-81ef-0060083a0bcf}'] - // uuid parameter is manually converted to constref/TGuid, so - // that it is possible to assign an interface to this parameter. procedure QueryReferent(constref uuid: TGuid; out result); safecall; end; diff --git a/components/geckoport/version2/gecko10/nsiwebbrowser.inc b/components/geckoport/version2/gecko10/nsiwebbrowser.inc index 7f9c79b65..98d31e39b 100644 --- a/components/geckoport/version2/gecko10/nsiwebbrowser.inc +++ b/components/geckoport/version2/gecko10/nsiwebbrowser.inc @@ -2,10 +2,8 @@ type nsIWebBrowser = interface(nsISupports) ['{33e9d001-caab-4ba9-8961-54902f197202}'] - // aIID parameter is manually converted to constref/TGuid, so that it is possible - // to assign an interface to this parameter. procedure addWebBrowserListener(aListener: nsIWeakReference; constref aIID: TGuid); safecall; - procedure removeWebBrowserListener(aListener: nsIWeakReference; aIID: nsIIDRef); safecall; + procedure removeWebBrowserListener(aListener: nsIWeakReference; constref aIID: TGuid); safecall; function GetcontainerWindow(): nsIWebBrowserChrome; safecall; procedure SetcontainerWindow(acontainerWindow: nsIWebBrowserChrome); safecall; property containerWindow : nsIWebBrowserChrome read GetcontainerWindow write SetcontainerWindow; diff --git a/components/geckoport/version2/genincludefiles.sh b/components/geckoport/version2/genincludefiles.sh index fa1e4546b..aad0a02f3 100755 --- a/components/geckoport/version2/genincludefiles.sh +++ b/components/geckoport/version2/genincludefiles.sh @@ -13,7 +13,7 @@ fi idltopas $1/nsIDOMDocument.idl \ $1/nsIDOMElement.idl \ $1/nsISHEntry.idl \ - -c idlctypes.cfg -m idltypemap.cfg -p -f forwarddecl.inc -o + -m idltypemap.cfg -p -f forwarddecl.inc -o idltopas $1/nsIWebProgressListener.idl \ $1/nsIDOMNodeIterator.idl \ @@ -151,4 +151,4 @@ idltopas $1/nsIWebProgressListener.idl \ $1/nsIDOMStorage.idl \ $1/nsIContextMenuListener2.idl \ $1/nsIDOMText.idl \ - -c idlctypes.cfg -m idltypemap.cfg -f forwarddecl.inc -o + -m idltypemap.cfg -f forwarddecl.inc -o diff --git a/components/geckoport/version2/nsNetUtil.pas b/components/geckoport/version2/nsNetUtil.pas index 86635ba63..a39fe71f3 100644 --- a/components/geckoport/version2/nsNetUtil.pas +++ b/components/geckoport/version2/nsNetUtil.pas @@ -166,7 +166,7 @@ begin Result := grip.NewFileURI(spec); except str := NewUTF8String; - str.assign(spec.GetNativePath()); + spec.GetNativePath(str.AUTF8String); raise EGeckoError.CreateResFmt(PResStringRec(@SNewFileURIError), [str.ToString]); end; end; @@ -211,7 +211,7 @@ begin Result := st; except str := NewCString; - str.assign(uri.GetSpec()); + uri.GetSpec(str.ACString); raise EGeckoError.CreateResFmt(PResStringRec(@SOpenURIError), [str.ToString]); end; end; @@ -231,7 +231,7 @@ begin channel.AsyncOpen(listener, context); except str := NewCString; - str.assign(uri.GetSpec); + uri.GetSpec(str.ACString); raise EGeckoError.CreateResFmt(PResStringRec(@SOpenURIError), [str.ToString]); end; end; @@ -252,7 +252,7 @@ begin end else if uri2.Length()>0 then try - uri2.assign(baseURI.Resolve(spec2.AUTF8String)); + baseURI.Resolve(spec2.AUTF8String, uri2.AUTF8String); except raise EGeckoError.CreateRes(PResStringRec(@SMakeAbsoluteURIError)); end else @@ -276,11 +276,11 @@ begin end else try if uri2.Length()=0 then - buf1.assign(baseURI.GetSpec()) + baseURI.GetSpec(buf1.AUTF8String) else begin NS_UTF16ToCString(spec,NS_ENCODING_UTF8,buf2.AUTF8String); - buf1.assign(baseURI.Resolve(buf2.AUTF8String)); + baseURI.Resolve(buf2.AUTF8String, buf1.AUTF8String); end; rv := NS_CStringToUTF16(buf1.AUTF8String, NS_ENCODING_UTF8, uri); if NS_FAILED(rv) then diff --git a/components/geckoport/version2/nsXPCOM.pas b/components/geckoport/version2/nsXPCOM.pas index f67c72fb7..b459b7b32 100644 --- a/components/geckoport/version2/nsXPCOM.pas +++ b/components/geckoport/version2/nsXPCOM.pas @@ -14,7 +14,6 @@ unit nsXPCOM; interface uses - BaseUnix, nsTypes; {$i forwarddecl.inc} diff --git a/components/geckoport/version2/nsXPCOMGlue.pas b/components/geckoport/version2/nsXPCOMGlue.pas index e58c563b0..766f50432 100644 --- a/components/geckoport/version2/nsXPCOMGlue.pas +++ b/components/geckoport/version2/nsXPCOMGlue.pas @@ -354,7 +354,7 @@ begin raise EGeckoError.CreateRes(PResStringRec(@SGetComponentManagerError)); try - sCompMgr.CreateInstance(@CID, nil, @IID, Intf); + sCompMgr.CreateInstance(CID, nil, IID, Intf); except raise EGeckoError.CreateResFmt(PResStringRec(@SCreateInstanceError), [GUIDToString(CID)]); end; @@ -371,7 +371,7 @@ begin raise EGeckoError.CreateRes(PResStringRec(@SGetComponentManagerError)); try - sCompMgr.CreateInstanceByContractID(ContractID, nil, @IID, Intf); + sCompMgr.CreateInstanceByContractID(ContractID, nil, IID, Intf); except raise EGeckoError.CreateResFmt(PResStringRec(@SCreateInstanceError), [String(ContractID)]); end; @@ -405,7 +405,7 @@ begin raise EGeckoError.CreateRes(PResStringRec(@SGetServiceManagerError)); try - sSrvMgr.GetServiceByContractID(ContractID, @IID, Intf); + sSrvMgr.GetServiceByContractID(ContractID, IID, Intf); except raise EGeckoError.CreateResFmt(PResStringRec(@SGetServiceError), [ContractID]); end;