diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /xpcom/io | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'xpcom/io')
| -rw-r--r-- | xpcom/io/CocoaFileUtils.mm | 2 | ||||
| -rw-r--r-- | xpcom/io/nsLocalFileCommon.cpp | 3 | ||||
| -rw-r--r-- | xpcom/io/nsLocalFileCommon.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/xpcom/io/CocoaFileUtils.mm b/xpcom/io/CocoaFileUtils.mm index 3710be864c..f45da3ec66 100644 --- a/xpcom/io/CocoaFileUtils.mm +++ b/xpcom/io/CocoaFileUtils.mm @@ -309,7 +309,7 @@ void CopyQuarantineReferrerUrl(const CFStringRef aFilePath, ::CFDictionaryGetValue(mutQuarantineProps, kLSQuarantineOriginURLKey); if (referrerRef && ::CFGetTypeID(referrerRef) == ::CFURLGetTypeID()) { // URL string must be copied prior to releasing the dictionary. - mozilla::CopyCocoaStringToXPCOMString( + mozilla::CopyNSStringToXPCOMString( (NSString*)::CFURLGetString(static_cast<CFURLRef>(referrerRef)), aReferrer); } diff --git a/xpcom/io/nsLocalFileCommon.cpp b/xpcom/io/nsLocalFileCommon.cpp index f6eabf2d0f..7e9d7151c1 100644 --- a/xpcom/io/nsLocalFileCommon.cpp +++ b/xpcom/io/nsLocalFileCommon.cpp @@ -139,7 +139,8 @@ const char* const sExecutableExts[] = { ".wsc", ".wsf", ".wsh", - ".xll" // MS Excel dynamic link library + ".xll", // MS Excel dynamic link library + ".xrm-ms" // clang-format on }; diff --git a/xpcom/io/nsLocalFileCommon.h b/xpcom/io/nsLocalFileCommon.h index 3db0ac9e89..96b7e1f06a 100644 --- a/xpcom/io/nsLocalFileCommon.h +++ b/xpcom/io/nsLocalFileCommon.h @@ -8,9 +8,9 @@ #define _NS_LOCAL_FILE_COMMON_H_ #ifdef MOZ_ESR -extern const char* const sExecutableExts[107]; -#else extern const char* const sExecutableExts[108]; +#else +extern const char* const sExecutableExts[109]; #endif #endif |