Jacek Caban : mshtml: Remove nscstring and nscwstring typedefs.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Nov 17 11:49:14 CST 2006
Module: wine
Branch: master
Commit: 7f9a5fac716dda565f9dc9edfd36b6777454017e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9a5fac716dda565f9dc9edfd36b6777454017e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Nov 17 13:08:51 2006 +0100
mshtml: Remove nscstring and nscwstring typedefs.
---
dlls/mshtml/nsiface.idl | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index 39a9da7..e03ee4a 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -34,9 +34,7 @@ typedef REFIID nsIIDRef;
typedef nsIIDRef nsCIDRef;
typedef void** nsQIResult;
-typedef LPCSTR nscstring;
typedef WCHAR PRUnichar;
-typedef LPCWSTR nscwstring;
typedef ULONG PRUint32;
typedef LONG PRInt32;
typedef WORD PRUint16;
@@ -120,9 +118,9 @@ typedef nsISupports nsIDOMCSSRule;
interface nsIServiceManager : nsISupports
{
nsresult GetService(nsCIDRef aClass, nsIIDRef aIID, void **result);
- nsresult GetServiceByContactID(nscstring aContactID, nsIIDRef aIID, void **result);
+ nsresult GetServiceByContactID(const char *aContactID, nsIIDRef aIID, void **result);
nsresult IsServiceInstantiated(nsCIDRef aClass, nsIIDRef aIID, BOOL *_retval);
- nsresult IsServiceInstantiatedByContractID(nscstring aContractID, nsIIDRef aIID, BOOL *_retval);
+ nsresult IsServiceInstantiatedByContractID(const char *aContractID, nsIIDRef aIID, BOOL *_retval);
}
[
@@ -141,7 +139,7 @@ interface nsIFactory : nsISupports
]
interface nsIObserver : nsISupports
{
- nsresult Observe(nsISupports *aSubject, nscstring aTopic, nscwstring aData);
+ nsresult Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData);
}
[
@@ -151,10 +149,10 @@ interface nsIObserver : nsISupports
interface nsIComponentManager : nsISupports
{
nsresult GetClassObject(nsCIDRef aClass, nsIIDRef aIID, nsQIResult result);
- nsresult GetClassObjectByContractID(nscstring aContractID, nsIIDRef aIID, nsQIResult result);
+ nsresult GetClassObjectByContractID(const char *aContractID, nsIIDRef aIID, nsQIResult result);
nsresult CreateInstance(nsCIDRef aClass, nsISupports *aDelegate, nsIIDRef aIID,
nsQIResult result);
- nsresult CreateInstanceByContractID(nscstring aContractID, nsISupports *aDelegate,
+ nsresult CreateInstanceByContractID(const char *aContractID, nsISupports *aDelegate,
nsIIDRef aIID, nsQIResult result);
}
More information about the wine-cvs
mailing list