From a17830dad45f001f09aedc30f9ec4953745c26e3 Mon Sep 17 00:00:00 2001 From: "dougt%netscape.com" Date: Mon, 15 Apr 2002 22:26:29 +0000 Subject: [PATCH] XPCOM initialize primary event queue. 135531. r=brendan@mozilla.org, sr=darin@netscape.com git-svn-id: svn://10.0.0.236/trunk@118995 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/base/nsEmbedAPI.cpp | 14 ---------- .../extensions/cookie/tests/TestCookie.cpp | 14 ---------- mozilla/gfx/tests/coverage/nsCoverage.cpp | 6 ----- .../modules/oji/tests/src/TM/PostEvent.cpp | 10 ------- .../samples/SanePlugin/nsSanePlugin.cpp | 7 ----- mozilla/netwerk/base/tests/urltest.cpp | 27 ------------------- .../streamconv/test/TestStreamConv.cpp | 3 --- mozilla/netwerk/test/TestAsyncCache.js | 1 - mozilla/netwerk/test/TestCacheCollisions.js | 1 - mozilla/netwerk/test/TestCacheMgr.cpp | 3 --- mozilla/netwerk/test/TestCacheService.cpp | 3 --- mozilla/netwerk/test/TestCallbacks.cpp | 3 --- mozilla/netwerk/test/TestFileInput.cpp | 4 --- mozilla/netwerk/test/TestFileTransport.cpp | 3 --- mozilla/netwerk/test/TestProtocols.cpp | 3 --- mozilla/netwerk/test/TestRawCache.cpp | 3 --- mozilla/netwerk/test/TestRes.cpp | 3 --- mozilla/netwerk/test/TestSocketInput.cpp | 3 --- mozilla/netwerk/test/TestSocketTransport.cpp | 6 ----- mozilla/netwerk/test/TestThreadedIO.cpp | 9 ------- mozilla/netwerk/test/TestUpload.cpp | 3 --- mozilla/rdf/tests/localfile/localfile.cpp | 3 --- mozilla/rdf/tests/rdfcat/rdfcat.cpp | 3 --- mozilla/rdf/tests/rdfsink/rdfsink.cpp | 5 ---- mozilla/webshell/tests/viewer/nsViewerApp.h | 1 - mozilla/xpcom/build/nsXPComInit.cpp | 10 +++++-- mozilla/xpcom/tests/PropertiesTest.cpp | 7 ----- mozilla/xpcom/tools/registry/regxpcom.cpp | 7 +++++ 28 files changed, 15 insertions(+), 150 deletions(-) diff --git a/mozilla/embedding/base/nsEmbedAPI.cpp b/mozilla/embedding/base/nsEmbedAPI.cpp index 8fcf47a2161..43154059818 100644 --- a/mozilla/embedding/base/nsEmbedAPI.cpp +++ b/mozilla/embedding/base/nsEmbedAPI.cpp @@ -24,7 +24,6 @@ #include "nsIServiceManager.h" #include "nsIComponentRegistrar.h" -#include "nsIEventQueueService.h" #include "nsIAppStartupNotifier.h" #include "nsIStringBundle.h" @@ -91,19 +90,6 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory, sXPCOMCleanupHack.mCleanOnExit = PR_TRUE; #endif } - - // Create the Event Queue for the UI thread... - // - // If an event queue already exists for the thread, then - // CreateThreadEventQueue(...) will fail... - // CreateThread0ueue(...) will fail... - nsCOMPtr eventQService( - do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv)); - if (NS_FAILED(rv)) - return rv; - - eventQService->CreateThreadEventQueue(); - // Register components if (!sRegistryInitializedFlag) { diff --git a/mozilla/extensions/cookie/tests/TestCookie.cpp b/mozilla/extensions/cookie/tests/TestCookie.cpp index 76ed0a09e0e..9c4e054c495 100644 --- a/mozilla/extensions/cookie/tests/TestCookie.cpp +++ b/mozilla/extensions/cookie/tests/TestCookie.cpp @@ -45,11 +45,7 @@ #include "nsIStringBundle.h" -static nsIEventQueue* gEventQ = nsnull; - - static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID); -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); void SetACookie(nsICookieService *cookieService, const char* aSpec, const char* aCookieString) { nsCOMPtr uri; @@ -92,16 +88,6 @@ int main(PRInt32 argc, char *argv[]) nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull); if (NS_FAILED(rv)) return -1; - // Create the Event Queue for this thread... - nsCOMPtr eventQService = - do_GetService(kEventQueueServiceCID, &rv); - if (NS_FAILED(rv)) return -1; - - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) return -1; - - eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); - nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) diff --git a/mozilla/gfx/tests/coverage/nsCoverage.cpp b/mozilla/gfx/tests/coverage/nsCoverage.cpp index 373633fe6e8..d7db2b559ef 100644 --- a/mozilla/gfx/tests/coverage/nsCoverage.cpp +++ b/mozilla/gfx/tests/coverage/nsCoverage.cpp @@ -338,12 +338,6 @@ nsresult CoverageTest(int *argc, char **argv) return res; } - res = eventQService->CreateThreadEventQueue(); - if (NS_OK != res) { - NS_ASSERTION(PR_FALSE, "Could not create the event queue for the thread"); - return res; - } - // Create a application shell nsIAppShell *appShell; CallCreateInstance(kCAppShellCID, &appShell); diff --git a/mozilla/modules/oji/tests/src/TM/PostEvent.cpp b/mozilla/modules/oji/tests/src/TM/PostEvent.cpp index 35b4d56db68..21cfeb88fba 100755 --- a/mozilla/modules/oji/tests/src/TM/PostEvent.cpp +++ b/mozilla/modules/oji/tests/src/TM/PostEvent.cpp @@ -119,11 +119,6 @@ TM_OJIAPITest(ThreadManager_PostEvent_6) { nsCOMPtr eventQueue = NULL; - lrc = eventService->CreateThreadEventQueue(); - if (lrc != NS_OK) { - printf("Can'r create event queue ...\n"); - nsresult rc = NS_ERROR_FAILURE; - } printf("Waiting for thread ID (%p) ...", &id); tm->EnterMonitor(&id); tm->ExitMonitor(&id); @@ -204,11 +199,6 @@ TM_OJIAPITest(ThreadManager_PostEvent_7) { nsCOMPtr eventQueue = NULL; - lrc = eventService->CreateThreadEventQueue(); - if (lrc != NS_OK) { - printf("Can't create event queue ...\n"); - nsresult rc = NS_ERROR_FAILURE; - } //tm->EnterMonitor(&id); printf("Waiting for thread ID (%p) ...", &id); while(!id); diff --git a/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp b/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp index f30618316aa..6e146cfe7f0 100644 --- a/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp +++ b/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp @@ -2521,13 +2521,6 @@ void PR_CALLBACK scanimage_thread_routine( void * arg ) return; } - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) { - NS_ERROR("Unable to create new thread event queue!\n"); - // Does this mean that an event queue is already at - // our disposal? - } - rv = eventQService->GetThreadEventQueue(pthis->mUIThread, getter_AddRefs(eventQ)); if (NS_FAILED(rv)) { diff --git a/mozilla/netwerk/base/tests/urltest.cpp b/mozilla/netwerk/base/tests/urltest.cpp index 96e234aeddd..3068a57154b 100644 --- a/mozilla/netwerk/base/tests/urltest.cpp +++ b/mozilla/netwerk/base/tests/urltest.cpp @@ -47,7 +47,6 @@ #endif #include "plstr.h" -#include "nsIEventQueue.h" #include "nsIComponentManager.h" #include "nsIComponentRegistrar.h" @@ -56,7 +55,6 @@ #include "nsINetService.h" #include "nsIComponentManager.h" #include "nsIServiceManager.h" -#include "nsIEventQueueService.h" #include "nsString.h" #include "nsReadableUtils.h" @@ -78,10 +76,6 @@ // Define CIDs... static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID); -static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); - -// Define IIDs... -static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); //NS_DEFINE_IID(kIPostToServerIID, NS_IPOSTTOSERVER_IID); #ifdef XP_UNIX @@ -243,7 +237,6 @@ int main(int argc, char **argv) nsAutoString url_address; // char buf[256]; // nsIStreamListener *pConsumer; - nsIEventQueueService* pEventQService; // nsIURL *pURL; nsresult result; int i; @@ -262,21 +255,6 @@ int main(int argc, char **argv) testURL(argv[1]); return 0; #if 0 - nsRepository::RegisterComponent( - kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); - nsRepository::RegisterComponent( - kNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE); - - // Create the Event Queue for this thread... - pEventQService = nsnull; - result = nsServiceManager::GetService(kEventQueueServiceCID, - kIEventQueueServiceIID, - (nsISupports **)&pEventQService); - if (NS_SUCCEEDED(result)) { - // XXX: What if this fails? - result = pEventQService->CreateThreadEventQueue(); - } - for (i=1; i < argc; i++) { if (PL_strcasecmp(argv[i], "-all") == 0) { testURL(0); @@ -285,11 +263,6 @@ int main(int argc, char **argv) testURL(argv[i]); } - - if (nsnull != pEventQService) { - pEventQService->DestroyThreadEventQueue(); - nsServiceManager::ReleaseService(kEventQueueServiceCID, pEventQService); - } return 0; #endif } diff --git a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp index d9ea72b78b5..7f45e522fde 100644 --- a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp +++ b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp @@ -151,9 +151,6 @@ main(int argc, char* argv[]) do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) return rv; - eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); nsCOMPtr catman = diff --git a/mozilla/netwerk/test/TestAsyncCache.js b/mozilla/netwerk/test/TestAsyncCache.js index 501b19188bc..381e10546f9 100644 --- a/mozilla/netwerk/test/TestAsyncCache.js +++ b/mozilla/netwerk/test/TestAsyncCache.js @@ -8,7 +8,6 @@ function getEventQueue() var nsIEventQueueService = Components.interfaces.nsIEventQueueService; var CID = Components.classes["@mozilla.org/event-queue-service;1"]; var service = CID.getService(nsIEventQueueService); - service.createThreadEventQueue(); return service.getSpecialEventQueue(nsIEventQueueService.CURRENT_THREAD_EVENT_QUEUE); } diff --git a/mozilla/netwerk/test/TestCacheCollisions.js b/mozilla/netwerk/test/TestCacheCollisions.js index 242ab869772..cadcc3ef4c3 100644 --- a/mozilla/netwerk/test/TestCacheCollisions.js +++ b/mozilla/netwerk/test/TestCacheCollisions.js @@ -8,7 +8,6 @@ function getEventQueue() var nsIEventQueueService = Components.interfaces.nsIEventQueueService; var CID = Components.classes["@mozilla.org/event-queue-service;1"]; var service = CID.getService(nsIEventQueueService); - service.createThreadEventQueue(); return service.getSpecialEventQueue(nsIEventQueueService.CURRENT_THREAD_EVENT_QUEUE); } diff --git a/mozilla/netwerk/test/TestCacheMgr.cpp b/mozilla/netwerk/test/TestCacheMgr.cpp index e6dfeae3e0c..613d161c8a3 100644 --- a/mozilla/netwerk/test/TestCacheMgr.cpp +++ b/mozilla/netwerk/test/TestCacheMgr.cpp @@ -260,9 +260,6 @@ InitQueue() { do_GetService(kEventQueueServiceCID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service"); - rv = eventQService->CreateThreadEventQueue(); - NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create event queue"); - rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQueue); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread"); diff --git a/mozilla/netwerk/test/TestCacheService.cpp b/mozilla/netwerk/test/TestCacheService.cpp index 4856b0ae6aa..294bcfa034c 100644 --- a/mozilla/netwerk/test/TestCacheService.cpp +++ b/mozilla/netwerk/test/TestCacheService.cpp @@ -193,9 +193,6 @@ main(int argc, char* argv[]) do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) goto error_exit; - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) goto error_exit; - eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(gEventQ)); /** diff --git a/mozilla/netwerk/test/TestCallbacks.cpp b/mozilla/netwerk/test/TestCallbacks.cpp index 9789b250bb1..c7f5d0bdd7f 100644 --- a/mozilla/netwerk/test/TestCallbacks.cpp +++ b/mozilla/netwerk/test/TestCallbacks.cpp @@ -257,9 +257,6 @@ int main(int argc, char *argv[]) { do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) return rv; - rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/netwerk/test/TestFileInput.cpp b/mozilla/netwerk/test/TestFileInput.cpp index 3cfbcd5db3c..12c940609b4 100644 --- a/mozilla/netwerk/test/TestFileInput.cpp +++ b/mozilla/netwerk/test/TestFileInput.cpp @@ -112,10 +112,6 @@ public: nsCOMPtr eventQService = do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv)) { - rv = eventQService->CreateThreadEventQueue(); - - if (NS_FAILED(rv)) return rv; - rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &mEventQueue); } diff --git a/mozilla/netwerk/test/TestFileTransport.cpp b/mozilla/netwerk/test/TestFileTransport.cpp index bc8784c4272..4076c18e45c 100644 --- a/mozilla/netwerk/test/TestFileTransport.cpp +++ b/mozilla/netwerk/test/TestFileTransport.cpp @@ -366,9 +366,6 @@ main(int argc, char* argv[]) do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) return rv; - rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/netwerk/test/TestProtocols.cpp b/mozilla/netwerk/test/TestProtocols.cpp index 960ee8cd897..3d8dd5e5226 100644 --- a/mozilla/netwerk/test/TestProtocols.cpp +++ b/mozilla/netwerk/test/TestProtocols.cpp @@ -596,9 +596,6 @@ main(int argc, char* argv[]) do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) return rv; - eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); int i; diff --git a/mozilla/netwerk/test/TestRawCache.cpp b/mozilla/netwerk/test/TestRawCache.cpp index 09ba6411199..6034f2e744b 100644 --- a/mozilla/netwerk/test/TestRawCache.cpp +++ b/mozilla/netwerk/test/TestRawCache.cpp @@ -268,9 +268,6 @@ InitQueue() { do_GetService(kEventQueueServiceCID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service"); - rv = eventQService->CreateThreadEventQueue(); - NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create event queue"); - rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQueue); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread"); diff --git a/mozilla/netwerk/test/TestRes.cpp b/mozilla/netwerk/test/TestRes.cpp index cd187299ea6..85642f22066 100644 --- a/mozilla/netwerk/test/TestRes.cpp +++ b/mozilla/netwerk/test/TestRes.cpp @@ -209,9 +209,6 @@ TestAsyncRead(const char* url) do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) return rv; - rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/netwerk/test/TestSocketInput.cpp b/mozilla/netwerk/test/TestSocketInput.cpp index 35d122ff5dc..0ff78b202d5 100644 --- a/mozilla/netwerk/test/TestSocketInput.cpp +++ b/mozilla/netwerk/test/TestSocketInput.cpp @@ -163,9 +163,6 @@ main(int argc, char* argv[]) do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) return rv; - nsCOMPtr eventQ; rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ)); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/netwerk/test/TestSocketTransport.cpp b/mozilla/netwerk/test/TestSocketTransport.cpp index a7176fe0773..9ece985f0c7 100644 --- a/mozilla/netwerk/test/TestSocketTransport.cpp +++ b/mozilla/netwerk/test/TestSocketTransport.cpp @@ -375,9 +375,6 @@ TestConnection::Run(void) do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) return rv; - // // Make sure that all resources were allocated in the constructor... // @@ -641,9 +638,6 @@ main(int argc, char* argv[]) do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) return rv; - // // Create the connections and threads... // diff --git a/mozilla/netwerk/test/TestThreadedIO.cpp b/mozilla/netwerk/test/TestThreadedIO.cpp index d7102f9d964..e286cbc9c5c 100644 --- a/mozilla/netwerk/test/TestThreadedIO.cpp +++ b/mozilla/netwerk/test/TestThreadedIO.cpp @@ -59,16 +59,7 @@ createEventQueue() { nsCOMPtr eqs = do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv); if ( NS_SUCCEEDED( rv ) ) { - // Have service create us an event queue. - rv = eqs->CreateThreadEventQueue(); - if ( NS_SUCCEEDED( rv ) ) { - // Get the event queue it created. BTW, why the heck doesn't - // CreateThreadEventQueue just return it? eqs->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(result)); - } else { - printf( "%s %d: nsIEventQueueService::CreateThreadEventQueue failed, rv=0x%08X\n", - (char*)__FILE__, (int)__LINE__, (int)rv ); - } } else { printf( "%s %d: NS_WITH_SERVICE(nsIEventQueueService) failed, rv=0x%08X\n", (char*)__FILE__, (int)__LINE__, (int)rv ); diff --git a/mozilla/netwerk/test/TestUpload.cpp b/mozilla/netwerk/test/TestUpload.cpp index d1d9d8c15cf..e96a66bc750 100644 --- a/mozilla/netwerk/test/TestUpload.cpp +++ b/mozilla/netwerk/test/TestUpload.cpp @@ -145,9 +145,6 @@ main(int argc, char* argv[]) do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; - rv = eventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) return rv; - eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); diff --git a/mozilla/rdf/tests/localfile/localfile.cpp b/mozilla/rdf/tests/localfile/localfile.cpp index 189f2094415..d9d576fbc94 100644 --- a/mozilla/rdf/tests/localfile/localfile.cpp +++ b/mozilla/rdf/tests/localfile/localfile.cpp @@ -138,9 +138,6 @@ main(int argc, char** argv) (nsISupports**) &theEventQueueService))) goto done; - if (NS_FAILED(rv = theEventQueueService->CreateThreadEventQueue())) - goto done; - if (NS_FAILED(rv = theEventQueueService->GetThreadEventQueue(NS_CURRENT_THREAD, &mainQueue))) goto done; diff --git a/mozilla/rdf/tests/rdfcat/rdfcat.cpp b/mozilla/rdf/tests/rdfcat/rdfcat.cpp index 76331a150e2..9c0b24e2450 100644 --- a/mozilla/rdf/tests/rdfcat/rdfcat.cpp +++ b/mozilla/rdf/tests/rdfcat/rdfcat.cpp @@ -156,9 +156,6 @@ main(int argc, char** argv) do_GetService(kEventQueueServiceCID, &rv); RETURN_IF_FAILED(rv, "EventQueueService"); - rv = theEventQueueService->CreateThreadEventQueue(); - RETURN_IF_FAILED(rv, "CreateThreadEventQueue"); - nsIEventQueue* eq = nsnull; rv = theEventQueueService->GetThreadEventQueue(NS_CURRENT_THREAD, &eq); RETURN_IF_FAILED(rv, "GetThreadEventQueue"); diff --git a/mozilla/rdf/tests/rdfsink/rdfsink.cpp b/mozilla/rdf/tests/rdfsink/rdfsink.cpp index ec0c2a3abcd..2df353506d5 100644 --- a/mozilla/rdf/tests/rdfsink/rdfsink.cpp +++ b/mozilla/rdf/tests/rdfsink/rdfsink.cpp @@ -139,11 +139,6 @@ main(int argc, char** argv) goto done; } - if (NS_FAILED(rv = theEventQueueService->CreateThreadEventQueue())) { - NS_ERROR("unable to create thread event queue"); - goto done; - } - if (NS_FAILED(rv = theEventQueueService->GetThreadEventQueue(NS_CURRENT_THREAD, &mainQueue))) { NS_ERROR("unable to get event queue for current thread"); diff --git a/mozilla/webshell/tests/viewer/nsViewerApp.h b/mozilla/webshell/tests/viewer/nsViewerApp.h index bb4680fc2ac..b958855c41e 100644 --- a/mozilla/webshell/tests/viewer/nsViewerApp.h +++ b/mozilla/webshell/tests/viewer/nsViewerApp.h @@ -85,7 +85,6 @@ protected: nsIAppShell* mAppShell; nsIPref* mPrefs; - nsIEventQueueService* mEventQService; nsString mStartURL; PRBool mDoPurify; PRBool mLoadTestFromFile; diff --git a/mozilla/xpcom/build/nsXPComInit.cpp b/mozilla/xpcom/build/nsXPComInit.cpp index c7cfc9c6f6b..a767836b254 100644 --- a/mozilla/xpcom/build/nsXPComInit.cpp +++ b/mozilla/xpcom/build/nsXPComInit.cpp @@ -443,8 +443,7 @@ nsresult NS_COM NS_InitXPCOM2(nsIServiceManager* *result, NS_CATEGORYMANAGER_CONTRACTID, categoryManagerFactory, PR_TRUE); - if ( NS_FAILED(rv) ) - return rv; + if ( NS_FAILED(rv) ) return rv; } for (int i = 0; i < components_length; i++) @@ -458,6 +457,12 @@ nsresult NS_COM NS_InitXPCOM2(nsIServiceManager* *result, nsIInterfaceInfoManager* iim = XPTI_GetInterfaceInfoManager(); NS_IF_RELEASE(iim); + nsCOMPtr eventQService(do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv)); + if ( NS_FAILED(rv) ) return rv; + + rv = eventQService->CreateThreadEventQueue(); + if ( NS_FAILED(rv) ) return rv; + return rv; } @@ -507,6 +512,7 @@ NS_UnregisterXPCOMExitRoutine(XPCOMExitRoutine exitRoutine) // nsresult NS_COM NS_ShutdownXPCOM(nsIServiceManager* servMgr) { + // Notify observers of xpcom shutting down nsresult rv = NS_OK; { diff --git a/mozilla/xpcom/tests/PropertiesTest.cpp b/mozilla/xpcom/tests/PropertiesTest.cpp index 91dcd5c71cc..75d8a70c187 100644 --- a/mozilla/xpcom/tests/PropertiesTest.cpp +++ b/mozilla/xpcom/tests/PropertiesTest.cpp @@ -76,13 +76,6 @@ main(int argc, char* argv[]) NS_ASSERTION(registrar, "Null nsIComponentRegistrar"); registrar->AutoRegister(nsnull); - // Create the Event Queue for this thread... - nsCOMPtr pEventQService = - do_GetService(kEventQueueServiceCID); - if (pEventQService) - // XXX: What if this fails? - pEventQService->CreateThreadEventQueue(); - nsIInputStream* in = nsnull; nsCOMPtr service(do_GetService(kIOServiceCID, &ret)); diff --git a/mozilla/xpcom/tools/registry/regxpcom.cpp b/mozilla/xpcom/tools/registry/regxpcom.cpp index a839e85e8e1..7bc956f9da8 100644 --- a/mozilla/xpcom/tools/registry/regxpcom.cpp +++ b/mozilla/xpcom/tools/registry/regxpcom.cpp @@ -49,6 +49,7 @@ #include "nsIServiceManager.h" #include "nsCOMPtr.h" #include "nsILocalFile.h" +#include "nsIEventQueueService.h" static PRBool gUnreg = PR_FALSE, gSilent = PR_FALSE, gQuiet = PR_FALSE; @@ -192,6 +193,12 @@ int main(int argc, char *argv[]) nsCOMPtr registrar = do_QueryInterface(servMan); NS_ASSERTION(registrar, "Null nsIComponentRegistrar"); + + nsCOMPtr eventQService(do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv)); + if (NS_SUCCEEDED(rv)) { + // XXX: What if this fails? + rv = eventQService->CreateThreadEventQueue(); + } /* With no arguments, RegFactory will autoregister */ if (argc <= 1)