mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
444160f7b2
- align permissions to gecko (2b5293932d)
- Bug 1214759 - backport SkDashPathEffect::asPoints fix from upstream Skia. r=jmuizelaar (4f58a0ef9a)
- Bug 1216020 - Comment all ALLOW_COMPILER_WARNINGS lines. r=glandium. (30a485d631)
- bug 1174747 - Fix sqlite3 build on iOS. r=glandium (ad59695677)
- Bug 1229615 - Conditionalize mp4parse.h export. r=kinetik (f7e95a1afa)
- Bug 1211741 - Remove libstagefright ID3 files. r=k17e (016da13fed)
- Bug 1202266 - Suppress '-Wformat-security' in libstagefright CXXFLAGS. r=kentuckyfriedtakahe Bug 1143336 - Fix and suppress -Wunreachable-code-return warnings in media code. r=cajbir (f8f58de405)
- Bug 1225923 - part 1 - convert all needs-to-copy instances of AppendElement(nsDependentString(...)); r=erahm (e061f9cb53)
- Bug 1225923 - part 2 - fix AppendElement(nsDependentString(...)) call in HTMLInputElement.cpp; r=baku (69d4b4c288)
- Bug 1179089 - Let TelephonyRequestParent hold the callback objects. r=hsinyi (05a6d68415)
- Bug 1225923 - part 3 - fix AppendElement(nsDependentString(...)) calls in dom/telephony/; r=btseng (31cb1e8cb0)
- Bug 1225923 - part 4 - fix AppendElement(nsDependentCString(...)) call in nsClipboardProxy.cpp; r=roc (978e7bfe19)
- Bug 1225923 - part 5 - fix AppendElement(nsDependentAtomString(...)) calls; r=bz (82c93922bb)
- fix (761e252105)
- Bug 1187114 (part 1) - Replace nsBaseHashtable::EnumerateRead() calls in dom/xul/ with iterators. r=mccr8. (12b2947f5b)
- Bug 1187114 (part 2) - Replace nsBaseHashtable::EnumerateRead() calls in dom/xul/ with iterators. r=mccr8. (db1ad0cd0f)
- Bug 1187114 (part 3) - Replace nsBaseHashtable::EnumerateRead() calls in dom/xul/ with iterators. r=mccr8. (0b46fdbb38)
- Bug 1137009 - Do not persist xul window attributes when in fullscreen. r=enndeakin (6bef2373dc)
- Bug 1206958 - Use channel->asyncOpen2() in dom/xul/XULDocument.cpp (r=sicking) (21b1a90678)
- Bug 1216945 - Uninitialised value use in nsXULWindow::SizeShellTo. r=bzbarsky. (989ce9ff88)
- Bug 1189132 - Skip unmap during window destruction on GTK, working around talos hang with GL layers. r=karlt (34f29cb72b)
- Bug 1206964 - Use channel->AsyncOpen2() in netwerk/base/nsNetUtil.cpp (r=sicking) (fbb5158a68)
- Bug 1225682 - Don't use nsAuto{,C}String as class member variables in xpfe/. r=neil (bd453fc5f5)
- Bug 1221992 - Prevent ServiceWorkerClients.OpenWindow from opening tabs in private mode windows. r=smaug (f7da0cf34c)
- Bug 1034922 - Make nsSiteWindow's destructor private, and expose it to nsContentTreeOwner via friend class. r=Enn (87d8dfa052)
- Bug 1214174 - Windowless WebBrowserChrome2Stub should implement nsIEmbeddingSiteWindow GetDimensions. r=billm (4f4b44532d)
- Bug 1214174 - Add windowless browser test case. r=billm (2ece018afd)
- Bug 1160770 - Unnecessary return in tabScrolling property in XPFE autocomplete.xml NPOTB r=Neil DONTBUILD (7fe5f13994)
- Bug 1192943 - Use channel->asycnOpen2 in xpfe/components/directory/nsDirectoryViewer.cpp (r=sicking) (79c2f93134)
- Bug 1186790 - Replace nsBaseHashtable::EnumerateRead() calls in xpfe/with iterators. r=neil. (ee73ea015d)
- Bug 1232450 - use UniquePtr<T[]> instead of nsAutoArrayPtr<T> in xulrunner/; r=Yoric (ffa7a84864)
- Bug 1174011, fix xulrunner-stub compile, r=gladium DONTBUILD (bb9381a707)
- Bug 1216723 - Add a new -forbid- Safe Browsing list type. r=gcp,r=smaug (9f164a56d8)
- cleanup, do not run PP (0d7c0cd4c0)
- Bug 1204338 Followup to Bug 403800 Refactor netError.dtd/netErrorApp.dtd to simplify per-application overrides r=Pike (5e1bbcb45c)
- Bug 1154347 - Don't set -fomit-frame-pointer on all of skia. r=glandium, r=gw280 (af8db2b7b9)
- Bug 1136958 - Remove duplicate SkDiscardableMemory_none.cpp from gfx/skia/moz.build. r=gps (9bbebeecc4)
- bits of Bug 1188462 - Rename gfx/skia/trun (d839e73b23)
- Bug 1215899 - Suppress clang and gcc warnings in gfx/skia. r=gw280 (e7859525d0)
- Bug 1222166 - use gcc/clang warning flags for clang-cl in moz.build files; r=glandium (b885ca1dff)
- Bug 1082598 - Part 1: Update Skia to master revision 53c5d5fb795fe04bec050c0583223027c25b839b. r=jrmuizel (4baf696313)
- Bug 1082598 - Part 2: Fix Moz2D Skia usage for Skia update. r=jrmuizel (d6192e1b0d)
- Bug 1082598 - Part 3: Fix thebes gfxPlatform shutdown for Skia. r=jrmuizel (ecaf498adf)
- Bug 1082598 - Part 6: Fix layers for Skia update. r=jrmuizel (e80b4e204c)
- Bug 1082598 - Part 7: Update moz.build for Skia update. r=jrmuizel (121c4c6e21)
- Bug 1082598 - Part 8: Fix OpenGL interface glue for Skia update. r=jrmuizel (327cebb260)
- Bug 1082598 - Part 9: Fix test failures for Skia update. r=jrmuizel (1d0a6a6a9a)
- missing bit of Bug 1082598 - Part 1: Update Skia (559cb5a38a)
- cleanup strange misspatch (5d759aadaf)
307 lines
7.5 KiB
C++
307 lines
7.5 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nscore.h"
|
|
#include "plstr.h"
|
|
#include <stdio.h>
|
|
#include "nsString.h"
|
|
#include <windows.h>
|
|
|
|
// mmsystem.h is needed to build with WIN32_LEAN_AND_MEAN
|
|
#include <mmsystem.h>
|
|
|
|
#include "nsSound.h"
|
|
#include "nsIURL.h"
|
|
#include "nsNetUtil.h"
|
|
#include "nsIChannel.h"
|
|
#include "nsContentUtils.h"
|
|
#include "nsCRT.h"
|
|
|
|
#include "mozilla/Logging.h"
|
|
#include "prtime.h"
|
|
#include "prprf.h"
|
|
#include "prmem.h"
|
|
|
|
#include "nsNativeCharsetUtils.h"
|
|
#include "nsThreadUtils.h"
|
|
|
|
using mozilla::LogLevel;
|
|
|
|
PRLogModuleInfo* gWin32SoundLog = nullptr;
|
|
|
|
class nsSoundPlayer: public nsRunnable {
|
|
public:
|
|
nsSoundPlayer(nsSound *aSound, const wchar_t* aSoundName) :
|
|
mSoundName(aSoundName), mSound(aSound)
|
|
{
|
|
Init();
|
|
}
|
|
|
|
nsSoundPlayer(nsSound *aSound, const nsAString& aSoundName) :
|
|
mSoundName(aSoundName), mSound(aSound)
|
|
{
|
|
Init();
|
|
}
|
|
|
|
NS_DECL_NSIRUNNABLE
|
|
|
|
protected:
|
|
nsString mSoundName;
|
|
nsSound *mSound; // Strong, but this will be released from SoundReleaser.
|
|
nsCOMPtr<nsIThread> mThread;
|
|
|
|
void Init()
|
|
{
|
|
NS_GetCurrentThread(getter_AddRefs(mThread));
|
|
NS_ASSERTION(mThread, "failed to get current thread");
|
|
NS_IF_ADDREF(mSound);
|
|
}
|
|
|
|
class SoundReleaser: public nsRunnable {
|
|
public:
|
|
SoundReleaser(nsSound* aSound) :
|
|
mSound(aSound)
|
|
{
|
|
}
|
|
|
|
NS_DECL_NSIRUNNABLE
|
|
|
|
protected:
|
|
nsSound *mSound;
|
|
};
|
|
};
|
|
|
|
NS_IMETHODIMP
|
|
nsSoundPlayer::Run()
|
|
{
|
|
PR_SetCurrentThreadName("Play Sound");
|
|
|
|
NS_PRECONDITION(!mSoundName.IsEmpty(), "Sound name should not be empty");
|
|
::PlaySoundW(mSoundName.get(), nullptr,
|
|
SND_NODEFAULT | SND_ALIAS | SND_ASYNC);
|
|
nsCOMPtr<nsIRunnable> releaser = new SoundReleaser(mSound);
|
|
// Don't release nsSound from here, because here is not an owning thread of
|
|
// the nsSound. nsSound must be released in its owning thread.
|
|
mThread->Dispatch(releaser, NS_DISPATCH_NORMAL);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsSoundPlayer::SoundReleaser::Run()
|
|
{
|
|
mSound->ShutdownOldPlayerThread();
|
|
NS_IF_RELEASE(mSound);
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
#ifndef SND_PURGE
|
|
// Not available on Windows CE, and according to MSDN
|
|
// doesn't do anything on recent windows either.
|
|
#define SND_PURGE 0
|
|
#endif
|
|
|
|
NS_IMPL_ISUPPORTS(nsSound, nsISound, nsIStreamLoaderObserver)
|
|
|
|
|
|
nsSound::nsSound()
|
|
{
|
|
if (!gWin32SoundLog) {
|
|
gWin32SoundLog = PR_NewLogModule("nsSound");
|
|
}
|
|
|
|
mLastSound = nullptr;
|
|
}
|
|
|
|
nsSound::~nsSound()
|
|
{
|
|
NS_ASSERTION(!mPlayerThread, "player thread is not null but should be");
|
|
PurgeLastSound();
|
|
}
|
|
|
|
void nsSound::ShutdownOldPlayerThread()
|
|
{
|
|
if (mPlayerThread) {
|
|
mPlayerThread->Shutdown();
|
|
mPlayerThread = nullptr;
|
|
}
|
|
}
|
|
|
|
void nsSound::PurgeLastSound()
|
|
{
|
|
if (mLastSound) {
|
|
// Halt any currently playing sound.
|
|
::PlaySound(nullptr, nullptr, SND_PURGE);
|
|
|
|
// Now delete the buffer.
|
|
free(mLastSound);
|
|
mLastSound = nullptr;
|
|
}
|
|
}
|
|
|
|
NS_IMETHODIMP nsSound::Beep()
|
|
{
|
|
::MessageBeep(0);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
|
|
nsISupports *context,
|
|
nsresult aStatus,
|
|
uint32_t dataLen,
|
|
const uint8_t *data)
|
|
{
|
|
// print a load error on bad status
|
|
if (NS_FAILED(aStatus)) {
|
|
#ifdef DEBUG
|
|
if (aLoader) {
|
|
nsCOMPtr<nsIRequest> request;
|
|
nsCOMPtr<nsIChannel> channel;
|
|
aLoader->GetRequest(getter_AddRefs(request));
|
|
if (request)
|
|
channel = do_QueryInterface(request);
|
|
if (channel) {
|
|
nsCOMPtr<nsIURI> uri;
|
|
channel->GetURI(getter_AddRefs(uri));
|
|
if (uri) {
|
|
nsAutoCString uriSpec;
|
|
uri->GetSpec(uriSpec);
|
|
MOZ_LOG(gWin32SoundLog, LogLevel::Info,
|
|
("Failed to load %s\n", uriSpec.get()));
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
return aStatus;
|
|
}
|
|
|
|
ShutdownOldPlayerThread();
|
|
PurgeLastSound();
|
|
|
|
if (data && dataLen > 0) {
|
|
DWORD flags = SND_MEMORY | SND_NODEFAULT;
|
|
// We try to make a copy so we can play it async.
|
|
mLastSound = (uint8_t *) moz_xmalloc(dataLen);
|
|
if (mLastSound) {
|
|
memcpy(mLastSound, data, dataLen);
|
|
data = mLastSound;
|
|
flags |= SND_ASYNC;
|
|
}
|
|
::PlaySoundW(reinterpret_cast<LPCWSTR>(data), 0, flags);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP nsSound::Play(nsIURL *aURL)
|
|
{
|
|
nsresult rv;
|
|
|
|
#ifdef DEBUG_SOUND
|
|
char *url;
|
|
aURL->GetSpec(&url);
|
|
MOZ_LOG(gWin32SoundLog, LogLevel::Info,
|
|
("%s\n", url));
|
|
#endif
|
|
|
|
nsCOMPtr<nsIStreamLoader> loader;
|
|
rv = NS_NewStreamLoader(getter_AddRefs(loader),
|
|
aURL,
|
|
this, // aObserver
|
|
nsContentUtils::GetSystemPrincipal(),
|
|
nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
|
|
nsIContentPolicy::TYPE_OTHER);
|
|
return rv;
|
|
}
|
|
|
|
|
|
NS_IMETHODIMP nsSound::Init()
|
|
{
|
|
// This call halts a sound if it was still playing.
|
|
// We have to use the sound library for something to make sure
|
|
// it is initialized.
|
|
// If we wait until the first sound is played, there will
|
|
// be a time lag as the library gets loaded.
|
|
::PlaySound(nullptr, nullptr, SND_PURGE);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
NS_IMETHODIMP nsSound::PlaySystemSound(const nsAString &aSoundAlias)
|
|
{
|
|
ShutdownOldPlayerThread();
|
|
PurgeLastSound();
|
|
|
|
if (!NS_IsMozAliasSound(aSoundAlias)) {
|
|
if (aSoundAlias.IsEmpty())
|
|
return NS_OK;
|
|
nsCOMPtr<nsIRunnable> player = new nsSoundPlayer(this, aSoundAlias);
|
|
NS_ENSURE_TRUE(player, NS_ERROR_OUT_OF_MEMORY);
|
|
nsresult rv = NS_NewThread(getter_AddRefs(mPlayerThread), player);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_WARNING("nsISound::playSystemSound is called with \"_moz_\" events, they are obsolete, use nsISound::playEventSound instead");
|
|
|
|
uint32_t eventId;
|
|
if (aSoundAlias.Equals(NS_SYSSOUND_MAIL_BEEP))
|
|
eventId = EVENT_NEW_MAIL_RECEIVED;
|
|
else if (aSoundAlias.Equals(NS_SYSSOUND_CONFIRM_DIALOG))
|
|
eventId = EVENT_CONFIRM_DIALOG_OPEN;
|
|
else if (aSoundAlias.Equals(NS_SYSSOUND_ALERT_DIALOG))
|
|
eventId = EVENT_ALERT_DIALOG_OPEN;
|
|
else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_EXECUTE))
|
|
eventId = EVENT_MENU_EXECUTE;
|
|
else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_POPUP))
|
|
eventId = EVENT_MENU_POPUP;
|
|
else
|
|
return NS_OK;
|
|
|
|
return PlayEventSound(eventId);
|
|
}
|
|
|
|
NS_IMETHODIMP nsSound::PlayEventSound(uint32_t aEventId)
|
|
{
|
|
ShutdownOldPlayerThread();
|
|
PurgeLastSound();
|
|
|
|
const wchar_t *sound = nullptr;
|
|
switch (aEventId) {
|
|
case EVENT_NEW_MAIL_RECEIVED:
|
|
sound = L"MailBeep";
|
|
break;
|
|
case EVENT_ALERT_DIALOG_OPEN:
|
|
sound = L"SystemExclamation";
|
|
break;
|
|
case EVENT_CONFIRM_DIALOG_OPEN:
|
|
sound = L"SystemQuestion";
|
|
break;
|
|
case EVENT_MENU_EXECUTE:
|
|
sound = L"MenuCommand";
|
|
break;
|
|
case EVENT_MENU_POPUP:
|
|
sound = L"MenuPopup";
|
|
break;
|
|
case EVENT_EDITOR_MAX_LEN:
|
|
sound = L".Default";
|
|
break;
|
|
default:
|
|
// Win32 plays no sounds at NS_SYSSOUND_PROMPT_DIALOG and
|
|
// NS_SYSSOUND_SELECT_DIALOG.
|
|
return NS_OK;
|
|
}
|
|
NS_ASSERTION(sound, "sound is null");
|
|
|
|
nsCOMPtr<nsIRunnable> player = new nsSoundPlayer(this, sound);
|
|
NS_ENSURE_TRUE(player, NS_ERROR_OUT_OF_MEMORY);
|
|
nsresult rv = NS_NewThread(getter_AddRefs(mPlayerThread), player);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
return NS_OK;
|
|
}
|