Module: wine Branch: master Commit: 9545da643f31adce5a1bc5de07a7ecbcd124f1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9545da643f31adce5a1bc5de07...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Aug 26 23:13:29 2009 +0200
mshtml: Remove no longer used create_nsstream.
---
dlls/mshtml/nsembed.c | 30 ------------------------------ dlls/mshtml/nsiface.idl | 13 ------------- 2 files changed, 0 insertions(+), 43 deletions(-)
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 41f762f..50001aa 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -38,14 +38,10 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko);
#define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1" #define NS_WEBBROWSER_CONTRACTID "@mozilla.org/embedding/browser/nsWebBrowser;1" -#define NS_PROFILE_CONTRACTID "@mozilla.org/profile/manager;1" #define NS_MEMORY_CONTRACTID "@mozilla.org/xpcom/memory-service;1" -#define NS_STRINGSTREAM_CONTRACTID "@mozilla.org/io/string-input-stream;1" #define NS_COMMANDPARAMS_CONTRACTID "@mozilla.org/embedcomp/command-params;1" #define NS_HTMLSERIALIZER_CONTRACTID "@mozilla.org/layout/contentserializer;1?mimetype=text/html" #define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1" -#define NS_ARRAY_CONTRACTID "@mozilla.org/array;1" -#define NS_VARIANT_CONTRACTID "@mozilla.org/variant;1" #define NS_PREFERENCES_CONTRACTID "@mozilla.org/preferences;1"
#define APPSTARTUP_TOPIC "app-startup" @@ -581,32 +577,6 @@ void nsAString_Finish(nsAString *str) NS_StringContainerFinish(str); }
-nsIInputStream *create_nsstream(const char *data, PRInt32 data_len) -{ - nsIStringInputStream *ret; - nsresult nsres; - - if(!pCompMgr) - return NULL; - - nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, - NS_STRINGSTREAM_CONTRACTID, NULL, &IID_nsIStringInputStream, - (void**)&ret); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIStringInputStream\n"); - return NULL; - } - - nsres = nsIStringInputStream_SetData(ret, data, data_len); - if(NS_FAILED(nsres)) { - ERR("AdoptData failed: %08x\n", nsres); - nsIStringInputStream_Release(ret); - return NULL; - } - - return (nsIInputStream*)ret; -} - nsICommandParams *create_nscommand_params(void) { nsICommandParams *ret = NULL; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index b6ae250..1bfc67d 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -286,19 +286,6 @@ interface nsIInputStream : nsISupports
[ object, - uuid(450cd2d4-f0fd-424d-b365-b1251f80fd53), - local - /* NOT_FROZEN */ -] -interface nsIStringInputStream : nsIInputStream -{ - nsresult SetData(const char *data, PRInt32 dataLen); - nsresult AdoptData(char *data, PRInt32 dataLen); - nsresult ShareData(const char *data, PRInt32 dataLen); -} - -[ - object, uuid(07a22cc0-0ce5-11d3-9331-00104ba0fd40), local /* FROZEN */