# HG changeset patch # User John Reimer # Date 1218432665 25200 # Node ID 2c50647275de675d65a6409c70f7f66cd7d5b652 # Parent eec6ddb07873b058e156ceffa503a6ba5e909c1b remove backup files diff -r eec6ddb07873 -r 2c50647275de dwt/internal/mozilla/nsISupports.d~ --- a/dwt/internal/mozilla/nsISupports.d~ Sun Aug 10 22:25:43 2008 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -module dwt.internal.mozilla.nsISupports; - -import dwt.internal.mozilla.Common; -import dwt.internal.mozilla.nsID; - -const char[] NS_ISUPPORTS_IID_STR = "00000000-0000-0000-c000-000000000046"; - -const nsIID NS_ISUPPORTS_IID= - { 0x00000000, 0x0000, 0x0000, - [ 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 ] }; - -extern(System) - -interface IUnknown -{ - static const char[] IID_STR = NS_ISUPPORTS_IID_STR; - static const nsIID IID = NS_ISUPPORTS_IID; - - nsresult QueryInterface(nsIID * uuid, void **result); - - nsrefcnt AddRef(); - nsrefcnt Release(); -} - -// WHY WE USE COM's IUnknown for XPCOM: -// -// The IUnknown interface is special-cased in D and is specifically designed to be -// compatible with MS COM. XPCOM's nsISupports interface is the exact equivalent -// of IUnknown so we alias it here to take advantage of D's COM support. -JJR - -alias IUnknown nsISupports; \ No newline at end of file diff -r eec6ddb07873 -r 2c50647275de dwt/internal/mozilla/nsStringAPI.d~ --- a/dwt/internal/mozilla/nsStringAPI.d~ Sun Aug 10 22:25:43 2008 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,187 +0,0 @@ -module dwt.internal.mozilla.nsStringAPI; - -import dwt.internal.mozilla.Common; - -extern (System): - -/****************************************************************************** - -******************************************************************************/ - -enum -{ - NS_STRING_CONTAINER_INIT_DEPEND = 2, - NS_STRING_CONTAINER_INIT_ADOPT = 4, - NS_STRING_CONTAINER_INIT_SUBSTRING = 8, -} - -nsresult NS_StringContainerInit ( nsStringContainer *aContainer ); -nsresult NS_StringContainerInit2( nsStringContainer *aContainer, PRUnichar *aData, PRUint32 aDataLength, PRUint32 aFlags ); -void NS_StringContainerFinish(nsStringContainer *aContainer); -PRUint32 NS_StringGetData(nsAString *aStr, PRUnichar **aData, PRBool *aTerminated); -PRUint32 NS_StringGetMutableData(nsAString *aStr, PRUint32 aDataLength, PRUnichar **aData); -PRUnichar * NS_StringCloneData(nsAString *aStr); -nsresult NS_StringSetData(nsAString *aStr, PRUnichar *aData, PRUint32 aDataLength); -nsresult NS_StringSetDataRange( nsAString *aStr, PRUint32 aCutOffset, PRUint32 aCutLength, PRUnichar *aData, PRUint32 aDataLength ); -nsresult NS_StringCopy(nsAString *aDestStr, nsAString *aSrcStr); - -/****************************************************************************** - -******************************************************************************/ - -enum -{ - NS_CSTRING_CONTAINER_INIT_DEPEND = 2, - NS_CSTRING_CONTAINER_INIT_ADOPT = 4, - NS_CSTRING_CONTAINER_INIT_SUBSTRING = 8, -} - -nsresult NS_CStringContainerInit( nsCStringContainer *aContainer ); -nsresult NS_CStringContainerInit2( nsCStringContainer *aContainer, char *aData, PRUint32 aDataLength, PRUint32 aFlags ); -void NS_CStringContainerFinish( nsCStringContainer *aContainer ); -PRUint32 NS_CStringGetData( nsACString *aStr, char **aData, PRBool *aTerminated ); -PRUint32 NS_CStringGetMutableData( nsACString *aStr, PRUint32 aDataLength, char **aData ); -char * NS_CStringCloneData( nsACString *aStr); -nsresult NS_CStringSetData( nsACString *aStr, char *aData, PRUint32 aDataLength ); -nsresult NS_CStringSetDataRange( nsACString *aStr, PRUint32 aCutOffset, - PRUint32 aCutLength, char *aData, PRUint32 aDataLength ); -nsresult NS_CStringCopy( nsACString *aDestStr, nsACString *aSrcStr ); - -/****************************************************************************** - -******************************************************************************/ - -enum nsCStringEncoding -{ - NS_CSTRING_ENCODING_ASCII, - NS_CSTRING_ENCODING_UTF8, - NS_CSTRING_ENCODING_NATIVE_FILESYSTEM, -} - -nsresult NS_CStringToUTF16( nsACString *aSource, int aSrcEncoding, nsAString *aDest ); -nsresult NS_UTF16ToCString( nsAString *aSource, int aDestEncoding, nsACString *aDest ); - -/****************************************************************************** - -******************************************************************************/ - -alias nsAString nsAString_external; -alias nsACString nsACString_external; - -alias nsAString nsEmbedString; -alias nsACString nsEmbedCString; - -struct nsAString -{ - static nsAString opCall(wchar[] s) - { - nsAString result; - NS_StringSetData(&result, cast(PRUnichar*)s, uint.max); - return result; - } - - private: - void *v; -} - -struct nsACString -{ - static nsACString opCall(char[] s) - { - nsACString result; - NS_CStringSetData(&result, cast(char*)s, uint.max); - return result; - } - - private: - void *v; -} - -/****************************************************************************** - -******************************************************************************/ - -struct nsStringContainer// : public nsAString -{ -private: - void* v; - void* d1; - uint d2; - void* d3; -} - -struct nsCStringContainer// : public nsACString -{ -private: - void* v; - void* d1; - uint d2; - void* d3; -} - -/****************************************************************************** - -******************************************************************************/ - -// import mozilla.xpcom.nsDebug; - -alias nsString_external nsString; -alias nsCString_external nsCString; -alias nsDependentString_external nsDependentString; -alias nsDependentCString_external nsDependentCString; -alias NS_ConvertASCIItoUTF16_external NS_ConvertASCIItoUTF16; -alias NS_ConvertUTF8toUTF16_external NS_ConvertUTF8toUTF16; -alias NS_ConvertUTF16toUTF8_external NS_ConvertUTF16toUTF8; -alias NS_LossyConvertUTF16toASCII_external NS_LossyConvertUTF16toASCII; -alias nsGetterCopies_external nsGetterCopies; -alias nsCGetterCopies_external nsCGetterCopies; -alias nsDependentSubstring_external nsDependentSubstring; -alias nsDependentCSubstring_external nsDependentCSubstring; - -struct nsString_external{} -struct nsCString_external{} -struct nsDependentString_external{} -struct nsDependentCString_external{} -struct NS_ConvertASCIItoUTF16_external{} -struct NS_ConvertUTF8toUTF16_external{} -struct NS_ConvertUTF16toUTF8_external{} -struct NS_LossyConvertUTF16toASCII_external{} - -/****************************************************************************** - -******************************************************************************/ - -struct nsGetterCopies_external -{ - private: - alias PRUnichar char_type; - nsString_external *mString; - char_type *mData; -} - -struct nsCGetterCopies_external -{ - private: - alias char char_type; - nsCString_external *mString; - char_type *mData; -} - -/****************************************************************************** - -******************************************************************************/ - -struct nsDependentSubstring_external{} -struct nsDependentCSubstring_external{} - -/****************************************************************************** - -******************************************************************************/ - -PRUint32 strlen_PRUnichar ( PRUnichar* str ) -{ - PRUint32 len = 0; - if (str !is null) - while (*lparg0++ != 0) len++; - ret len; -} \ No newline at end of file diff -r eec6ddb07873 -r 2c50647275de dwt/internal/mozilla/nsXPCOM.d~ --- a/dwt/internal/mozilla/nsXPCOM.d~ Sun Aug 10 22:25:43 2008 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/****************************************************************************** - -module dwt.internal.mozilla.nsXPCOM; - -import dwt.internal.mozilla.Common; -import dwt.internal.mozilla.nsStringAPI; -import dwt.internal.mozilla.nsIModule; -import dwt.internal.mozilla.nsIComponentManager; -import dwt.internal.mozilla.nsIComponentRegistrar; -import dwt.internal.mozilla.nsIServiceManager; -import dwt.internal.mozilla.nsIFile; -import dwt.internal.mozilla.nsILocalFile; -import dwt.internal.mozilla.nsIDirectoryService; -import dwt.internal.mozilla.nsIMemory; -import dwt.internal.mozilla.nsIDebug; -import dwt.internal.mozilla.nsITraceRefcnt; - -/****************************************************************************** - -******************************************************************************/ - -extern (System): - -struct nsStaticModuleInfo -{ - char *name; - nsGetModuleProc getModule; -} - -alias nsresult function (nsIComponentManager, nsIFile, nsIModule*) nsGetModuleProc; - -/****************************************************************************** - -******************************************************************************/ - -nsresult NS_InitXPCOM2( nsIServiceManager *result, nsIFile binDirectory, - nsIDirectoryServiceProvider appFileLocationProvider ); -nsresult NS_InitXPCOM3( nsIServiceManager *result, nsIFile binDirectory, - nsIDirectoryServiceProvider appFileLocationProvider, - nsStaticModuleInfo* staticComponents, - PRUint32 componentCount ); - -nsresult NS_ShutdownXPCOM(nsIServiceManager servMgr); -nsresult NS_GetServiceManager(nsIServiceManager *result); -nsresult NS_GetComponentManager(nsIComponentManager *result); -nsresult NS_GetComponentRegistrar(nsIComponentRegistrar *result); -nsresult NS_GetMemoryManager(nsIMemory *result); -nsresult NS_NewLocalFile(inout nsAString path, PRBool followLinks, nsILocalFile** result); -nsresult NS_NewNativeLocalFile(inout nsACString path, PRBool followLinks, nsILocalFile** result); -void * NS_Alloc(PRSize size); -void * NS_Realloc(void *ptr, PRSize size); -void NS_Free(void *ptr); -nsresult NS_GetDebug(nsIDebug **result); -nsresult NS_GetTraceRefcnt(nsITraceRefcnt *result);