From 1fb11162dfed659cc91e6e1ee7efefc8583f52bf Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Tue, 1 Aug 2006 15:46:06 +0000 Subject: [PATCH] 83561, r=dveditz, calling convention correctness fix git-svn-id: svn://10.0.0.236/trunk@206296 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpinstall/src/nsJSFile.cpp | 46 +++++++------- mozilla/xpinstall/src/nsJSFile.h | 42 ++++++------- mozilla/xpinstall/src/nsJSFileSpecObj.cpp | 6 +- mozilla/xpinstall/src/nsJSInstall.cpp | 60 +++++++++---------- .../src/nsJSInstallTriggerGlobal.cpp | 14 ++--- mozilla/xpinstall/src/nsJSInstallVersion.cpp | 18 +++--- mozilla/xpinstall/src/nsSoftwareUpdate.cpp | 2 +- mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp | 8 +-- 8 files changed, 98 insertions(+), 98 deletions(-) diff --git a/mozilla/xpinstall/src/nsJSFile.cpp b/mozilla/xpinstall/src/nsJSFile.cpp index e4b51ef2c53..d62632a4d55 100644 --- a/mozilla/xpinstall/src/nsJSFile.cpp +++ b/mozilla/xpinstall/src/nsJSFile.cpp @@ -109,7 +109,7 @@ GetNativeThis(JSContext *cx, JSObject *obj, jsval *argv) // // Native method DirCreate // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpDirCreate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -154,7 +154,7 @@ InstallFileOpDirCreate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js // // Native method DirGetParent // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpDirGetParent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -214,7 +214,7 @@ InstallFileOpDirGetParent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, // // Native method DirRemove // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpDirRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -267,7 +267,7 @@ InstallFileOpDirRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js // // Native method DirRename // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpDirRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -330,7 +330,7 @@ InstallFileOpDirRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js // // Native method FileCopy // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileCopy(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -399,7 +399,7 @@ InstallFileOpFileCopy(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv // // Native method FileDelete // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -444,7 +444,7 @@ InstallFileOpFileRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j // // Native method FileExists // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileExists(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -489,7 +489,7 @@ InstallFileOpFileExists(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j // // Native method FileExecute // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileExecute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -564,7 +564,7 @@ InstallFileOpFileExecute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, // // Native method FileGetNativeVersion // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileGetNativeVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -609,7 +609,7 @@ InstallFileOpFileGetNativeVersion(JSContext *cx, JSObject *obj, uintN argc, jsva // // Native method FileGetDiskSpaceAvailable // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileGetDiskSpaceAvailable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { @@ -657,7 +657,7 @@ InstallFileOpFileGetDiskSpaceAvailable(JSContext *cx, JSObject *obj, uintN argc, // // Native method FileGetModDate // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileGetModDate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -702,7 +702,7 @@ InstallFileOpFileGetModDate(JSContext *cx, JSObject *obj, uintN argc, jsval *arg // // Native method FileGetSize // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileGetSize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -750,7 +750,7 @@ InstallFileOpFileGetSize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, // // Native method FileIsDirectory // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileIsDirectory(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -795,7 +795,7 @@ InstallFileOpFileIsDirectory(JSContext *cx, JSObject *obj, uintN argc, jsval *ar // // Native method FileIsWritable // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileIsWritable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -839,7 +839,7 @@ InstallFileOpFileIsWritable(JSContext *cx, JSObject *obj, uintN argc, jsval *arg // // Native method FileIsFile // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileIsFile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -884,7 +884,7 @@ InstallFileOpFileIsFile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j // // Native method FileModDateChanged // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileModDateChanged(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -939,7 +939,7 @@ InstallFileOpFileModDateChanged(JSContext *cx, JSObject *obj, uintN argc, jsval // // Native method FileMove // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileMove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1005,7 +1005,7 @@ InstallFileOpFileMove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv // // Native method FileRename // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1068,7 +1068,7 @@ InstallFileOpFileRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j // // Native method FileWindowsGetShortName // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileWindowsGetShortName(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsAutoString shortPathName; @@ -1114,7 +1114,7 @@ InstallFileOpFileWindowsGetShortName(JSContext *cx, JSObject *obj, uintN argc, j // // Native method FileWindowsShortcut // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileWindowsShortcut(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1190,7 +1190,7 @@ InstallFileOpFileWindowsShortcut(JSContext *cx, JSObject *obj, uintN argc, jsval // // Native method FileMacAlias // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileMacAlias(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1312,7 +1312,7 @@ InstallFileOpFileMacAlias(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, // // Native method FileUnixLinkCreate // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileUnixLink(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1369,7 +1369,7 @@ InstallFileOpFileUnixLink(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, // // Native method WindowsRegisterServer // -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpWinRegisterServer(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = diff --git a/mozilla/xpinstall/src/nsJSFile.h b/mozilla/xpinstall/src/nsJSFile.h index 488f4612b36..8c7f3d58c8e 100644 --- a/mozilla/xpinstall/src/nsJSFile.h +++ b/mozilla/xpinstall/src/nsJSFile.h @@ -42,67 +42,67 @@ #include "nscore.h" -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpDirCreate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpDirGetParent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpDirRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpDirRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileCopy(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileExists(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileExecute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileGetNativeVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileGetDiskSpaceAvailable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileGetModDate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileGetSize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileIsDirectory(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileIsWritable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileIsFile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileModDateChanged(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileMove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileWindowsShortcut(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileMacAlias(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -JSBool PR_CALLBACK +JSBool JS_DLL_CALLBACK InstallFileOpFileUnixLink(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); PRInt32 InitXPFileOpObjectPrototype(JSContext *jscontext, JSObject *global, JSObject **fileOpObjectPrototype); diff --git a/mozilla/xpinstall/src/nsJSFileSpecObj.cpp b/mozilla/xpinstall/src/nsJSFileSpecObj.cpp index 149c1e58578..ca31ba9bbd3 100644 --- a/mozilla/xpinstall/src/nsJSFileSpecObj.cpp +++ b/mozilla/xpinstall/src/nsJSFileSpecObj.cpp @@ -85,7 +85,7 @@ JSClass FileSpecObjectClass = { /* * Native method fso_ToString */ -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) fso_ToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstallFolder *nativeThis = @@ -117,7 +117,7 @@ fso_ToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) /* * Native method fso_AppendString */ -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) fso_AppendPath(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { return JS_TRUE; @@ -127,7 +127,7 @@ fso_AppendPath(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva /* * FileSpecObj destructor */ -static void PR_CALLBACK FileSpecObjectCleanup(JSContext *cx, JSObject *obj) +JS_STATIC_DLL_CALLBACK(void) FileSpecObjectCleanup(JSContext *cx, JSObject *obj) { nsInstallFolder *nativeThis = (nsInstallFolder*)JS_GetPrivate(cx, obj); if (nativeThis != nsnull) diff --git a/mozilla/xpinstall/src/nsJSInstall.cpp b/mozilla/xpinstall/src/nsJSInstall.cpp index 2ca242caedb..d1b8fb22e96 100644 --- a/mozilla/xpinstall/src/nsJSInstall.cpp +++ b/mozilla/xpinstall/src/nsJSInstall.cpp @@ -66,13 +66,13 @@ extern JSClass FileSpecObjectClass; extern JSClass FileOpClass; -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) GetInstallProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp); -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) SetInstallProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp); -PR_STATIC_CALLBACK(void) +JS_STATIC_DLL_CALLBACK(void) FinalizeInstall(JSContext *cx, JSObject *obj); /***********************************************************************/ @@ -120,7 +120,7 @@ JSObject *gFileOpObject = nsnull; // // Install Properties Getter // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) GetInstallProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsInstall *a = (nsInstall*)JS_GetPrivate(cx, obj); @@ -213,7 +213,7 @@ GetInstallProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) // // Install Properties Setter // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) SetInstallProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsInstall *a = (nsInstall*)JS_GetPrivate(cx, obj); @@ -238,7 +238,7 @@ SetInstallProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } -static void PR_CALLBACK FinalizeInstall(JSContext *cx, JSObject *obj) +static void JS_DLL_CALLBACK FinalizeInstall(JSContext *cx, JSObject *obj) { nsInstall *nativeThis = (nsInstall*)JS_GetPrivate(cx, obj); delete nativeThis; @@ -371,7 +371,7 @@ void ConvertJSvalToVersionString(nsString& versionString, JSContext* cx, jsval a // // Native method AbortInstall // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallAbortInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -411,7 +411,7 @@ InstallAbortInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval // // Native method AddDirectory // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallAddDirectory(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -565,7 +565,7 @@ InstallAddDirectory(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval // // Native method AddSubcomponent // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallAddSubcomponent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -728,7 +728,7 @@ InstallAddSubcomponent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js // // Native method DeleteComponent // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallDeleteComponent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { // this function was once documented but never supported. Return an error, @@ -740,7 +740,7 @@ InstallDeleteComponent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js // // Native method Execute // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallExecute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -807,7 +807,7 @@ InstallExecute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva // // Native method FinalizeInstall // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallFinalizeInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -838,7 +838,7 @@ InstallFinalizeInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js // // Native method Gestalt // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallGestalt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -881,7 +881,7 @@ InstallGestalt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva // // Native method GetComponentFolder // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallGetComponentFolder(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -955,7 +955,7 @@ InstallGetComponentFolder(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, // // Native method GetFolder // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallGetFolder(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1058,7 +1058,7 @@ InstallGetFolder(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r // // Native method GetLastError // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallGetLastError(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1087,7 +1087,7 @@ InstallGetLastError(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval // // Native method GetWinProfile // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallGetWinProfile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { *rval = JSVAL_NULL; @@ -1128,7 +1128,7 @@ InstallGetWinProfile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva // // Native method GetWinRegistry // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallGetWinRegistry(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { *rval = JSVAL_NULL; @@ -1155,7 +1155,7 @@ InstallGetWinRegistry(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv // // Native method LoadResources // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallLoadResources(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1191,7 +1191,7 @@ InstallLoadResources(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva // // Native method Patch // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallPatch(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1304,7 +1304,7 @@ InstallPatch(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) // int type, // FileSpecObject chrome, // String extraPath) -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallRegisterChrome(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { // If there's no private data, this must be the prototype, so ignore @@ -1350,7 +1350,7 @@ InstallRegisterChrome(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv // // Native method RefreshPlugins // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallRefreshPlugins(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1376,7 +1376,7 @@ InstallRefreshPlugins(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv // // Native method ResetError // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallResetError(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1403,7 +1403,7 @@ InstallResetError(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * // // Native method SetPackageFolder // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallSetPackageFolder(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1463,7 +1463,7 @@ InstallSetPackageFolder(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j // // Native method StartInstall // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallStartInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1517,7 +1517,7 @@ InstallStartInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval // // Native method Uninstall // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallUninstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1558,7 +1558,7 @@ InstallUninstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r /*START HACK FOR DEBUGGING UNTIL ALERTS WORK*/ -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallTRACE(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsAutoString b0; @@ -1580,7 +1580,7 @@ InstallTRACE(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) // // Native method LogComment // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallLogComment(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1613,7 +1613,7 @@ InstallLogComment(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * // // Native method InstallAlert // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallAlert(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = @@ -1649,7 +1649,7 @@ InstallAlert(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) // // Native method InstallConfirm // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallConfirm(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsInstall *nativeThis = diff --git a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp index 294cffa86c2..4bb1aca340a 100644 --- a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp +++ b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp @@ -95,7 +95,7 @@ JSClass InstallTriggerGlobalClass = { // // InstallTriggerGlobal finalizer // -PR_STATIC_CALLBACK(void) +JS_STATIC_DLL_CALLBACK(void) FinalizeInstallTriggerGlobal(JSContext *cx, JSObject *obj) { nsISupports *nativeThis = (nsISupports*)JS_GetPrivate(cx, obj); @@ -197,7 +197,7 @@ static nsIDOMInstallTriggerGlobal* getTriggerNative(JSContext *cx, JSObject *obj // // Native method UpdateEnabled // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallTriggerGlobalUpdateEnabled(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsIDOMInstallTriggerGlobal *nativeThis = getTriggerNative(cx, obj); @@ -223,7 +223,7 @@ InstallTriggerGlobalUpdateEnabled(JSContext *cx, JSObject *obj, uintN argc, jsva // // Native method Install // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallTriggerGlobalInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsIDOMInstallTriggerGlobal *nativeThis = getTriggerNative(cx, obj); @@ -411,7 +411,7 @@ InstallTriggerGlobalInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *arg // // Native method InstallChrome // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallTriggerGlobalInstallChrome(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsIDOMInstallTriggerGlobal *nativeThis = getTriggerNative(cx, obj); @@ -500,7 +500,7 @@ InstallTriggerGlobalInstallChrome(JSContext *cx, JSObject *obj, uintN argc, jsva // // Native method StartSoftwareUpdate // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallTriggerGlobalStartSoftwareUpdate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsIDOMInstallTriggerGlobal *nativeThis = getTriggerNative(cx, obj); @@ -587,7 +587,7 @@ InstallTriggerGlobalStartSoftwareUpdate(JSContext *cx, JSObject *obj, uintN argc // // Native method CompareVersion // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallTriggerGlobalCompareVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsIDOMInstallTriggerGlobal *nativeThis = getTriggerNative(cx, obj); @@ -685,7 +685,7 @@ InstallTriggerGlobalCompareVersion(JSContext *cx, JSObject *obj, uintN argc, jsv // // Native method GetVersion // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallTriggerGlobalGetVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsIDOMInstallTriggerGlobal *nativeThis = getTriggerNative(cx, obj); diff --git a/mozilla/xpinstall/src/nsJSInstallVersion.cpp b/mozilla/xpinstall/src/nsJSInstallVersion.cpp index 8a392ec788e..3881bcf5fa7 100644 --- a/mozilla/xpinstall/src/nsJSInstallVersion.cpp +++ b/mozilla/xpinstall/src/nsJSInstallVersion.cpp @@ -118,7 +118,7 @@ enum InstallVersion_slots { // // InstallVersion Properties Getter // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) GetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsIDOMInstallVersion *a = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj); @@ -184,7 +184,7 @@ GetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) // // InstallVersion Properties Setter // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) SetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsIDOMInstallVersion *a = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj); @@ -270,7 +270,7 @@ SetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) // // InstallVersion finalizer // -PR_STATIC_CALLBACK(void) +JS_STATIC_DLL_CALLBACK(void) FinalizeInstallVersion(JSContext *cx, JSObject *obj) { nsISupports *nativeThis = (nsISupports*)JS_GetPrivate(cx, obj); @@ -293,7 +293,7 @@ FinalizeInstallVersion(JSContext *cx, JSObject *obj) // // InstallVersion enumerate // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) EnumerateInstallVersion(JSContext *cx, JSObject *obj) { return JS_TRUE; @@ -303,7 +303,7 @@ EnumerateInstallVersion(JSContext *cx, JSObject *obj) // // InstallVersion resolve // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) ResolveInstallVersion(JSContext *cx, JSObject *obj, jsval id) { return JS_TRUE; @@ -313,7 +313,7 @@ ResolveInstallVersion(JSContext *cx, JSObject *obj, jsval id) // // Native method Init // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallVersionInit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsIDOMInstallVersion *nativeThis = @@ -356,7 +356,7 @@ InstallVersionInit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval // // Native method ToString // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallVersionToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsIDOMInstallVersion *nativeThis = @@ -392,7 +392,7 @@ InstallVersionToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js // // Native method CompareTo // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallVersionCompareTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsIDOMInstallVersion *nativeThis = @@ -548,7 +548,7 @@ static JSConstDoubleSpec version_constants[] = // // InstallVersion constructor // -PR_STATIC_CALLBACK(JSBool) +JS_STATIC_DLL_CALLBACK(JSBool) InstallVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsresult result; diff --git a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp index 6b26bd82107..60438c3d14d 100644 --- a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp +++ b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp @@ -82,7 +82,7 @@ #include "nsCURILoader.h" -extern "C" void RunChromeInstallOnThread(void *data); +extern "C" void PR_CALLBACK RunChromeInstallOnThread(void *data); //////////////////////////////////////////////////////////////////////////////// // Globals diff --git a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp index 6158ec67791..5c37de17336 100644 --- a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp +++ b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp @@ -86,14 +86,14 @@ extern nsresult InitInstallVersionClass(JSContext *jscontext, JSObject *global, extern nsresult InitInstallTriggerGlobalClass(JSContext *jscontext, JSObject *global, void** prototype); // Defined in this file: -PR_STATIC_CALLBACK(void) XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report); +JS_STATIC_DLL_CALLBACK(void) XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report); static PRInt32 GetInstallScriptFromJarfile(nsIZipReader* hZip, char** scriptBuffer, PRUint32 *scriptLength); static PRInt32 OpenAndValidateArchive(nsIZipReader* hZip, nsIFile* jarFile, nsIPrincipal* aPrincipal); static nsresult SetupInstallContext(nsIZipReader* hZip, nsIFile* jarFile, const PRUnichar* url, const PRUnichar* args, PRUint32 flags, CHROMEREG_IFACE* reg, JSRuntime *jsRT, JSContext **jsCX, JSObject **jsGlob); -extern "C" void RunInstallOnThread(void *data); +extern "C" void PR_CALLBACK RunInstallOnThread(void *data); nsresult VerifySigning(nsIZipReader* hZip, nsIPrincipal* aPrincipal) @@ -456,7 +456,7 @@ PRInt32 RunInstall(nsInstallInfo *installInfo) // Return type : extern "C" // Argument : void *data /////////////////////////////////////////////////////////////////////////////////////////////// -extern "C" void RunInstallOnThread(void *data) +extern "C" void PR_CALLBACK RunInstallOnThread(void *data) { nsInstallInfo *installInfo = (nsInstallInfo*)data; @@ -624,7 +624,7 @@ extern "C" void RunInstallOnThread(void *data) // How do we get it there? Maybe just alerts on errors, could also dump to // the new console service. //----------------------------------------------------------------------------- -extern "C" void RunChromeInstallOnThread(void *data) +extern "C" void PR_CALLBACK RunChromeInstallOnThread(void *data) { nsresult rv;