mshtml: Write-strings warnings fix (Resend)

Andrew Talbot Andrew.Talbot at talbotville.com
Thu Aug 24 14:54:13 CDT 2006


A speculative patch (slightly altered, from my earlier attempt, to suit
the current code). Please comment.

Thanks,

-- Andy.
---
Changelog:
    mshtml: Write-strings warnings fix.

diff -urN a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
--- a/dlls/mshtml/nsiface.idl	2006-08-21 17:23:25.000000000 +0100
+++ b/dlls/mshtml/nsiface.idl	2006-08-24 18:33:20.000000000 +0100
@@ -34,9 +34,9 @@
 typedef nsIIDRef nsCIDRef;
 
 typedef void** nsQIResult;
-typedef LPSTR nsstring;
+typedef LPCSTR nscstring;
 typedef WCHAR PRUnichar;
-typedef LPWSTR nswstring;
+typedef LPCWSTR nscwstring;
 typedef ULONG PRUint32;
 typedef LONG PRInt32;
 typedef WORD PRUint16;
@@ -118,9 +118,9 @@
 interface nsIServiceManager : nsISupports
 {
     nsresult GetService(nsCIDRef aClass, nsIIDRef aIID, void **result);
-    nsresult GetServiceByContactID(nsstring aContactID, nsIIDRef aIID, void **result);
+    nsresult GetServiceByContactID(nscstring aContactID, nsIIDRef aIID, void **result);
     nsresult IsServiceInstantiated(nsCIDRef aClass, nsIIDRef aIID, BOOL *_retval);
-    nsresult IsServiceInstantiatedByContractID(nsstring aContractID, nsIIDRef aIID, BOOL *_retval);
+    nsresult IsServiceInstantiatedByContractID(nscstring aContractID, nsIIDRef aIID, BOOL *_retval);
 }
 
 [
@@ -139,7 +139,7 @@
 ]
 interface nsIObserver : nsISupports
 {
-    nsresult Observe(nsISupports *aSubject, nsstring aTopic, nswstring aData);
+    nsresult Observe(nsISupports *aSubject, nscstring aTopic, nscwstring aData);
 }
 
 [
@@ -149,10 +149,10 @@
 interface nsIComponentManager : nsISupports
 {
     nsresult GetClassObject(nsCIDRef aClass, nsIIDRef aIID, nsQIResult result);
-    nsresult GetClassObjectByContractID(nsstring aContractID, nsIIDRef aIID, nsQIResult result);
+    nsresult GetClassObjectByContractID(nscstring aContractID, nsIIDRef aIID, nsQIResult result);
     nsresult CreateInstance(nsCIDRef aClass, nsISupports *aDelegate, nsIIDRef aIID,
             nsQIResult result);
-    nsresult CreateInstanceByContractID(nsstring aContractID, nsISupports *aDelegate,
+    nsresult CreateInstanceByContractID(nscstring aContractID, nsISupports *aDelegate,
             nsIIDRef aIID, nsQIResult result);
 }
 



More information about the wine-patches mailing list