Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 397929 - Convert GetMessage APIs to GetMessageMoz APIs, at the C++ symbol level only (vtables remain the same), to work around brain-dead, idiotic, insane Windows API macros. r=bsmedberg, a=schrep

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@245447 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jwalden%mit.edu 2008-02-12 04:11:08 +00:00
parent e94debc4e6
commit 041dc03c46
10 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/dom/src/base/nsDOMException.cpp
View File

@ -232,7 +232,7 @@ nsBaseDOMException::~nsBaseDOMException()
NS_IMPL_ISUPPORTS2(nsBaseDOMException, nsIException, nsIBaseDOMException)
NS_IMETHODIMP
nsBaseDOMException::GetMessage(char **aMessage)
nsBaseDOMException::GetMessageMoz(char **aMessage)
{
if (mMessage) {
*aMessage = NS_strdup(mMessage);

2
mozilla/js/src/xpconnect/src/XPCDispTearOff.cpp
View File

@ -96,7 +96,7 @@ HRESULT Error(HRESULT hResult, const char * message)
static void BuildMessage(nsIException * exception, nsCString & result)
{
nsXPIDLCString msg;
exception->GetMessage(getter_Copies(msg));
exception->GetMessageMoz(getter_Copies(msg));
nsXPIDLCString filename;
exception->GetFilename(getter_Copies(filename));

2
mozilla/js/src/xpconnect/src/nsScriptError.cpp
View File

@ -61,7 +61,7 @@ nsScriptError::~nsScriptError() {}
// nsIConsoleMessage methods
NS_IMETHODIMP
nsScriptError::GetMessage(PRUnichar **result) {
nsScriptError::GetMessageMoz(PRUnichar **result) {
nsresult rv;
nsCAutoString message;

2
mozilla/js/src/xpconnect/src/xpcconvert.cpp
View File

@ -1329,7 +1329,7 @@ XPCConvert::ConstructException(nsresult rv, const char* message,
nsCOMPtr<nsIScriptError> errorObject = do_QueryInterface(data);
if(errorObject) {
if (NS_SUCCEEDED(errorObject->GetMessage(getter_Copies(xmsg)))) {
if (NS_SUCCEEDED(errorObject->GetMessageMoz(getter_Copies(xmsg)))) {
CopyUTF16toUTF8(xmsg, sxmsg);
msg = sxmsg.get();
}

2
mozilla/js/src/xpconnect/src/xpcexception.cpp
View File

@ -176,7 +176,7 @@ nsXPCException::Reset()
/* readonly attribute string message; */
NS_IMETHODIMP
nsXPCException::GetMessage(char * *aMessage)
nsXPCException::GetMessageMoz(char * *aMessage)
{
if(!mInitialized)
return NS_ERROR_NOT_INITIALIZED;

1
mozilla/js/src/xpconnect/src/xpcprivate.h
View File

@ -139,7 +139,6 @@
// Nasty MS defines
#undef GetClassInfo
#undef GetClassName
#undef GetMessage
#endif
/***************************************************************************/

2
mozilla/toolkit/xre/nsConsoleWriter.cpp
View File

@ -115,7 +115,7 @@ WriteConsoleLog()
nsCAutoString nativemsg;
for (PRUint32 i = 0; i < mcount; ++i) {
rv = messages[i]->GetMessage(getter_Copies(msg));
rv = messages[i]->GetMessageMoz(getter_Copies(msg));
if (NS_SUCCEEDED(rv)) {
NS_CopyUnicodeToNative(msg, nativemsg);
PR_fprintf(file, "%s" NS_LINEBREAK, nativemsg.get());

2
mozilla/xpcom/base/nsConsoleMessage.cpp
View File

@ -54,7 +54,7 @@ nsConsoleMessage::nsConsoleMessage(const PRUnichar *message)
}
NS_IMETHODIMP
nsConsoleMessage::GetMessage(PRUnichar **result) {
nsConsoleMessage::GetMessageMoz(PRUnichar **result) {
*result = ToNewUnicode(mMessage);
return NS_OK;

2
mozilla/xpcom/base/nsIConsoleMessage.idl
View File

@ -45,7 +45,7 @@
[scriptable, uuid(41bd8784-1dd2-11b2-9553-8606958fffe1)]
interface nsIConsoleMessage : nsISupports
{
readonly attribute wstring message;
[binaryname(MessageMoz)] readonly attribute wstring message;
};
%{ C++

2
mozilla/xpcom/base/nsIException.idl
View File

@ -67,7 +67,7 @@ interface nsIStackFrame : nsISupports
interface nsIException : nsISupports
{
// A custom message set by the thrower.
readonly attribute string message;
[binaryname(MessageMoz)] readonly attribute string message;
// The nsresult associated with this exception.
readonly attribute nsresult result;
// The name of the error code (ie, a string repr of |result|)